diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
| commit | 9f01e33a0428f8a8c206b3f6018f526a41d65b43 (patch) | |
| tree | 7f3c8606ebbe0f882955761a899ec9f819412c17 /engine/battle_anims | |
| parent | 0bc1e91d217fb1a724c08ed6c5826c2379f10507 (diff) | |
Port miscellaneous recent updates from pokecrystal
Diffstat (limited to 'engine/battle_anims')
| -rw-r--r-- | engine/battle_anims/bg_effects.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 2c20b40d..de9d0306 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1475,10 +1475,10 @@ Tackle_BGEffect25_2d_two: Functionc886e: push af - ld a, [wFXAnimID + 1] ; FXAnimID + 1 + ld a, [wFXAnimID + 1] or a jr nz, .not_rollout - ld a, [wFXAnimID] ; FXAnimID + ld a, [wFXAnimID] cp ROLLOUT jr z, .rollout .not_rollout |