Merge branch 'master' into unk_text_8095904

1 files changed, 12 insertions, 12 deletions

diff --git a/src/engine/save_menu_util.c b/src/engine/save_menu_util.c
index 771cb72c7..ccf4d9f6f 100644
--- a/src/engine/save_menu_util.c
+++ b/src/engine/save_menu_util.c
@@ -18,7 +18,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top)
     if (FlagGet(FLAG_SYS_POKEDEX_GET))
     {
         // print info + dex information.
-        MenuDrawTextWindow(left, top, left + width, top + 11);
+        Menu_DrawStdWindowFrame(left, top, left + width, top + 11);
         PrintSaveMapName(++left, ++top); // MAP NAME
         PrintSavePlayerName(left, top + 2); // PLAYER
         PrintSaveBadges(left, top + 4); // BADGES
@@ -28,7 +28,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top)
     else
     {
         // print everything besides dex.
-        MenuDrawTextWindow(left, top, left + width, top + 9);
+        Menu_DrawStdWindowFrame(left, top, left + width, top + 9);
         PrintSaveMapName(++left, ++top); // MAP NAME
         PrintSavePlayerName(left, top + 2); // PLAYER
         PrintSaveBadges(left, top + 4); // BADGES
@@ -45,9 +45,9 @@ void HandleCloseSaveWindow(u16 left, u16 top)
         width = 13;
 
     if (FlagGet(FLAG_SYS_POKEDEX_GET))
-        MenuZeroFillWindowRect(left, top, left + width, top + 11);
+        Menu_EraseWindowRect(left, top, left + width, top + 11);
     else
-        MenuZeroFillWindowRect(left, top, left + width, top + 9);
+        Menu_EraseWindowRect(left, top, left + width, top + 9);
 }
 
 /*
@@ -62,7 +62,7 @@ u8 IsResizeSaveWindowEnabled(void) // i don't know what else to name it..
 
 void PrintSavePlayerName(s16 x, s16 y)
 {
-    MenuPrint(gOtherText_Player, x, y);
+    Menu_PrintText(gOtherText_Player, x, y);
     MenuPrint_RightAligned(gSaveBlock2.playerName, x + 12, y);
 }
 
@@ -71,14 +71,14 @@ void PrintSaveMapName(s16 x, s16 y)
     char name[32];
 
     CopyMapName(name, gMapHeader.regionMapSectionId);
-    MenuPrint(name, x, y);
+    Menu_PrintText(name, x, y);
 }
 
 void PrintSaveBadges(s16 x, s16 y)
 {
     char badges[16];
 
-    MenuPrint(gOtherText_Badges, x, y);
+    Menu_PrintText(gOtherText_Badges, x, y);
     ConvertIntToDecimalString(badges, GetBadgeCount());
     MenuPrint_RightAligned(badges, x + 12, y);
 }
@@ -87,7 +87,7 @@ void PrintSavePokedexCount(s16 x, s16 y)
 {
     char pokedex[16];
 
-    MenuPrint(gOtherText_Pokedex, x, y);
+    Menu_PrintText(gOtherText_Pokedex, x, y);
     ConvertIntToDecimalStringN(pokedex, GetPokedexSeenCount(), 1, 3);
     MenuPrint_RightAligned(pokedex, x + 12, y);
 }
@@ -96,7 +96,7 @@ void PrintSavePlayTime(s16 x, s16 y)
 {
     char playtime[16];
 
-    MenuPrint(gOtherText_PlayTime, x, y);
+    Menu_PrintText(gOtherText_PlayTime, x, y);
     FormatPlayTime(playtime, gSaveBlock2.playTimeHours, gSaveBlock2.playTimeMinutes, 1);
     MenuPrint_RightAligned(playtime, x + 12, y);
 }
@@ -125,9 +125,9 @@ u16 GetPokedexSeenCount()
     return pokedexSeenCount;
 }
 
-void FormatPlayTime(char *playtime, u16 hours, u16 minutes, u16 unk)
+void FormatPlayTime(char *playtime, u16 hours, u16 minutes, u16 colon)
 {
-    s16 colon = unk;
+    s16 _colon = colon;
     playtime = ConvertIntToDecimalString(playtime, hours);
 
     // playtime[0] is hours.
@@ -136,7 +136,7 @@ void FormatPlayTime(char *playtime, u16 hours, u16 minutes, u16 unk)
 
     playtime[0] = 0;
 
-    if (colon)
+    if (_colon)
         playtime[1] = 0xF0; // set middle character to ":"
     else
         playtime[1] = 0;