Merge pull request #1 from pret/master

Update fork to match main fork.

1 files changed, 29 insertions, 28 deletions

diff --git a/src/load_save.c b/src/load_save.c
index 0d4f1238d..0630f060c 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,12 +1,13 @@
 #include "global.h"
+#include "gba/flash_internal.h"
 #include "load_save.h"
-#include "asm.h"
 #include "main.h"
 #include "pokemon.h"
 #include "rom4.h"
 
 extern u8 gPlayerPartyCount;
-extern u32 gUnknown_3004820;
+
+bool32 gFlashMemoryPresent;
 
 struct LoadedSaveData
 {
@@ -15,20 +16,20 @@ struct LoadedSaveData
     struct ItemSlot pokeBalls[16];
     struct ItemSlot TMsHMs[64];
     struct ItemSlot berries[46];
-    struct SaveBlock1_2B4C_Struct unknownSaveData[16];
+    struct MailStruct mail[16];
 };
 
 extern struct LoadedSaveData gLoadedSaveData[];
 
 void CheckForFlashMemory(void)
 {
-    if(!IdentifyFlash())
+    if (!IdentifyFlash())
     {
-        gUnknown_3004820 = 1;
+        gFlashMemoryPresent = TRUE;
         InitFlashTimer();
     }
     else
-        gUnknown_3004820 = 0;
+        gFlashMemoryPresent = FALSE;
 }
 
 bool32 GetSecretBase2Field_9(void)
@@ -80,16 +81,16 @@ void LoadPlayerParty(void)
 static void SaveMapObjects(void)
 {
     int i;
-    
-    for(i = 0; i < 16; i++)
+
+    for (i = 0; i < 16; i++)
         gSaveBlock1.mapObjects[i] = gMapObjects[i];
 }
 
 static void LoadMapObjects(void)
 {
     int i;
-    
-    for(i = 0; i < 16; i++)
+
+    for (i = 0; i < 16; i++)
         gMapObjects[i] = gSaveBlock1.mapObjects[i];
 }
 
@@ -105,60 +106,60 @@ void LoadSerializedGame(void)
     LoadMapObjects();
 }
 
-void LoadPlayerData(void)
+void LoadPlayerBag(void)
 {
     int i;
 
     // load player items.
-    for(i = 0; i < 20; i++)
+    for (i = 0; i < 20; i++)
         gLoadedSaveData->items[i] = gSaveBlock1.bagPocket_Items[i];
 
     // load player key items.
-    for(i = 0; i < 20; i++)
+    for (i = 0; i < 20; i++)
         gLoadedSaveData->keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i];
 
     // load player pokeballs.
-    for(i = 0; i < 16; i++)
+    for (i = 0; i < 16; i++)
         gLoadedSaveData->pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i];
 
     // load player TMs and HMs.
-    for(i = 0; i < 64; i++)
+    for (i = 0; i < 64; i++)
         gLoadedSaveData->TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i];
 
     // load player berries.
-    for(i = 0; i < 46; i++)
+    for (i = 0; i < 46; i++)
         gLoadedSaveData->berries[i] = gSaveBlock1.bagPocket_Berries[i];
 
-    // load misc data.
-    for(i = 0; i < 16; i++)
-        gLoadedSaveData->unknownSaveData[i] = gSaveBlock1.unkSave[i];
+    // load mail.
+    for (i = 0; i < 16; i++)
+        gLoadedSaveData->mail[i] = gSaveBlock1.mail[i];
 }
 
-void SavePlayerData(void)
+void SavePlayerBag(void)
 {
     int i;
 
     // save player items.
-    for(i = 0; i < 20; i++)
+    for (i = 0; i < 20; i++)
         gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData->items[i];
 
     // save player key items.
-    for(i = 0; i < 20; i++)
+    for (i = 0; i < 20; i++)
         gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData->keyItems[i];
 
     // save player pokeballs.
-    for(i = 0; i < 16; i++)
+    for (i = 0; i < 16; i++)
         gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData->pokeBalls[i];
 
     // save player TMs and HMs.
-    for(i = 0; i < 64; i++)
+    for (i = 0; i < 64; i++)
         gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData->TMsHMs[i];
 
     // save player berries.
-    for(i = 0; i < 46; i++)
+    for (i = 0; i < 46; i++)
         gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData->berries[i];
 
-    // save misc data.
-    for(i = 0; i < 16; i++)
-        gSaveBlock1.unkSave[i] = gLoadedSaveData->unknownSaveData[i];
+    // save mail.
+    for (i = 0; i < 16; i++)
+        gSaveBlock1.mail[i] = gLoadedSaveData->mail[i];
 }