summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-03-15 19:32:49 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-03-15 19:32:49 -0400
commit81da6acff56cadc5e2b7b5572aba944bf0f1c8ad (patch)
tree2c0a7bad392242f715c145cbd74f61dac265a18f /src/battle_controller_player.c
parentc6563b78c0b922aa9674d4e12fc528f0098ba904 (diff)
battle_gfx_sfx_util sync emerald names to unnamed syms
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 41bab484f..3ff18ecb5 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2296,7 +2296,7 @@ static void PlayerHandlePause(void)
static void PlayerHandleMoveAnimation(void)
{
- if (!mplay_80342A4(gActiveBattler))
+ if (!IsBattleSEPlaying(gActiveBattler))
{
u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
@@ -2528,7 +2528,7 @@ static void PlayerHandleExpUpdate(void)
static void PlayerHandleStatusIconUpdate(void)
{
- if (!mplay_80342A4(gActiveBattler))
+ if (!IsBattleSEPlaying(gActiveBattler))
{
u8 battlerId;
@@ -2541,7 +2541,7 @@ static void PlayerHandleStatusIconUpdate(void)
static void PlayerHandleStatusAnimation(void)
{
- if (!mplay_80342A4(gActiveBattler))
+ if (!IsBattleSEPlaying(gActiveBattler))
{
InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
@@ -2817,7 +2817,7 @@ static void PlayerHandleSpriteInvisibility(void)
static void PlayerHandleBattleAnimation(void)
{
- if (!mplay_80342A4(gActiveBattler))
+ if (!IsBattleSEPlaying(gActiveBattler))
{
u8 animationId = gBattleBufferA[gActiveBattler][1];
u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);