diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-30 19:39:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 19:39:07 -0400 |
| commit | 1a34a06758175b4d39ee0a81c3441ac958d005fd (patch) | |
| tree | 6d45cd2c009eabf36e6a34550607bfa80cad5ed9 /asm/battle_setup.s | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
| parent | d4ace1162fd85d0531da5bf2296102bf1f503073 (diff) | |
Merge pull request #84 from jiangzhengwenjz/battle_transition
battle_transition
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 99e4c3468..787b0fb8e 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -30,13 +30,13 @@ _0807F644: bne _0807F686 bl sub_812B478 ldrb r0, [r4, 0x2] - bl sub_80D08B8 + bl BT_StartOnField ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] b _0807F686 _0807F65E: - bl sub_80D08F8 + bl BT_IsDone lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |