From 8a69f1f020145600408c93b11b6fc5139e37ed81 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Tue, 13 Dec 2022 23:27:51 -0500 Subject: [PATCH] Fixes receiving the wrong item when picking up ammo drops near a chest. (#2183) * Fixes receiving the wrong item when picking up ammo drops near a chest. Still shows the wrong model above links head but does give the right item and shows the right text. * Fixes get item model during first time pickup anim near chest. --- soh/src/overlays/actors/ovl_player_actor/z_player.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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 08f0da8d0..f58248db0 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -1710,7 +1710,7 @@ s32 func_808332E4(Player* this) { void func_808332F4(Player* this, PlayState* play) { GetItemEntry giEntry; - if (this->getItemEntry.objectId == OBJECT_INVALID) { + if (this->getItemEntry.objectId == OBJECT_INVALID || (this->getItemId != this->getItemEntry.getItemId)) { giEntry = ItemTable_Retrieve(this->getItemId); } else { giEntry = this->getItemEntry; @@ -12576,7 +12576,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) { } if (this->unk_84F == 0) { - if (this->getItemEntry.objectId == OBJECT_INVALID) { + if (this->getItemEntry.objectId == OBJECT_INVALID || (this->getItemId != this->getItemEntry.getItemId)) { giEntry = ItemTable_Retrieve(this->getItemId); } else { giEntry = this->getItemEntry;