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/diploma.c | |
parent | c408110319885748b4fcc696063242c7002f4d30 (diff) | |
parent | a1aa645f2364deffda698b8e0cdc5c961b5306a5 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
Diffstat (limited to 'src/diploma.c')
-rw-r--r-- | src/diploma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diploma.c b/src/diploma.c index d4a269757..fedc10bd0 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -72,7 +72,7 @@ void CB2_ShowDiploma(void) DmaFill16(3, 0, VRAM, VRAM_SIZE); DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); ResetPaletteFade(); |