summaryrefslogtreecommitdiff
path: root/asm/start_menu.s
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-30 18:24:14 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-30 18:24:14 -0500
commitc5f1b576f2bb3aacf4c4a64c15dcb7220c4ffb86 (patch)
tree4409a4e75cd8701e20b75f532042b7da3adab554 /asm/start_menu.s
parent536a338ff9aac796c542b3bb01a822c2a28df0a5 (diff)
parentb3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers
Diffstat (limited to 'asm/start_menu.s')
-rw-r--r--asm/start_menu.s4
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