Merge pull request #356 from GriffinRichards/rename-songs

Give songs meaningful english names

1 files changed, 15 insertions, 15 deletions

diff --git a/src/party_menu.c b/src/party_menu.c
index b8ad7d830..43ee671b0 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1214,7 +1214,7 @@ static bool8 IsSelectedMonNotEgg(u8 *slotPtr)
 {
     if (GetMonData(&gPlayerParty[*slotPtr], MON_DATA_IS_EGG) == TRUE)
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         return FALSE;
     }
     return TRUE;
@@ -1225,7 +1225,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr)
     switch (gPartyMenu.action)
     {
     case PARTY_ACTION_SEND_OUT:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         break;
     case PARTY_ACTION_SWITCH:
     case PARTY_ACTION_SOFTBOILED:
@@ -1844,7 +1844,7 @@ static void TryEnterMonForMinigame(u8 taskId, u8 slot)
     }
     else
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         DisplayPartyMenuMessage(gText_PkmnCantParticipate, FALSE);
         ScheduleBgCopyTilemapToVram(2);
         gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
@@ -3809,7 +3809,7 @@ static void CursorCB_Enter(u8 taskId)
             return;
         }
     }
-    PlaySE(SE_HAZURE);
+    PlaySE(SE_FAILURE);
     DisplayPartyMenuMessage(str, TRUE);
     gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
 }
@@ -3884,7 +3884,7 @@ static void CursorCB_Register(u8 taskId)
         Task_ClosePartyMenu(taskId);
         return;
     }
-    PlaySE(SE_HAZURE);
+    PlaySE(SE_FAILURE);
     PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
     PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
     StringAppend(gStringVar4, gText_PauseUntilPress);
@@ -3902,7 +3902,7 @@ static void CursorCB_Trade1(u8 taskId)
     if (stringId != UR_TRADE_MSG_NONE)
     {
         StringExpandPlaceholders(gStringVar4, sUnionRoomTradeMessages[stringId - 1]);
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
         PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
         StringAppend(gStringVar4, gText_PauseUntilPress);
@@ -4528,13 +4528,13 @@ void ItemUseCB_MedicineStep(u8 taskId, TaskFunc func)
     gPartyMenuUseExitCallback = TRUE;
     if (!IsItemFlute(item))
     {
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         if (gPartyMenu.action != PARTY_ACTION_REUSABLE_ITEM)
             RemoveBagItem(item, 1);
     }
     else
     {
-        PlaySE(SE_BIDORO);
+        PlaySE(SE_GLASS_FLUTE);
     }
     SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
     if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible)
@@ -4694,7 +4694,7 @@ static void sub_8125898(u8 taskId, UNUSED TaskFunc func)
     ExecuteTableBasedItemEffect_(gPartyMenu.slotId, gSpecialVar_ItemId, (u8)gPartyMenu.data1);
     gPartyMenuUseExitCallback = TRUE;
     ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, gSpecialVar_ItemId, 0xFFFF);
-    PlaySE(SE_KAIFUKU);
+    PlaySE(SE_USE_ITEM);
     RemoveBagItem(gSpecialVar_ItemId, 1);
     move = GetMonData(mon, gPartyMenu.data1 + MON_DATA_MOVE1);
     StringCopy(gStringVar1, gMoveNames[move]);
@@ -4725,7 +4725,7 @@ static void TryUsePPItem(u8 taskId)
         gPartyMenuUseExitCallback = TRUE;
         mon = &gPlayerParty[ptr->slotId];
         ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, item, 0xFFFF);
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         RemoveBagItem(item, 1);
         move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot);
         StringCopy(gStringVar1, gMoveNames[move]);
@@ -4851,7 +4851,7 @@ static void Task_DoLearnedMoveFanfareAfterText(u8 taskId)
 {
     if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        PlayFanfare(MUS_FANFA1);
+        PlayFanfare(MUS_LEVEL_UP);
         gTasks[taskId].func = Task_LearnNextMoveOrClosePartyMenu;
     }
 }
@@ -5260,7 +5260,7 @@ static void UseSacredAsh(u8 taskId)
         gTasks[taskId].func = Task_SacredAshLoop;
         return;
     }
-    PlaySE(SE_KAIFUKU);
+    PlaySE(SE_USE_ITEM);
     if (sPartyMenuInternal->tHadEffect == 0)
         sSacredAshQuestLogMonBackup = mon;
     SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
@@ -5778,7 +5778,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId)
 
     if (msgId != 0xFF)
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         DisplayPartyMenuStdMessage(msgId);
         gTasks[taskId].func = Task_ContinueChoosingHalfParty;
     }
@@ -5791,7 +5791,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId)
         }
         else
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             DisplayPartyMenuStdMessage(PARTY_MSG_NO_MON_FOR_BATTLE);
             gTasks[taskId].func = Task_ContinueChoosingHalfParty;
         }
@@ -6300,7 +6300,7 @@ static void Task_MultiPartnerPartySlideIn(u8 taskId)
                 if (gMultiPartnerParty[i - MULTI_PARTY_SIZE].species != SPECIES_NONE)
                     AnimateSelectedPartyIcon(sPartyMenuBoxes[i].monSpriteId, 0);
             }
-            PlaySE(SE_W231); // The Harden SE plays once the partners party mons have slid on screen
+            PlaySE(SE_M_HARDEN); // The Harden SE plays once the partners party mons have slid on screen
             gTasks[taskId].func = Task_WaitAfterMultiPartnerPartySlideIn;
         }
     }