diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
| commit | 607cba8c2e5253874f378cd6280fd066b0c9fa3d (patch) | |
| tree | 8894b0b686adc29286d078500932306fabbc2973 /asm/start_menu.s | |
| parent | 663ecd00145da49fda7d2509d629d737ea633cd8 (diff) | |
| parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) | |
Merge branch 'master' into battle_refactor
Diffstat (limited to 'asm/start_menu.s')
| -rw-r--r-- | asm/start_menu.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s index e8f9c3090..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 @@ -1695,7 +1695,7 @@ _080A05AC: movs r0, 0 movs r1, 0x1 movs r3, 0xFF - bl AddTextPrinterParametrized + bl AddTextPrinterParameterized movs r0, 0 movs r1, 0x8 movs r2, 0xE |