From 0c334615b65abe06a7d7e9a3ceb373c6e28e7203 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sat, 13 Aug 2022 00:38:09 -0400
Subject: [PATCH] Adds else if to added fanfare sound cases.

Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940112924 and https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940113492
---
 soh/src/overlays/actors/ovl_player_actor/z_player.c | 10 ++++++++--
 1 file changed, 8 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 a8b8dd71fa..1f1cd2f2cf 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -12584,13 +12584,16 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
                     }
                     Audio_PlayFanfare(temp1);
                 }
-            } else {
+            } else if (giEntry.modIndex == MOD_RANDOMIZER) {
                 if (this->getItemId == RG_DOUBLE_DEFENSE || this->getItemId == RG_MAGIC_SINGLE ||
                     this->getItemId == RG_MAGIC_DOUBLE) {
                     Audio_PlayFanfare(NA_BGM_HEART_GET | 0x900);
                 } else {
                     Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900);
                 }
+            } else {
+                // Just in case something weird happens with MOD_INDEX
+                Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900);
             }
         } else {
             if (giEntry.modIndex == MOD_NONE) {
@@ -12609,13 +12612,16 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
                     }
                     Audio_PlayFanfare(temp1);
                 }
-            } else {
+            } else if (giEntry.modIndex == MOD_RANDOMIZER) {
                 if (giEntry.itemId == RG_DOUBLE_DEFENSE || giEntry.itemId == RG_MAGIC_SINGLE ||
                     giEntry.itemId == RG_MAGIC_DOUBLE) {
                     Audio_PlayFanfare(NA_BGM_HEART_GET | 0x900);
                 } else {
                     Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900);
                 }
+            } else {
+                // Just in case something weird happens with modIndex.
+                Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900);
             }
         }
         this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;