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

battle_gfx_sfx_util sync emerald names to unnamed syms

Browse Source
This commit is contained in:
PikalaxALT
2021-03-15 19:32:49 -04:00
parent c6563b78c0
commit 81da6acff5
14 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_player.c
+4 -4
View File
@@ -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);