diff options
author | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
commit | 663ecd00145da49fda7d2509d629d737ea633cd8 (patch) | |
tree | a4cfc7323151501d5603f1cd34e68a73f328434e /src/berry_fix_program.c | |
parent | a78b0636f50c012c3618d55a9b83f834319de6e0 (diff) | |
parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor
Diffstat (limited to 'src/berry_fix_program.c')
-rw-r--r-- | src/berry_fix_program.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 3b2bfb5f7..f487489d4 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -141,7 +141,7 @@ void InitBerryFixProgram(void) SetVBlankCallback(NULL); ResetSpriteData(); ResetTasks(); - remove_some_task(); + ScanlineEffect_Stop(); SetGpuReg(REG_OFFSET_DISPCNT, 0x0000); berry_fix_mb_manager = AllocZeroed(0x50); berry_fix_mb_manager->state = 0; |