diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-30 19:38:24 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-30 19:38:24 -0500 |
| commit | f7c9a6cb547264aaeba8629638aca47869a2994a (patch) | |
| tree | 9b0ccf490b61a38ffce0bfb457780684ef1a3138 /asm/start_menu.s | |
| parent | 092da42723713105c4a4ecc42f230a9a364bd0a4 (diff) | |
| parent | b3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
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 518b46f76..b99ed84ce 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -449,7 +449,7 @@ _0809FB34: beq _0809FBA0 movs r0, 0x1 movs r1, 0 - bl fade_screen + bl FadeScreen b _0809FBA0 .pool _0809FB98: @@ -1561,7 +1561,7 @@ _080A0490: bl ResetSpriteData bl ResetTasks bl ResetPaletteFade - bl dp12_8087EA4 + bl ScanlineEffect_Clear b _080A04FC _080A04A2: movs r0, 0 |