From f4a051fb901c6cc415ddfa4fd53f97618512311f Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sun, 14 Aug 2022 21:28:54 -0400 Subject: [PATCH] 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; }