From 9ed7feb30aebb53b82912184965787151a4bec5f Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sat, 13 Aug 2022 12:13:46 -0400 Subject: [PATCH] Realized I had the bgm conditions wrong. --- soh/src/overlays/actors/ovl_player_actor/z_player.c | 4 +++- 1 file changed, 3 insertions(+), 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 1f1cd2f2cf..f04bf93c9f 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -12566,7 +12566,8 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) { } Player_SetPendingFlag(this, globalCtx); - if (this->getItemEntry.objectId != OBJECT_INVALID) { + if (this->getItemEntry.objectId == OBJECT_INVALID) { + // Use this if player does not have a getItemEntry if (giEntry.modIndex == MOD_NONE) { if (((this->getItemId >= GI_RUPEE_GREEN) && (this->getItemId <= GI_RUPEE_RED)) || ((this->getItemId >= GI_RUPEE_PURPLE) && (this->getItemId <= GI_RUPEE_GOLD)) || @@ -12596,6 +12597,7 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) { Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900); } } else { + // Use this if we do have a getItemEntry if (giEntry.modIndex == MOD_NONE) { if (((giEntry.itemId >= ITEM_RUPEE_GREEN) && (giEntry.itemId <= ITEM_RUPEE_RED)) || ((giEntry.itemId >= ITEM_RUPEE_PURPLE) && (giEntry.itemId <= ITEM_RUPEE_GOLD)) ||