diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-11 13:21:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-11 13:21:26 -0400 |
commit | c17af4853c5c5854170702292ebd573bc14b5b0e (patch) | |
tree | 4b10ee7f38e45cf1c0f74eafb1274afe70405155 /src/main.c | |
parent | 7f920b887f9a060524347b4cc3a5e3f3abdd3b03 (diff) | |
parent | 18b20721d91e811595491d70e9512ace654e4f5a (diff) |
Merge pull request #46 from PikalaxALT/oak_speech
Oak speech
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 068cc8578..bfab49c49 100644 --- a/src/main.c +++ b/src/main.c @@ -29,7 +29,7 @@ extern void MapMusicMain(void); extern void EnableInterrupts(u16); extern void sub_800DD28(void); extern u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void)); -extern void remove_some_task(void); +extern void ScanlineEffect_Stop(void); extern void sub_80F50F4(void); extern bool32 sub_80F5118(void); extern bool8 sub_813B870(void); @@ -441,7 +441,7 @@ void DoSoftReset(void) { REG_IME = 0; m4aSoundVSyncOff(); - remove_some_task(); + ScanlineEffect_Stop(); DmaStop(1); DmaStop(2); DmaStop(3); |