diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-06-01 20:40:27 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-06-01 20:40:27 -0400 |
| commit | f0b41debc35c2084aad6d369eab11a2d2df4ab44 (patch) | |
| tree | 9b720ab0b617fa207051efc7ff9373669f7dc47b /src/battle_anim_mon_movement.c | |
| parent | a839463c849679974c986bf9c9c260eff0e94cb7 (diff) | |
| parent | 9f5bf65fb336cf7a3ba68d32267bf993f0f6a494 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps
Diffstat (limited to 'src/battle_anim_mon_movement.c')
| -rw-r--r-- | src/battle_anim_mon_movement.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index e789e4680..b9c4c7b30 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -94,7 +94,7 @@ void AnimTask_ShakeMon(u8 taskId) { u8 spriteId; spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - if (spriteId == 0xff) + if (spriteId == SPRITE_NONE) { DestroyAnimVisualTask(taskId); return; @@ -162,7 +162,7 @@ void AnimTask_ShakeMon2(u8 taskId) if (gBattleAnimArgs[0] < MAX_BATTLERS_COUNT) { spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - if (spriteId == 0xff) + if (spriteId == SPRITE_NONE) { DestroyAnimVisualTask(taskId); return; @@ -255,7 +255,7 @@ static void AnimTask_ShakeMon2_Step(u8 taskId) void AnimTask_ShakeMonInPlace(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - if (spriteId == 0xff) + if (spriteId == SPRITE_NONE) { DestroyAnimVisualTask(taskId); return; |