diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
| commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
| tree | 70220c06025360d7089011f5d80239b61ac183af /asm/battle_anim.s | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
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 |