diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-08-04 15:23:09 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-08-04 15:23:09 -0700 |
| commit | ed90bf2430290853bd9376d53c70055fa07634be (patch) | |
| tree | 39f67b5cbd0c0ef9e1a4763a052fd07924349940 /asm/battle_setup.s | |
| parent | bbc7c6ccfc7d59f61f406849f752fdd5038a6a80 (diff) | |
| parent | d58bf398b2b83a326d23d14d531de7f45a1058bb (diff) | |
Merge branch 'master' into pokedex_2
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 |