diff --git a/soh/include/z64item.h b/soh/include/z64item.h index ec2bf14576..8883eb8ca7 100644 --- a/soh/include/z64item.h +++ b/soh/include/z64item.h @@ -430,38 +430,38 @@ typedef enum { /* 0x91 */ GI_REQUIEM_OF_SPIRIT, /* 0x92 */ GI_PRELUDE_OF_LIGHT, - GI_SINGLE_MAGIC, - GI_DOUBLE_MAGIC, - GI_DOUBLE_DEFENSE, + /* 0x93 */ GI_SINGLE_MAGIC, + /* 0x94 */ GI_DOUBLE_MAGIC, + /* 0x95 */ GI_DOUBLE_DEFENSE, - /* 0x93 */ GI_GERUDO_FORTRESS_SMALL_KEY, - /* 0x94 */ GI_FOREST_TEMPLE_SMALL_KEY, - /* 0x95 */ GI_FIRE_TEMPLE_SMALL_KEY, - /* 0x96 */ GI_WATER_TEMPLE_SMALL_KEY, - /* 0x97 */ GI_SPIRIT_TEMPLE_SMALL_KEY, - /* 0x98 */ GI_SHADOW_TEMPLE_SMALL_KEY, - /* 0x99 */ GI_BOTTOM_OF_THE_WELL_SMALL_KEY, - /* 0x9A */ GI_GERUDO_TRAINING_GROUNDS_SMALL_KEY, - /* 0x9B */ GI_GANONS_CASTLE_SMALL_KEY, + /* 0x96 */ GI_BOTTLE_WITH_RED_POTION, + /* 0x97 */ GI_BOTTLE_WITH_GREEN_POTION, + /* 0x98 */ GI_BOTTLE_WITH_BLUE_POTION, + /* 0x99 */ GI_BOTTLE_WITH_FAIRY, + /* 0x9A */ GI_BOTTLE_WITH_FISH, + /* 0x9B */ GI_BOTTLE_WITH_BLUE_FIRE, + /* 0x9C */ GI_BOTTLE_WITH_BUGS, + /* 0x9D */ GI_BOTTLE_WITH_POE, + /* 0x9E */ GI_BOTTLE_WITH_BIG_POE, - /* 0x9C */ GI_FOREST_TEMPLE_BOSS_KEY, - /* 0x9D */ GI_FIRE_TEMPLE_BOSS_KEY, - /* 0x9E */ GI_WATER_TEMPLE_BOSS_KEY, - /* 0x9F */ GI_SPIRIT_TEMPLE_BOSS_KEY, - /* 0xA0 */ GI_SHADOW_TEMPLE_BOSS_KEY, - /* 0xA1 */ GI_GANONS_CASTLE_BOSS_KEY, + /* 0x9F */ GI_GERUDO_FORTRESS_SMALL_KEY, + /* 0xA0 */ GI_FOREST_TEMPLE_SMALL_KEY, + /* 0xA1 */ GI_FIRE_TEMPLE_SMALL_KEY, + /* 0xA2 */ GI_WATER_TEMPLE_SMALL_KEY, + /* 0xA3 */ GI_SPIRIT_TEMPLE_SMALL_KEY, + /* 0xA4 */ GI_SHADOW_TEMPLE_SMALL_KEY, + /* 0xA5 */ GI_BOTTOM_OF_THE_WELL_SMALL_KEY, + /* 0xA6 */ GI_GERUDO_TRAINING_GROUNDS_SMALL_KEY, + /* 0xA7 */ GI_GANONS_CASTLE_SMALL_KEY, - GI_BOTTLE_WITH_RED_POTION, - GI_BOTTLE_WITH_GREEN_POTION, - GI_BOTTLE_WITH_BLUE_POTION, - GI_BOTTLE_WITH_FAIRY, - GI_BOTTLE_WITH_FISH, - GI_BOTTLE_WITH_BLUE_FIRE, - GI_BOTTLE_WITH_BUGS, - GI_BOTTLE_WITH_POE, - GI_BOTTLE_WITH_BIG_POE, + /* 0xA8 */ GI_FOREST_TEMPLE_BOSS_KEY, + /* 0xA9 */ GI_FIRE_TEMPLE_BOSS_KEY, + /* 0xAA */ GI_WATER_TEMPLE_BOSS_KEY, + /* 0xAB */ GI_SPIRIT_TEMPLE_BOSS_KEY, + /* 0xAC */ GI_SHADOW_TEMPLE_BOSS_KEY, + /* 0xAD */ GI_GANONS_CASTLE_BOSS_KEY, - /* 0x84 */ GI_MAX + /* 0xAE */ GI_MAX } GetItemID; typedef enum { diff --git a/soh/soh/Enhancements/randomizer/3drando/item.hpp b/soh/soh/Enhancements/randomizer/3drando/item.hpp index a424dbf2b8..dbfb695b1e 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/item.hpp @@ -103,11 +103,11 @@ public: return false; } - if ((type == ITEMTYPE_BOSSKEY && getItemId != 0x9A) && (BossKeysanity.Is(BOSSKEYSANITY_VANILLA) || BossKeysanity.Is(BOSSKEYSANITY_OWN_DUNGEON))) { + if ((type == ITEMTYPE_BOSSKEY && getItemId != 0xAD) && (BossKeysanity.Is(BOSSKEYSANITY_VANILLA) || BossKeysanity.Is(BOSSKEYSANITY_OWN_DUNGEON))) { return false; } //Ganons Castle Boss Key - if (getItemId == 0x9A && (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA) || GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON))) { + if (getItemId == 0xAD && (GanonsBossKey.Is(GANONSBOSSKEY_VANILLA) || GanonsBossKey.Is(GANONSBOSSKEY_OWN_DUNGEON))) { return false; } diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index c6a584dcb7..8fefef0a5a 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -645,6 +645,16 @@ GetItemEntry sGetItemTable[] = { GET_ITEM(ITEM_DOUBLE_MAGIC, OBJECT_GI_MAGICPOT, GID_MAGIC_LARGE, 0xE8, 0x80, CHEST_ANIM_LONG), GET_ITEM(ITEM_DOUBLE_DEFENSE, OBJECT_GI_HEARTS, GID_HEART_CONTAINER, 0xE9, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_RED_POTION, OBJECT_GI_LIQUID, GID_POTION_RED, 0x43, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_GREEN_POTION, OBJECT_GI_LIQUID, GID_POTION_GREEN, 0x44, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_BLUE_POTION, OBJECT_GI_LIQUID, GID_POTION_BLUE, 0x45, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_FAIRY, OBJECT_GI_BOTTLE, GID_BOTTLE, 0x46, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_FISH, OBJECT_GI_FISH, GID_FISH, 0x47, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_BLUE_FIRE, OBJECT_GI_FIRE, GID_BLUE_FIRE, 0x5D, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_BUGS, OBJECT_GI_INSECT, GID_BUG, 0x7A, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_POE, OBJECT_GI_GHOST, GID_POE, 0x97, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE_WITH_BIG_POE, OBJECT_GI_GHOST, GID_BIG_POE, 0xF9, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_GERUDO_FORTRESS_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, 0x60, 0x80, CHEST_ANIM_SHORT), GET_ITEM(ITEM_FOREST_TEMPLE_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, 0x60, 0x80, CHEST_ANIM_SHORT), GET_ITEM(ITEM_FIRE_TEMPLE_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, 0x60, 0x80, CHEST_ANIM_SHORT), @@ -662,16 +672,6 @@ GetItemEntry sGetItemTable[] = { GET_ITEM(ITEM_SHADOW_TEMPLE_BOSS_KEY, OBJECT_GI_BOSSKEY, GID_KEY_BOSS, 0xC7, 0x80, CHEST_ANIM_LONG), GET_ITEM(ITEM_GANONS_CASTLE_BOSS_KEY, OBJECT_GI_BOSSKEY, GID_KEY_BOSS, 0xC7, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_RED_POTION, OBJECT_GI_LIQUID, GID_POTION_RED, 0x43, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_GREEN_POTION, OBJECT_GI_LIQUID, GID_POTION_GREEN, 0x44, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_BLUE_POTION, OBJECT_GI_LIQUID, GID_POTION_BLUE, 0x45, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_FAIRY, OBJECT_GI_BOTTLE, GID_BOTTLE, 0x46, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_FISH, OBJECT_GI_FISH, GID_FISH, 0x47, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_BLUE_FIRE, OBJECT_GI_FIRE, GID_BLUE_FIRE, 0x5D, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_BUGS, OBJECT_GI_INSECT, GID_BUG, 0x7A, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_POE, OBJECT_GI_GHOST, GID_POE, 0x97, 0x80, CHEST_ANIM_LONG), - GET_ITEM(ITEM_BOTTLE_WITH_BIG_POE, OBJECT_GI_GHOST, GID_BIG_POE, 0xF9, 0x80, CHEST_ANIM_LONG), - GET_ITEM_NONE, GET_ITEM_NONE, };