Merge branch 'master' into contest_link_80C2020

1 files changed, 6 insertions, 6 deletions

diff --git a/src/load_save.c b/src/load_save.c
index 8424b1121..7960a42eb 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -81,32 +81,32 @@ void LoadPlayerParty(void)
         gPlayerParty[i] = gSaveBlock1.playerParty[i];
 }
 
-static void SaveMapObjects(void)
+static void SaveEventObjects(void)
 {
     int i;
 
     for (i = 0; i < 16; i++)
-        gSaveBlock1.mapObjects[i] = gMapObjects[i];
+        gSaveBlock1.eventObjects[i] = gEventObjects[i];
 }
 
-static void LoadMapObjects(void)
+static void LoadEventObjects(void)
 {
     int i;
 
     for (i = 0; i < 16; i++)
-        gMapObjects[i] = gSaveBlock1.mapObjects[i];
+        gEventObjects[i] = gSaveBlock1.eventObjects[i];
 }
 
 void SaveSerializedGame(void)
 {
     SavePlayerParty();
-    SaveMapObjects();
+    SaveEventObjects();
 }
 
 void LoadSerializedGame(void)
 {
     LoadPlayerParty();
-    LoadMapObjects();
+    LoadEventObjects();
 }
 
 void LoadPlayerBag(void)