diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 23:20:13 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 23:20:13 -0500 |
| commit | d4e8c20f840996049f269ffcd22d7e3feb489696 (patch) | |
| tree | 48b8deab17118064ae33bf8924569c834416cb96 /src/egg_hatch.c | |
| parent | d35cf06854be09a6bcf5ceb63cdb54cefd6d48a2 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index ed1e7f4cc..b3cd88585 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -63,7 +63,7 @@ extern void sub_806A068(u16, u8); extern void fade_screen(u8, u8); extern void overworld_free_bg_tilemaps(void); extern void sub_80AF168(void); -extern void remove_some_task(void); +extern void ScanlineEffect_Stop(void); extern void c2_exit_to_overworld_2_switch(void); extern void play_some_sound(void); extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback); @@ -506,7 +506,7 @@ static void CB2_EggHatch_0(void) FreeAllSpritePalettes(); ResetSpriteData(); ResetTasks(); - remove_some_task(); + ScanlineEffect_Stop(); m4aSoundVSyncOn(); gMain.state++; break; |