diff --git a/include/code_800558C.h b/include/code_800558C.h index e37d53e11..4dfbdd65b 100644 --- a/include/code_800558C.h +++ b/include/code_800558C.h @@ -8,7 +8,7 @@ extern s16 gUnknown_2026E4E; extern s16 *gWindowBgCopy; void sub_80057E8(void); -void sub_8005838(s32 *, u8 kind); +void CopyWindowBgBuffer(s32 *, u8 kind); void ToggleWindowBgBuffer(void); #endif // GUARD_CODE_800558C_H diff --git a/src/code_800558C.c b/src/code_800558C.c index 53adfd976..cc9ef5c48 100644 --- a/src/code_800558C.c +++ b/src/code_800558C.c @@ -102,7 +102,7 @@ void sub_80057E8(void) } // arm9.bin::02005758 -void sub_8005838(s32 *a0, u8 kind) +void CopyWindowBgBuffer(s32 *a0, u8 kind) { const s16 *src1, *src2; s16 *dst; diff --git a/src/debug_field_map.c b/src/debug_field_map.c index f52afb58e..58e8e1d23 100644 --- a/src/debug_field_map.c +++ b/src/debug_field_map.c @@ -38,7 +38,7 @@ UNUSED static void DebugMapViewer(void) sub_809975C(); sub_809D0AC(); ResetDialogueBox(); - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); AllocGroundMapAction(); while (TRUE) { bool8 quitMapView; @@ -48,7 +48,7 @@ UNUSED static void DebugMapViewer(void) if (DebugFieldMapWindow_Init()) { DebugFieldMapWindow_MoveMenuTo(mapId); while (TRUE) { - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); sub_8012A18(0); switch (DebugFieldMapWindow_GetInput()) { case MENU_INPUT_A_PRESS: @@ -132,7 +132,7 @@ UNUSED static void DebugMapViewer(void) sub_809D25C(); sub_80A59DC(); DrawDialogueBoxString_Async(); - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); ToggleWindowBgBuffer(); nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); diff --git a/src/dungeon_tilemap.c b/src/dungeon_tilemap.c index 4b37021c4..07a702546 100644 --- a/src/dungeon_tilemap.c +++ b/src/dungeon_tilemap.c @@ -303,11 +303,11 @@ static void sub_803F7BC(void) u32 roomId = tile->room; if (strPtr->allTilesRevealed != 0 || strPtr->unk1820C != 0 || strPtr->unk18217 != 0) { - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); } else if (roomId == CORRIDOR_ROOM) { u32 kind = (strPtr->visibilityRange == 2) ? 1 : 2; - sub_8005838(NULL, kind); + CopyWindowBgBuffer(NULL, kind); } else { s32 sp[4]; @@ -317,7 +317,7 @@ static void sub_803F7BC(void) sp[1] = room->unk10 - strPtr->cameraPixelPos.y; sp[2] = room->unk14 - strPtr->cameraPixelPos.x; sp[3] = room->unk18 - strPtr->cameraPixelPos.y; - sub_8005838(sp, 3); + CopyWindowBgBuffer(sp, 3); } } diff --git a/src/dungeon_vram.c b/src/dungeon_vram.c index bbcbcdf3a..b69d77d22 100644 --- a/src/dungeon_vram.c +++ b/src/dungeon_vram.c @@ -239,7 +239,7 @@ void sub_803E668(u32 unused) nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); nullsub_12(); - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); ToggleWindowBgBuffer(); gDungeonFramesCounter++; IncrementPlayTime(gPlayTimeRef); diff --git a/src/friend_areas_map_util.c b/src/friend_areas_map_util.c index 79d624119..cc35e4c17 100644 --- a/src/friend_areas_map_util.c +++ b/src/friend_areas_map_util.c @@ -373,7 +373,7 @@ void FriendAreasMap_RunFrameActions(void) SetBG3RegOffsets(gFriendAreasMapPtr->bgPos.x, gFriendAreasMapPtr->bgPos.y); AnimateSprites(); UpdateAnimatedColors(FadeScreen(), gFriendAreasMapPtr->unk4C4C, 0xB0, 16, gFriendAreasMapPtr->brightness, NULL); - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); ToggleWindowBgBuffer(); diff --git a/src/ground_main.c b/src/ground_main.c index e909a60e4..657c400f4 100644 --- a/src/ground_main.c +++ b/src/ground_main.c @@ -308,7 +308,7 @@ u32 xxx_script_related_8098468_Async(s32 startMode) GroundMap_ExecuteEvent(EVENT_DIVIDE, FALSE); } GroundMap_Action(); - sub_8005838(NULL,0); + CopyWindowBgBuffer(NULL,0); ToggleWindowBgBuffer(); xxx_call_update_bg_sound_input(); while ( 1 ) { diff --git a/src/main_loops.c b/src/main_loops.c index 75920a8b4..79ec3f0aa 100644 --- a/src/main_loops.c +++ b/src/main_loops.c @@ -273,7 +273,7 @@ void GameLoop_Async(void) static void MainLoops_RunFrameActions(u32 unused) { DrawDialogueBoxString_Async(); - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); @@ -362,7 +362,7 @@ static void QuickSave_Async(u32 mode) sub_8099744(); sub_8099750(); SetCharacterMask(3); - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); ToggleWindowBgBuffer(); CreateDialogueBoxAndPortrait(sSaveTextQuicksaving, 0, 0, 0x20); diff --git a/src/other_menus1.c b/src/other_menus1.c index 32b3a36a1..e0208e0b7 100644 --- a/src/other_menus1.c +++ b/src/other_menus1.c @@ -208,7 +208,7 @@ static void sub_80371B8(void) void sub_80373C4(void) { - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); ToggleWindowBgBuffer(); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); diff --git a/src/textbox.c b/src/textbox.c index 133dac807..6aebaf9e8 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -1040,10 +1040,10 @@ void sub_809B57C_Async(void) } if (sTextbox->unk434 < 0) { - sub_8005838(0, 0); + CopyWindowBgBuffer(0, 0); } else { - sub_8005838(0, 5); + CopyWindowBgBuffer(0, 5); } } diff --git a/src/world_map.c b/src/world_map.c index e2c80da90..85c8eb3a3 100644 --- a/src/world_map.c +++ b/src/world_map.c @@ -406,7 +406,7 @@ static void WorldMap_RunFrameActions(void) SetBG3RegOffsets(sWorldMapPtr->bgPos.x, sWorldMapPtr->bgPos.y); AnimateSprites(TRUE); FadeScreen(); - sub_8005838(NULL, 0); + CopyWindowBgBuffer(NULL, 0); nullsub_8(gGameOptionsRef->touchScreen); sub_8005180(); ToggleWindowBgBuffer();