diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
| commit | 4ac064bbaf54966082a860e6b6723c5ec654c436 (patch) | |
| tree | b419b2bb1a7fe7d17c440d58e5000c21e832386c /asm/intro.s | |
| parent | f81c52b56e865d8ecc753a69a31a5148548320a6 (diff) | |
| parent | a4787bc06a323071d32d3e0705e9cd39d9221452 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
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 a0149851e..c1754873c 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -282,7 +282,7 @@ _0816CE6C: .pool _0816CE8C: bl GameCubeMultiBoot_Quit - ldr r0, =sub_800BA38 + ldr r0, =SerialCB bl SetSerialCallback _0816CE96: movs r0, 0 @@ -562,7 +562,7 @@ task_intro_2: @ 816D12C movs r0, 0xCF lsls r0, 1 bl m4aSongNumStart - bl sub_800B628 + bl ResetSerial add sp, 0x4 pop {r4,r5} pop {r0} |