summaryrefslogtreecommitdiff
path: root/asm/start_menu.s
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-01-21 06:59:13 -0600
committerGitHub <noreply@github.com>2018-01-21 06:59:13 -0600
commit0db23bc215000bbad41968ba5a650e55f86ceb71 (patch)
tree2d42133425d9f4bd20b04b80d506668318ee9283 /asm/start_menu.s
parent8a60952fc01ada92e029be488481a29da32f47eb (diff)
parente0fbd5daad0646c77d1f587d2763bc707df5d417 (diff)
Merge pull request #164 from DizzyEggg/decompile_option_menu
Decompile option menu
Diffstat (limited to 'asm/start_menu.s')
-rw-r--r--asm/start_menu.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s
index 6182c3c27..e8f9c3090 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -653,7 +653,7 @@ _0809FD38:
bl play_some_sound
bl RemoveExtraStartMenuWindows
bl overworld_free_bg_tilemaps
- ldr r0, =CB2_OptionsMenu
+ ldr r0, =CB2_InitOptionMenu
bl SetMainCallback2
ldr r1, =gMain
ldr r0, =sub_8086194
@@ -1510,7 +1510,7 @@ _080A0418:
bl SetGpuReg
movs r0, 0
bl SetVBlankCallback
- bl remove_some_task
+ bl ScanlineEffect_Stop
movs r2, 0xA0
lsls r2, 19
mov r1, sp