summaryrefslogtreecommitdiff
path: root/src/battle/battle_controller_wally.c
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2018-01-16 23:35:14 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2018-01-16 23:35:14 +0100
commit05ab3f96218b58001aa2d90cef951f7e4087c4ae (patch)
tree642a3ceb3f83690fb90d5c535592e1339c66664a /src/battle/battle_controller_wally.c
parent35f04db27cd4d5689c6498ba80eaeb695f973ebc (diff)
parente1fd501e16deefe643c4572efaa07a59372616e4 (diff)
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/battle/battle_controller_wally.c')
-rw-r--r--src/battle/battle_controller_wally.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 4c0adab5e..49f530129 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -412,7 +412,7 @@ void sub_81376B8(void)
FreeSpriteTilesByTag(0x27F9);
FreeSpritePaletteByTag(0x27F9);
CreateTask(c3_0802FDF4, 10);
- sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+ HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
WallyBufferExecCompleted();
}
}
@@ -429,7 +429,7 @@ void sub_81377B0(void)
}
else
{
- sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+ HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
WallyBufferExecCompleted();
}
}
@@ -1066,7 +1066,7 @@ void sub_8138294(u8 a)
SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
break;
}
- sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+ HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
}
void WallyHandlecmd3(void)