diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-02-10 14:46:53 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-02-10 14:46:53 -0800 |
| commit | aaf065aba01db7456ed9a8fd82ccb2961ea9d97a (patch) | |
| tree | e69568253cb4d0a3096cc2c35f08400505115d04 /src | |
| parent | 6eaadfc62e89a25c2de674aebf69f077c491580f (diff) | |
Sync battle anim script command names with pokeemerald
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/battle_anim.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index c71c12ce7..476f2c910 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -1327,7 +1327,7 @@ extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; -extern const u16 gUnknown_081C7160[]; +extern const u16 gSingingMoves[]; extern const u8 *const gBattleAnims_Moves[]; static void RunAnimScriptCommand(void); @@ -1521,10 +1521,11 @@ void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim) if (isMoveAnim) { - for (i = 0; gUnknown_081C7160[i] != 0xFFFF; i++) + for (i = 0; gSingingMoves[i] != 0xFFFF; i++) { - if (move == gUnknown_081C7160[i]) + if (move == gSingingMoves[i]) { + // Lower the volume for the short song that gets played. m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128); break; } |