Merge branch 'master' of https://github.com/pret/pokeruby

`:Q
B
A
B:`
r
A
r

D
D
C
D
D
r

1 files changed, 16 insertions, 13 deletions

diff --git a/src/load_save.c b/src/load_save.c
index 0630f060c..730aea2b8 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -19,7 +19,10 @@ struct LoadedSaveData
     struct MailStruct mail[16];
 };
 
-extern struct LoadedSaveData gLoadedSaveData[];
+EWRAM_DATA struct SaveBlock2 gSaveBlock2 = {0};
+EWRAM_DATA struct SaveBlock1 gSaveBlock1 = {0};
+
+static EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0};
 
 void CheckForFlashMemory(void)
 {
@@ -112,27 +115,27 @@ void LoadPlayerBag(void)
 
     // load player items.
     for (i = 0; i < 20; i++)
-        gLoadedSaveData->items[i] = gSaveBlock1.bagPocket_Items[i];
+        gLoadedSaveData.items[i] = gSaveBlock1.bagPocket_Items[i];
 
     // load player key items.
     for (i = 0; i < 20; i++)
-        gLoadedSaveData->keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i];
+        gLoadedSaveData.keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i];
 
     // load player pokeballs.
     for (i = 0; i < 16; i++)
-        gLoadedSaveData->pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i];
+        gLoadedSaveData.pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i];
 
     // load player TMs and HMs.
     for (i = 0; i < 64; i++)
-        gLoadedSaveData->TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i];
+        gLoadedSaveData.TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i];
 
     // load player berries.
     for (i = 0; i < 46; i++)
-        gLoadedSaveData->berries[i] = gSaveBlock1.bagPocket_Berries[i];
+        gLoadedSaveData.berries[i] = gSaveBlock1.bagPocket_Berries[i];
 
     // load mail.
     for (i = 0; i < 16; i++)
-        gLoadedSaveData->mail[i] = gSaveBlock1.mail[i];
+        gLoadedSaveData.mail[i] = gSaveBlock1.mail[i];
 }
 
 void SavePlayerBag(void)
@@ -141,25 +144,25 @@ void SavePlayerBag(void)
 
     // save player items.
     for (i = 0; i < 20; i++)
-        gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData->items[i];
+        gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData.items[i];
 
     // save player key items.
     for (i = 0; i < 20; i++)
-        gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData->keyItems[i];
+        gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData.keyItems[i];
 
     // save player pokeballs.
     for (i = 0; i < 16; i++)
-        gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData->pokeBalls[i];
+        gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData.pokeBalls[i];
 
     // save player TMs and HMs.
     for (i = 0; i < 64; i++)
-        gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData->TMsHMs[i];
+        gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData.TMsHMs[i];
 
     // save player berries.
     for (i = 0; i < 46; i++)
-        gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData->berries[i];
+        gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData.berries[i];
 
     // save mail.
     for (i = 0; i < 16; i++)
-        gSaveBlock1.mail[i] = gLoadedSaveData->mail[i];
+        gSaveBlock1.mail[i] = gLoadedSaveData.mail[i];
 }