summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-09 20:02:59 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-09 20:02:59 -0400
commit855c052be041ed85789db1e460dd35cab9d12b4f (patch)
tree35dcf54a3b48510c01c721e2733646ed597ff79a /src/battle_controller_player.c
parent734cada66a2d9938cdc9a2806f68352d06da6e9a (diff)
Rename song constants using Japanese sound test menu
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index b0cd92c2e..0d827c8db 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -807,7 +807,7 @@ static void sub_802F610(void)
{
if (gReceivedRemoteLinkPlayers == 0)
{
- m4aSongNumStop(SE_T_OOAME);
+ m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(sub_8011A1C);
@@ -816,7 +816,7 @@ static void sub_802F610(void)
}
else if (IsLinkTaskFinished())
{
- m4aSongNumStop(SE_T_OOAME);
+ m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(sub_8011A1C);
@@ -838,7 +838,7 @@ void sub_802F6A8(void)
}
else
{
- m4aSongNumStop(SE_T_OOAME);
+ m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(gMain.savedCallback);
@@ -1087,7 +1087,7 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId)
exp -= currLvlExp;
expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp;
SetBattleBarStruct(battlerId, gHealthboxSpriteIds[battlerId], expToNextLvl, exp, -gainedExp);
- PlaySE(SE_U);
+ PlaySE(SE_EXP);
gTasks[taskId].func = sub_80300F4;
}
@@ -1113,7 +1113,7 @@ static void sub_80300F4(u8 taskId)
u16 species;
s32 expOnNextLvl;
- m4aSongNumStop(SE_U);
+ m4aSongNumStop(SE_EXP);
level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL);
currExp = GetMonData(&gPlayerParty[monId], MON_DATA_EXP);
species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
@@ -1227,7 +1227,7 @@ static void sub_80303A8(u8 taskId)
++data[15];
break;
case 2:
- PlaySE(SE_T_KAMI2);
+ PlaySE(SE_REGI);
if (IsMonGettingExpSentOut())
sub_811E5B8(sprite->pos1.x + sprite->pos2.x,
sprite->pos1.y + sprite->pos2.y,