diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 23:20:13 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 23:20:13 -0500 |
| commit | d4e8c20f840996049f269ffcd22d7e3feb489696 (patch) | |
| tree | 48b8deab17118064ae33bf8924569c834416cb96 /asm/start_menu.s | |
| parent | d35cf06854be09a6bcf5ceb63cdb54cefd6d48a2 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/start_menu.s')
| -rw-r--r-- | asm/start_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s index fa2d86dce..0ecc2f275 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 |