diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:16:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-28 16:16:00 -0400 |
commit | c8307317344f0ca6d176882cf8b55d3bf82dc680 (patch) | |
tree | 393b23af98581a7dec2e0731732a23ece4b23007 /src/battle_controller_player_partner.c | |
parent | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (diff) | |
parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) |
Merge branch 'master' into doc-blender
Diffstat (limited to 'src/battle_controller_player_partner.c')
-rw-r--r-- | src/battle_controller_player_partner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 21c1fdd5b..fd6616746 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -1371,7 +1371,7 @@ static void PlayerPartnerHandleFaintAnimation(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; |