load_save.c uses constants defined in global.h

3 files changed, 18 insertions, 18 deletions

diff --git a/include/global.h b/include/global.h
index 36e1db978..4dc23e12f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -96,7 +96,8 @@ enum LanguageId
 // capacities of various saveblock objects
 #define DAYCARE_MON_COUNT   2
 #define POKEBLOCKS_COUNT    40
-#define EVENT_OBJECTS_COUNT   16
+#define PARTY_SIZE          6
+#define EVENT_OBJECTS_COUNT 16
 #define BERRY_TREES_COUNT   128
 #define FLAGS_COUNT         288
 #define VARS_COUNT          256
diff --git a/include/pokemon.h b/include/pokemon.h
index 783263aad..67ce267ab 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -137,7 +137,6 @@
 #define STATUS_PRIMARY_POKERUS   0x6
 #define STATUS_PRIMARY_FAINTED   0x7
 
-#define PARTY_SIZE 6
 #define MAX_TOTAL_EVS 510
 #define NUM_STATS 6
 #define UNOWN_FORM_COUNT 28
diff --git a/src/load_save.c b/src/load_save.c
index 7960a42eb..a1ca7ce76 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -67,7 +67,7 @@ void SavePlayerParty(void)
 
     gSaveBlock1.playerPartyCount = gPlayerPartyCount;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         gSaveBlock1.playerParty[i] = gPlayerParty[i];
 }
 
@@ -77,7 +77,7 @@ void LoadPlayerParty(void)
 
     gPlayerPartyCount = gSaveBlock1.playerPartyCount;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         gPlayerParty[i] = gSaveBlock1.playerParty[i];
 }
 
@@ -85,7 +85,7 @@ static void SaveEventObjects(void)
 {
     int i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
         gSaveBlock1.eventObjects[i] = gEventObjects[i];
 }
 
@@ -93,7 +93,7 @@ static void LoadEventObjects(void)
 {
     int i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
         gEventObjects[i] = gSaveBlock1.eventObjects[i];
 }
 
@@ -114,27 +114,27 @@ void LoadPlayerBag(void)
     int i;
 
     // load player items.
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < BAG_ITEMS_COUNT; i++)
         gLoadedSaveData.items[i] = gSaveBlock1.bagPocket_Items[i];
 
     // load player key items.
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < BAG_KEYITEMS_COUNT; i++)
         gLoadedSaveData.keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i];
 
     // load player pokeballs.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < BAG_POKEBALLS_COUNT; i++)
         gLoadedSaveData.pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i];
 
     // load player TMs and HMs.
-    for (i = 0; i < 64; i++)
+    for (i = 0; i < BAG_TMHM_COUNT; i++)
         gLoadedSaveData.TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i];
 
     // load player berries.
-    for (i = 0; i < 46; i++)
+    for (i = 0; i < BAG_BERRIES_COUNT; i++)
         gLoadedSaveData.berries[i] = gSaveBlock1.bagPocket_Berries[i];
 
     // load mail.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAIL_COUNT; i++)
         gLoadedSaveData.mail[i] = gSaveBlock1.mail[i];
 }
 
@@ -143,26 +143,26 @@ void SavePlayerBag(void)
     int i;
 
     // save player items.
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < BAG_ITEMS_COUNT; i++)
         gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData.items[i];
 
     // save player key items.
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < BAG_KEYITEMS_COUNT; i++)
         gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData.keyItems[i];
 
     // save player pokeballs.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < BAG_POKEBALLS_COUNT; i++)
         gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData.pokeBalls[i];
 
     // save player TMs and HMs.
-    for (i = 0; i < 64; i++)
+    for (i = 0; i < BAG_TMHM_COUNT; i++)
         gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData.TMsHMs[i];
 
     // save player berries.
-    for (i = 0; i < 46; i++)
+    for (i = 0; i < BAG_BERRIES_COUNT; i++)
         gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData.berries[i];
 
     // save mail.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAIL_COUNT; i++)
         gSaveBlock1.mail[i] = gLoadedSaveData.mail[i];
 }