diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 19:22:06 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 19:22:06 -0500 |
| commit | ea347199a21f7a6c01a395e507db872ac1781e79 (patch) | |
| tree | 625ec0a6469b40573d165ceee0855e969af45929 /asm/intro.s | |
| parent | f39053ee3023b02139784f88d346b3b57853c307 (diff) | |
| parent | 14a76793e596d612efd273169c4172922c270f13 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/intro.s')
| -rw-r--r-- | asm/intro.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/intro.s b/asm/intro.s index 3bfae63da..c1754873c 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -59,7 +59,7 @@ sub_816CC54: @ 816CC54 lsls r0, 24 cmp r0, 0 bne _0816CC66 - ldr r0, =c2_title_screen_1 + ldr r0, =CB2_InitTitleScreen bl SetMainCallback2 _0816CC66: pop {r0} @@ -337,13 +337,13 @@ _0816CEFA: .pool thumb_func_end c2_copyright_1 - thumb_func_start c2_show_copyright_and_intro_again_2 -c2_show_copyright_and_intro_again_2: @ 816CF0C + thumb_func_start CB2_InitCopyrightScreenAfterTitleScreen +CB2_InitCopyrightScreenAfterTitleScreen: @ 816CF0C push {lr} bl do_copyright_screen pop {r0} bx r0 - thumb_func_end c2_show_copyright_and_intro_again_2 + thumb_func_end CB2_InitCopyrightScreenAfterTitleScreen thumb_func_start task_intro_1 @ void task_intro_1(int task_id) |