From 7e0e8c63af2394b7ef3bc1c3344ebf9de2454762 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sun, 14 Aug 2022 18:40:48 -0400 Subject: [PATCH 1/3] Fixes issues with approaching bottleable items. --- soh/src/overlays/actors/ovl_player_actor/z_player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 615b39894a..b2afa9ed73 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6104,7 +6104,7 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { this->getItemId = iREG(68); } - if (this->getItemId < GI_MAX || (gSaveContext.n64ddFlag && this->getItemId < RG_MAX)) { + if (this->getItemId < GI_MAX) { GetItemEntry giEntry; if (this->getItemEntry.objectId == OBJECT_INVALID) { giEntry = ItemTable_Retrieve(this->getItemId); From 0e2530cd497921f5c40f693ef8706b95a2e863d9 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sun, 14 Aug 2022 20:15:33 -0400 Subject: [PATCH 2/3] Fixes Ruto's Letter. It was accidentally getting classified as a rando item. --- soh/soh/Enhancements/randomizer/randomizer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index a2b94be7e5..80bdf1c8dd 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1857,6 +1857,8 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet, GetItemID ogItemId) case RG_ZELDAS_LETTER: return GI_LETTER_ZELDA; + case RG_RUTOS_LETTER: + return GI_LETTER_RUTO; case RG_POCKET_EGG: return GI_POCKET_EGG; @@ -2172,6 +2174,7 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) { case RG_MAGIC_BEAN: case RG_WEIRD_EGG: case RG_ZELDAS_LETTER: + case RG_RUTOS_LETTER: case RG_POCKET_EGG: case RG_COJIRO: case RG_ODD_MUSHROOM: From f4a051fb901c6cc415ddfa4fd53f97618512311f Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sun, 14 Aug 2022 21:28:54 -0400 Subject: [PATCH 3/3] Should re-fix freestanding ice traps --- .../overlays/actors/ovl_player_actor/z_player.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 b2afa9ed73..2c33afbb14 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6104,14 +6104,14 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { this->getItemId = iREG(68); } - if (this->getItemId < GI_MAX) { - GetItemEntry giEntry; - if (this->getItemEntry.objectId == OBJECT_INVALID) { - giEntry = ItemTable_Retrieve(this->getItemId); - } else { - giEntry = this->getItemEntry; - } - + GetItemEntry giEntry; + if (this->getItemEntry.objectId == OBJECT_INVALID) { + giEntry = ItemTable_Retrieve(this->getItemId); + } else { + giEntry = this->getItemEntry; + } + if ((giEntry.modIndex == MOD_NONE && this->getItemId < GI_MAX) || + (giEntry.modIndex == MOD_RANDOMIZER && this->getItemId < RG_MAX)) { if ((interactedActor != &this->actor) && !iREG(67)) { interactedActor->parent = &this->actor; }