Merge pull request #1 from pret/master

Update fork to match main fork.

1 files changed, 19 insertions, 20 deletions

diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index ff42d66ea..b2dd662d6 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -1,21 +1,18 @@
 #include "global.h"
 #include "save_menu_util.h"
-#include "asm.h"
+#include "event_data.h"
 #include "menu.h"
-#include "flag.h"
-#include "string_util.h"
 #include "pokedex.h"
-
-extern u8 gOtherText_Player[];
-extern u8 gOtherText_Badges[];
-extern u8 gOtherText_Pokedex[];
-extern u8 gOtherText_PlayTime[];
+#include "region_map.h"
+#include "string_util.h"
+#include "strings2.h"
 
 void HandleDrawSaveWindowInfo(s16 left, s16 top)
 {
     u32 width = 12;
 
-    if (sub_809473C())
+    // old handle for setting window width?
+    if (IsResizeSaveWindowEnabled())
         width = 13;
 
     if (FlagGet(SYS_POKEDEX_GET))
@@ -39,11 +36,12 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top)
     }
 }
 
-void sub_80946C8(u16 left, u16 top)
+void HandleCloseSaveWindow(u16 left, u16 top)
 {
     u32 width = 12;
 
-    if (sub_809473C())
+    // old handle for setting window width?
+    if (IsResizeSaveWindowEnabled())
         width = 13;
 
     if (FlagGet(SYS_POKEDEX_GET))
@@ -52,9 +50,14 @@ void sub_80946C8(u16 left, u16 top)
         MenuZeroFillWindowRect(left, top, left + width, top + 9);
 }
 
-u8 sub_809473C()
+/*
+theory: This function was used to handle the save menu window's width being auto sized from
+either 12 or 13 in an older source. Whatever was here might have either been optimized out by
+GF's compiler or was dummied out to always return a TRUE at some point.
+*/
+u8 IsResizeSaveWindowEnabled(void) // i don't know what else to name it..
 {
-    return 1;
+    return TRUE;
 }
 
 void PrintSavePlayerName(s16 x, s16 y)
@@ -74,22 +77,18 @@ void PrintSaveMapName(s16 x, s16 y)
 void PrintSaveBadges(s16 x, s16 y)
 {
     char badges[16];
-    u8 badgeCount;
 
     MenuPrint(gOtherText_Badges, x, y);
-    badgeCount = GetBadgeCount();
-    ConvertIntToDecimalString(badges, badgeCount);
+    ConvertIntToDecimalString(badges, GetBadgeCount());
     MenuPrint_RightAligned(badges, x + 12, y);
 }
 
 void PrintSavePokedexCount(s16 x, s16 y)
 {
     char pokedex[16];
-    u16 pokedexCount;
 
     MenuPrint(gOtherText_Pokedex, x, y);
-    pokedexCount = GetPokedexSeenCount();
-    ConvertIntToDecimalStringN(pokedex, pokedexCount, 1, 3);
+    ConvertIntToDecimalStringN(pokedex, GetPokedexSeenCount(), 1, 3);
     MenuPrint_RightAligned(pokedex, x + 12, y);
 }
 
@@ -118,7 +117,7 @@ u16 GetPokedexSeenCount()
 {
     u16 pokedexSeenCount;
 
-    if (IsNationalPokedex())
+    if (IsNationalPokedexEnabled())
         pokedexSeenCount = GetNationalPokedexCount(1);
     else
         pokedexSeenCount = GetHoennPokedexCount(1);