From 3e6a0ef566ce468b2b6cb57114a94565916c5f95 Mon Sep 17 00:00:00 2001 From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:18:52 +0000 Subject: [PATCH] Add Dana's models to the game, add cosmetic customisation for keys and rename Bombchus in Logic (#4311) * 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 --- .../objects/object_bombchubag/Hilite_new | Bin 0 -> 604 bytes .../object_bombchubag/gBombchuBagBodyDL | 13 + .../object_bombchubag/gBombchuBagBodyDL_tri_0 | 31 + .../object_bombchubag/gBombchuBagBodyDL_tri_1 | 99 ++ .../object_bombchubag/gBombchuBagBodyDL_vtx_0 | 45 + .../object_bombchubag/gBombchuBagBodyDL_vtx_1 | 112 +++ .../object_bombchubag/gBombchuBagMaskDL | 11 + .../object_bombchubag/gBombchuBagMaskDL_tri_0 | 54 ++ .../object_bombchubag/gBombchuBagMaskDL_vtx_0 | 56 ++ ...t_gBombchuBagBodyDL_f3dlite_bag_body_matte | 11 + ...t_gBombchuBagBodyDL_f3dlite_bag_body_shine | 20 + .../mat_gBombchuBagMaskDL_f3dlite_bag_mask | 11 + .../object_boss_soul/gGIBossSoulSkullDL | 19 +- .../object_boss_soul/gGIBossSoulSkullDL_tri_0 | 214 ++--- .../object_boss_soul/gGIBossSoulSkullDL_tri_1 | 32 +- .../object_boss_soul/gGIBossSoulSkullDL_tri_2 | 37 +- .../object_boss_soul/gGIBossSoulSkullDL_tri_3 | 82 +- .../object_boss_soul/gGIBossSoulSkullDL_tri_4 | 275 +----- .../object_boss_soul/gGIBossSoulSkullDL_vtx_0 | 287 +++--- .../object_boss_soul/gGIBossSoulSkullDL_vtx_1 | 60 +- .../object_boss_soul/gGIBossSoulSkullDL_vtx_2 | 48 +- .../object_boss_soul/gGIBossSoulSkullDL_vtx_3 | 116 +-- .../object_boss_soul/gGIBossSoulSkullDL_vtx_4 | 309 +----- .../mat_gGIBossSoulSkullDL_Gem_eyes | 21 - .../mat_gGIBossSoulSkullDL_skull_horns | 21 - .../mat_gGIBossSoulSkullDL_skull_surface | 21 - .../custom/objects/object_boss_soul/noise_tex | Bin 1116 -> 0 bytes .../objects/object_boss_soul/noise_tex_copy | Bin 2140 -> 0 bytes .../objects/object_bosskey/Hilite_Caustics2 | Bin 0 -> 2140 bytes .../custom/objects/object_bosskey/Hilite_new | Bin 0 -> 604 bytes .../objects/object_bosskey/gBossKeyCustomDL | 11 + .../object_bosskey/gBossKeyCustomDL_tri_0 | 142 +++ .../object_bosskey/gBossKeyCustomDL_vtx_0 | 151 +++ .../object_bosskey/gBossKeyIconFireTempleDL | 11 + .../gBossKeyIconFireTempleDL_tri_0 | 68 ++ .../gBossKeyIconFireTempleDL_vtx_0 | 54 ++ .../object_bosskey/gBossKeyIconForestTempleDL | 11 + .../gBossKeyIconForestTempleDL_tri_0 | 104 ++ .../gBossKeyIconForestTempleDL_vtx_0 | 58 ++ .../object_bosskey/gBossKeyIconGanonsCastleDL | 11 + .../gBossKeyIconGanonsCastleDL_tri_0 | 749 +++++++++++++++ .../gBossKeyIconGanonsCastleDL_vtx_0 | 803 ++++++++++++++++ .../object_bosskey/gBossKeyIconShadowTempleDL | 11 + .../gBossKeyIconShadowTempleDL_tri_0 | 74 ++ .../gBossKeyIconShadowTempleDL_vtx_0 | 60 ++ .../object_bosskey/gBossKeyIconSpiritTempleDL | 11 + .../gBossKeyIconSpiritTempleDL_tri_0 | 100 ++ .../gBossKeyIconSpiritTempleDL_vtx_0 | 63 ++ .../object_bosskey/gBossKeyIconWaterTempleDL | 11 + .../gBossKeyIconWaterTempleDL_tri_0 | 106 ++ .../gBossKeyIconWaterTempleDL_vtx_0 | 92 ++ ...ossKeyCustomDL_f3dlite_BossKeyMetal_Custom | 20 + ...FireTempleDL_f3dlite_BossKeyGem_FireTemple | 21 + ...stTempleDL_f3dlite_BossKeyGem_ForestTemple | 21 + ...nsCastleDL_f3dlite_BossKeyGem_GanonsCastle | 21 + ...owTempleDL_f3dlite_BossKeyGem_ShadowTemple | 21 + ...itTempleDL_f3dlite_BossKeyGem_SpiritTemple | 21 + ...terTempleDL_f3dlite_BossKeyGem_WaterTemple | 21 + .../custom/objects/object_key/Hilite_new | Bin 0 -> 604 bytes .../custom/objects/object_key/gSkeletonKeyDL | 13 + .../objects/object_key/gSkeletonKeyDL_tri_0 | 121 +++ .../objects/object_key/gSkeletonKeyDL_tri_1 | 316 ++++++ .../objects/object_key/gSkeletonKeyDL_vtx_0 | 130 +++ .../objects/object_key/gSkeletonKeyDL_vtx_1 | 335 +++++++ .../objects/object_key/gSmallKeyCustomDL | 11 + .../object_key/gSmallKeyCustomDL_tri_0 | 95 ++ .../object_key/gSmallKeyCustomDL_vtx_0 | 100 ++ .../object_key/gSmallKeyIconBottomoftheWellDL | 11 + .../gSmallKeyIconBottomoftheWellDL_tri_0 | 241 +++++ .../gSmallKeyIconBottomoftheWellDL_vtx_0 | 298 ++++++ .../object_key/gSmallKeyIconFireTempleDL | 11 + .../gSmallKeyIconFireTempleDL_tri_0 | 68 ++ .../gSmallKeyIconFireTempleDL_vtx_0 | 54 ++ .../object_key/gSmallKeyIconForestTempleDL | 11 + .../gSmallKeyIconForestTempleDL_tri_0 | 104 ++ .../gSmallKeyIconForestTempleDL_vtx_0 | 58 ++ .../object_key/gSmallKeyIconGanonsCastleDL | 11 + .../gSmallKeyIconGanonsCastleDL_tri_0 | 749 +++++++++++++++ .../gSmallKeyIconGanonsCastleDL_vtx_0 | 803 ++++++++++++++++ .../object_key/gSmallKeyIconGerudoFortressDL | 11 + .../gSmallKeyIconGerudoFortressDL_tri_0 | 156 +++ .../gSmallKeyIconGerudoFortressDL_vtx_0 | 179 ++++ .../gSmallKeyIconGerudoTrainingGroundDL | 11 + .../gSmallKeyIconGerudoTrainingGroundDL_tri_0 | 391 ++++++++ .../gSmallKeyIconGerudoTrainingGroundDL_vtx_0 | 430 +++++++++ .../object_key/gSmallKeyIconShadowTempleDL | 11 + .../gSmallKeyIconShadowTempleDL_tri_0 | 74 ++ .../gSmallKeyIconShadowTempleDL_vtx_0 | 60 ++ .../object_key/gSmallKeyIconSpiritTempleDL | 11 + .../gSmallKeyIconSpiritTempleDL_tri_0 | 100 ++ .../gSmallKeyIconSpiritTempleDL_vtx_0 | 63 ++ .../gSmallKeyIconTreasureChestGameDL | 11 + .../gSmallKeyIconTreasureChestGameDL_tri_0 | 376 ++++++++ .../gSmallKeyIconTreasureChestGameDL_vtx_0 | 406 ++++++++ .../object_key/gSmallKeyIconWaterTempleDL | 11 + .../gSmallKeyIconWaterTempleDL_tri_0 | 106 ++ .../gSmallKeyIconWaterTempleDL_vtx_0 | 92 ++ ..._gSkeletonKeyDL_f3dlite_KeyMetal_Skeleton} | 11 +- ...letonKeyDL_f3dlite_KeyMetal_SkeletonShade} | 16 +- ...t_gSmallKeyCustomDL_f3dlite_KeyMetal_Small | 20 + ...heWellDL_f3dlite_IconMetal_BottomoftheWell | 20 + ...nFireTempleDL_f3dlite_IconMetal_FireTemple | 20 + ...estTempleDL_f3dlite_IconMetal_ForestTemple | 20 + ...onsCastleDL_f3dlite_IconMetal_GanonsCastle | 20 + ...ortressDL_f3dlite_IconMetal_GerudoFortress | 20 + ...dDL_f3dlite_IconMetal_GerudoTrainingGround | 20 + ...dowTempleDL_f3dlite_IconMetal_ShadowTemple | 20 + ...ritTempleDL_f3dlite_IconMetal_SpiritTemple | 20 + ...GameDL_f3dlite_IconMetal_TreasureChestGame | 20 + ...aterTempleDL_f3dlite_IconMetal_WaterTemple | 20 + .../custom/objects/object_keyring/Hilite_new | Bin 0 -> 604 bytes .../gKeyringIconBottomoftheWellDL | 11 + .../gKeyringIconBottomoftheWellDL_tri_0 | 299 ++++++ .../gKeyringIconBottomoftheWellDL_vtx_0 | 360 +++++++ .../object_keyring/gKeyringIconFireTempleDL | 11 + .../gKeyringIconFireTempleDL_tri_0 | 126 +++ .../gKeyringIconFireTempleDL_vtx_0 | 116 +++ .../object_keyring/gKeyringIconForestTempleDL | 11 + .../gKeyringIconForestTempleDL_tri_0 | 162 ++++ .../gKeyringIconForestTempleDL_vtx_0 | 120 +++ .../object_keyring/gKeyringIconGanonsCastleDL | 11 + .../gKeyringIconGanonsCastleDL_tri_0 | 807 ++++++++++++++++ .../gKeyringIconGanonsCastleDL_vtx_0 | 865 +++++++++++++++++ .../gKeyringIconGerudoFortressDL | 11 + .../gKeyringIconGerudoFortressDL_tri_0 | 213 +++++ .../gKeyringIconGerudoFortressDL_vtx_0 | 233 +++++ .../gKeyringIconGerudoTrainingGroundDL | 11 + .../gKeyringIconGerudoTrainingGroundDL_tri_0 | 449 +++++++++ .../gKeyringIconGerudoTrainingGroundDL_vtx_0 | 495 ++++++++++ .../object_keyring/gKeyringIconShadowTempleDL | 11 + .../gKeyringIconShadowTempleDL_tri_0 | 132 +++ .../gKeyringIconShadowTempleDL_vtx_0 | 124 +++ .../object_keyring/gKeyringIconSpiritTempleDL | 11 + .../gKeyringIconSpiritTempleDL_tri_0 | 158 +++ .../gKeyringIconSpiritTempleDL_vtx_0 | 125 +++ .../gKeyringIconTreasureChestGameDL | 11 + .../gKeyringIconTreasureChestGameDL_tri_0 | 433 +++++++++ .../gKeyringIconTreasureChestGameDL_vtx_0 | 461 +++++++++ .../object_keyring/gKeyringIconWaterTempleDL | 11 + .../gKeyringIconWaterTempleDL_tri_0 | 164 ++++ .../gKeyringIconWaterTempleDL_vtx_0 | 154 +++ .../gKeyringKeysBottomoftheWellDL | 11 + .../gKeyringKeysBottomoftheWellDL_tri_0 | 276 ++++++ .../gKeyringKeysBottomoftheWellDL_vtx_0 | 301 ++++++ .../gKeyringKeysBottomoftheWellMQDL | 11 + .../gKeyringKeysBottomoftheWellMQDL_tri_0 | 185 ++++ .../gKeyringKeysBottomoftheWellMQDL_vtx_0 | 203 ++++ .../object_keyring/gKeyringKeysFireTempleDL | 11 + .../gKeyringKeysFireTempleDL_tri_0 | 728 ++++++++++++++ .../gKeyringKeysFireTempleDL_vtx_0 | 806 ++++++++++++++++ .../object_keyring/gKeyringKeysFireTempleMQDL | 11 + .../gKeyringKeysFireTempleMQDL_tri_0 | 457 +++++++++ .../gKeyringKeysFireTempleMQDL_vtx_0 | 502 ++++++++++ .../object_keyring/gKeyringKeysForestTempleDL | 11 + .../gKeyringKeysForestTempleDL_tri_0 | 457 +++++++++ .../gKeyringKeysForestTempleDL_vtx_0 | 502 ++++++++++ .../gKeyringKeysForestTempleMQDL | 11 + .../gKeyringKeysForestTempleMQDL_tri_0 | 547 +++++++++++ .../gKeyringKeysForestTempleMQDL_vtx_0 | 605 ++++++++++++ .../object_keyring/gKeyringKeysGanonsCastleDL | 11 + .../gKeyringKeysGanonsCastleDL_tri_0 | 276 ++++++ .../gKeyringKeysGanonsCastleDL_vtx_0 | 301 ++++++ .../gKeyringKeysGanonsCastleMQDL | 11 + .../gKeyringKeysGanonsCastleMQDL_tri_0 | 185 ++++ .../gKeyringKeysGanonsCastleMQDL_vtx_0 | 203 ++++ .../gKeyringKeysGerudoFortressDL | 11 + .../gKeyringKeysGerudoFortressDL_tri_0 | 366 +++++++ .../gKeyringKeysGerudoFortressDL_vtx_0 | 404 ++++++++ .../gKeyringKeysGerudoTrainingGroundDL | 11 + .../gKeyringKeysGerudoTrainingGroundDL_tri_0 | 819 ++++++++++++++++ .../gKeyringKeysGerudoTrainingGroundDL_vtx_0 | 904 ++++++++++++++++++ .../gKeyringKeysGerudoTrainingGroundMQDL | 11 + ...gKeyringKeysGerudoTrainingGroundMQDL_tri_0 | 276 ++++++ ...gKeyringKeysGerudoTrainingGroundMQDL_vtx_0 | 301 ++++++ .../object_keyring/gKeyringKeysShadowTempleDL | 11 + .../gKeyringKeysShadowTempleDL_tri_0 | 457 +++++++++ .../gKeyringKeysShadowTempleDL_vtx_0 | 502 ++++++++++ .../gKeyringKeysShadowTempleMQDL | 11 + .../gKeyringKeysShadowTempleMQDL_tri_0 | 547 +++++++++++ .../gKeyringKeysShadowTempleMQDL_vtx_0 | 605 ++++++++++++ .../object_keyring/gKeyringKeysSpiritTempleDL | 11 + .../gKeyringKeysSpiritTempleDL_tri_0 | 457 +++++++++ .../gKeyringKeysSpiritTempleDL_vtx_0 | 502 ++++++++++ .../gKeyringKeysSpiritTempleMQDL | 11 + .../gKeyringKeysSpiritTempleMQDL_tri_0 | 638 ++++++++++++ .../gKeyringKeysSpiritTempleMQDL_vtx_0 | 703 ++++++++++++++ .../gKeyringKeysTreasureChestGameDL | 11 + .../gKeyringKeysTreasureChestGameDL_tri_0 | 366 +++++++ .../gKeyringKeysTreasureChestGameDL_vtx_0 | 404 ++++++++ .../object_keyring/gKeyringKeysWaterTempleDL | 11 + .../gKeyringKeysWaterTempleDL_tri_0 | 547 +++++++++++ .../gKeyringKeysWaterTempleDL_vtx_0 | 605 ++++++++++++ .../gKeyringKeysWaterTempleMQDL | 11 + .../gKeyringKeysWaterTempleMQDL_tri_0 | 185 ++++ .../gKeyringKeysWaterTempleMQDL_vtx_0 | 203 ++++ .../objects/object_keyring/gKeyringRingDL | 11 + .../object_keyring/gKeyringRingDL_tri_0 | 184 ++++ .../object_keyring/gKeyringRingDL_vtx_0 | 193 ++++ ...heWellDL_f3dlite_IconMetal_BottomoftheWell | 20 + ...nFireTempleDL_f3dlite_IconMetal_FireTemple | 20 + ...estTempleDL_f3dlite_IconMetal_ForestTemple | 20 + ...onsCastleDL_f3dlite_IconMetal_GanonsCastle | 20 + ...ortressDL_f3dlite_IconMetal_GerudoFortress | 21 + ...dDL_f3dlite_IconMetal_GerudoTrainingGround | 20 + ...dowTempleDL_f3dlite_IconMetal_ShadowTemple | 20 + ...ritTempleDL_f3dlite_IconMetal_SpiritTemple | 20 + ...GameDL_f3dlite_IconMetal_TreasureChestGame | 20 + ...aterTempleDL_f3dlite_IconMetal_WaterTemple | 20 + ...theWellDL_f3dlite_KeyMetal_BottomoftheWell | 20 + ...eWellMQDL_f3dlite_KeyMetal_BottomoftheWell | 20 + ...ysFireTempleDL_f3dlite_KeyMetal_FireTemple | 20 + ...FireTempleMQDL_f3dlite_KeyMetal_FireTemple | 20 + ...restTempleDL_f3dlite_KeyMetal_ForestTemple | 20 + ...stTempleMQDL_f3dlite_KeyMetal_ForestTemple | 20 + ...nonsCastleDL_f3dlite_KeyMetal_GanonsCastle | 20 + ...nsCastleMQDL_f3dlite_KeyMetal_GanonsCastle | 20 + ...FortressDL_f3dlite_KeyMetal_GerudoFortress | 20 + ...ndDL_f3dlite_KeyMetal_GerudoTrainingGround | 20 + ...MQDL_f3dlite_KeyMetal_GerudoTrainingGround | 20 + ...adowTempleDL_f3dlite_KeyMetal_ShadowTemple | 20 + ...owTempleMQDL_f3dlite_KeyMetal_ShadowTemple | 20 + ...iritTempleDL_f3dlite_KeyMetal_SpiritTemple | 20 + ...itTempleMQDL_f3dlite_KeyMetal_SpiritTemple | 20 + ...tGameDL_f3dlite_KeyMetal_TreasureChestGame | 20 + ...WaterTempleDL_f3dlite_KeyMetal_WaterTemple | 20 + ...terTempleMQDL_f3dlite_KeyMetal_WaterTemple | 20 + .../mat_gKeyringRingDL_f3dlite_KeyRingMetal | 20 + .../parameter_static/gBossSoul.rgba32.png | Bin 5756 -> 8164 bytes soh/assets/soh_assets.h | 154 +++ .../cosmetics/CosmeticsEditor.cpp | 131 ++- .../Enhancements/cosmetics/CosmeticsEditor.h | 3 + soh/soh/Enhancements/debugconsole.cpp | 1 + soh/soh/Enhancements/presets.h | 6 +- .../3drando/hint_list/hint_list_item.cpp | 20 + .../randomizer/3drando/item_pool.cpp | 4 +- .../randomizer/3drando/starting_inventory.cpp | 2 +- soh/soh/Enhancements/randomizer/draw.cpp | 374 +++++--- soh/soh/Enhancements/randomizer/draw.h | 2 + .../Enhancements/randomizer/hook_handlers.cpp | 4 +- soh/soh/Enhancements/randomizer/item.cpp | 8 +- soh/soh/Enhancements/randomizer/item_list.cpp | 9 +- .../dungeons/dodongos_cavern.cpp | 2 +- .../dungeons/spirit_temple.cpp | 30 +- soh/soh/Enhancements/randomizer/logic.cpp | 4 +- .../randomizer/option_descriptions.cpp | 21 +- .../Enhancements/randomizer/randomizer.cpp | 12 +- .../Enhancements/randomizer/randomizerTypes.h | 6 +- soh/soh/Enhancements/randomizer/settings.cpp | 6 +- soh/soh/SohMenuBar.cpp | 31 +- soh/src/code/z_en_item00.c | 2 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 2 +- soh/src/overlays/actors/ovl_En_Box/z_en_box.c | 1 + .../overlays/actors/ovl_En_GirlA/z_en_girla.c | 6 +- 253 files changed, 34297 insertions(+), 1280 deletions(-) create mode 100644 soh/assets/custom/objects/object_bombchubag/Hilite_new create mode 100644 soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL create mode 100644 soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_tri_1 create mode 100644 soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL create mode 100644 soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagBodyDL_f3dlite_bag_body_matte create mode 100644 soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagBodyDL_f3dlite_bag_body_shine create mode 100644 soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagMaskDL_f3dlite_bag_mask delete mode 100644 soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes delete mode 100644 soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns delete mode 100644 soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface delete mode 100644 soh/assets/custom/objects/object_boss_soul/noise_tex delete mode 100644 soh/assets/custom/objects/object_boss_soul/noise_tex_copy create mode 100644 soh/assets/custom/objects/object_bosskey/Hilite_Caustics2 create mode 100644 soh/assets/custom/objects/object_bosskey/Hilite_new create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_bosskey/mat_gBossKeyCustomDL_f3dlite_BossKeyMetal_Custom create mode 100644 soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconFireTempleDL_f3dlite_BossKeyGem_FireTemple create mode 100644 soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconForestTempleDL_f3dlite_BossKeyGem_ForestTemple create mode 100644 soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconGanonsCastleDL_f3dlite_BossKeyGem_GanonsCastle create mode 100644 soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconShadowTempleDL_f3dlite_BossKeyGem_ShadowTemple create mode 100644 soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconSpiritTempleDL_f3dlite_BossKeyGem_SpiritTemple create mode 100644 soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconWaterTempleDL_f3dlite_BossKeyGem_WaterTemple create mode 100644 soh/assets/custom/objects/object_key/Hilite_new create mode 100644 soh/assets/custom/objects/object_key/gSkeletonKeyDL create mode 100644 soh/assets/custom/objects/object_key/gSkeletonKeyDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSkeletonKeyDL_tri_1 create mode 100644 soh/assets/custom/objects/object_key/gSkeletonKeyDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSkeletonKeyDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyCustomDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyCustomDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyCustomDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL_vtx_0 rename soh/assets/custom/objects/{object_boss_soul/mat_gGIBossSoulSkullDL_skull_black => object_key/mat_gSkeletonKeyDL_f3dlite_KeyMetal_Skeleton} (66%) rename soh/assets/custom/objects/{object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes => object_key/mat_gSkeletonKeyDL_f3dlite_KeyMetal_SkeletonShade} (55%) create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyCustomDL_f3dlite_KeyMetal_Small create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconBottomoftheWellDL_f3dlite_IconMetal_BottomoftheWell create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconFireTempleDL_f3dlite_IconMetal_FireTemple create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconForestTempleDL_f3dlite_IconMetal_ForestTemple create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconGanonsCastleDL_f3dlite_IconMetal_GanonsCastle create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconGerudoTrainingGroundDL_f3dlite_IconMetal_GerudoTrainingGround create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconShadowTempleDL_f3dlite_IconMetal_ShadowTemple create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconSpiritTempleDL_f3dlite_IconMetal_SpiritTemple create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconTreasureChestGameDL_f3dlite_IconMetal_TreasureChestGame create mode 100644 soh/assets/custom/objects/object_key/mat_gSmallKeyIconWaterTempleDL_f3dlite_IconMetal_WaterTemple create mode 100644 soh/assets/custom/objects/object_keyring/Hilite_new create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringRingDL create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringRingDL_tri_0 create mode 100644 soh/assets/custom/objects/object_keyring/gKeyringRingDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconBottomoftheWellDL_f3dlite_IconMetal_BottomoftheWell create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconFireTempleDL_f3dlite_IconMetal_FireTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconForestTempleDL_f3dlite_IconMetal_ForestTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconGanonsCastleDL_f3dlite_IconMetal_GanonsCastle create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoTrainingGroundDL_f3dlite_IconMetal_GerudoTrainingGround create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconShadowTempleDL_f3dlite_IconMetal_ShadowTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconSpiritTempleDL_f3dlite_IconMetal_SpiritTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconTreasureChestGameDL_f3dlite_IconMetal_TreasureChestGame create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringIconWaterTempleDL_f3dlite_IconMetal_WaterTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysBottomoftheWellDL_f3dlite_KeyMetal_BottomoftheWell create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysBottomoftheWellMQDL_f3dlite_KeyMetal_BottomoftheWell create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysFireTempleDL_f3dlite_KeyMetal_FireTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysFireTempleMQDL_f3dlite_KeyMetal_FireTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysForestTempleDL_f3dlite_KeyMetal_ForestTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysForestTempleMQDL_f3dlite_KeyMetal_ForestTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGanonsCastleDL_f3dlite_KeyMetal_GanonsCastle create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGanonsCastleMQDL_f3dlite_KeyMetal_GanonsCastle create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoFortressDL_f3dlite_KeyMetal_GerudoFortress create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoTrainingGroundDL_f3dlite_KeyMetal_GerudoTrainingGround create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoTrainingGroundMQDL_f3dlite_KeyMetal_GerudoTrainingGround create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysShadowTempleDL_f3dlite_KeyMetal_ShadowTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysShadowTempleMQDL_f3dlite_KeyMetal_ShadowTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysSpiritTempleDL_f3dlite_KeyMetal_SpiritTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysSpiritTempleMQDL_f3dlite_KeyMetal_SpiritTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysTreasureChestGameDL_f3dlite_KeyMetal_TreasureChestGame create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysWaterTempleDL_f3dlite_KeyMetal_WaterTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringKeysWaterTempleMQDL_f3dlite_KeyMetal_WaterTemple create mode 100644 soh/assets/custom/objects/object_keyring/mat_gKeyringRingDL_f3dlite_KeyRingMetal mode change 100755 => 100644 soh/assets/custom/textures/parameter_static/gBossSoul.rgba32.png diff --git a/soh/assets/custom/objects/object_bombchubag/Hilite_new b/soh/assets/custom/objects/object_bombchubag/Hilite_new new file mode 100644 index 0000000000000000000000000000000000000000..5438695faeb81b84633fe3d1358ffa90efbd7578 GIT binary patch literal 604 zcma)2J!^wd6t(>W?N&mjk|8(*ametdVxWslP&yRFCE_3sAxOyZmO?VR6q79yggzXK zg9PdHx+SBV$yRW33LX3dy)QPTv`al)y?DRQIUL7vkM|G#3;2G%#~&;p{r7VTo!8${ z4?W#+90U|Zg}*|%tgD8)(!#$$zTD8lLE-VFlP1g8LBV=dUD~4@<m@pM4xSz z_PqwX?ONMzHjV{cp4b7~pypBkaV;FNSzHo%z-drOpi*wi`mF6*PHRw{?>eR$s0LF3YJF{`L5;zLF1ELK z!(3n+a5nHF=4x;J@~LdxoRB!wP`{tT7eJ3@^u++D)Sckd|wSfR}>F- p6VO!ABn8klIMVgnXu + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_tri_0 b/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_tri_0 new file mode 100644 index 00000000000..add13c49f37 --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_tri_0 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_tri_1 b/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_tri_1 new file mode 100644 index 00000000000..7430c2a294f --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_tri_1 @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_vtx_0 b/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_vtx_0 new file mode 100644 index 00000000000..cddcb70e429 --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_vtx_0 @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_vtx_1 b/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_vtx_1 new file mode 100644 index 00000000000..6f8e0802d4c --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/gBombchuBagBodyDL_vtx_1 @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL b/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL new file mode 100644 index 00000000000..b68fbafffc6 --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL_tri_0 b/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL_tri_0 new file mode 100644 index 00000000000..c5ccc230fe0 --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL_tri_0 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL_vtx_0 b/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL_vtx_0 new file mode 100644 index 00000000000..cdc8798bce7 --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/gBombchuBagMaskDL_vtx_0 @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagBodyDL_f3dlite_bag_body_matte b/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagBodyDL_f3dlite_bag_body_matte new file mode 100644 index 00000000000..4fb4e2029cb --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagBodyDL_f3dlite_bag_body_matte @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagBodyDL_f3dlite_bag_body_shine b/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagBodyDL_f3dlite_bag_body_shine new file mode 100644 index 00000000000..985d1ad9da4 --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagBodyDL_f3dlite_bag_body_shine @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagMaskDL_f3dlite_bag_mask b/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagMaskDL_f3dlite_bag_mask new file mode 100644 index 00000000000..4fb4e2029cb --- /dev/null +++ b/soh/assets/custom/objects/object_bombchubag/mat_gBombchuBagMaskDL_f3dlite_bag_mask @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL index 6e3cbc204f2..191d058ecab 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL @@ -1,19 +1,16 @@ - + + + + + - + - + - + - - - - - - - diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_0 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_0 index 34ff33a7105..6432498424f 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_0 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_0 @@ -1,163 +1,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_1 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_1 index e406505e8e5..2dd15cd06b5 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_1 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_1 @@ -1,26 +1,14 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_2 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_2 index d937553564d..1ae88a89bb0 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_2 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_2 @@ -1,7 +1,38 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_3 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_3 index 87fb8da0153..38c434f31b2 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_3 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_3 @@ -1,48 +1,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_4 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_4 index 6e436b142b5..bf4f6d36319 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_4 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_tri_4 @@ -1,245 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0 index ed4b6e1c0fb..c42b6353834 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_0 @@ -1,173 +1,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1 index d2728aae47a..c6d6561073b 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_1 @@ -1,26 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2 index eb0050c03c9..83377b227f0 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_2 @@ -1,6 +1,46 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3 index f124650c8cb..13644a811e1 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_3 @@ -1,58 +1,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4 b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4 index 2bbe7895e42..777a370588a 100644 --- a/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4 +++ b/soh/assets/custom/objects/object_boss_soul/gGIBossSoulSkullDL_vtx_4 @@ -1,267 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes deleted file mode 100644 index 07364ba3a24..00000000000 --- a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns deleted file mode 100644 index 78d2a531c59..00000000000 --- a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_horns +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface b/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface deleted file mode 100644 index e15a4dce412..00000000000 --- a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_surface +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_boss_soul/noise_tex b/soh/assets/custom/objects/object_boss_soul/noise_tex deleted file mode 100644 index aaf4e331f15f797a3b1122b58c57b3767e66bc0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1116 zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JVw&9uYY}ZlKyY|id266pZ|L)_-3^t z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uTqZsmTyW<5x_pt+H9l4&R zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{ zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{ zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o# zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+ zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hlZM*At{kGk< zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv# z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%( z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7 zkVWyC0UUWR_wL|gup?AW-oi9ub&Qw z;QO^voH{)n%}}RxY6g{*=loVYRAL6Z)M=wy_YC@aI+o|lOJD1>b^4m$(y!oK$J2i8 zSC!bMQTkeS<@t0h9@)3_E5B78cfEdw%PYT~j#vdhMl+m_>6h0kX&t}E*eLSimwh99 z)e$AXWYWH_Ujn?75~$5%Bg^tT~u;9etdbR5`9(4xTRh5h)v1I!PRGm3F7!|DQ(kpu7~|c5)5oSf?|bXKmRgDjHItRR#2`YW zraam@1(j!53%d}zJX2YDUW-PVp>0MPbt(acI;A=)9b@qDi3(Z=iuy|KMiI{pt&28V zvaCh4t*bh??^nBAUSNqAKExCiNp6=>?Yzy~T5O}7;9*!LE~8rdrW45{8sa|3>)@YZ z-?wqfdFMfBeYG=UUJaH8KNt!^ALsumt`fAH38JV$rU}-GDDOfW=yP4F-)W&+up$ zm%;ky)TwkOh_3~@!F%4w%P+DBis;8KRQ_QMos%70_Z>`Nj9!Chia6knmf?Z<5QL^2 ztq5CVBnoU(;TXxxJkYDlz=BvPpkJ#_I04s>&dBdFyz7+Qa7Q$$)@zQ-L;+sk4S3=$ zRpV_2l+Bg`2apS%`DK<+2m1s3@xX7&(VOrIXK+g2ME;Hh+Y`0ZJ8Z+|zR#PeV=b6+ zsfun;Hd_xHd_YbjFlSz)Z^=vtFhm6DgGlUWm5`mO2T73A*Yeyb(dQUZi{vCPop4a8 zbkVQ)dtG(xu`$9>v|vI8l;0?_(*r1hhWMgcFrs?UBM;B!EqHjh3z|U>GKVmZT0j0M zEqGCr#E^~8ZsOmm>X-P@ literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_bosskey/Hilite_new b/soh/assets/custom/objects/object_bosskey/Hilite_new new file mode 100644 index 0000000000000000000000000000000000000000..5438695faeb81b84633fe3d1358ffa90efbd7578 GIT binary patch literal 604 zcma)2J!^wd6t(>W?N&mjk|8(*ametdVxWslP&yRFCE_3sAxOyZmO?VR6q79yggzXK zg9PdHx+SBV$yRW33LX3dy)QPTv`al)y?DRQIUL7vkM|G#3;2G%#~&;p{r7VTo!8${ z4?W#+90U|Zg}*|%tgD8)(!#$$zTD8lLE-VFlP1g8LBV=dUD~4@<m@pM4xSz z_PqwX?ONMzHjV{cp4b7~pypBkaV;FNSzHo%z-drOpi*wi`mF6*PHRw{?>eR$s0LF3YJF{`L5;zLF1ELK z!(3n+a5nHF=4x;J@~LdxoRB!wP`{tT7eJ3@^u++D)Sckd|wSfR}>F- p6VO!ABn8klIMVgnXu + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL_tri_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL_tri_0 new file mode 100644 index 00000000000..55782c31512 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL_tri_0 @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL_vtx_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL_vtx_0 new file mode 100644 index 00000000000..1e9285c2541 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyCustomDL_vtx_0 @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL b/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL new file mode 100644 index 00000000000..5b07f23b0ea --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL_tri_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL_tri_0 new file mode 100644 index 00000000000..66729a5c3ec --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL_tri_0 @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL_vtx_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL_vtx_0 new file mode 100644 index 00000000000..72d3900495b --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconFireTempleDL_vtx_0 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL b/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL new file mode 100644 index 00000000000..ff11c42ce5f --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL_tri_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL_tri_0 new file mode 100644 index 00000000000..7f516410e02 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL_tri_0 @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL_vtx_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL_vtx_0 new file mode 100644 index 00000000000..e04ca5dc1fd --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconForestTempleDL_vtx_0 @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL b/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL new file mode 100644 index 00000000000..770739883f2 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL_tri_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL_tri_0 new file mode 100644 index 00000000000..4e7d534f9dc --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL_tri_0 @@ -0,0 +1,749 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL_vtx_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL_vtx_0 new file mode 100644 index 00000000000..64d53ebb3b8 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconGanonsCastleDL_vtx_0 @@ -0,0 +1,803 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL b/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL new file mode 100644 index 00000000000..52ec0e5f9fb --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL_tri_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL_tri_0 new file mode 100644 index 00000000000..43091fea3ed --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL_tri_0 @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL_vtx_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL_vtx_0 new file mode 100644 index 00000000000..1619bed17fb --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconShadowTempleDL_vtx_0 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL b/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL new file mode 100644 index 00000000000..58acaff2180 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL_tri_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL_tri_0 new file mode 100644 index 00000000000..7a94a569969 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL_tri_0 @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL_vtx_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL_vtx_0 new file mode 100644 index 00000000000..ceebb97ee5f --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconSpiritTempleDL_vtx_0 @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL b/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL new file mode 100644 index 00000000000..edd9984a492 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL_tri_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL_tri_0 new file mode 100644 index 00000000000..198e881c211 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL_tri_0 @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL_vtx_0 b/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL_vtx_0 new file mode 100644 index 00000000000..e3d917797ac --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/gBossKeyIconWaterTempleDL_vtx_0 @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/mat_gBossKeyCustomDL_f3dlite_BossKeyMetal_Custom b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyCustomDL_f3dlite_BossKeyMetal_Custom new file mode 100644 index 00000000000..8c58c67c9dd --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyCustomDL_f3dlite_BossKeyMetal_Custom @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconFireTempleDL_f3dlite_BossKeyGem_FireTemple b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconFireTempleDL_f3dlite_BossKeyGem_FireTemple new file mode 100644 index 00000000000..c96909c8043 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconFireTempleDL_f3dlite_BossKeyGem_FireTemple @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconForestTempleDL_f3dlite_BossKeyGem_ForestTemple b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconForestTempleDL_f3dlite_BossKeyGem_ForestTemple new file mode 100644 index 00000000000..ab328f65bd3 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconForestTempleDL_f3dlite_BossKeyGem_ForestTemple @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconGanonsCastleDL_f3dlite_BossKeyGem_GanonsCastle b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconGanonsCastleDL_f3dlite_BossKeyGem_GanonsCastle new file mode 100644 index 00000000000..c4c60bef10a --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconGanonsCastleDL_f3dlite_BossKeyGem_GanonsCastle @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconShadowTempleDL_f3dlite_BossKeyGem_ShadowTemple b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconShadowTempleDL_f3dlite_BossKeyGem_ShadowTemple new file mode 100644 index 00000000000..301b96815f9 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconShadowTempleDL_f3dlite_BossKeyGem_ShadowTemple @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconSpiritTempleDL_f3dlite_BossKeyGem_SpiritTemple b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconSpiritTempleDL_f3dlite_BossKeyGem_SpiritTemple new file mode 100644 index 00000000000..f838ce38074 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconSpiritTempleDL_f3dlite_BossKeyGem_SpiritTemple @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconWaterTempleDL_f3dlite_BossKeyGem_WaterTemple b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconWaterTempleDL_f3dlite_BossKeyGem_WaterTemple new file mode 100644 index 00000000000..4e6dc67fce3 --- /dev/null +++ b/soh/assets/custom/objects/object_bosskey/mat_gBossKeyIconWaterTempleDL_f3dlite_BossKeyGem_WaterTemple @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/Hilite_new b/soh/assets/custom/objects/object_key/Hilite_new new file mode 100644 index 0000000000000000000000000000000000000000..5438695faeb81b84633fe3d1358ffa90efbd7578 GIT binary patch literal 604 zcma)2J!^wd6t(>W?N&mjk|8(*ametdVxWslP&yRFCE_3sAxOyZmO?VR6q79yggzXK zg9PdHx+SBV$yRW33LX3dy)QPTv`al)y?DRQIUL7vkM|G#3;2G%#~&;p{r7VTo!8${ z4?W#+90U|Zg}*|%tgD8)(!#$$zTD8lLE-VFlP1g8LBV=dUD~4@<m@pM4xSz z_PqwX?ONMzHjV{cp4b7~pypBkaV;FNSzHo%z-drOpi*wi`mF6*PHRw{?>eR$s0LF3YJF{`L5;zLF1ELK z!(3n+a5nHF=4x;J@~LdxoRB!wP`{tT7eJ3@^u++D)Sckd|wSfR}>F- p6VO!ABn8klIMVgnXu + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSkeletonKeyDL_tri_0 b/soh/assets/custom/objects/object_key/gSkeletonKeyDL_tri_0 new file mode 100644 index 00000000000..80e7f1bad5a --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSkeletonKeyDL_tri_0 @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSkeletonKeyDL_tri_1 b/soh/assets/custom/objects/object_key/gSkeletonKeyDL_tri_1 new file mode 100644 index 00000000000..46e6b22e5c6 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSkeletonKeyDL_tri_1 @@ -0,0 +1,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSkeletonKeyDL_vtx_0 b/soh/assets/custom/objects/object_key/gSkeletonKeyDL_vtx_0 new file mode 100644 index 00000000000..f135e476d7d --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSkeletonKeyDL_vtx_0 @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSkeletonKeyDL_vtx_1 b/soh/assets/custom/objects/object_key/gSkeletonKeyDL_vtx_1 new file mode 100644 index 00000000000..0f5b2970eba --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSkeletonKeyDL_vtx_1 @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyCustomDL b/soh/assets/custom/objects/object_key/gSmallKeyCustomDL new file mode 100644 index 00000000000..0ac9078448e --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyCustomDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyCustomDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyCustomDL_tri_0 new file mode 100644 index 00000000000..594962af681 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyCustomDL_tri_0 @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyCustomDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyCustomDL_vtx_0 new file mode 100644 index 00000000000..9ceebf1907c --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyCustomDL_vtx_0 @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL b/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL new file mode 100644 index 00000000000..c9da256e239 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL_tri_0 new file mode 100644 index 00000000000..87c380d5ca1 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL_tri_0 @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL_vtx_0 new file mode 100644 index 00000000000..bd7962a42ec --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconBottomoftheWellDL_vtx_0 @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL b/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL new file mode 100644 index 00000000000..57f2ce5bf1e --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL_tri_0 new file mode 100644 index 00000000000..aa905d45af7 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL_tri_0 @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL_vtx_0 new file mode 100644 index 00000000000..9e167011c93 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconFireTempleDL_vtx_0 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL b/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL new file mode 100644 index 00000000000..4bf30307327 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL_tri_0 new file mode 100644 index 00000000000..5414d43d906 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL_tri_0 @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL_vtx_0 new file mode 100644 index 00000000000..28f60fbae04 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconForestTempleDL_vtx_0 @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL b/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL new file mode 100644 index 00000000000..6c1d663d078 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL_tri_0 new file mode 100644 index 00000000000..c0eb2f9f774 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL_tri_0 @@ -0,0 +1,749 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL_vtx_0 new file mode 100644 index 00000000000..52fd01da3fe --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGanonsCastleDL_vtx_0 @@ -0,0 +1,803 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL new file mode 100644 index 00000000000..f688a34de43 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL_tri_0 new file mode 100644 index 00000000000..e1d99f600e7 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL_tri_0 @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL_vtx_0 new file mode 100644 index 00000000000..3e17db8423f --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoFortressDL_vtx_0 @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL new file mode 100644 index 00000000000..493d635312a --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL_tri_0 new file mode 100644 index 00000000000..7d8b684a37b --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL_tri_0 @@ -0,0 +1,391 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL_vtx_0 new file mode 100644 index 00000000000..a4cd378207e --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconGerudoTrainingGroundDL_vtx_0 @@ -0,0 +1,430 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL b/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL new file mode 100644 index 00000000000..71426049e37 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL_tri_0 new file mode 100644 index 00000000000..25ecf0b48f4 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL_tri_0 @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL_vtx_0 new file mode 100644 index 00000000000..42a1284ce7d --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconShadowTempleDL_vtx_0 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL b/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL new file mode 100644 index 00000000000..5c314fb5afb --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL_tri_0 new file mode 100644 index 00000000000..fbce62b66be --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL_tri_0 @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL_vtx_0 new file mode 100644 index 00000000000..66a2c5f88d2 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconSpiritTempleDL_vtx_0 @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL b/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL new file mode 100644 index 00000000000..4e27a5d3e97 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL_tri_0 new file mode 100644 index 00000000000..246bae6a998 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL_tri_0 @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL_vtx_0 new file mode 100644 index 00000000000..fd7c81995d9 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconTreasureChestGameDL_vtx_0 @@ -0,0 +1,406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL b/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL new file mode 100644 index 00000000000..b2b4f5bfcba --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL_tri_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL_tri_0 new file mode 100644 index 00000000000..94037d2c9a3 --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL_tri_0 @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL_vtx_0 b/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL_vtx_0 new file mode 100644 index 00000000000..2ff0541949d --- /dev/null +++ b/soh/assets/custom/objects/object_key/gSmallKeyIconWaterTempleDL_vtx_0 @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_black b/soh/assets/custom/objects/object_key/mat_gSkeletonKeyDL_f3dlite_KeyMetal_Skeleton similarity index 66% rename from soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_black rename to soh/assets/custom/objects/object_key/mat_gSkeletonKeyDL_f3dlite_KeyMetal_Skeleton index 6aee093d9cf..4062e86db92 100644 --- a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_black +++ b/soh/assets/custom/objects/object_key/mat_gSkeletonKeyDL_f3dlite_KeyMetal_Skeleton @@ -1,21 +1,20 @@ - + - + - + - + - + - diff --git a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes b/soh/assets/custom/objects/object_key/mat_gSkeletonKeyDL_f3dlite_KeyMetal_SkeletonShade similarity index 55% rename from soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes rename to soh/assets/custom/objects/object_key/mat_gSkeletonKeyDL_f3dlite_KeyMetal_SkeletonShade index c08beb94a1d..ac5b346105b 100644 --- a/soh/assets/custom/objects/object_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes +++ b/soh/assets/custom/objects/object_key/mat_gSkeletonKeyDL_f3dlite_KeyMetal_SkeletonShade @@ -1,21 +1,21 @@ - - - + + + - + - + - + - + - + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyCustomDL_f3dlite_KeyMetal_Small b/soh/assets/custom/objects/object_key/mat_gSmallKeyCustomDL_f3dlite_KeyMetal_Small new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyCustomDL_f3dlite_KeyMetal_Small @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconBottomoftheWellDL_f3dlite_IconMetal_BottomoftheWell b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconBottomoftheWellDL_f3dlite_IconMetal_BottomoftheWell new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconBottomoftheWellDL_f3dlite_IconMetal_BottomoftheWell @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconFireTempleDL_f3dlite_IconMetal_FireTemple b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconFireTempleDL_f3dlite_IconMetal_FireTemple new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconFireTempleDL_f3dlite_IconMetal_FireTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconForestTempleDL_f3dlite_IconMetal_ForestTemple b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconForestTempleDL_f3dlite_IconMetal_ForestTemple new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconForestTempleDL_f3dlite_IconMetal_ForestTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGanonsCastleDL_f3dlite_IconMetal_GanonsCastle b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGanonsCastleDL_f3dlite_IconMetal_GanonsCastle new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGanonsCastleDL_f3dlite_IconMetal_GanonsCastle @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGerudoTrainingGroundDL_f3dlite_IconMetal_GerudoTrainingGround b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGerudoTrainingGroundDL_f3dlite_IconMetal_GerudoTrainingGround new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconGerudoTrainingGroundDL_f3dlite_IconMetal_GerudoTrainingGround @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconShadowTempleDL_f3dlite_IconMetal_ShadowTemple b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconShadowTempleDL_f3dlite_IconMetal_ShadowTemple new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconShadowTempleDL_f3dlite_IconMetal_ShadowTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconSpiritTempleDL_f3dlite_IconMetal_SpiritTemple b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconSpiritTempleDL_f3dlite_IconMetal_SpiritTemple new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconSpiritTempleDL_f3dlite_IconMetal_SpiritTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconTreasureChestGameDL_f3dlite_IconMetal_TreasureChestGame b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconTreasureChestGameDL_f3dlite_IconMetal_TreasureChestGame new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconTreasureChestGameDL_f3dlite_IconMetal_TreasureChestGame @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_key/mat_gSmallKeyIconWaterTempleDL_f3dlite_IconMetal_WaterTemple b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconWaterTempleDL_f3dlite_IconMetal_WaterTemple new file mode 100644 index 00000000000..57c9001dd7c --- /dev/null +++ b/soh/assets/custom/objects/object_key/mat_gSmallKeyIconWaterTempleDL_f3dlite_IconMetal_WaterTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/Hilite_new b/soh/assets/custom/objects/object_keyring/Hilite_new new file mode 100644 index 0000000000000000000000000000000000000000..5438695faeb81b84633fe3d1358ffa90efbd7578 GIT binary patch literal 604 zcma)2J!^wd6t(>W?N&mjk|8(*ametdVxWslP&yRFCE_3sAxOyZmO?VR6q79yggzXK zg9PdHx+SBV$yRW33LX3dy)QPTv`al)y?DRQIUL7vkM|G#3;2G%#~&;p{r7VTo!8${ z4?W#+90U|Zg}*|%tgD8)(!#$$zTD8lLE-VFlP1g8LBV=dUD~4@<m@pM4xSz z_PqwX?ONMzHjV{cp4b7~pypBkaV;FNSzHo%z-drOpi*wi`mF6*PHRw{?>eR$s0LF3YJF{`L5;zLF1ELK z!(3n+a5nHF=4x;J@~LdxoRB!wP`{tT7eJ3@^u++D)Sckd|wSfR}>F- p6VO!ABn8klIMVgnXu + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL_tri_0 new file mode 100644 index 00000000000..0afe832aff7 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL_tri_0 @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL_vtx_0 new file mode 100644 index 00000000000..58e9ef0ad6c --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconBottomoftheWellDL_vtx_0 @@ -0,0 +1,360 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL new file mode 100644 index 00000000000..10a581f7505 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL_tri_0 new file mode 100644 index 00000000000..3848bb958a7 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL_tri_0 @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL_vtx_0 new file mode 100644 index 00000000000..a48f4da0900 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconFireTempleDL_vtx_0 @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL new file mode 100644 index 00000000000..3f5f8e2b30b --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL_tri_0 new file mode 100644 index 00000000000..d76afc98f0c --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL_tri_0 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL_vtx_0 new file mode 100644 index 00000000000..3d03eb5af3e --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconForestTempleDL_vtx_0 @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL b/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL new file mode 100644 index 00000000000..11c19c09ab1 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL_tri_0 new file mode 100644 index 00000000000..fae636a2e0e --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL_tri_0 @@ -0,0 +1,807 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL_vtx_0 new file mode 100644 index 00000000000..70972926201 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGanonsCastleDL_vtx_0 @@ -0,0 +1,865 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL new file mode 100644 index 00000000000..3552eef1b70 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0 new file mode 100644 index 00000000000..791defa81af --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0 @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0 new file mode 100644 index 00000000000..1dd0cbb61ef --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0 @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL new file mode 100644 index 00000000000..f7bf5e89bd3 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL_tri_0 new file mode 100644 index 00000000000..70e7032efc1 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL_tri_0 @@ -0,0 +1,449 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL_vtx_0 new file mode 100644 index 00000000000..f255b1e8552 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoTrainingGroundDL_vtx_0 @@ -0,0 +1,495 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL new file mode 100644 index 00000000000..78f6956b6dc --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL_tri_0 new file mode 100644 index 00000000000..e76ad0a5983 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL_tri_0 @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL_vtx_0 new file mode 100644 index 00000000000..06897138540 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconShadowTempleDL_vtx_0 @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL new file mode 100644 index 00000000000..ac3998c5e05 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL_tri_0 new file mode 100644 index 00000000000..ed0bbd56361 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL_tri_0 @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL_vtx_0 new file mode 100644 index 00000000000..519fda91b0f --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconSpiritTempleDL_vtx_0 @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL b/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL new file mode 100644 index 00000000000..5dfb7d89419 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL_tri_0 new file mode 100644 index 00000000000..cba2269e60d --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL_tri_0 @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL_vtx_0 new file mode 100644 index 00000000000..0bddb8b229e --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconTreasureChestGameDL_vtx_0 @@ -0,0 +1,461 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL new file mode 100644 index 00000000000..bcbb38c840d --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL_tri_0 new file mode 100644 index 00000000000..9eb74a012fa --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL_tri_0 @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL_vtx_0 new file mode 100644 index 00000000000..70d0655e256 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringIconWaterTempleDL_vtx_0 @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL new file mode 100644 index 00000000000..5db16596e09 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL_tri_0 new file mode 100644 index 00000000000..d8c70273265 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL_tri_0 @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL_vtx_0 new file mode 100644 index 00000000000..47d6419fc41 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellDL_vtx_0 @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL new file mode 100644 index 00000000000..defb5b283e3 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL_tri_0 new file mode 100644 index 00000000000..55f14d8e9bc --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL_tri_0 @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL_vtx_0 new file mode 100644 index 00000000000..81ca9693afa --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysBottomoftheWellMQDL_vtx_0 @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL new file mode 100644 index 00000000000..98ea5b8f43d --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL_tri_0 new file mode 100644 index 00000000000..a04f9824186 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL_tri_0 @@ -0,0 +1,728 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL_vtx_0 new file mode 100644 index 00000000000..3b96611f003 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleDL_vtx_0 @@ -0,0 +1,806 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL new file mode 100644 index 00000000000..3d81cd28bad --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL_tri_0 new file mode 100644 index 00000000000..ca8d79f151e --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL_tri_0 @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL_vtx_0 new file mode 100644 index 00000000000..114ad721982 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysFireTempleMQDL_vtx_0 @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL new file mode 100644 index 00000000000..74831c2201b --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL_tri_0 new file mode 100644 index 00000000000..009f5a41d38 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL_tri_0 @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL_vtx_0 new file mode 100644 index 00000000000..114ad721982 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleDL_vtx_0 @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL new file mode 100644 index 00000000000..33b2eaa3ef1 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL_tri_0 new file mode 100644 index 00000000000..491d44044da --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL_tri_0 @@ -0,0 +1,547 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL_vtx_0 new file mode 100644 index 00000000000..5331ba549b3 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysForestTempleMQDL_vtx_0 @@ -0,0 +1,605 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL new file mode 100644 index 00000000000..693b894b9d0 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL_tri_0 new file mode 100644 index 00000000000..0c059294f80 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL_tri_0 @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL_vtx_0 new file mode 100644 index 00000000000..47d6419fc41 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleDL_vtx_0 @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL new file mode 100644 index 00000000000..fe6e93dd6fe --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL_tri_0 new file mode 100644 index 00000000000..eae1fe0fd17 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL_tri_0 @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL_vtx_0 new file mode 100644 index 00000000000..81ca9693afa --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGanonsCastleMQDL_vtx_0 @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL new file mode 100644 index 00000000000..71b8e23e479 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL_tri_0 new file mode 100644 index 00000000000..5aa84af332b --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL_tri_0 @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL_vtx_0 new file mode 100644 index 00000000000..1005037ee6e --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoFortressDL_vtx_0 @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL new file mode 100644 index 00000000000..d01877e7bb8 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL_tri_0 new file mode 100644 index 00000000000..fd249043c7e --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL_tri_0 @@ -0,0 +1,819 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL_vtx_0 new file mode 100644 index 00000000000..bc91491ad82 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundDL_vtx_0 @@ -0,0 +1,904 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL new file mode 100644 index 00000000000..cb914449c0b --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL_tri_0 new file mode 100644 index 00000000000..5fb4d5f7ea7 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL_tri_0 @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL_vtx_0 new file mode 100644 index 00000000000..47d6419fc41 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysGerudoTrainingGroundMQDL_vtx_0 @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL new file mode 100644 index 00000000000..7738f6244ff --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL_tri_0 new file mode 100644 index 00000000000..612359c24b2 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL_tri_0 @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL_vtx_0 new file mode 100644 index 00000000000..114ad721982 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleDL_vtx_0 @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL new file mode 100644 index 00000000000..d9b35ef41e4 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL_tri_0 new file mode 100644 index 00000000000..d5f9116054a --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL_tri_0 @@ -0,0 +1,547 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL_vtx_0 new file mode 100644 index 00000000000..5331ba549b3 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysShadowTempleMQDL_vtx_0 @@ -0,0 +1,605 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL new file mode 100644 index 00000000000..f2f531e39bc --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL_tri_0 new file mode 100644 index 00000000000..34e3d25b25b --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL_tri_0 @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL_vtx_0 new file mode 100644 index 00000000000..114ad721982 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleDL_vtx_0 @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL new file mode 100644 index 00000000000..1a6058c23b8 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL_tri_0 new file mode 100644 index 00000000000..a4c7b6c8a16 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL_tri_0 @@ -0,0 +1,638 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL_vtx_0 new file mode 100644 index 00000000000..b32d9fd5169 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysSpiritTempleMQDL_vtx_0 @@ -0,0 +1,703 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL new file mode 100644 index 00000000000..69c9d7a9f47 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL_tri_0 new file mode 100644 index 00000000000..548ac57315d --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL_tri_0 @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL_vtx_0 new file mode 100644 index 00000000000..1005037ee6e --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysTreasureChestGameDL_vtx_0 @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL new file mode 100644 index 00000000000..72868b38493 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL_tri_0 new file mode 100644 index 00000000000..5ef106903af --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL_tri_0 @@ -0,0 +1,547 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL_vtx_0 new file mode 100644 index 00000000000..5331ba549b3 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleDL_vtx_0 @@ -0,0 +1,605 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL new file mode 100644 index 00000000000..1394e1eb90d --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL_tri_0 new file mode 100644 index 00000000000..e81ea815f2a --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL_tri_0 @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL_vtx_0 new file mode 100644 index 00000000000..81ca9693afa --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringKeysWaterTempleMQDL_vtx_0 @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringRingDL b/soh/assets/custom/objects/object_keyring/gKeyringRingDL new file mode 100644 index 00000000000..8939b439e7d --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringRingDL @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringRingDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringRingDL_tri_0 new file mode 100644 index 00000000000..1e143c94841 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringRingDL_tri_0 @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/gKeyringRingDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringRingDL_vtx_0 new file mode 100644 index 00000000000..4008f380689 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/gKeyringRingDL_vtx_0 @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconBottomoftheWellDL_f3dlite_IconMetal_BottomoftheWell b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconBottomoftheWellDL_f3dlite_IconMetal_BottomoftheWell new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconBottomoftheWellDL_f3dlite_IconMetal_BottomoftheWell @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconFireTempleDL_f3dlite_IconMetal_FireTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconFireTempleDL_f3dlite_IconMetal_FireTemple new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconFireTempleDL_f3dlite_IconMetal_FireTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconForestTempleDL_f3dlite_IconMetal_ForestTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconForestTempleDL_f3dlite_IconMetal_ForestTemple new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconForestTempleDL_f3dlite_IconMetal_ForestTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGanonsCastleDL_f3dlite_IconMetal_GanonsCastle b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGanonsCastleDL_f3dlite_IconMetal_GanonsCastle new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGanonsCastleDL_f3dlite_IconMetal_GanonsCastle @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress new file mode 100644 index 00000000000..b5755b4a829 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoTrainingGroundDL_f3dlite_IconMetal_GerudoTrainingGround b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoTrainingGroundDL_f3dlite_IconMetal_GerudoTrainingGround new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoTrainingGroundDL_f3dlite_IconMetal_GerudoTrainingGround @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconShadowTempleDL_f3dlite_IconMetal_ShadowTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconShadowTempleDL_f3dlite_IconMetal_ShadowTemple new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconShadowTempleDL_f3dlite_IconMetal_ShadowTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconSpiritTempleDL_f3dlite_IconMetal_SpiritTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconSpiritTempleDL_f3dlite_IconMetal_SpiritTemple new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconSpiritTempleDL_f3dlite_IconMetal_SpiritTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconTreasureChestGameDL_f3dlite_IconMetal_TreasureChestGame b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconTreasureChestGameDL_f3dlite_IconMetal_TreasureChestGame new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconTreasureChestGameDL_f3dlite_IconMetal_TreasureChestGame @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconWaterTempleDL_f3dlite_IconMetal_WaterTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconWaterTempleDL_f3dlite_IconMetal_WaterTemple new file mode 100644 index 00000000000..a76e9f9bd32 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconWaterTempleDL_f3dlite_IconMetal_WaterTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysBottomoftheWellDL_f3dlite_KeyMetal_BottomoftheWell b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysBottomoftheWellDL_f3dlite_KeyMetal_BottomoftheWell new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysBottomoftheWellDL_f3dlite_KeyMetal_BottomoftheWell @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysBottomoftheWellMQDL_f3dlite_KeyMetal_BottomoftheWell b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysBottomoftheWellMQDL_f3dlite_KeyMetal_BottomoftheWell new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysBottomoftheWellMQDL_f3dlite_KeyMetal_BottomoftheWell @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysFireTempleDL_f3dlite_KeyMetal_FireTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysFireTempleDL_f3dlite_KeyMetal_FireTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysFireTempleDL_f3dlite_KeyMetal_FireTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysFireTempleMQDL_f3dlite_KeyMetal_FireTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysFireTempleMQDL_f3dlite_KeyMetal_FireTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysFireTempleMQDL_f3dlite_KeyMetal_FireTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysForestTempleDL_f3dlite_KeyMetal_ForestTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysForestTempleDL_f3dlite_KeyMetal_ForestTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysForestTempleDL_f3dlite_KeyMetal_ForestTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysForestTempleMQDL_f3dlite_KeyMetal_ForestTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysForestTempleMQDL_f3dlite_KeyMetal_ForestTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysForestTempleMQDL_f3dlite_KeyMetal_ForestTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGanonsCastleDL_f3dlite_KeyMetal_GanonsCastle b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGanonsCastleDL_f3dlite_KeyMetal_GanonsCastle new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGanonsCastleDL_f3dlite_KeyMetal_GanonsCastle @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGanonsCastleMQDL_f3dlite_KeyMetal_GanonsCastle b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGanonsCastleMQDL_f3dlite_KeyMetal_GanonsCastle new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGanonsCastleMQDL_f3dlite_KeyMetal_GanonsCastle @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoFortressDL_f3dlite_KeyMetal_GerudoFortress b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoFortressDL_f3dlite_KeyMetal_GerudoFortress new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoFortressDL_f3dlite_KeyMetal_GerudoFortress @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoTrainingGroundDL_f3dlite_KeyMetal_GerudoTrainingGround b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoTrainingGroundDL_f3dlite_KeyMetal_GerudoTrainingGround new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoTrainingGroundDL_f3dlite_KeyMetal_GerudoTrainingGround @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoTrainingGroundMQDL_f3dlite_KeyMetal_GerudoTrainingGround b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoTrainingGroundMQDL_f3dlite_KeyMetal_GerudoTrainingGround new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysGerudoTrainingGroundMQDL_f3dlite_KeyMetal_GerudoTrainingGround @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysShadowTempleDL_f3dlite_KeyMetal_ShadowTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysShadowTempleDL_f3dlite_KeyMetal_ShadowTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysShadowTempleDL_f3dlite_KeyMetal_ShadowTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysShadowTempleMQDL_f3dlite_KeyMetal_ShadowTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysShadowTempleMQDL_f3dlite_KeyMetal_ShadowTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysShadowTempleMQDL_f3dlite_KeyMetal_ShadowTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysSpiritTempleDL_f3dlite_KeyMetal_SpiritTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysSpiritTempleDL_f3dlite_KeyMetal_SpiritTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysSpiritTempleDL_f3dlite_KeyMetal_SpiritTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysSpiritTempleMQDL_f3dlite_KeyMetal_SpiritTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysSpiritTempleMQDL_f3dlite_KeyMetal_SpiritTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysSpiritTempleMQDL_f3dlite_KeyMetal_SpiritTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysTreasureChestGameDL_f3dlite_KeyMetal_TreasureChestGame b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysTreasureChestGameDL_f3dlite_KeyMetal_TreasureChestGame new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysTreasureChestGameDL_f3dlite_KeyMetal_TreasureChestGame @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysWaterTempleDL_f3dlite_KeyMetal_WaterTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysWaterTempleDL_f3dlite_KeyMetal_WaterTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysWaterTempleDL_f3dlite_KeyMetal_WaterTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysWaterTempleMQDL_f3dlite_KeyMetal_WaterTemple b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysWaterTempleMQDL_f3dlite_KeyMetal_WaterTemple new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringKeysWaterTempleMQDL_f3dlite_KeyMetal_WaterTemple @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringRingDL_f3dlite_KeyRingMetal b/soh/assets/custom/objects/object_keyring/mat_gKeyringRingDL_f3dlite_KeyRingMetal new file mode 100644 index 00000000000..fafddd26845 --- /dev/null +++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringRingDL_f3dlite_KeyRingMetal @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/textures/parameter_static/gBossSoul.rgba32.png b/soh/assets/custom/textures/parameter_static/gBossSoul.rgba32.png old mode 100755 new mode 100644 index 9fe2ac4042ee5893354fd4fd2dec4b208b735ea1..4e60a4995f161918fbc625cea3c841f3c14bf003 GIT binary patch delta 5188 zcmai$c{tQ<+s6lEDa6>5eJ8^h>)7|qAR_w`W;1qU?DDe=Wr-LeiG(7NB}-KHgzUwg zB}rKmQucUtKimBt&-1+RAHP4Y>-YJ7&+9zT>$r~dQ1-LVO;LbhFygX3$;v%cD1hjX zBluv2NZ|okA#4}{2LgpnR_5R{zcw=`90zf_#__aO^TBMw>0MvySgyc!UVfHo#5wvT zQ*|NKVy5?pS{o0z3xz71#Yz{lx4I?k-^PuWP5dG(PF-1!Dzpd_*gUw<8mYrTGWxc8 z??8S-*1vP~dh~T_FuKz&q@bXvy)GBu zSLpifi2!gUpEDJin{sF~`?90T?M*k6!QjiYv_jE3O}&8|s}UbtU+&V_=vk)SIZyw# zV%C(jDd^W7AB4#dXf5t&ffv#SKq47m?J`i?ZC{GowmVf6mM(Z6B%RGJSri|`eTrSw zAX$OlPM^6!H7HpJ9Z%+ae9o7eAql}%O}IpLUOX1i5w}q*VG~a>$rgEsWFJs?D2rIk zH2?gxD>FIE8C71&Sy}TyMtQ=@+tM3acF>U(f zMKJ#`zC>6w9lqjefX@vSVOJc2uliW$gff=e6MFk99yd>pGEam|6Z!{RzBW&dt9r3K zYIOmQX}pf~pnN4h&f&$zPtJd-C#xbLolIT&--TS6s2KQ}>MHiL;)LKnuHkcLD zIn@`!bY#Mw&{S*9fzVERK#W)R)XF%5#A)H=USUuNDPG%pl#p=j?%vZ3IR zoej5)XoDe+Wro-GiukgKPL)eXpY|yrAs2Y&G*LJ`^HY`PXnBS!b6~ljC%^m90&M*A zv*ulKzjjE%E?;p-7R>Golg7IYa8F|P2yv@=ezlogFt)hn)H&lhRK4-84F6P*@}bgg zXu57itHy%1S|y~;#kSnwx$NEA>gc^DGpE|22DjmizSNsiJ7ojD!*P#XN{lYmp6v$o z&%T)ZD1a-sMx8B6y|qOSYP1>aSmg14*Rved<1y92YXeNL6K0vWEYj3%V-;LWcc&#y zir=f_o<&HL2Qo*i&e{nE)OsRW-5z95FeIj2i$b*4P@iqmxqgqiU0OsSRgDibfJF_9 zyQfyQK<$lU-jpde-nLz-NKD;I3~>T(B19k7-C!Kc9e#X{W9gYj*Z#!|jlcXUuKb#t z-pP+A#UYkO>C4}9l`RZAcSoNa4mUG&hM%dsKD6&x(z+u`-ChI(X>f{xwfX`fN6lD} z6#;&|3l*nzHM(!un2c5XSbCsTbt~?Xw813G8P{rgYl&A|dXj}d%Xy5)Kbj8sBX-P4 zA|{ZB2&uSIz)X$-d_#vrLcZC|&{j2t#{mUjCU|LiPVKOt`f9_7;LT#{8TvKy* zM+vpjwKB4WZ?nYcEKS{<_S##V%ixocuJc=V42Aqu4SEt6P3%9%LTdoF%7H_G)g9cH!hWyd6}{_xeoNBM z`R`rpsVV}4=F41;?tdiTnXd~;hWRUt1A-Ycox!I1kTpdXt3XSH&xgm8gO=dZ$Sj`V z()%SwGCGE;$3Kkh*-r=dl7tAi`QD4B8uZ+)ZV@T>UU+e@*ZE5r5ZkMsdi^%9cFlrq z-}QzvosGc2ZZnhyXhiL)XdYB*PMg}mL?T8nJ>rcE$1O>&7Y;}-f8$&V;_ZjDmAmtY zDF%XazSfVrmsNhA?k_^?_9Qoil~I^7A+>&k^%Fn!qWp4wwQ(KZHW&94NBXWkP8zGT zg*_OIhsj5SX|QRJ06_GRYMAf*9L;x&)Y-YT6*cF$jc_z7#j`mxxaFfFgYM?N%-3(? z$J*j;FM2ub4{rTT!WHI=|CH>Yob{Ry(D1pAw?G}Q=8ssgKX71(l?=Q~COR2~A0n|= zo~@NihMunbbVKGc>jgvb`GZpxy4k&x3uRq;fex>8Y|OHjwt$e@OxU#>#?-7`VuIa$ zoSl!qxdj_yI&@^%`?*7I&asW(QEq&Z{$wE8?cq(G*KO$`1!)#^Ax~Z*Ej2PJvQpBc z;ii*xrJSP^Ym%kvc8u$~?w6Rv3`JB$L?ZAu^?9b|Fl249|6qi^m#T=h!(j45zk0+T z(=Q=G-|{2H_&7kUnea;3aUvZ)SGLP|b8NRXb2ogEV{p1w5~6DT2-R)55*&v2+s?4N zRXp;RjZ1O>9$~l_ex;BQU{=uq>G{NSXT3%%!F$VYns!_Cs!M9tZ z1X!L~3_d&jRd2a1BoRA^ShiaWoz1k*!)|yPZU9ta5rM`OK^C{sM=9&#*nUulnoeZ&{U}Tkf^&%~{{w>VI6y8yDDi z&$$ulzYfhS!H-aJf|-}1c4f$#KQ_6YpFZm(f`ByWvOgb$& z5-hAsMK}TalZ9U($e=Y@vON5bufgH|^XO3iT`JMBFg9A9h z?Sia$dPyU0>CKlV!y>QF3GAt@7j#DMQ0W(UT(0w`wp8vn=|+2~G|JGq&K3K!qOY60 zdCR`s&7`@yS`bnG?Y?Gz%lgoY^>+!HD3MLRG3FE?EItf3Hi}qhzh;lLx;~WD!>lf} zDLR48nN{QF=L*BUeqFMVWYFbN6aVE5PTWAeK;q2#N5*^lP>W}tH1Z0=snwx0x|SBM|Ah zbwHIfOl+udM!SMQEH;Fbf!E&LOdaj-D@U25{;Bl)0vLsnv_w2fqyTk!`QK|fe0(WMm> zgTd7>3TQPLR0R%GfGR0tVNiq`1_M>bpw$%A5NLN54`oU`t)!Sc+Cxnhj)6lJ)D&P) zCAcC2>Y;>Df@0uscMlZ|0*8aaD2ucb#&!fhjDKj5$Y~)Vp$kZJOZCeHU#vCB-8Vo> zL_rm%q@b*-qKr^fhASw+{sq}$i9rN^KP?fsoB~WvL5(s%p+{x>IUPybNA|Lz0))#zXBKW+4g zq)>mNw*}F{!wZWh{dc3^KK}{+r;`;HPY5Cr!;$|hE53hE>t7&ckuF}$-9uGX<)lwg z6&wZ&RXS-W6oJ4gLa~bO2xV1w6(uFCJ0*=?ivI77p|sGSV^)B|6fVPI>M&JxMFeG; zUK$Y6{C%m^k-qMDtaWfefDZvn{7W|0*ua03_rGv|(f`>U|NmG1R}A=@+`vB|oJhcX zk}N{~{?GXT0sNbT83B#;3;I8U{}s`c|9yE3v30x*stka3Vf~wvC;U`^i9-+w#K`{p zqXOmS^PFtblaS^{^h;FKRP>T4(L3uP5UnxNQ17yRXLpW^4~Gp;VxeN4#+qL&G{n^V z^TU`fLw!RE?Fx&tl!Q!<1h2V}LUtE}aR%7hlNAz2$6g#N!!2ZNa+xi@>pU~$zN`ca z#tS6a-V=xRH<;q_p+_NuoAfTB>W=mZ=@~I^H+&RTA z0gv2H^>U{Ago~+i-7AS$xZN|NboZ`C>jIGSBsy){E{KnNO!iZ_Krbe9!d5$c4DR}_ z=5oD!Ub>51UF6P7#|=xbwJ$b;DdR0p%j@g-?=I#~>t}+j+h(1AK6PyPdWw#okrZ0! zG4Y`j^3f|nIi~I^9;y0pc~#56+FJCWb+Y3|Ud`1J15)8v-1y_$e2D$UrDe-R9$gE- zLcY0bPE8I9h2}261pOkDFz}+myZvYfEN-SXwYgcHsgq~q;+Pay3W-EARC1ZAxjb+; zQoggZQ%U8)hGzP0MaL=zfxXR+x;3v}G)tz5ST3w6HY)n&__*!qZ4$|)2gbyf1Wt6n zN8oL)vX;xKk!9=&td>oo0AKMdZvpA2_2!Zc)LC(Y(T54KL9{P_9qm-Gm*t`Ng3^ay zdJ3?}IuEwBfqwq{DMmrAtgH+N^9vhin@EoY-$j+i&8zVwwqI#o(;HK=D(8rgkLT0a zR^1b(XwCASWmi;jyyFtdQb8IM!%c_AlGM#bGMc(By3{6AtM3}{f&5pwZNF>*c8MIki>1Wz$QsO(TiRWcdGa`NJ{rwuCe;o8RqD~okQ zEUuNG?EF;p8E6AOwo&EXxg)BZ_n;{2H1d?NJ|fG?KHEqxXMV||#iU-=qcf3t;(}Z8 z^>U@SJyf;*E+2x3)G;6HI1OOnXUVLXItL|l1JtRQ#qiHWL_|bHwePumDE(B^IO=3q zvG*AwLS%+I8x#ag#mFV=rlFv1sqQn`QFI}Pya0wV(R9K@Y68REdeZn;OvU#&jktQ- zUgI>LQRqQ~< zMCHzxWwS&{@}Q3X_k_&nu3Lh_;2L`-mx&Ck(f98WI9d^~*_hZZ6ePVTsoSIeK`IZ+ z$F`B;xx)%&xQz^FoDf5#;k$EaEvzUT$7x!#F+&DOwkD-lsFaD>-n&cYnHQSqlH*bH zdU%+%+XEu~MLARtAh+cydw1Pd#7pJ$FEwA3pisHZbtDLT`Wn}d{?TB5Qo8 z3|WuaYLa_4=X*~4&kPI<6p7hvJQ}w`C3lM?=*LEBr>_Fd5aMwKb;0_j&8uYZ(WxoM zK~_CY&g~a8MygHNf2CIH`^soKExl}@j`&eqsli5S6H1vF=cEg$*_n?))*J91Lszf>| z2cE>(+G{`+Sk9|z6Z!E#8zrqi`(EG`--I{=wdSm78TfJJfflI2|C=EyK?1!0B_jR6 zkl!I3qFMV#4L@H`(I-3ofS7t0r$DV7t8zYq<3wbBIx7$J8HUzR>|iQ?--zQ{*$Lk$ zi>9hbQ&*3-JT>QEHv6tQYAj3-NR;}y9W|t`N^EcnI(HA4jufFbPu^P)(&(aLmA+ft F{{Z>hFJJ%w delta 2740 zcmah}c|4Ts7k_7r?9(J6T#ccH%ru)>WTIg#6F1piDYIeHSVySz+KNJ!5h2+cm2S7B zQqwIpbPN}_6snAsV>TT zNH_kjUxM^?-)$EB36QT2BxMkYFgOV4LCPHn!py%m9)|RVp}sgBV+9lIp!L7y0*NN#2zVTc28F~E$+mc^ErE_E&}@kmTM`|B1BVLLfR&KX90XX^ zKM4bX1;l(G|K5sFE+s<_8IouXL(svbV`q>Qvm#S}Tg)BLia%>uCJ`%+c$y7rp0_=| zeNNTGs8G+qrS;0lNEcV$+7all=D!)G1Y-6?dx;Bl=S%c{YEO(F&P$jzO_&D2#vY%> zwXic~0=}1C})_DXt&I=Q%CL zXPZsW?8J6IT2zeRx%l62tpzz}s?J--Rg4>Y1+?orspoHVQS}YT`mMfzi*fwowsii? zs6qE?$vL?5QPsgJW~_1qd<)(PYNRp7)*LK!n9de~IV!EeRq~6I(>z6F1&|sx!hZ89 z!Xsox^3mBP+Z2|rXz7S|k<6y_{t)uXtwg)K08akefq8qt`B{-#Ta&|lnIdT4s?$py zie>C)fLdmY)8R`)jHgeAo+z5b9)JA`$X~|x-|*If4q7Ks=o26gkSx(sN|@U5k`+35 z$s27ej93^N%D{w+#nHAKHblnZIQ%HC0LP0GZCF^@K)~T8G#y_HDv`wF@+mf0E}uun zk_lWsmPVn`u{0YRo<^YXsdy@0(x9`-f3O1BNCDC{U8;*d?mz+bIN}P~pR_?;c z_(Y5*8ohXVZGD6yfw!0=ie_L4R3d>)q~Y;46dNjyOq3KL4UI^&Mcai6Y`4Y=1(9No zSQr%vSxefH=p74j5=GIr9s)6k&k=K+px$6${<-r$f8Tj59_j-8Vys2`D84W>>Hk?v zzAa6+pwP%<8$1Upj7s7`)e$LJE|*Bg@+e$hC>2k)A=8KwDQX>Qu`AH z+k|idl5+%yA(OB1B9rSL{5kqaaguBJX37B7)RX0ydAVwqF zH82hUaOMkuB}(o0K%|=3&4Z=(Qf;}u5q7w-u0z{o>Yekh zX4}$qSG6O^;bc3MI)RI>D_lbfcfuYj?|}d2il3_*xV)WRJy6#ar)azp7P`M`-}W*% zW2{weo_}d$<9z>Y-|YPSUEEuc`h0RQ`PTcd1Is@v#KFz4KYaGa`u}wQM0SNSWfcS5 zRMy@6W$y$3g9i_eiO!2G3h=%jyklNHtcaaaG=g>N%}Q(a;$r=$1M%2O!XYONOtFWX zoZO&M-emfwZ;3Met1MU6zv-B6mUHdP$-`+{F(3OTbGO_)FsMixot&<%P8)D>e^B*m ziFI#kz18)i!Y7YXs3w6y4wjz>uKwUu3ldPweB+Nn*J1M;9g|-Tq$XN7*qdf2koq!X zM!Ou@XnXr>4d1fm4_w$O1VO?(iJ;nZGYn{%AcYt{J{f;S=X{>U#qdXA8Xi0~la0{V zQ%^PLtf$`lDc6=}(Zf&H4+3)QNDgp1eN!|}ws-H6O@{rINb18O14fTwI?4q6<^Wt3 znHS&#uP-mnkWtlq#ZhkVbRk&f0W+(7MPHQ}i@mbgOMi={nG}(-iRpTd$-43E+UI&+u!Ln#@c0DYYYt709tdY#9T}|K__a_GGepMfiB6~I3R81cLx<-mvjr4h}QMt$1%eEO8 z9G}>k9zCeWa1D_Bs5gFeGw813i+$;%t@Y=mH@lUtHlc|)o6_CeT5)SGbL_5)1|n_w zE(e`;M|5uEiRcXF`Z5%pnRS;Y)q5p2Iy#yXcOb85hteqJrukzHhK4?35rHez)h{P0o~;rK4@UhV$ZgWA=b?{5ThP5@FdQc7-oF1F3>_g?#leS*yEE-n*psUr|_|$(kd@L%isk-*C+&IouFO4&sDz;4?IyU56 zJwKa$M^47GmvOD2qakXFcYZV8?3m8Bd`~{~w7>sLn?Nz+;D)MlK(w#+H@b&Wx~ zs1HAP2n-AyPinm^%zA`GSjg_f5AwP~pW7eT@^7q%GhOpaQfk0;$7La~NcS>CW8?Ba z4liG(ju@dK4S9)mR%tUaqs!h*IVTBL$HvBn1Qs`8_<~2I3)39f~)mxvy zz&bcC_}8p%@46Pewq8k5h`Z2|HnB3g36>SQA}zprMvAIY)f ziEwAH+|hg>+22p|+V9VvHFsAGit6jz@Y*lN#!^x6;32SpEgcR>_tIpaHI_{-RRJwh zeXM++ckX1DUKV}18-2R6D>AkpjB`UVr|e#d><4RFf|H3r2?B7uFUKod2V& ztn5Wg3)r$HBY(84&evWa))jL((a!X+6Xt1N_w1>n@d1gadc(P^SN(vNVr)=hPD4rZ zre|m8=H^bjcvRKaj&@v+o4C5K3sZ3C2ebBSGfibf>{yTaj^?r6lHQJNgD6)E-60oc z7}+Z#G7<+HC}vBQbwW(3J1(e!%eoytUQ?TNmReu`8aJVAsnRrX(b}{Np8okAAq56( l{MKl%=e*uiRQNjQK diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h index 894be4106f6..78f4d281e99 100644 --- a/soh/assets/soh_assets.h +++ b/soh/assets/soh_assets.h @@ -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; diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp index 6274de46954..c5e6070f95e 100644 --- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp +++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp @@ -74,6 +74,7 @@ std::map groupLabels = { { COSMETICS_GROUP_SWORDS, "Swords" }, { COSMETICS_GROUP_GLOVES, "Gloves" }, { COSMETICS_GROUP_EQUIPMENT, "Equipment" }, + { COSMETICS_GROUP_KEY, "Keys" }, { COSMETICS_GROUP_CONSUMABLE, "Consumables" }, { COSMETICS_GROUP_HUD, "HUD" }, { COSMETICS_GROUP_KALEIDO, "Pause Menu" }, @@ -118,7 +119,7 @@ Color_RGBA8 ColorRGBA8(uint8_t r, uint8_t g, uint8_t b, uint8_t a) { /* So, you would like to add a new cosmetic option? BUCKLE UP - To preface this, if you have any questions or concerns ping @ProxySaw on discord, if I'm no longer available ask around in the #development-chat + To preface this, if you have any questions or concerns ping @ProxySaw on discord, if I'm no longer available ask around in the #soh-development # Silly Options Lets get this one out of the way, probably the only thing that will be consistent between silly options is how they are rendered @@ -252,6 +253,35 @@ static std::map cosmeticOptions = { COSMETIC_OPTION("Consumable.GoldRupee", "Gold Rupee", COSMETICS_GROUP_CONSUMABLE, ColorRGBA8(255, 190, 55, 255), false, true, true), COSMETIC_OPTION("Consumable.SilverRupee", "Silver Rupee", COSMETICS_GROUP_CONSUMABLE, ColorRGBA8(255, 255, 255, 255), false, true, true), + COSMETIC_OPTION("Key.KeyringRing", "Key Ring Ring", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.ForestSmallBase", "Forest Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.ForestEmblem", "Forest Key Gem/Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.ForestBossBase", "Forest Boss Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 0, 255), false, true, false), + COSMETIC_OPTION("Key.FireSmallBase", "Fire Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.FireEmblem", "Fire Key Gem/Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.FireBossBase", "Fire Boss Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 0, 255), false, true, false), + COSMETIC_OPTION("Key.WaterSmallBase", "Water Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.WaterEmblem", "Water Key Gem/Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.WaterBossBase", "Water Boss Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 0, 255), false, true, false), + COSMETIC_OPTION("Key.SpiritSmallBase", "Spirit Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.SpiritEmblem", "Spirit Key Gem/Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.SpiritBossBase", "Spirit Boss Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 0, 255), false, true, false), + COSMETIC_OPTION("Key.ShadowSmallBase", "Shadow Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.ShadowEmblem", "Shadow Key Gem/Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.ShadowBossBase", "Shadow Boss Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 0, 255), false, true, false), + COSMETIC_OPTION("Key.WellSmallBase", "Well Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.WellEmblem", "Well Key Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.FortSmallBase", "Fortress Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.FortEmblem", "Fortress Key Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.GTGSmallBase", "GTG Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.GTGEmblem", "GTG Key Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.GanonsSmallBase", "Ganon's Small Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + COSMETIC_OPTION("Key.GanonsEmblem", "Ganon's Key Gem/Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.GanonsBossBase", "Ganon's Boss Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 0, 255), false, true, false), + //COSMETIC_OPTION("Key.ChestGameSmallBase", "Chest Game Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 255, 255), false, true, false), + //COSMETIC_OPTION("Key.ChestGameEmblem", "Chest Game Key Emblem", COSMETICS_GROUP_KEY, ColorRGBA8(255, 0, 0, 255), false, true, true), + COSMETIC_OPTION("Key.Skeleton", "Skeleton Key", COSMETICS_GROUP_KEY, ColorRGBA8(255, 255, 170, 255), false, true, false), + COSMETIC_OPTION("HUD.AButton", "A Button", COSMETICS_GROUP_HUD, ColorRGBA8( 90, 90, 255, 255), false, true, false), COSMETIC_OPTION("HUD.BButton", "B Button", COSMETICS_GROUP_HUD, ColorRGBA8( 0, 150, 0, 255), false, true, false), COSMETIC_OPTION("HUD.CButtons", "C Buttons", COSMETICS_GROUP_HUD, ColorRGBA8(255, 160, 0, 255), false, true, false), @@ -1785,6 +1815,94 @@ static const char* colorSchemes[2] = { "Gamecube", }; +void CosmeticsEditorWindow::ApplyDungeonEmblemColors(){ + CVarSetColor(cosmeticOptions["Key.ForestEmblem"].cvar, {0, 255, 0, 255}); + CVarSetInteger(cosmeticOptions["Key.ForestEmblem"].changedCvar, 1); + cosmeticOptions["Key.ForestEmblem"].currentColor = {0, 255/255.0f, 0, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.FireEmblem"].cvar, {255, 30, 0, 255}); + CVarSetInteger(cosmeticOptions["Key.FireEmblem"].changedCvar, 1); + cosmeticOptions["Key.FireEmblem"].currentColor = {255/255.0f, 30/255.0f, 0, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.WaterEmblem"].cvar, {0, 137, 255, 255}); + CVarSetInteger(cosmeticOptions["Key.WaterEmblem"].changedCvar, 1); + cosmeticOptions["Key.WaterEmblem"].currentColor = {0, 137/255.0f, 255/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.SpiritEmblem"].cvar, {255, 85, 0, 255}); + CVarSetInteger(cosmeticOptions["Key.SpiritEmblem"].changedCvar, 1); + cosmeticOptions["Key.SpiritEmblem"].currentColor = {255/255.0f, 85/255.0f, 0, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.ShadowEmblem"].cvar, {153, 0, 255, 255}); + CVarSetInteger(cosmeticOptions["Key.ShadowEmblem"].changedCvar, 1); + cosmeticOptions["Key.ShadowEmblem"].currentColor = {153/255.0f, 0, 255/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.WellEmblem"].cvar, { 255, 0, 188, 255}); + CVarSetInteger(cosmeticOptions["Key.WellEmblem"].changedCvar, 1); + cosmeticOptions["Key.WellEmblem"].currentColor = {255/255.0f, 0, 188/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.GTGEmblem"].cvar, {255, 255, 0, 255}); + CVarSetInteger(cosmeticOptions["Key.GTGEmblem"].changedCvar, 1); + cosmeticOptions["Key.GTGEmblem"].currentColor = {255/255.0f, 255/255.0f, 0, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.FortEmblem"].cvar, {255, 255, 203, 255}); + CVarSetInteger(cosmeticOptions["Key.FortEmblem"].changedCvar, 1); + cosmeticOptions["Key.FortEmblem"].currentColor = { 255/255.0f, 255/255.0f, 203/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.GanonsEmblem"].cvar, {255, 0, 0, 255}); + CVarSetInteger(cosmeticOptions["Key.GanonsEmblem"].changedCvar, 1); + cosmeticOptions["Key.GanonsEmblem"].currentColor = {255/255.0f, 0, 0, 255/255.0f}; + + //CVarSetColor(cosmeticOptions["Key.ChestGameEmblem"].cvar, {255, 255, 0, 255}); + //CVarSetInteger(cosmeticOptions["Key.ChestGameEmblem"].changedCvar, 1); + //cosmeticOptions["Key.ChestGameEmblem"].currentColor = {255/255.0f, 255/255.0f, 0, 255/255.0f}; +} + +void CosmeticsEditorWindow::ApplyDungeonBaseColors(){ + CVarSetColor(cosmeticOptions["Key.ForestSmallBase"].cvar, {4, 195, 46, 255}); + CVarSetInteger(cosmeticOptions["Key.ForestSmallBase"].changedCvar, 1); + cosmeticOptions["Key.ForestSmallBase"].currentColor = {4/255.0f, 195/255.0f, 46/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.FireSmallBase"].cvar, {237, 95, 95, 255}); + CVarSetInteger(cosmeticOptions["Key.FireSmallBase"].changedCvar, 1); + cosmeticOptions["Key.FireSmallBase"].currentColor = {237/255.0f, 95/255.0f, 95/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.WaterSmallBase"].cvar, {85, 180, 223, 255}); + CVarSetInteger(cosmeticOptions["Key.WaterSmallBase"].changedCvar, 1); + cosmeticOptions["Key.WaterSmallBase"].currentColor = {85/255.0f, 180/255.0f, 223/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.SpiritSmallBase"].cvar, {222, 158, 47, 255}); + CVarSetInteger(cosmeticOptions["Key.SpiritSmallBase"].changedCvar, 1); + cosmeticOptions["Key.SpiritSmallBase"].currentColor = {222/255.0f, 158/255.0f, 47/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.ShadowSmallBase"].cvar, {126, 16, 177, 255}); + CVarSetInteger(cosmeticOptions["Key.ShadowSmallBase"].changedCvar, 1); + cosmeticOptions["Key.ShadowSmallBase"].currentColor = {126/255.0f, 16/255.0f, 177/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.WellSmallBase"].cvar, {227, 110, 255, 255}); + CVarSetInteger(cosmeticOptions["Key.WellSmallBase"].changedCvar, 1); + cosmeticOptions["Key.WellSmallBase"].currentColor = {227/255.0f, 110/255.0f, 255/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.GTGSmallBase"].cvar, {221, 212, 60, 255}); + CVarSetInteger(cosmeticOptions["Key.GTGSmallBase"].changedCvar, 1); + cosmeticOptions["Key.GTGSmallBase"].currentColor = {221/255.0f, 212/255.0f, 60/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.FortSmallBase"].cvar, {255, 255, 255, 255}); + CVarSetInteger(cosmeticOptions["Key.FortSmallBase"].changedCvar, 1); + cosmeticOptions["Key.FortSmallBase"].currentColor = {255/255.0f, 255/255.0f, 255/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.GanonsSmallBase"].cvar, {80, 80, 80, 255}); + CVarSetInteger(cosmeticOptions["Key.GanonsSmallBase"].changedCvar, 1); + cosmeticOptions["Key.GanonsSmallBase"].currentColor = {80/255.0f, 80/255.0f, 80/255.0f, 255/255.0f}; + + CVarSetColor(cosmeticOptions["Key.GanonsBossBase"].cvar, {80, 80, 80, 255}); + CVarSetInteger(cosmeticOptions["Key.GanonsBossBase"].changedCvar, 1); + cosmeticOptions["Key.GanonsBossBase"].currentColor = {80/255.0f, 80/255.0f, 80/255.0f, 255/255.0f}; + + //CVarSetColor(cosmeticOptions["Key.ChestGameSmallBase"].cvar, {255, 255, 0, 255}); + //CVarSetInteger(cosmeticOptions["Key.ChestGameSmallBase"].changedCvar, 1); + //cosmeticOptions["Key.ChestGameSmallBase"].currentColor = {255/255.0f, 255/255.0f, 0, 255/255.0f}; +} + void CosmeticsEditorWindow::DrawElement() { ImGui::Text("Color Scheme"); ImGui::SameLine(); @@ -1794,6 +1912,16 @@ void CosmeticsEditorWindow::DrawElement() { "Some cosmetic options may not apply if you have any mods that provide custom models for the cosmetic option.\n\n" "For example, if you have custom Link model, then the Link's Hair color option will most likely not apply." ); + + if (ImGui::Button("Apply Dungeon Gem/Emblem Colors", ImVec2(ImGui::GetContentRegionAvail().x / 2, 30.0f))) { + ApplyDungeonEmblemColors(); + Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame(); + } + ImGui::SameLine(); + if (ImGui::Button("Apply Dungeon Base Colors", ImVec2(ImGui::GetContentRegionAvail().x, 30.0f))) { + ApplyDungeonBaseColors(); + Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame(); + } if (CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)) { if (ImGui::Button("Lock All Advanced", ImVec2(ImGui::GetContentRegionAvail().x / 2, 30.0f))) { for (auto& [id, cosmeticOption] : cosmeticOptions) { @@ -1887,6 +2015,7 @@ void CosmeticsEditorWindow::DrawElement() { DrawCosmeticGroup(COSMETICS_GROUP_MIRRORSHIELD); DrawCosmeticGroup(COSMETICS_GROUP_EQUIPMENT); DrawCosmeticGroup(COSMETICS_GROUP_SWORDS); + DrawCosmeticGroup(COSMETICS_GROUP_KEY); DrawCosmeticGroup(COSMETICS_GROUP_CONSUMABLE); ImGui::EndTabItem(); } diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.h b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.h index 55dba5780ba..c9d395791f7 100644 --- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.h +++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.h @@ -9,6 +9,7 @@ typedef enum { COSMETICS_GROUP_SWORDS, COSMETICS_GROUP_GLOVES, COSMETICS_GROUP_EQUIPMENT, + COSMETICS_GROUP_KEY, COSMETICS_GROUP_CONSUMABLE, COSMETICS_GROUP_HUD, COSMETICS_GROUP_KALEIDO, @@ -62,6 +63,8 @@ class CosmeticsEditorWindow : public Ship::GuiWindow { void InitElement() override; void DrawElement() override; + void ApplyDungeonEmblemColors(); + void ApplyDungeonBaseColors(); void UpdateElement() override {}; }; #endif //__cplusplus \ No newline at end of file diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp index 580fafc1444..9e4b4b0e4fd 100644 --- a/soh/soh/Enhancements/debugconsole.cpp +++ b/soh/soh/Enhancements/debugconsole.cpp @@ -1297,6 +1297,7 @@ static constexpr std::array, COSMETICS_GRO {"swords", COSMETICS_GROUP_SWORDS}, {"gloves", COSMETICS_GROUP_GLOVES}, {"equipment", COSMETICS_GROUP_EQUIPMENT}, + {"key", COSMETICS_GROUP_KEY}, {"consumable", COSMETICS_GROUP_CONSUMABLE}, {"hud", COSMETICS_GROUP_HUD}, {"kaleido", COSMETICS_GROUP_KALEIDO}, diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index 1bc4550f555..965fa26782d 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -397,7 +397,7 @@ const std::vector randomizerCvars = { CVAR_RANDOMIZER_SETTING("BigPoesHint"), CVAR_RANDOMIZER_SETTING("BiggoronHint"), CVAR_RANDOMIZER_SETTING("BlueFireArrows"), - CVAR_RANDOMIZER_SETTING("BombchusInLogic"), + CVAR_RANDOMIZER_SETTING("BombchuBag"), CVAR_RANDOMIZER_SETTING("BossKeysanity"), CVAR_RANDOMIZER_SETTING("BridgeRewardOptions"), CVAR_RANDOMIZER_SETTING("ChickensHint"), @@ -1019,7 +1019,7 @@ const std::vector spockRacePresetEntries = { PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("50GSHint"), 1), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("AllLocationsReachable"), 0), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BlueFireArrows"), 1), - PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BombchusInLogic"), 1), + PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BombchuBag"), 1), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), 1), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 1), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DampeHint"), 1), @@ -1103,7 +1103,7 @@ const std::vector spockRaceNoLogicPresetEntries = { PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("50GSHint"), 1), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("AllLocationsReachable"), 0), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BlueFireArrows"), 1), - PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BombchusInLogic"), 1), + PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BombchuBag"), 1), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BossKeysanity"), RO_DUNGEON_ITEM_LOC_ANYWHERE), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), 1), PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 1), diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp index 0bf60eb81c4..89c290a40f4 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp @@ -1512,6 +1512,16 @@ void StaticData::HintTable_Init_Item() { CustomMessage("a gambler's lockpick", /*german*/"ein Spieler-Dietrich", /*french*/"un crochet à serrure de parieur")}); // /*spanish*/una apertura portentosa del juego de azar + hintTextTable[RHT_TREASURE_GAME_KEY_RING] = HintText(CustomMessage("a Chest Game Key Ring"), + { + CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés") + // /*spanish*/un llavero + }, { + CustomMessage("a gambler's toolbox for unlocking"), + CustomMessage("a gambler's season pass"), + CustomMessage("a gambler's jingling ring"), + CustomMessage("a gambler's skeleton key")}); + hintTextTable[RHT_KOKIRI_EMERALD] = HintText(CustomMessage("the Kokiri Emerald", /*german*/"der Kokiri-Smaragd", /*french*/"l'Émeraude Kokiri"), // /*spanish*/la Esmeralda de los Kokiri { @@ -2057,6 +2067,16 @@ void StaticData::HintTable_Init_Item() { }, { CustomMessage("a fish-puller", /*german*/"ein Fischzieher", /*french*/"(canne à pêche)")}); // /*spanish*/(caña de pescar) + + hintTextTable[RHT_BOMBCHU_BAG] = HintText(CustomMessage("Bombchu Bag", /*german*/"!!!", /*french*/"!!!"), + { + CustomMessage("explosives", /*german*/"ein Explosivpaket", /*french*/"un paquet d'explosifs"), + // /*spanish*/un montón de explosivos + CustomMessage("something that can remove boulders", /*german*/"etwas, das Geröll entfernen kann", /*french*/"une chose qui enlève les rochers") + // /*spanish*/algo que pueda quitar rocas + }, { + CustomMessage("sack of mice", /*german*/"!!!", /*french*/"!!!")}); + hintTextTable[RHT_SKELETON_KEY] = HintText(CustomMessage("a Skeleton Key", /*german*/ "ein Universalschlüssel", /*french*/ "une Clé Squelette"), // /*spanish*/una Llave Maestra { diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp index 6f908de2203..cee278220b4 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp @@ -998,7 +998,7 @@ void GenerateItemPool() { if (/*!ProgressiveGoronSword TODO: Implement Progressive Goron Sword*/true) { AddItemToMainPool(RG_GIANTS_KNIFE); } - if (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) { + if (ctx->GetOption(RSK_BOMBCHU_BAG)) { AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS); } else { AddItemToMainPool(RG_BOMBCHU_10); @@ -1122,7 +1122,7 @@ void GenerateItemPool() { AddItemToMainPool(RG_PROGRESSIVE_NUT_UPGRADE); } - if (ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) { + if (ctx->GetOption(RSK_BOMBCHU_BAG)) { AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS, 5); } else { AddItemToMainPool(RG_BOMBCHU_5); diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp index 4e1afddb7bf..ca80c4b69f2 100644 --- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp @@ -73,7 +73,7 @@ void GenerateStartingInventory() { // AddItemToInventory(RG_PROGRESSIVE_STICK_UPGRADE, StartingStickCapacity.Value()); // AddItemToInventory(RG_PROGRESSIVE_NUT_UPGRADE, StartingNutCapacity.Value()); // AddItemToInventory(RG_PROGRESSIVE_BOMB_BAG, StartingBombBag.Value()); - // AddItemToInventory((BombchusInLogic ? RG_PROGRESSIVE_BOMBCHUS : RG_BOMBCHU_20), StartingBombchus.Value()); + // AddItemToInventory((BombchuBag ? RG_PROGRESSIVE_BOMBCHUS : RG_BOMBCHU_20), StartingBombchus.Value()); // AddItemToInventory(RG_PROGRESSIVE_BOW, StartingBow.Value()); // AddItemToInventory(RG_FIRE_ARROWS, StartingFireArrows.Value()); // AddItemToInventory(RG_ICE_ARROWS, StartingIceArrows.Value()); diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp index f83786fd9aa..6b3788db6d0 100644 --- a/soh/soh/Enhancements/randomizer/draw.cpp +++ b/soh/soh/Enhancements/randomizer/draw.cpp @@ -16,32 +16,59 @@ #include "objects/object_gi_fire/object_gi_fire.h" #include "objects/object_fish/object_fish.h" #include "objects/object_toki_objects/object_toki_objects.h" +#include "objects/object_gi_bomb_2/object_gi_bomb_2.h" #include "objects/gameplay_field_keep/gameplay_field_keep.h" #include "soh_assets.h" +#include "dungeon.h" #include "soh/Enhancements/cosmetics/cosmeticsTypes.h" extern "C" { extern SaveContext gSaveContext; } +const char* SmallBaseCvarValue[10] = { + CVAR_COSMETIC("Key.ForestSmallBase.Value"), + CVAR_COSMETIC("Key.FireSmallBase.Value"), + CVAR_COSMETIC("Key.WaterSmallBase.Value"), + CVAR_COSMETIC("Key.SpiritSmallBase.Value"), + CVAR_COSMETIC("Key.ShadowSmallBase.Value"), + CVAR_COSMETIC("Key.WellSmallBase.Value"), + CVAR_COSMETIC("Key.GTGSmallBase.Value"), + CVAR_COSMETIC("Key.FortSmallBase.Value"), + CVAR_COSMETIC("Key.GanonsSmallBase.Value"), + CVAR_COSMETIC("Key.ChestGameSmallBase.Value"), +}; + +const char* SmallEmblemCvarValue[10] = { + CVAR_COSMETIC("Key.ForestEmblem.Value"), + CVAR_COSMETIC("Key.FireEmblem.Value"), + CVAR_COSMETIC("Key.WaterEmblem.Value"), + CVAR_COSMETIC("Key.SpiritEmblem.Value"), + CVAR_COSMETIC("Key.ShadowEmblem.Value"), + CVAR_COSMETIC("Key.WellEmblem.Value"), + CVAR_COSMETIC("Key.GTGEmblem.Value"), + CVAR_COSMETIC("Key.FortEmblem.Value"), + CVAR_COSMETIC("Key.GanonsEmblem.Value"), + CVAR_COSMETIC("Key.ChestGameEmblem.Value"), +}; + extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey); extern "C" void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEntry) { - s8 keysCanBeOutsideDungeon = getItemEntry->getItemId == RG_GERUDO_FORTRESS_SMALL_KEY ? - Randomizer_GetSettingValue(RSK_GERUDO_KEYS) != RO_GERUDO_KEYS_VANILLA : - DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_KEYSANITY); - s8 isColoredKeysEnabled = keysCanBeOutsideDungeon && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MatchKeyColors"), 1); - s16 color_slot = getItemEntry->getItemId - RG_FOREST_TEMPLE_SMALL_KEY; - s16 colors[9][3] = { - { 4, 195, 46 }, // Forest Temple - { 237, 95, 95 }, // Fire Temple - { 85, 180, 223 }, // Water Temple - { 222, 158, 47 }, // Spirit Temple - { 126, 16, 177 }, // Shadow Temple - { 227, 110, 255 }, // Bottom of the Well - { 221, 212, 60 }, // Gerudo Training Ground - { 255, 255, 255 }, // Thieves' Hideout - { 80, 80, 80 } // Ganon's Castle + s8 isCustomKeysEnabled = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), 0); + int slot = getItemEntry->drawItemId - RG_FOREST_TEMPLE_SMALL_KEY; + + Gfx* customIconDLs[] = { + (Gfx*)gSmallKeyIconForestTempleDL, + (Gfx*)gSmallKeyIconFireTempleDL, + (Gfx*)gSmallKeyIconWaterTempleDL, + (Gfx*)gSmallKeyIconSpiritTempleDL, + (Gfx*)gSmallKeyIconShadowTempleDL, + (Gfx*)gSmallKeyIconBottomoftheWellDL, + (Gfx*)gSmallKeyIconGerudoTrainingGroundDL, + (Gfx*)gSmallKeyIconGerudoFortressDL, + (Gfx*)gSmallKeyIconGanonsCastleDL, + (Gfx*)gSmallKeyIconTreasureChestGameDL, }; OPEN_DISPS(play->state.gfxCtx); @@ -51,14 +78,28 @@ extern "C" void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEn gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); - if (isColoredKeysEnabled) { - gDPSetGrayscaleColor(POLY_OPA_DISP++, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255); - gSPGrayscale(POLY_OPA_DISP++, true); - } + Color_RGB8 keyColor = { 255, 255, 255 }; + keyColor = CVarGetColor24(SmallBaseCvarValue[slot], keyColor); + + if (isCustomKeysEnabled) { + gDPSetEnvColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gSmallKeyCustomDL); + + Gfx_SetupDL_25Xlu(play->state.gfxCtx); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSmallKeyDL); + Color_RGB8 emblemColor = { 255, 0, 0 }; + emblemColor = CVarGetColor24(SmallEmblemCvarValue[slot], emblemColor); - if (isColoredKeysEnabled) { + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), + G_MTX_MODELVIEW | G_MTX_LOAD); + gDPSetEnvColor(POLY_XLU_DISP++, emblemColor.r, emblemColor.g, emblemColor.b, 255); + + gSPDisplayList(POLY_XLU_DISP++, customIconDLs[slot]); + + } else { + gDPSetGrayscaleColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255); + gSPGrayscale(POLY_OPA_DISP++, true); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSmallKeyDL); gSPGrayscale(POLY_OPA_DISP++, false); } @@ -109,19 +150,25 @@ extern "C" void Randomizer_DrawCompass(PlayState* play, GetItemEntry* getItemEnt } extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEntry) { - s8 keysCanBeOutsideDungeon = getItemEntry->getItemId == RG_GANONS_CASTLE_BOSS_KEY ? - DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_GANONS_BOSS_KEY) : - DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_BOSS_KEYSANITY); - s8 isColoredKeysEnabled = keysCanBeOutsideDungeon && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MatchKeyColors"), 1); - s16 color_slot; - color_slot = getItemEntry->getItemId - RG_FOREST_TEMPLE_BOSS_KEY; - s16 colors[6][3] = { - { 4, 195, 46 }, // Forest Temple - { 237, 95, 95 }, // Fire Temple - { 85, 180, 223 }, // Water Temple - { 222, 158, 47 }, // Spirit Temple - { 126, 16, 177 }, // Shadow Temple - { 210, 0, 0 } // Ganon's Castle + s8 isCustomKeysEnabled = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), 1); + s16 slot = getItemEntry->getItemId - RG_FOREST_TEMPLE_BOSS_KEY; + + std::string CvarValue[6] = { + "gCosmetics.Key.Forest", + "gCosmetics.Key.Fire", + "gCosmetics.Key.Water", + "gCosmetics.Key.Spirit", + "gCosmetics.Key.Shadow", + "gCosmetics.Key.Ganons", + }; + + Gfx* CustomdLists[] = { + (Gfx*)gBossKeyIconForestTempleDL, + (Gfx*)gBossKeyIconFireTempleDL, + (Gfx*)gBossKeyIconWaterTempleDL, + (Gfx*)gBossKeyIconSpiritTempleDL, + (Gfx*)gBossKeyIconShadowTempleDL, + (Gfx*)gBossKeyIconGanonsCastleDL, }; OPEN_DISPS(play->state.gfxCtx); @@ -131,15 +178,22 @@ extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEnt gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); - if (color_slot == 5 && isColoredKeysEnabled) { // Ganon's Boss Key - gDPSetGrayscaleColor(POLY_OPA_DISP++, 80, 80, 80, 255); - gSPGrayscale(POLY_OPA_DISP++, true); - } - - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiBossKeyDL); - - if (color_slot == 5 && isColoredKeysEnabled) { // Ganon's Boss Key - gSPGrayscale(POLY_OPA_DISP++, false); + Color_RGB8 keyColor = { 255, 255, 0 }; + //Supposed to use CVAR_COSMETIC but I can't figure out the syntax + keyColor = CVarGetColor24((CvarValue[slot] + "BossBase.Value").c_str(), keyColor); + + if (isCustomKeysEnabled){ + gDPSetEnvColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gBossKeyCustomDL); + } else { + if (CVarGetInteger((CvarValue[slot] + "BossBase.Changed").c_str(), false)){ + gDPSetGrayscaleColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255); + gSPGrayscale(POLY_OPA_DISP++, true); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiBossKeyDL); + gSPGrayscale(POLY_OPA_DISP++, false); + } else { + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiBossKeyDL); + } } Gfx_SetupDL_25Xlu(play->state.gfxCtx); @@ -147,62 +201,140 @@ extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEnt gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); - if (isColoredKeysEnabled) { - gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255); - gSPGrayscale(POLY_XLU_DISP++, true); - } - - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBossKeyGemDL); - - if (isColoredKeysEnabled) { - gSPGrayscale(POLY_XLU_DISP++, false); + Color_RGB8 emblemColor = { 255, 0, 0 }; + emblemColor = CVarGetColor24((CvarValue[slot] + "Emblem.Value").c_str(), emblemColor); + + if (isCustomKeysEnabled){ + gDPSetEnvColor(POLY_XLU_DISP++, emblemColor.r, emblemColor.g, emblemColor.b, 255); + gSPDisplayList(POLY_XLU_DISP++, CustomdLists[slot]); + } else { + if (CVarGetInteger((CvarValue[slot] + "Emblem.Changed").c_str(), false)){ + gDPSetGrayscaleColor(POLY_XLU_DISP++, emblemColor.r, emblemColor.g, emblemColor.b, 255); + gSPGrayscale(POLY_XLU_DISP++, true); + gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBossKeyGemDL); + gSPGrayscale(POLY_XLU_DISP++, false); + } else { + gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBossKeyGemDL); + } } CLOSE_DISPS(play->state.gfxCtx); } extern "C" void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEntry) { - s16 color_slot = getItemEntry->getItemId - RG_FOREST_TEMPLE_KEY_RING; - s16 colors[9][3] = { - { 4, 195, 46 }, // Forest Temple - { 237, 95, 95 }, // Fire Temple - { 85, 180, 223 }, // Water Temple - { 222, 158, 47 }, // Spirit Temple - { 126, 16, 177 }, // Shadow Temple - { 227, 110, 255 }, // Bottom of the Well - { 221, 212, 60 }, // Gerudo Training Ground - { 255, 255, 255 }, // Thieves' Hideout - { 80, 80, 80 } // Ganon's Castle + s8 isCustomKeysEnabled = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), 0); + int slot = getItemEntry->drawItemId - RG_FOREST_TEMPLE_KEY_RING; + + Gfx* CustomIconDLs[] = { + (Gfx*)gKeyringIconForestTempleDL, + (Gfx*)gKeyringIconFireTempleDL, + (Gfx*)gKeyringIconWaterTempleDL, + (Gfx*)gKeyringIconSpiritTempleDL, + (Gfx*)gKeyringIconShadowTempleDL, + (Gfx*)gKeyringIconBottomoftheWellDL, + (Gfx*)gKeyringIconGerudoTrainingGroundDL, + (Gfx*)gKeyringIconGerudoFortressDL, + (Gfx*)gKeyringIconGanonsCastleDL, + (Gfx*)gKeyringIconTreasureChestGameDL, + }; + + Gfx* CustomKeysDLs[] = { + (Gfx*)gKeyringKeysForestTempleDL, + (Gfx*)gKeyringKeysFireTempleDL, + (Gfx*)gKeyringKeysWaterTempleDL, + (Gfx*)gKeyringKeysSpiritTempleDL, + (Gfx*)gKeyringKeysShadowTempleDL, + (Gfx*)gKeyringKeysBottomoftheWellDL, + (Gfx*)gKeyringKeysGerudoTrainingGroundDL, + (Gfx*)gKeyringKeysGerudoFortressDL, + (Gfx*)gKeyringKeysGanonsCastleDL, + (Gfx*)gKeyringKeysTreasureChestGameDL, + }; + + Gfx* CustomKeysMQDLs[] = { + (Gfx*)gKeyringKeysForestTempleMQDL, + (Gfx*)gKeyringKeysFireTempleMQDL, + (Gfx*)gKeyringKeysWaterTempleMQDL, + (Gfx*)gKeyringKeysSpiritTempleMQDL, + (Gfx*)gKeyringKeysShadowTempleMQDL, + (Gfx*)gKeyringKeysBottomoftheWellMQDL, + (Gfx*)gKeyringKeysGerudoTrainingGroundMQDL, + (Gfx*)gKeyringKeysGerudoFortressDL, + (Gfx*)gKeyringKeysGanonsCastleMQDL, + (Gfx*)gKeyringKeysTreasureChestGameDL, + }; + + //RANDOTODO make DungeonInfo static and vanilla accessible to allow all these key model data vars to be stored there. + //(Rando::DungeonKey)0 means the keyring is not tied to a dungeon and should not be checked for an MQ variant + Rando::DungeonKey SlotToDungeon[10] = { + Rando::FOREST_TEMPLE, + Rando::FIRE_TEMPLE, + Rando::WATER_TEMPLE, + Rando::SPIRIT_TEMPLE, + Rando::SHADOW_TEMPLE, + Rando::BOTTOM_OF_THE_WELL, + Rando::GERUDO_TRAINING_GROUND, + (Rando::DungeonKey)0, //Gerudo Fortress + Rando::GANONS_CASTLE, + (Rando::DungeonKey)0, //Treasure Chest Game }; OPEN_DISPS(play->state.gfxCtx); Gfx_SetupDL_25Opa(play->state.gfxCtx); - gDPSetGrayscaleColor(POLY_OPA_DISP++, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255); - gSPGrayscale(POLY_OPA_DISP++, true); - - Matrix_Scale(0.5f, 0.5f, 0.5f, MTXMODE_APPLY); - Matrix_RotateZ(0.8f, MTXMODE_APPLY); - Matrix_RotateX(-2.16f, MTXMODE_APPLY); - Matrix_RotateY(-0.56f, MTXMODE_APPLY); - Matrix_RotateZ(-0.86f, MTXMODE_APPLY); - Matrix_Translate(28.29f, 0, 0, MTXMODE_APPLY); - Matrix_Translate(-(3.12f * 2), -(-0.34f * 2), -(17.53f * 2), MTXMODE_APPLY); - Matrix_RotateX(-(-0.31f * 2), MTXMODE_APPLY); - Matrix_RotateY(-(0.19f * 2), MTXMODE_APPLY); - Matrix_RotateZ(-(0.20f * 2), MTXMODE_APPLY); - for (int i = 0; i < 5; i++) { + Color_RGB8 keyColor = { 255, 255, 255 }; + keyColor = CVarGetColor24(SmallBaseCvarValue[slot], keyColor); + + if (isCustomKeysEnabled) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), - G_MTX_MODELVIEW | G_MTX_LOAD); - Matrix_Translate(3.12f, -0.34f, 17.53f, MTXMODE_APPLY); - Matrix_RotateX(-0.31f, MTXMODE_APPLY); - Matrix_RotateY(0.19f, MTXMODE_APPLY); - Matrix_RotateZ(0.20f, MTXMODE_APPLY); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSmallKeyDL); - } + G_MTX_MODELVIEW | G_MTX_LOAD); + + gDPSetEnvColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255); + if (SlotToDungeon[slot] != 0 && Rando::Context::GetInstance()->GetDungeon(SlotToDungeon[slot])->IsMQ()){ + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)CustomKeysMQDLs[slot]); + } else { + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)CustomKeysDLs[slot]); + } + + Color_RGB8 ringColor = { 255, 255, 255 }; + ringColor = CVarGetColor24(CVAR_COSMETIC("Key.KeyringRing.Value"), ringColor); + gDPSetEnvColor(POLY_OPA_DISP++, ringColor.r, ringColor.g, ringColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gKeyringRingDL); + + Color_RGB8 emblemColor = { 255, 0, 0 }; + emblemColor = CVarGetColor24(SmallEmblemCvarValue[slot], emblemColor); - gSPGrayscale(POLY_OPA_DISP++, false); + Gfx_SetupDL_25Opa(play->state.gfxCtx); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), + G_MTX_MODELVIEW | G_MTX_LOAD); + gDPSetEnvColor(POLY_OPA_DISP++, emblemColor.r, emblemColor.g, emblemColor.b, 255); + + gSPDisplayList(POLY_OPA_DISP++, CustomIconDLs[slot]); + } else { + gDPSetGrayscaleColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255); + gSPGrayscale(POLY_OPA_DISP++, true); + Matrix_Scale(0.5f, 0.5f, 0.5f, MTXMODE_APPLY); + Matrix_RotateZ(0.8f, MTXMODE_APPLY); + Matrix_RotateX(-2.16f, MTXMODE_APPLY); + Matrix_RotateY(-0.56f, MTXMODE_APPLY); + Matrix_RotateZ(-0.86f, MTXMODE_APPLY); + Matrix_Translate(28.29f, 0, 0, MTXMODE_APPLY); + Matrix_Translate(-(3.12f * 2), -(-0.34f * 2), -(17.53f * 2), MTXMODE_APPLY); + Matrix_RotateX(-(-0.31f * 2), MTXMODE_APPLY); + Matrix_RotateY(-(0.19f * 2), MTXMODE_APPLY); + Matrix_RotateZ(-(0.20f * 2), MTXMODE_APPLY); + for (int i = 0; i < 5; i++) { + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), + G_MTX_MODELVIEW | G_MTX_LOAD); + Matrix_Translate(3.12f, -0.34f, 17.53f, MTXMODE_APPLY); + Matrix_RotateX(-0.31f, MTXMODE_APPLY); + Matrix_RotateY(0.19f, MTXMODE_APPLY); + Matrix_RotateZ(0.20f, MTXMODE_APPLY); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSmallKeyDL); + } + gSPGrayscale(POLY_OPA_DISP++, false); + } CLOSE_DISPS(play->state.gfxCtx); } @@ -368,10 +500,11 @@ extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEn Gfx_SetupDL_25Xlu(play->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); + if (slot == 8) { // For Ganon only... - gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 255); } else { - gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 255); } gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gBossSoulSkullDL); @@ -545,52 +678,53 @@ extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getI CLOSE_DISPS(play->state.gfxCtx); } -int skeletonKeyHue = 0; - -// Runs every frame to update rainbow hue, taken from CosmeticsEditor.cpp. -Color_RGBA8 GetSkeletonKeyColor() { - float rainbowSpeed = 0.6f; - - float frequency = 2 * M_PI / (360 * rainbowSpeed); - Color_RGBA8 color; - color.r = sin(frequency * skeletonKeyHue + 0) * 127 + 128; - color.g = sin(frequency * skeletonKeyHue + (2 * M_PI / 3)) * 127 + 128; - color.b = sin(frequency * skeletonKeyHue + (4 * M_PI / 3)) * 127 + 128; - color.a = 255; - - skeletonKeyHue++; - if (skeletonKeyHue >= (360 * rainbowSpeed)) skeletonKeyHue = 0; - - return color; -} - -int skeletonKeyRotation = 0; extern "C" void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry) { OPEN_DISPS(play->state.gfxCtx); - Color_RGBA8 color = GetSkeletonKeyColor(); - Gfx_SetupDL_25Opa(play->state.gfxCtx); - skeletonKeyRotation += 1; + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), + G_MTX_MODELVIEW | G_MTX_LOAD); - if (skeletonKeyRotation > 40) { - skeletonKeyRotation -= 80; - } + Color_RGB8 keyColor = { 255, 255, 170 }; + keyColor = CVarGetColor24(CVAR_COSMETIC("Key.Skeleton.Value"), keyColor); + gDPSetEnvColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gSkeletonKeyDL); - Matrix_RotateZ(M_PI / 40 * skeletonKeyRotation, MTXMODE_APPLY); - Matrix_RotateY(M_PI / 40 * skeletonKeyRotation, MTXMODE_APPLY); + CLOSE_DISPS(play->state.gfxCtx); +} + +extern "C" void Randomizer_DrawBombchuBag(PlayState* play, GetItemEntry* getItemEntry){ + OPEN_DISPS(play->state.gfxCtx); + Gfx_SetupDL_26Opa(play->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); - gDPSetGrayscaleColor(POLY_OPA_DISP++, color.r, color.g, color.b, color.a); - gSPGrayscale(POLY_OPA_DISP++, true); + Color_RGB8 maskColor = { 0, 100, 150 }; + maskColor = CVarGetColor24(CVAR_COSMETIC("Equipment.ChuFace.Value"), maskColor); + gDPSetEnvColor(POLY_OPA_DISP++, maskColor.r, maskColor.g, maskColor.b, 255); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiSmallKeyDL); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gBombchuBagMaskDL); - gSPGrayscale(POLY_OPA_DISP++, false); + Color_RGB8 bodyColor = { 180, 130, 50 }; + bodyColor = CVarGetColor24(CVAR_COSMETIC("Equipment.ChuBody.Value"), bodyColor); + gDPSetEnvColor(POLY_OPA_DISP++, bodyColor.r, bodyColor.g, bodyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gBombchuBagBodyDL); CLOSE_DISPS(play->state.gfxCtx); -} \ No newline at end of file +} + +extern "C" void Randomizer_DrawBombchuBagInLogic(PlayState* play, GetItemEntry* getItemEntry) { + if(IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOMBCHU_BAG)){ + Randomizer_DrawBombchuBag(play, getItemEntry); + } else { + OPEN_DISPS(play->state.gfxCtx); + Gfx_SetupDL_26Opa(play->state.gfxCtx); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), + G_MTX_MODELVIEW | G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiBombchuDL); + CLOSE_DISPS(play->state.gfxCtx); + } +} diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h index 5384946859d..31ac2c1fbf4 100644 --- a/soh/soh/Enhancements/randomizer/draw.h +++ b/soh/soh/Enhancements/randomizer/draw.h @@ -23,6 +23,8 @@ void Randomizer_DrawBronzeScale(PlayState* play, GetItemEntry* getItemEntry); void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry); void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry); void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry getItemEntry); +void Randomizer_DrawBombchuBagInLogic(PlayState* play, GetItemEntry* getItemEntry); +void Randomizer_DrawBombchuBag(PlayState* play, GetItemEntry* getItemEntry); #define GET_ITEM_MYSTERY \ { ITEM_NONE_FE, 0, 0, 0, 0, MOD_RANDOMIZER, MOD_RANDOMIZER, ITEM_NONE_FE, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, ITEM_NONE_FE, MOD_RANDOMIZER, (CustomDrawFunc)Randomizer_DrawMysteryItem } diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index 035f6d02944..e720d33dab0 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -1119,7 +1119,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l break; } case VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN: { - *should = RAND_GET_OPTION(RSK_BOMBCHUS_IN_LOGIC) == false || INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU; + *should = RAND_GET_OPTION(RSK_BOMBCHU_BAG) == false || INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU; break; } case VB_CHECK_RANDO_PRICE_OF_MEDIGORON: { @@ -1533,7 +1533,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l case VB_BE_ABLE_TO_PLAY_BOMBCHU_BOWLING: { // Only check for bomb bag when bombchus aren't in logic // and only check for bombchus when bombchus are in logic - *should = INV_CONTENT((RAND_GET_OPTION(RSK_BOMBCHUS_IN_LOGIC) ? ITEM_BOMBCHU : ITEM_BOMB)) != ITEM_NONE; + *should = INV_CONTENT((RAND_GET_OPTION(RSK_BOMBCHU_BAG) ? ITEM_BOMBCHU : ITEM_BOMB)) != ITEM_NONE; break; } case VB_SHOULD_CHECK_FOR_FISHING_RECORD: { diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp index 5f94ad6e43d..c802747ecd9 100644 --- a/soh/soh/Enhancements/randomizer/item.cpp +++ b/soh/soh/Enhancements/randomizer/item.cpp @@ -340,13 +340,11 @@ std::shared_ptr Item::GetGIEntry() const { // NOLINT(*-no-recursio break; case RG_PROGRESSIVE_BOMBCHUS: if (logic->CurrentInventory(ITEM_BOMBCHU) == ITEM_NONE) { - actual = RG_BOMBCHU_20; + actual = RG_BOMBCHU_BAG; } else if (infiniteUpgrades != RO_INF_UPGRADES_OFF) { actual = RG_BOMBCHU_INF; - } else if (logic->GetAmmo(ITEM_BOMBCHU) < 5) { - actual = RG_BOMBCHU_10; } else { - actual = RG_BOMBCHU_5; + actual = RG_BOMBCHU_10; } break; default: @@ -398,7 +396,7 @@ bool Item::IsMajorItem() const { } if ((randomizerGet == RG_BOMBCHU_5 || randomizerGet == RG_BOMBCHU_10 || randomizerGet == RG_BOMBCHU_20) && - !ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC)) { + !ctx->GetOption(RSK_BOMBCHU_BAG)) { return false; } diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp index 2fbcc0cccef..6aee0a775b7 100644 --- a/soh/soh/Enhancements/randomizer/item_list.cpp +++ b/soh/soh/Enhancements/randomizer/item_list.cpp @@ -66,7 +66,7 @@ void Rando::StaticData::InitItemTable() { itemTable[RG_PROGRESSIVE_SCALE] = Item(RG_PROGRESSIVE_SCALE, Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Schuppe" }, ITEMTYPE_ITEM, 0x86, true, LOGIC_PROGRESSIVE_SCALE, RHT_PROGRESSIVE_SCALE, true); itemTable[RG_PROGRESSIVE_NUT_UPGRADE] = Item(RG_PROGRESSIVE_NUT_UPGRADE, Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nuß-Kapazität" }, ITEMTYPE_ITEM, 0x87, true, LOGIC_PROGRESSIVE_NUT_BAG, RHT_PROGRESSIVE_NUT_UPGRADE, true); itemTable[RG_PROGRESSIVE_STICK_UPGRADE] = Item(RG_PROGRESSIVE_STICK_UPGRADE, Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stab-Kapazität" }, ITEMTYPE_ITEM, 0x88, true, LOGIC_PROGRESSIVE_STICK_BAG, RHT_PROGRESSIVE_STICK_UPGRADE, true); - itemTable[RG_PROGRESSIVE_BOMBCHUS] = Item(RG_PROGRESSIVE_BOMBCHUS, Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Krabbelminen" }, ITEMTYPE_ITEM, 0x89, true, LOGIC_BOMBCHUS, RHT_PROGRESSIVE_BOMBCHUS, RG_PROGRESSIVE_BOMBCHUS, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x33, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER, true); + itemTable[RG_PROGRESSIVE_BOMBCHUS] = Item(RG_PROGRESSIVE_BOMBCHUS, Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Krabbelminen" }, ITEMTYPE_ITEM, 0x89, true, LOGIC_BOMBCHUS, RHT_PROGRESSIVE_BOMBCHUS, true); itemTable[RG_PROGRESSIVE_MAGIC_METER] = Item(RG_PROGRESSIVE_MAGIC_METER, Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives Magisches Maß" }, ITEMTYPE_ITEM, 0x8A, true, LOGIC_PROGRESSIVE_MAGIC, RHT_PROGRESSIVE_MAGIC_METER, true); itemTable[RG_PROGRESSIVE_OCARINA] = Item(RG_PROGRESSIVE_OCARINA, Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" }, ITEMTYPE_ITEM, 0x8B, true, LOGIC_PROGRESSIVE_OCARINA, RHT_PROGRESSIVE_OCARINA, true); itemTable[RG_PROGRESSIVE_GORONSWORD] = Item(RG_PROGRESSIVE_GORONSWORD, Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronen-Schwert" }, ITEMTYPE_ITEM, 0xD4, true, LOGIC_PROGRESSIVE_GIANT_KNIFE, RHT_PROGRESSIVE_GORONSWORD, true); @@ -178,6 +178,8 @@ void Rando::StaticData::InitItemTable() { itemTable[RG_GERUDO_FORTRESS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing); itemTable[RG_GANONS_CASTLE_KEY_RING] = Item(RG_GANONS_CASTLE_KEY_RING, Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Schlüsselbund für Ganons Schloß" }, ITEMTYPE_SMALLKEY, 0xDD, true, LOGIC_GANONS_CASTLE_KEYS, RHT_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_KEY_RING, OBJECT_GI_KEY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER); itemTable[RG_GANONS_CASTLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing); + itemTable[RG_TREASURE_GAME_KEY_RING] = Item(RG_TREASURE_GAME_KEY_RING, Text{ "Chest Game Key Ring", "Trousseau du jeu la Chasse-aux-Trésors", "Schlüsselbund für das Truhenspiel" }, ITEMTYPE_SMALLKEY, 0xDE, true, LOGIC_TREASURE_GAME_KEYS, RHT_TREASURE_GAME_KEY_RING, RG_TREASURE_GAME_KEY_RING, OBJECT_GI_KEY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER); + itemTable[RG_TREASURE_GAME_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing); // Dungeon Rewards itemTable[RG_KOKIRI_EMERALD] = Item(RG_KOKIRI_EMERALD, Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" }, ITEMTYPE_DUNGEONREWARD, 0xCB, true, LOGIC_KOKIRI_EMERALD, RHT_KOKIRI_EMERALD, ITEM_KOKIRI_EMERALD, OBJECT_GI_JEWEL, GID_KOKIRI_EMERALD, 0x80, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_NONE); itemTable[RG_GORON_RUBY] = Item(RG_GORON_RUBY, Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" }, ITEMTYPE_DUNGEONREWARD, 0xCC, true, LOGIC_GORON_RUBY, RHT_GORON_RUBY, ITEM_GORON_RUBY, OBJECT_GI_JEWEL, GID_GORON_RUBY, 0x81, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_NONE); @@ -208,6 +210,7 @@ void Rando::StaticData::InitItemTable() { itemTable[RG_BOMBCHU_5] = Item(RG_BOMBCHU_5, Text{ "Bombchus (5)", "Missiles (5)", "Krabbelminen (5)" }, ITEMTYPE_REFILL, GI_BOMBCHUS_5, true, LOGIC_BOMBCHUS, RHT_BOMBCHUS_5, ITEM_BOMBCHUS_5, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK, MOD_NONE); itemTable[RG_BOMBCHU_10] = Item(RG_BOMBCHU_10, Text{ "Bombchus (10)", "Missiles (10)", "Krabbelminen (10)" }, ITEMTYPE_REFILL, GI_BOMBCHUS_10, true, LOGIC_BOMBCHUS, RHT_BOMBCHUS_10, ITEM_BOMBCHU, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK, MOD_NONE); itemTable[RG_BOMBCHU_20] = Item(RG_BOMBCHU_20, Text{ "Bombchus (20)", "Missiles (20)", "Krabbelminen (20)" }, ITEMTYPE_REFILL, GI_BOMBCHUS_20, true, LOGIC_BOMBCHUS, RHT_BOMBCHUS_20, ITEM_BOMBCHUS_20, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK, MOD_NONE); + itemTable[RG_BOMBCHU_20].SetCustomDrawFunc(Randomizer_DrawBombchuBagInLogic); itemTable[RG_ARROWS_5] = Item(RG_ARROWS_5, Text{ "Arrows (5)", "Flèches (5)", "Pfeile (5)" }, ITEMTYPE_REFILL, GI_ARROWS_SMALL, false, LOGIC_NONE, RHT_ARROWS_5, ITEM_ARROWS_SMALL, OBJECT_GI_ARROW, GID_ARROWS_SMALL, 0xE6, 0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK, MOD_NONE); itemTable[RG_ARROWS_10] = Item(RG_ARROWS_10, Text{ "Arrows (10)", "Flèches (10)", "Pfeile (10)" }, ITEMTYPE_REFILL, GI_ARROWS_MEDIUM, false, LOGIC_NONE, RHT_ARROWS_10, ITEM_ARROWS_MEDIUM, OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, 0xE6, 0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK, MOD_NONE); itemTable[RG_ARROWS_30] = Item(RG_ARROWS_30, Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" }, ITEMTYPE_REFILL, GI_ARROWS_LARGE, false, LOGIC_NONE, RHT_ARROWS_30, ITEM_ARROWS_LARGE, OBJECT_GI_ARROW, GID_ARROWS_LARGE, 0xE6, 0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK, MOD_NONE); @@ -288,6 +291,9 @@ void Rando::StaticData::InitItemTable() { itemTable[RG_BRONZE_SCALE] = Item(RG_BRONZE_SCALE, Text{ "Bronze Scale", "Écaille de Bronze", "Bronzene Schuppe" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, LOGIC_PROGRESSIVE_WALLET, RHT_BRONZE_SCALE, RG_BRONZE_SCALE, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER); itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale); + itemTable[RG_BOMBCHU_BAG] = Item(RG_BOMBCHU_BAG, Text{ "Bombchu Bag", "!!!", "!!!" }, ITEMTYPE_ITEM, RG_BOMBCHU_BAG, true, LOGIC_BOMBCHUS, RHT_BOMBCHU_BAG, RG_BOMBCHU_BAG, OBJECT_GI_BOMB_2, GID_BOMBCHU, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER); + itemTable[RG_BOMBCHU_BAG].SetCustomDrawFunc(Randomizer_DrawBombchuBag); + itemTable[RG_QUIVER_INF] = Item(RG_QUIVER_INF, Text{ "Infinite Quiver", "Carquois Infini", "Unendlicher Köcher" }, ITEMTYPE_ITEM, RG_QUIVER_INF, true, LOGIC_PROGRESSIVE_BOW, RHT_QUIVER_INF, RG_QUIVER_INF, OBJECT_GI_ARROWCASE, GID_QUIVER_50, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER); itemTable[RG_BOMB_BAG_INF] = Item(RG_BOMB_BAG_INF, Text{ "Infinite Bomb Bag", "Sac de Bombes Infini", "Unendliche Bombentasche" }, ITEMTYPE_ITEM, RG_BOMB_BAG_INF, true, LOGIC_PROGRESSIVE_BOMB_BAG, RHT_BOMB_BAG_INF, RG_BOMB_BAG_INF, OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_40, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER); itemTable[RG_BULLET_BAG_INF] = Item(RG_BULLET_BAG_INF, Text{ "Infinite Bullet Bag", "Sac de Graines Infinis", "Unendliche Samentasche" }, ITEMTYPE_ITEM, RG_BULLET_BAG_INF, true, LOGIC_PROGRESSIVE_BULLET_BAG, RHT_BULLET_BAG_INF, RG_BULLET_BAG_INF, OBJECT_GI_DEKUPOUCH, GID_BULLET_BAG, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER); @@ -295,6 +301,7 @@ void Rando::StaticData::InitItemTable() { itemTable[RG_NUT_UPGRADE_INF] = Item(RG_NUT_UPGRADE_INF, Text{ "Infinite Nut Capacity", "Noix Mojo Infinies", "Unendliche Nuß-Kapazität" }, ITEMTYPE_ITEM, RG_NUT_UPGRADE_INF, true, LOGIC_PROGRESSIVE_NUT_BAG, RHT_NUT_UPGRADE_INF, RG_NUT_UPGRADE_INF, OBJECT_GI_NUTS, GID_NUTS, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER); itemTable[RG_MAGIC_INF] = Item(RG_MAGIC_INF, Text{ "Infinite Magic Meter", "Magie Infinie", "Unendliches Magisches Maß" }, ITEMTYPE_ITEM, RG_MAGIC_INF, true, LOGIC_PROGRESSIVE_MAGIC, RHT_MAGIC_INF, RG_MAGIC_INF, OBJECT_GI_MAGICPOT, GID_MAGIC_LARGE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER); itemTable[RG_BOMBCHU_INF] = Item(RG_BOMBCHU_INF, Text{ "Infinite Bombchus", "Missiles Teigneux Infinis", "Unendliche Krabbelminen" }, ITEMTYPE_ITEM, RG_BOMBCHU_INF, true, LOGIC_BOMBCHUS, RHT_BOMBCHU_INF, RG_BOMBCHU_INF, OBJECT_GI_BOMB_2, GID_BOMBCHU, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER); + itemTable[RG_BOMBCHU_INF].SetCustomDrawFunc(Randomizer_DrawBombchuBag); itemTable[RG_WALLET_INF] = Item(RG_WALLET_INF, Text{ "Infinite Wallet", "Bourse Infinie", "Unendliche Geldbörse" }, ITEMTYPE_ITEM, RG_WALLET_INF, true, LOGIC_PROGRESSIVE_WALLET, RHT_WALLET_INF, RG_WALLET_INF, OBJECT_GI_PURSE, GID_WALLET_GIANT, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER); itemTable[RG_SKELETON_KEY] = Item(RG_SKELETON_KEY, Text{ "Skeleton Key", "Clé Squelette", "Skelettschlüssel" }, ITEMTYPE_ITEM, GI_STONE_OF_AGONY, true, LOGIC_SKELETON_KEY, RHT_SKELETON_KEY, RG_SKELETON_KEY, OBJECT_GI_MAP, GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER); diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp index eb8be8bb735..189d1c86714 100644 --- a/soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp @@ -60,7 +60,7 @@ void RegionTable_Init_DodongosCavern() { }, { //Exits Entrance(RR_DODONGOS_CAVERN_LOBBY, []{return true;}), - //Shield seems to be in logic to drop a pot on thier head as they hit you to blow up the wall + //Shield seems to be in logic to drop a pot on their head as they hit you to blow up the wall Entrance(RR_DODONGOS_CAVERN_SE_ROOM, []{return Here(RR_DODONGOS_CAVERN_SE_CORRIDOR, []{return logic->BlastOrSmash() || logic->CanAttack() || (logic->TakeDamage() && logic->CanShield());});}), Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, []{return true;}), }); diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp index 36ee1d5ab76..8b8b4d46585 100644 --- a/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp @@ -45,12 +45,12 @@ void RegionTable_Init_SpiritTemple() { areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Region("Child Spirit Temple Climb", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))), - LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))), + LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))), + LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))), LOCATION(RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM, logic->HasProjectile(HasProjectileAge::Both) || logic->CanUse(RG_DINS_FIRE) || (logic->TakeDamage() && (logic->CanJumpslashExceptHammer() || logic->HasProjectile(HasProjectileAge::Child))) || (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasProjectile(HasProjectileAge::Child)) || - ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->TakeDamage() && logic->CanJumpslashExceptHammer())))), + ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->TakeDamage() && logic->CanJumpslashExceptHammer())))), LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1, logic->CanBreakPots()), }, { //Exits @@ -72,11 +72,11 @@ void RegionTable_Init_SpiritTemple() { areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Region("Spirit Temple Central Chamber", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST, ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && + LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST, ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || ctx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_STICKS) ))) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives() && logic->CanUse(RG_STICKS)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && (logic->CanUse(RG_FIRE_ARROWS) || (ctx->GetTrickOption(RT_SPIRIT_MAP_CHEST) && logic->CanUse(RG_FAIRY_BOW))) && logic->CanUse(RG_SILVER_GAUNTLETS))), - LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && + LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || ctx->GetTrickOption(RT_SPIRIT_SUN_CHEST)) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_STICKS) ))) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives() && logic->CanUse(RG_STICKS)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && (logic->CanUse(RG_FIRE_ARROWS) || (ctx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->CanUse(RG_FAIRY_BOW))) && logic->CanUse(RG_SILVER_GAUNTLETS))), @@ -85,19 +85,19 @@ void RegionTable_Init_SpiritTemple() { LOCATION(RC_SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM, (logic->HasExplosives() && logic->CanUse(RG_BOOMERANG) && logic->CanUse(RG_HOOKSHOT)) || (logic->CanUse(RG_BOOMERANG) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives()) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && - logic->CanUse(RG_BOOMERANG) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))))), - LOCATION(RC_SPIRIT_TEMPLE_GS_LOBBY, ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && + logic->CanUse(RG_BOOMERANG) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))))), + LOCATION(RC_SPIRIT_TEMPLE_GS_LOBBY, ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && ctx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->CanUse(RG_BOOMERANG) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) || (ctx->GetTrickOption(RT_SPIRIT_LOBBY_GS) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasExplosives() && logic->CanUse(RG_BOOMERANG)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP)))), - LOCATION(RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), - LOCATION(RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), - LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), - LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), - LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), - LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), - LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), - LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), + LOCATION(RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), + LOCATION(RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), + LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), + LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), + LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), + LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), + LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), + LOCATION(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6, logic->CanBreakPots() && (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)))), }, { //Exits Entrance(RR_SPIRIT_TEMPLE_OUTDOOR_HANDS, []{return logic->CanJumpslashExceptHammer() || logic->HasExplosives();}), diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp index 48b4c062309..cd65fd0069d 100644 --- a/soh/soh/Enhancements/randomizer/logic.cpp +++ b/soh/soh/Enhancements/randomizer/logic.cpp @@ -649,7 +649,7 @@ namespace Rando { //RANDOTODO Dark link is buggy right now, retest when he is not return CanJumpslash() || CanUse(RG_FAIRY_BOW); case RE_ANUBIS: - //there's a restoration that allows beating them with mirror shield + some way to trigger thier attack + //there's a restoration that allows beating them with mirror shield + some way to trigger their attack return HasFireSource(); case RE_BEAMOS: return HasExplosives(); @@ -964,7 +964,7 @@ namespace Rando { } bool Logic::BombchusEnabled(){ - return ctx->GetOption(RSK_BOMBCHUS_IN_LOGIC) ? CheckInventory(ITEM_BOMBCHU, true) : HasItem(RG_BOMB_BAG); + return ctx->GetOption(RSK_BOMBCHU_BAG) ? CheckInventory(ITEM_BOMBCHU, true) : HasItem(RG_BOMB_BAG); } // TODO: Implement Ammo Drop Setting in place of bombchu drops diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp index f95f817e79c..2e577c51ec1 100644 --- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp +++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp @@ -384,7 +384,7 @@ void Settings::CreateOptionDescriptions() { "to the item pool.\n" "All But Beans - Medigoron, Granny and the Carpet Salesman will have checks, " "A Giant's Knife and a pack of Bombchus will be added to the item pool, and " - "one of the bottles will contain a Blue Potion.\n\n" + "one of the bottles will contain a Blue Potion.\n" "All - Apply both effects.\n" "\n" "Granny's item will only be offered after you have traded in the Odd Mushroom when Shuffle Adult Trade is on. " @@ -663,20 +663,19 @@ void Settings::CreateOptionDescriptions() { mOptionDescriptions[RSK_KAK_100_SKULLS_HINT] = "Talking to the Cursed Resident in the Skulltula House who is saved after 100 tokens will tell you the reward."; mOptionDescriptions[RSK_MASK_SHOP_HINT] = "Reading the mask shop sign will tell you rewards from showing masks at the Deku Theatre."; mOptionDescriptions[RSK_FULL_WALLETS] = "Start with a full wallet. All wallet upgrades come filled with rupees."; - mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC] = - "Bombchus are properly considered in logic. Without this setting, any Bombchu requirement " + mOptionDescriptions[RSK_BOMBCHU_BAG] = + "Bombchus require their own bag to be found before use. Without this setting, any Bombchu requirement " "is filled by Bomb Bag + a renewable source of Bombchus.\n" "\n" - "The first Bombchu pack will always be 20, and subsequent packs will be " - "5 or 10 based on how many you have.\n" - "Once found, they can be replenished at the Bombchu shop.\n" + "The first Bombchu you find be a Bag containing 20 chus, and subsequent packs will have 10." + "Once found, they can be replenished at shops selling refills, Bombchu Bowling and the carpet merchant.\n" "\n" - "Bombchu Bowling is opened by obtaining Bombchus."; - mOptionDescriptions[RSK_ENABLE_BOMBCHU_DROPS] = "Once you obtain Bombchus for the first time, refills can be found " - "in bushes and other places where bomb drops can normally spawn." + "Bombchu Bowling is opened by obtaining the Bombchu Bag."; + mOptionDescriptions[RSK_ENABLE_BOMBCHU_DROPS] = "Once you obtain a Bombchu Bag, refills will sometimes replace " + "Bomb drops that would spawn." "\n" - "If you have Bombchus in Logic disabled, you will also need a " - "Bomb Bag for Bombchus to drop."; + "If you have Bombchu Bag disabled, you will need a Bomb Bag " + "and existing Bombchus for Bombchus to drop."; mOptionDescriptions[RSK_BLUE_FIRE_ARROWS] = "Ice Arrows act like Blue Fire, making them able to melt red ice. " "Item placement logic will respect this option, so it might be required to use this to progress."; diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 1dcdb5506ba..301498bf8b3 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -3338,7 +3338,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) { void Randomizer::CreateCustomMessages() { // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED // with GIMESSAGE(getItemID, itemID, english, german, french). - const std::array getItemMessages = {{ + const std::array getItemMessages = {{ GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, "You found %gGreg%w!", "%gGreg%w! Du hast ihn wirklich gefunden!", @@ -3457,6 +3457,10 @@ void Randomizer::CreateCustomMessages() { "You found a %rGanon's Castle &%wKeyring!", "Du erhältst ein %rSchlüsselbund%w&für %rGanons Schloß%w!", "Vous obtenez un trousseau de&clés du %rChâteau de Ganon%w!"), + GIMESSAGE(RG_TREASURE_GAME_KEY_RING, ITEM_KEY_SMALL, + "You found a %rTreasure Chest Game &%wKeyring!", + "!!!", + "!!!"), GIMESSAGE(RG_FOREST_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS, "You found the %gForest Temple &%wBoss Key!", @@ -3633,6 +3637,9 @@ void Randomizer::CreateCustomMessages() { GIMESSAGE_NO_GERMAN(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!", "Vous avez trouvé une %rCanne à pêche%w perdue!&Il est temps d'aller à l'étang!"), + GIMESSAGE_NO_GERMAN(RG_BOMBCHU_BAG, ITEM_BOMBCHU, + "You found the %rBombchu Bag%w!", + "!!!"), GIMESSAGE_NO_GERMAN(RG_BOMB_BAG_INF, ITEM_BOMB_BAG_40, "You got an %rInfinite Bomb Bag%w!&Now you have %yinfinite bombs%w!", "Vous avez obtenu un %rSac à bombes à l'infini%w!&Vous avez maintenant des %ybombes à l'infini%w!"), @@ -4006,13 +4013,14 @@ extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) { break; case RG_PROGRESSIVE_BOMBCHUS: + case RG_BOMBCHU_BAG: if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) { INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU; AMMO(ITEM_BOMBCHU) = 20; } else if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INFINITE_UPGRADES)) { Flags_SetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS); } else { - AMMO(ITEM_BOMBCHU) += AMMO(ITEM_BOMBCHU) < 5 ? 10 : 5; + AMMO(ITEM_BOMBCHU) += 10; if (AMMO(ITEM_BOMBCHU) > 50) { AMMO(ITEM_BOMBCHU) = 50; } diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 703b2a301ff..d7edb01df8d 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -3213,6 +3213,7 @@ typedef enum { RG_GERUDO_TRAINING_GROUND_KEY_RING, RG_GERUDO_FORTRESS_KEY_RING, RG_GANONS_CASTLE_KEY_RING, + RG_TREASURE_GAME_KEY_RING, RG_KOKIRI_EMERALD, RG_GORON_RUBY, RG_ZORA_SAPPHIRE, @@ -3306,6 +3307,7 @@ typedef enum { RG_TYCOON_WALLET, RG_BRONZE_SCALE, RG_CHILD_WALLET, + RG_BOMBCHU_BAG, RG_QUIVER_INF, RG_BOMB_BAG_INF, RG_BULLET_BAG_INF, @@ -4487,6 +4489,7 @@ typedef enum { RHT_GERUDO_TRAINING_GROUND_KEY_RING, RHT_GERUDO_FORTRESS_KEY_RING, RHT_GANONS_CASTLE_KEY_RING, + RHT_TREASURE_GAME_KEY_RING, RHT_KOKIRI_EMERALD, RHT_GORON_RUBY, RHT_ZORA_SAPPHIRE, @@ -4556,6 +4559,7 @@ typedef enum { RHT_BUY_RED_POTION_40, RHT_BUY_RED_POTION_50, RHT_TRIFORCE, + RHT_BOMBCHU_BAG, RHT_QUIVER_INF, RHT_BOMB_BAG_INF, RHT_BULLET_BAG_INF, @@ -5227,7 +5231,7 @@ typedef enum { RSK_BLUE_FIRE_ARROWS, RSK_SUNLIGHT_ARROWS, RSK_ENABLE_BOMBCHU_DROPS, - RSK_BOMBCHUS_IN_LOGIC, + RSK_BOMBCHU_BAG, RSK_LINKS_POCKET, RSK_MQ_DUNGEON_RANDOM, RSK_MQ_DUNGEON_COUNT, diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp index 0c5e6c41c4d..2eca186031f 100644 --- a/soh/soh/Enhancements/randomizer/settings.cpp +++ b/soh/soh/Enhancements/randomizer/settings.cpp @@ -143,7 +143,7 @@ void Settings::CreateOptions() { mOptions[RSK_MIX_INTERIOR_ENTRANCES] = Option::Bool("Mix Interiors", CVAR_RANDOMIZER_SETTING("MixInteriors"), mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES], IMFLAG_NONE); mOptions[RSK_MIX_GROTTO_ENTRANCES] = Option::Bool("Mix Grottos", CVAR_RANDOMIZER_SETTING("MixGrottos"), mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES]); mOptions[RSK_DECOUPLED_ENTRANCES] = Option::Bool("Decouple Entrances", CVAR_RANDOMIZER_SETTING("DecoupleEntrances"), mOptionDescriptions[RSK_DECOUPLED_ENTRANCES]); - mOptions[RSK_BOMBCHUS_IN_LOGIC] = Option::Bool("Bombchus in Logic", CVAR_RANDOMIZER_SETTING("BombchusInLogic"), mOptionDescriptions[RSK_BOMBCHUS_IN_LOGIC]); + mOptions[RSK_BOMBCHU_BAG] = Option::Bool("Bombchu Bag", CVAR_RANDOMIZER_SETTING("BombchuBag"), mOptionDescriptions[RSK_BOMBCHU_BAG]); mOptions[RSK_ENABLE_BOMBCHU_DROPS] = Option::U8("Bombchu Drops", {"No", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("EnableBombchuDrops"), mOptionDescriptions[RSK_ENABLE_BOMBCHU_DROPS], WidgetType::Combobox, RO_AMMO_DROPS_ON); // TODO: AmmoDrops and/or HeartDropRefill, combine with/separate Ammo Drops from Bombchu Drops? mOptions[RSK_TRIFORCE_HUNT] = Option::Bool("Triforce Hunt", CVAR_RANDOMIZER_SETTING("TriforceHunt"), mOptionDescriptions[RSK_TRIFORCE_HUNT], IMFLAG_NONE); @@ -921,7 +921,7 @@ void Settings::CreateOptions() { }, WidgetContainerType::COLUMN); mOptionGroups[RSG_ADDITIONAL_FEATURES_IMGUI] = OptionGroup::SubGroup("Additional Features", { &mOptions[RSK_FULL_WALLETS], - &mOptions[RSK_BOMBCHUS_IN_LOGIC], + &mOptions[RSK_BOMBCHU_BAG], &mOptions[RSK_ENABLE_BOMBCHU_DROPS], &mOptions[RSK_BLUE_FIRE_ARROWS], &mOptions[RSK_SUNLIGHT_ARROWS], @@ -1006,7 +1006,7 @@ void Settings::CreateOptions() { &mOptions[RSK_MIX_INTERIOR_ENTRANCES], &mOptions[RSK_MIX_GROTTO_ENTRANCES], &mOptions[RSK_DECOUPLED_ENTRANCES], - &mOptions[RSK_BOMBCHUS_IN_LOGIC], + &mOptions[RSK_BOMBCHU_BAG], &mOptions[RSK_ENABLE_BOMBCHU_DROPS], &mOptions[RSK_TRIFORCE_HUNT], &mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL], diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index f3a9557c27b..6a2ce1c540c 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -2236,34 +2236,9 @@ void DrawRandomizerMenu() { UIWidgets::Tooltip( "When obtaining rupees, randomize what the rupee is called in the textbox." ); - - // Only disable the key colors checkbox when none of the keysanity settings are set to "Any Dungeon", "Overworld" or "Anywhere" - bool disableKeyColors = true; - - if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_KEYSANITY) == RO_DUNGEON_ITEM_LOC_ANY_DUNGEON || - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_KEYSANITY) == RO_DUNGEON_ITEM_LOC_OVERWORLD || - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_KEYSANITY) == RO_DUNGEON_ITEM_LOC_ANYWHERE || - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GERUDO_KEYS) != RO_GERUDO_KEYS_VANILLA || - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOSS_KEYSANITY) == RO_DUNGEON_ITEM_LOC_ANY_DUNGEON || - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOSS_KEYSANITY) == RO_DUNGEON_ITEM_LOC_OVERWORLD || - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOSS_KEYSANITY) == RO_DUNGEON_ITEM_LOC_ANYWHERE || - (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GANONS_BOSS_KEY) != RO_GANON_BOSS_KEY_VANILLA && - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GANONS_BOSS_KEY) != RO_GANON_BOSS_KEY_OWN_DUNGEON && - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GANONS_BOSS_KEY) != RO_GANON_BOSS_KEY_STARTWITH) || - !IS_RANDO) { - disableKeyColors = false; - } - - static const char* disableKeyColorsText = - "This setting is disabled because a savefile is loaded without any key\n" - "shuffle settings set to \"Any Dungeon\", \"Overworld\" or \"Anywhere\""; - - UIWidgets::PaddedEnhancementCheckbox("Key Colors Match Dungeon", CVAR_RANDOMIZER_ENHANCEMENT("MatchKeyColors"), true, false, - disableKeyColors, disableKeyColorsText, UIWidgets::CheckboxGraphics::Cross, true); - UIWidgets::Tooltip( - "Matches the color of small keys and boss keys to the dungeon they belong to. " - "This helps identify keys from afar and adds a little bit of flair.\n\nThis only " - "applies to seeds with keys and boss keys shuffled to \"Any Dungeon\", \"Overworld\", or \"Anywhere\"."); + + UIWidgets::PaddedEnhancementCheckbox("Use Custom Key Models", CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), true, false); + UIWidgets::Tooltip("Use Custom graphics for dungeon keys, Big and Small, so that they can be easily told apart"); bool disableCompassColors = !DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS); diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c index 05e5785b974..6b977650dd3 100644 --- a/soh/src/code/z_en_item00.c +++ b/soh/src/code/z_en_item00.c @@ -1556,7 +1556,7 @@ s16 func_8001F404(s16 dropId) { if ((CVarGetInteger(CVAR_ENHANCEMENT("EnableBombchuDrops"), 0) || (IS_RANDO && Randomizer_GetSettingValue(RSK_ENABLE_BOMBCHU_DROPS) == 1)) && (dropId == ITEM00_BOMBS_A || dropId == ITEM00_BOMBS_B || dropId == ITEM00_BOMBS_SPECIAL) && - (!IS_RANDO || Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC) || INV_CONTENT(ITEM_BOMB) != ITEM_NONE)) { + (!IS_RANDO || Randomizer_GetSettingValue(RSK_BOMBCHU_BAG) || INV_CONTENT(ITEM_BOMB) != ITEM_NONE)) { dropId = EnItem00_ConvertBombDropToBombchu(dropId); } // #endregion diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 2cb1087039d..ccf1150cff7 100644 --- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -179,7 +179,7 @@ void EnBomBowMan_CheckBeatenDC(EnBomBowlMan* this, PlayState* play) { if (IS_RANDO) { // when rando'd, check if we have bombchus if chus are in logic // and check if we have a bomb bag if chus aren't in logic - u8 explosive = Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC) ? ITEM_BOMBCHU : ITEM_BOMB; + u8 explosive = Randomizer_GetSettingValue(RSK_BOMBCHU_BAG) ? ITEM_BOMBCHU : ITEM_BOMB; bombchuBowlingClosed = (INV_CONTENT(explosive) == ITEM_NONE); } else { // if not rando'd, check if we have beaten Dodongo's Cavern diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c index b6fb10f3c0a..aca1fc81190 100644 --- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -582,6 +582,7 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) { (play->sceneNum == SCENE_TREASURE_BOX_SHOP && this->dyna.actor.room != 6); // Exclude treasure game chests except for the final room if (!isVanilla) { + GetItemEntry test = this->getItemEntry; getItemCategory = this->getItemEntry.getItemCategory; // If they have bombchus, don't consider the bombchu item major if ( diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 3343fb615fd..432212c01c4 100644 --- a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -763,9 +763,9 @@ s32 EnGirlA_CanBuy_Bombchus(PlayState* play, EnGirlA* this) { // When in rando, don't allow buying bombchus when the player doesn't have required explosives // If bombchus are in logic, the player needs to have bombchus; otherwise they need a bomb bag if (IS_RANDO) { - u8 bombchusInLogic = Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC); - if ((!bombchusInLogic && CUR_CAPACITY(UPG_BOMB_BAG) == 0) || - (bombchusInLogic && INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE)) { + u8 bombchuBag = Randomizer_GetSettingValue(RSK_BOMBCHU_BAG); + if ((!bombchuBag && CUR_CAPACITY(UPG_BOMB_BAG) == 0) || + (bombchuBag && INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE)) { return CANBUY_RESULT_CANT_GET_NOW; } }