nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add Dana's models to the game, add cosmetic customisation for keys and rename Bombchus in Logic (#4311)

Browse Source 
* initial implementation of new models

* fix typo

* Add smaller skeleton key model and try to fix windows build

* stupid windows, you made me look bad!

* make DrawBombchuBag function work

* small cleanups

* OOGGA BOOGA BOO

* fix post merge leftovers

* post merge fix

* Added Big Key Lighting override to show vanilla lighting when unchanged

* rename CustomdLists into customIconDLs

* post merge fixes

* fix some tooltip issues

* post merge cleanup and some small menu changes

* post merge fix

* post merge fix

* add new boss soul model, colours broken

* update boss soul model for env support

* Add dungeon customise buttons to cosmetic editor

* fix mac build?

* keys don't support alpha

* fix submodules

* ring now draws

* fix keyring colours

* Add bombchu Bag RG, fix boss soul skull colour

* address reviews
This commit is contained in:
Pepper0ni
2025-01-15 13:18:52 +00:00
committed by GitHub
parent 95a4e1cfba
commit 3e6a0ef566
253 changed files with 34305 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
soh/assets/soh_assets.h
View File

@@ -83,6 +83,160 @@ static const ALIGN_ASSET(2) char gFishingPoleGiDL[] = dgFishingPoleGiDL;
#define dgMysteryItemDL "__OTR__objects/object_mystery_item/gMysteryItemDL"
static const ALIGN_ASSET(2) char gMysteryItemDL[] = dgMysteryItemDL;
#define dgBombchuBagBodyDL "__OTR__objects/object_bombchubag/gBombchuBagBodyDL"
static const ALIGN_ASSET(2) char gBombchuBagBodyDL[] = dgBombchuBagBodyDL;
#define dgBombchuBagMaskDL "__OTR__objects/object_bombchubag/gBombchuBagMaskDL"
static const ALIGN_ASSET(2) char gBombchuBagMaskDL[] = dgBombchuBagMaskDL;
//boss keys
#define dgBossKeyCustomDL "__OTR__objects/object_bosskey/gBossKeyCustomDL"
static const ALIGN_ASSET(2) char gBossKeyCustomDL[] = dgBossKeyCustomDL;
#define dgBossKeyIconForestTempleDL "__OTR__objects/object_bosskey/gBossKeyIconForestTempleDL"
static const ALIGN_ASSET(2) char gBossKeyIconForestTempleDL[] = dgBossKeyIconForestTempleDL;
#define dgBossKeyIconFireTempleDL "__OTR__objects/object_bosskey/gBossKeyIconFireTempleDL"
static const ALIGN_ASSET(2) char gBossKeyIconFireTempleDL[] = dgBossKeyIconFireTempleDL;
#define dgBossKeyIconWaterTempleDL "__OTR__objects/object_bosskey/gBossKeyIconWaterTempleDL"
static const ALIGN_ASSET(2) char gBossKeyIconWaterTempleDL[] = dgBossKeyIconWaterTempleDL;
#define dgBossKeyIconSpiritTempleDL "__OTR__objects/object_bosskey/gBossKeyIconSpiritTempleDL"
static const ALIGN_ASSET(2) char gBossKeyIconSpiritTempleDL[] = dgBossKeyIconSpiritTempleDL;
#define dgBossKeyIconShadowTempleDL "__OTR__objects/object_bosskey/gBossKeyIconShadowTempleDL"
static const ALIGN_ASSET(2) char gBossKeyIconShadowTempleDL[] = dgBossKeyIconShadowTempleDL;
#define dgBossKeyIconGanonsCastleDL "__OTR__objects/object_bosskey/gBossKeyIconGanonsCastleDL"
static const ALIGN_ASSET(2) char gBossKeyIconGanonsCastleDL[] = dgBossKeyIconGanonsCastleDL;
//skeleton key
#define dgSkeletonKeyDL "__OTR__objects/object_key/gSkeletonKeyDL"
static const ALIGN_ASSET(2) char gSkeletonKeyDL[] = dgSkeletonKeyDL;
//small keys
#define dgSmallKeyCustomDL "__OTR__objects/object_key/gSmallKeyCustomDL"
static const ALIGN_ASSET(2) char gSmallKeyCustomDL[] = dgSmallKeyCustomDL;
#define dgSmallKeyIconForestTempleDL "__OTR__objects/object_key/gSmallKeyIconForestTempleDL"
static const ALIGN_ASSET(2) char gSmallKeyIconForestTempleDL[] = dgSmallKeyIconForestTempleDL;
#define dgSmallKeyIconFireTempleDL "__OTR__objects/object_key/gSmallKeyIconFireTempleDL"
static const ALIGN_ASSET(2) char gSmallKeyIconFireTempleDL[] = dgSmallKeyIconFireTempleDL;
#define dgSmallKeyIconWaterTempleDL "__OTR__objects/object_key/gSmallKeyIconWaterTempleDL"
static const ALIGN_ASSET(2) char gSmallKeyIconWaterTempleDL[] = dgSmallKeyIconWaterTempleDL;
#define dgSmallKeyIconGerudoFortressDL "__OTR__objects/object_key/gSmallKeyIconGerudoFortressDL"
static const ALIGN_ASSET(2) char gSmallKeyIconGerudoFortressDL[] = dgSmallKeyIconGerudoFortressDL;
#define dgSmallKeyIconGerudoTrainingGroundDL "__OTR__objects/object_key/gSmallKeyIconGerudoTrainingGroundDL"
static const ALIGN_ASSET(2) char gSmallKeyIconGerudoTrainingGroundDL[] = dgSmallKeyIconGerudoTrainingGroundDL;
#define dgSmallKeyIconSpiritTempleDL "__OTR__objects/object_key/gSmallKeyIconSpiritTempleDL"
static const ALIGN_ASSET(2) char gSmallKeyIconSpiritTempleDL[] = dgSmallKeyIconSpiritTempleDL;
#define dgSmallKeyIconBottomoftheWellDL "__OTR__objects/object_key/gSmallKeyIconBottomoftheWellDL"
static const ALIGN_ASSET(2) char gSmallKeyIconBottomoftheWellDL[] = dgSmallKeyIconBottomoftheWellDL;
#define dgSmallKeyIconShadowTempleDL "__OTR__objects/object_key/gSmallKeyIconShadowTempleDL"
static const ALIGN_ASSET(2) char gSmallKeyIconShadowTempleDL[] = dgSmallKeyIconShadowTempleDL;
#define dgSmallKeyIconGanonsCastleDL "__OTR__objects/object_key/gSmallKeyIconGanonsCastleDL"
static const ALIGN_ASSET(2) char gSmallKeyIconGanonsCastleDL[] = dgSmallKeyIconGanonsCastleDL;
#define dgSmallKeyIconTreasureChestGameDL "__OTR__objects/object_key/gSmallKeyIconTreasureChestGameDL"
static const ALIGN_ASSET(2) char gSmallKeyIconTreasureChestGameDL[] = dgSmallKeyIconTreasureChestGameDL;
//keyrings
#define dgKeyringRingDL "__OTR__objects/object_keyring/gKeyringRingDL"
static const ALIGN_ASSET(2) char gKeyringRingDL[] = dgKeyringRingDL;
#define dgKeyringIconForestTempleDL "__OTR__objects/object_keyring/gKeyringIconForestTempleDL"
static const ALIGN_ASSET(2) char gKeyringIconForestTempleDL[] = dgKeyringIconForestTempleDL;
#define dgKeyringIconFireTempleDL "__OTR__objects/object_keyring/gKeyringIconFireTempleDL"
static const ALIGN_ASSET(2) char gKeyringIconFireTempleDL[] = dgKeyringIconFireTempleDL;
#define dgKeyringIconWaterTempleDL "__OTR__objects/object_keyring/gKeyringIconWaterTempleDL"
static const ALIGN_ASSET(2) char gKeyringIconWaterTempleDL[] = dgKeyringIconWaterTempleDL;
#define dgKeyringIconGerudoFortressDL "__OTR__objects/object_keyring/gKeyringIconGerudoFortressDL"
static const ALIGN_ASSET(2) char gKeyringIconGerudoFortressDL[] = dgKeyringIconGerudoFortressDL;
#define dgKeyringIconGerudoTrainingGroundDL "__OTR__objects/object_keyring/gKeyringIconGerudoTrainingGroundDL"
static const ALIGN_ASSET(2) char gKeyringIconGerudoTrainingGroundDL[] = dgKeyringIconGerudoTrainingGroundDL;
#define dgKeyringIconSpiritTempleDL "__OTR__objects/object_keyring/gKeyringIconSpiritTempleDL"
static const ALIGN_ASSET(2) char gKeyringIconSpiritTempleDL[] = dgKeyringIconSpiritTempleDL;
#define dgKeyringIconBottomoftheWellDL "__OTR__objects/object_keyring/gKeyringIconBottomoftheWellDL"
static const ALIGN_ASSET(2) char gKeyringIconBottomoftheWellDL[] = dgKeyringIconBottomoftheWellDL;
#define dgKeyringIconShadowTempleDL "__OTR__objects/object_keyring/gKeyringIconShadowTempleDL"
static const ALIGN_ASSET(2) char gKeyringIconShadowTempleDL[] = dgKeyringIconShadowTempleDL;
#define dgKeyringIconGanonsCastleDL "__OTR__objects/object_keyring/gKeyringIconGanonsCastleDL"
static const ALIGN_ASSET(2) char gKeyringIconGanonsCastleDL[] = dgKeyringIconGanonsCastleDL;
#define dgKeyringIconTreasureChestGameDL "__OTR__objects/object_keyring/gKeyringIconTreasureChestGameDL"
static const ALIGN_ASSET(2) char gKeyringIconTreasureChestGameDL[] = dgKeyringIconTreasureChestGameDL;
#define dgKeyringKeysForestTempleDL "__OTR__objects/object_keyring/gKeyringKeysForestTempleDL"
static const ALIGN_ASSET(2) char gKeyringKeysForestTempleDL[] = dgKeyringKeysForestTempleDL;
#define dgKeyringKeysFireTempleDL "__OTR__objects/object_keyring/gKeyringKeysFireTempleDL"
static const ALIGN_ASSET(2) char gKeyringKeysFireTempleDL[] = dgKeyringKeysFireTempleDL;
#define dgKeyringKeysWaterTempleDL "__OTR__objects/object_keyring/gKeyringKeysWaterTempleDL"
static const ALIGN_ASSET(2) char gKeyringKeysWaterTempleDL[] = dgKeyringKeysWaterTempleDL;
#define dgKeyringKeysGerudoFortressDL "__OTR__objects/object_keyring/gKeyringKeysGerudoFortressDL"
static const ALIGN_ASSET(2) char gKeyringKeysGerudoFortressDL[] = dgKeyringKeysGerudoFortressDL;
#define dgKeyringKeysGerudoTrainingGroundDL "__OTR__objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL"
static const ALIGN_ASSET(2) char gKeyringKeysGerudoTrainingGroundDL[] = dgKeyringKeysGerudoTrainingGroundDL;
#define dgKeyringKeysSpiritTempleDL "__OTR__objects/object_keyring/gKeyringKeysSpiritTempleDL"
static const ALIGN_ASSET(2) char gKeyringKeysSpiritTempleDL[] = dgKeyringKeysSpiritTempleDL;
#define dgKeyringKeysBottomoftheWellDL "__OTR__objects/object_keyring/gKeyringKeysBottomoftheWellDL"
static const ALIGN_ASSET(2) char gKeyringKeysBottomoftheWellDL[] = dgKeyringKeysBottomoftheWellDL;
#define dgKeyringKeysShadowTempleDL "__OTR__objects/object_keyring/gKeyringKeysShadowTempleDL"
static const ALIGN_ASSET(2) char gKeyringKeysShadowTempleDL[] = dgKeyringKeysShadowTempleDL;
#define dgKeyringKeysGanonsCastleDL "__OTR__objects/object_keyring/gKeyringKeysGanonsCastleDL"
static const ALIGN_ASSET(2) char gKeyringKeysGanonsCastleDL[] = dgKeyringKeysGanonsCastleDL;
#define dgKeyringKeysTreasureChestGameDL "__OTR__objects/object_keyring/gKeyringKeysTreasureChestGameDL"
static const ALIGN_ASSET(2) char gKeyringKeysTreasureChestGameDL[] = dgKeyringKeysTreasureChestGameDL;
#define dgKeyringKeysForestTempleMQDL "__OTR__objects/object_keyring/gKeyringKeysForestTempleMQDL"
static const ALIGN_ASSET(2) char gKeyringKeysForestTempleMQDL[] = dgKeyringKeysForestTempleMQDL;
#define dgKeyringKeysFireTempleMQDL "__OTR__objects/object_keyring/gKeyringKeysFireTempleMQDL"
static const ALIGN_ASSET(2) char gKeyringKeysFireTempleMQDL[] = dgKeyringKeysFireTempleMQDL;
#define dgKeyringKeysWaterTempleMQDL "__OTR__objects/object_keyring/gKeyringKeysWaterTempleMQDL"
static const ALIGN_ASSET(2) char gKeyringKeysWaterTempleMQDL[] = dgKeyringKeysWaterTempleMQDL;
#define dgKeyringKeysGerudoTrainingGroundMQDL "__OTR__objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL"
static const ALIGN_ASSET(2) char gKeyringKeysGerudoTrainingGroundMQDL[] = dgKeyringKeysGerudoTrainingGroundMQDL;
#define dgKeyringKeysSpiritTempleMQDL "__OTR__objects/object_keyring/gKeyringKeysSpiritTempleMQDL"
static const ALIGN_ASSET(2) char gKeyringKeysSpiritTempleMQDL[] = dgKeyringKeysSpiritTempleMQDL;
#define dgKeyringKeysBottomoftheWellMQDL "__OTR__objects/object_keyring/gKeyringKeysBottomoftheWellMQDL"
static const ALIGN_ASSET(2) char gKeyringKeysBottomoftheWellMQDL[] = dgKeyringKeysBottomoftheWellMQDL;
#define dgKeyringKeysShadowTempleMQDL "__OTR__objects/object_keyring/gKeyringKeysShadowTempleMQDL"
static const ALIGN_ASSET(2) char gKeyringKeysShadowTempleMQDL[] = dgKeyringKeysShadowTempleMQDL;
#define dgKeyringKeysGanonsCastleMQDL "__OTR__objects/object_keyring/gKeyringKeysGanonsCastleMQDL"
static const ALIGN_ASSET(2) char gKeyringKeysGanonsCastleMQDL[] = dgKeyringKeysGanonsCastleMQDL;
// overlays
#define dgOptionsDividerChangeLangVtx "__OTR__overlays/ovl_file_choose/gOptionsDividerChangeLangVtx"
static const ALIGN_ASSET(2) char gOptionsDividerChangeLangVtx[] = dgOptionsDividerChangeLangVtx;