diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-04-28 16:55:43 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-04-28 16:55:43 -0700 |
| commit | e833d3742325698846eb3d394b41a556a76af711 (patch) | |
| tree | 68d45add4b819898d3d99064e78a09dbd5ba1c48 /asm/intro.s | |
| parent | 57603a0d46c785d845a3fa168f94c01dc8b0b253 (diff) | |
| parent | 523c53506da69eccebb95af1d1cb76803d0fb88f (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'asm/intro.s')
| -rw-r--r-- | asm/intro.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/intro.s b/asm/intro.s index 309b636c8..909fee72e 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -2742,14 +2742,14 @@ _080EDC0C: bl DisableInterrupts movs r0, 0 bl SetHBlankCallback - ldr r0, _080EDC3C @ =sub_8078914 + ldr r0, _080EDC3C @ =CB2_InitTitleScreen bl SetMainCallback2 _080EDC34: pop {r4} pop {r0} bx r0 .align 2, 0 -_080EDC3C: .4byte sub_8078914 +_080EDC3C: .4byte CB2_InitTitleScreen thumb_func_end sub_80EDBE8 thumb_func_start sub_80EDC40 |