dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Give songs meaningful english names

Browse Source
This commit is contained in:
GriffinR
2020-08-20 18:02:00 -04:00
parent 6c34effda9
commit 3014241179
1178 changed files with 10482 additions and 10477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_controller_player.c
View File

@@ -853,7 +853,7 @@ static void sub_80586F8(void)
{
if (gReceivedRemoteLinkPlayers == 0)
{
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(sub_8038D64);
@@ -866,7 +866,7 @@ static void sub_80586F8(void)
{
if (IsLinkTaskFinished())
{
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(sub_8038D64);
@@ -895,7 +895,7 @@ void sub_80587B0(void)
}
else
{
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(gMain.savedCallback);
@@ -2392,7 +2392,7 @@ static void PlayerHandleFaintAnimation(void)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;