diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:41 -0400 |
| commit | 4cf09577950db22d7f0acf6ede45b8dca1c97156 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /src/battle_controller_pokedude.c | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
| parent | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (diff) | |
Merge pull request #356 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/battle_controller_pokedude.c')
| -rw-r--r-- | src/battle_controller_pokedude.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 285be03c7..c8a4b0286 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -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(); |