diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-19 13:23:17 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-19 13:23:17 +0100 |
| commit | d4cd912eb85411a4be1ea97441f929a16f455f34 (patch) | |
| tree | 31f54c8322ac4a7be5f2509b0903248cf993e24b /src/roulette.c | |
| parent | 05ab3f96218b58001aa2d90cef951f7e4087c4ae (diff) | |
| parent | 1d8798203e86b61e889ea1c0fba851cbdbdd03d7 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/roulette.c')
| -rw-r--r-- | src/roulette.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/roulette.c b/src/roulette.c index 6d79f9d38..41e8ef77f 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -579,7 +579,7 @@ void sub_8115384(void) case 0x0: SetVBlankCallback(NULL); ScanlineEffect_Stop(); - sub_80F9438(); + ClearVideoCallbacks(); sub_80F9368(); REG_BG2CNT = 0x4686; REG_BG1CNT = 0x4401; @@ -603,7 +603,7 @@ void sub_8115384(void) break; case 0x3: sub_8115238(); - sub_80F9020(); + ClearBGTilemapBuffers(); LZ77UnCompWram(&gUnknown_083F88BC, (void *)(ewram18800)); LZ77UnCompVram(&gUnknown_083F8A60, (void *)(VRAM + 0x3000)); gMain.state++; @@ -1604,7 +1604,7 @@ void sub_8116B40(u8 taskid) // end oulette ? FreeAllSpritePalettes(); ResetPaletteFade(); ResetSpriteData(); - sub_80F9020(); + ClearBGTilemapBuffers(); REG_BLDCNT = 0x0; REG_BLDALPHA = 0x0; REG_BLDY = 0x0; |