diff options
author | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
---|---|---|
committer | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
commit | 35cc20c9aa5a37f03bc0bf46bc31398aecda7bf6 (patch) | |
tree | 59427fda7dbbb92268caf353870d0f0ed8f5e13b /src/pokemon_summary_screen.c | |
parent | c408110319885748b4fcc696063242c7002f4d30 (diff) | |
parent | a1aa645f2364deffda698b8e0cdc5c961b5306a5 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
Diffstat (limited to 'src/pokemon_summary_screen.c')
-rw-r--r-- | src/pokemon_summary_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index e56448d8b..a900badd1 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -75,7 +75,7 @@ extern u8 sub_81221AC(); extern void SetVBlankHBlankCallbacksToNull(); extern void ResetVramOamAndBgCntRegs(); extern void clear_scheduled_bg_copies_to_vram(); -extern void remove_some_task(); +extern void ScanlineEffect_Stop(); extern void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable); extern void ShowBg(u8 a); extern void SetGpuReg(u8 regOffset, u16 value); @@ -455,7 +455,7 @@ bool8 sub_81BFB10(void) gMain.state++; break; case 1: - remove_some_task(); + ScanlineEffect_Stop(); gMain.state++; break; case 2: |