summaryrefslogtreecommitdiff
path: root/asm/battle_setup.s
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-10-08 10:31:33 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-10-08 10:31:33 -0400
commit99bd3d91547858203c84cdf7f4ec37effabc0385 (patch)
tree0474d1930129cd1943300d1be78b849061e3532f /asm/battle_setup.s
parent0f67a952a396c80984236b45974407bcc8f6191d (diff)
Finish main menu decomp
Diffstat (limited to 'asm/battle_setup.s')
-rw-r--r--asm/battle_setup.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s
index c5b4510b7..5a9797056 100644
--- a/asm/battle_setup.s
+++ b/asm/battle_setup.s
@@ -28,7 +28,7 @@ _0807F644:
bl FldEffPoison_IsActive
cmp r0, 0
bne _0807F686
- bl sub_812B478
+ bl HelpSystem_Disable
ldrb r0, [r4, 0x2]
bl BT_StartOnField
ldrh r0, [r4]
@@ -41,7 +41,7 @@ _0807F65E:
lsrs r0, 24
cmp r0, 0x1
bne _0807F686
- bl sub_812B484
+ bl HelpSystem_Enable
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0807F68C @ =sub_800FD9C
bl SetMainCallback2