diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
| commit | fba22dbd24a797a45345dbc7e0ff8fb520ecba19 (patch) | |
| tree | 961ec5145112e039542f50a79032a06481cf12a0 /asm/battle_setup.s | |
| parent | 9b3b3244f7dad9c0a1d6335a8786da1fdfedd870 (diff) | |
| parent | 1a34a06758175b4d39ee0a81c3441ac958d005fd (diff) | |
Merge branch 'master' into slot_machine
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 |