dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give songs meaningful english names

Browse Source
This commit is contained in:
GriffinR
2020-08-29 03:11:03 -04:00
parent c5839905a1
commit bb56d4a3f4
964 changed files with 8731 additions and 8814 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_pokedude.c
+4 -4
View File
@@ -1782,14 +1782,14 @@ static void PokedudeHandleFaintAnimation(void)
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
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_8012110;
}
else
{
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET);
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
}
gBattlerControllerFuncs[gActiveBattler] = sub_8156DCC;
@@ -2607,7 +2607,7 @@ static void sub_8159BA8(void)
if (gUnknown_3005EE0[gActiveBattler][3] == 13)
{
BattleStopLowHpSound();
PlayBGM(MUS_WIN_YASEI);
PlayBGM(MUS_VICTORY_WILD);
}
gBattle_BG0_Y = gUnknown_3005EE0[gActiveBattler][4];
sub_80EB524();
@@ -2680,7 +2680,7 @@ static void sub_8159D04(void)
if (gUnknown_3005EE0[gActiveBattler][3] == 13)
{
BattleStopLowHpSound();
PlayBGM(MUS_WIN_YASEI);
PlayBGM(MUS_VICTORY_WILD);
}
sub_80EF0E0(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT));
sub_80EB524();