diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-13 20:29:11 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-13 20:29:11 -0500 |
| commit | 924c0c6b5a9ceeb27fdc9e41e69d283c2b8d36d8 (patch) | |
| tree | 2c22380365ddf70f1432cac5f9cbede0bdef2abc /asm/battle_anim.s | |
| parent | 2852f4f1b86f1a5fbfdceb296d184158068b5ad5 (diff) | |
| parent | f6af9e7013107154df62d2eff53e3accb7a24b3d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd
Diffstat (limited to 'asm/battle_anim.s')
| -rw-r--r-- | asm/battle_anim.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_anim.s b/asm/battle_anim.s index 645700d53..5ce9c4cf9 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -4047,7 +4047,7 @@ sub_80A5AFC: @ 80A5AFC lsls r0, 24 cmp r0, 0 bne _080A5BA6 - bl battle_type_is_double + bl IsDoubleBattle lsls r0, 24 cmp r0, 0 beq _080A5BA6 @@ -4129,7 +4129,7 @@ sub_80A5BAC: @ 80A5BAC lsls r0, 24 cmp r0, 0 bne _080A5C38 - bl battle_type_is_double + bl IsDoubleBattle lsls r0, 24 cmp r0, 0 beq _080A5C38 |