summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-09 23:55:03 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-09 23:55:03 -0600
commitf9f0e84b70f1b313200acd6f0d180413e34517da (patch)
treea714942823290d6561a4d9b920ab155fe8093d45 /src/engine
parentcf7ffa568a2a09c761bae6aa4c70b8d8913c3e81 (diff)
label some scanline_effect functions
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/main.c2
-rw-r--r--src/engine/main_menu.c6
-rw-r--r--src/engine/option_menu.c4
-rw-r--r--src/engine/reset_rtc_screen.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/main.c b/src/engine/main.c
index d1ccffea0..1bed4080b 100644
--- a/src/engine/main.c
+++ b/src/engine/main.c
@@ -350,7 +350,7 @@ void DoSoftReset(void)
{
REG_IME = 0;
m4aSoundVSyncOff();
- remove_some_task();
+ ScanlineEffect_Stop();
DmaStop(1);
DmaStop(2);
DmaStop(3);
diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c
index 3402d93bc..a0b8b7020 100644
--- a/src/engine/main_menu.c
+++ b/src/engine/main_menu.c
@@ -229,7 +229,7 @@ u32 InitMainMenu(u8 a1)
ResetPaletteFade();
LoadPalette(gMainMenuPalette, 0, 32);
- remove_some_task();
+ ScanlineEffect_Stop();
ResetTasks();
ResetSpriteData();
FreeAllSpritePalettes();
@@ -763,7 +763,7 @@ static void Task_NewGameSpeech1(u8 taskId)
LZ77UnCompVram(gUnknown_081E7834, (void *)(BG_VRAM + 0x3800));
LoadPalette(gUnknown_081E764C, 0, 0x40);
LoadPalette(gUnknown_081E796C, 1, 0x10);
- remove_some_task();
+ ScanlineEffect_Stop();
ResetSpriteData();
FreeAllSpritePalettes();
AddBirchSpeechObjects(taskId);
@@ -1368,7 +1368,7 @@ void CB_ContinueNewGameSpeechPart2()
gTasks[taskId].tBGhofs = -60;
- remove_some_task();
+ ScanlineEffect_Stop();
ResetSpriteData();
FreeAllSpritePalettes();
AddBirchSpeechObjects(taskId);
diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c
index 868830880..cb5f66649 100644
--- a/src/engine/option_menu.c
+++ b/src/engine/option_menu.c
@@ -8,7 +8,7 @@
#include "task.h"
extern void SetPokemonCryStereo(u32 val);
-extern void remove_some_task(void);
+extern void ScanlineEffect_Stop(void);
//Task data
enum {
@@ -110,7 +110,7 @@ void CB2_InitOptionMenu(void)
}
case 1:
ResetPaletteFade();
- remove_some_task();
+ ScanlineEffect_Stop();
ResetTasks();
ResetSpriteData();
gMain.state++;
diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index 5297b3378..d077bc670 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -438,7 +438,7 @@ void CB2_InitResetRtcScreen(void)
ResetOamRange(0, 128);
LoadOam();
- remove_some_task();
+ ScanlineEffect_Stop();
dp12_8087EA4();
ResetSpriteData();
ResetTasks();