diff --git a/include/code_800558C.h b/include/code_800558C.h index e25068523..e37d53e11 100644 --- a/include/code_800558C.h +++ b/include/code_800558C.h @@ -9,6 +9,6 @@ extern s16 *gWindowBgCopy; void sub_80057E8(void); void sub_8005838(s32 *, u8 kind); -void sub_80060EC(void); +void ToggleWindowBgBuffer(void); #endif // GUARD_CODE_800558C_H diff --git a/src/code_800558C.c b/src/code_800558C.c index e4ea82a0b..53adfd976 100644 --- a/src/code_800558C.c +++ b/src/code_800558C.c @@ -474,7 +474,7 @@ UNUSED static void sub_80060A8(void) #endif // arm9.bin::020056C0 -void sub_80060EC(void) +void ToggleWindowBgBuffer(void) { gWin0HPtr = sBufferPtr; sBufferIdx = !sBufferIdx; diff --git a/src/debug_field_map.c b/src/debug_field_map.c index 50ef85498..f52afb58e 100644 --- a/src/debug_field_map.c +++ b/src/debug_field_map.c @@ -133,7 +133,7 @@ UNUSED static void DebugMapViewer(void) sub_80A59DC(); DrawDialogueBoxString_Async(); sub_8005838(NULL, 0); - sub_80060EC(); + ToggleWindowBgBuffer(); nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); sub_8099BE4(); diff --git a/src/dungeon_tilemap.c b/src/dungeon_tilemap.c index 10224aaef..4b37021c4 100644 --- a/src/dungeon_tilemap.c +++ b/src/dungeon_tilemap.c @@ -716,7 +716,7 @@ void sub_8040094(u8 r0) { gDungeon->unk181e8.unk18217 = r0; sub_803F7BC(); - sub_80060EC(); + ToggleWindowBgBuffer(); IncrementPlayTime(gPlayTimeRef); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); diff --git a/src/dungeon_vram.c b/src/dungeon_vram.c index b450dfa98..bbcbcdf3a 100644 --- a/src/dungeon_vram.c +++ b/src/dungeon_vram.c @@ -206,7 +206,7 @@ static void sub_803E490(u32 unused) nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); nullsub_12(); - sub_80060EC(); + ToggleWindowBgBuffer(); gDungeonFramesCounter++; @@ -240,7 +240,7 @@ void sub_803E668(u32 unused) sub_8005180(); nullsub_12(); sub_8005838(NULL, 0); - sub_80060EC(); + ToggleWindowBgBuffer(); gDungeonFramesCounter++; IncrementPlayTime(gPlayTimeRef); WaitForNextFrameAndAdvanceRNG(); diff --git a/src/friend_areas_map_util.c b/src/friend_areas_map_util.c index 7a4478b63..79d624119 100644 --- a/src/friend_areas_map_util.c +++ b/src/friend_areas_map_util.c @@ -376,7 +376,7 @@ void FriendAreasMap_RunFrameActions(void) sub_8005838(NULL, 0); nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); - sub_80060EC(); + ToggleWindowBgBuffer(); IncrementPlayTime(gPlayTimeRef); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); diff --git a/src/ground_main.c b/src/ground_main.c index 47d880c0d..e909a60e4 100644 --- a/src/ground_main.c +++ b/src/ground_main.c @@ -309,7 +309,7 @@ u32 xxx_script_related_8098468_Async(s32 startMode) } GroundMap_Action(); sub_8005838(NULL,0); - sub_80060EC(); + ToggleWindowBgBuffer(); xxx_call_update_bg_sound_input(); while ( 1 ) { xxx_call_update_bg_sound_input(); diff --git a/src/main_loops.c b/src/main_loops.c index 6687e2864..75920a8b4 100644 --- a/src/main_loops.c +++ b/src/main_loops.c @@ -279,7 +279,7 @@ static void MainLoops_RunFrameActions(u32 unused) sub_8005180(); // Extra call here in blue. Seems to be for 2nd screen sprites - sub_80060EC(); + ToggleWindowBgBuffer(); UpdateSoundEffectCounters(); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); @@ -363,7 +363,7 @@ static void QuickSave_Async(u32 mode) sub_8099750(); SetCharacterMask(3); sub_8005838(NULL, 0); - sub_80060EC(); + ToggleWindowBgBuffer(); CreateDialogueBoxAndPortrait(sSaveTextQuicksaving, 0, 0, 0x20); while (TRUE) { diff --git a/src/menu_input.c b/src/menu_input.c index 33cd3d517..984c673ec 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -66,7 +66,7 @@ void sub_8012A18(s32 unused) DrawDialogueBoxString_Async(); nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); - sub_80060EC(); + ToggleWindowBgBuffer(); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); // Input related CopySpritesToOam(); diff --git a/src/other_menus1.c b/src/other_menus1.c index 8cf8775b0..32b3a36a1 100644 --- a/src/other_menus1.c +++ b/src/other_menus1.c @@ -209,7 +209,7 @@ static void sub_80371B8(void) void sub_80373C4(void) { sub_8005838(NULL, 0); - sub_80060EC(); + ToggleWindowBgBuffer(); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); TransferBGPaletteBuffer(); diff --git a/src/textbox.c b/src/textbox.c index f3b35b49b..133dac807 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -1049,7 +1049,7 @@ void sub_809B57C_Async(void) void sub_809B614(void) { - sub_80060EC(); + ToggleWindowBgBuffer(); gUnknown_20399DE = gUnknown_20399DC; gUnknown_20399DC &= ~2; } diff --git a/src/world_map.c b/src/world_map.c index 45efb0ed2..e2c80da90 100644 --- a/src/world_map.c +++ b/src/world_map.c @@ -409,7 +409,7 @@ static void WorldMap_RunFrameActions(void) sub_8005838(NULL, 0); nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); - sub_80060EC(); + ToggleWindowBgBuffer(); IncrementPlayTime(gPlayTimeRef); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs();