summaryrefslogtreecommitdiff
path: root/src/load_save.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-14 08:08:51 -0500
committerGitHub <noreply@github.com>2018-06-14 08:08:51 -0500
commitbebcea402921d23232f7657fcfdab810f8699399 (patch)
treea59ea431d486bf23cde76e35ca789d1a0d113f3e /src/load_save.c
parentf810c9ecade3d793a139f67cd8f63effc5644b99 (diff)
parente01dd90bb36f850fe88f2b1edae65c74b3bc48b1 (diff)
Merge pull request #263 from huderlem/event_object_movement
Sync event object movement with pokeruby
Diffstat (limited to 'src/load_save.c')
-rw-r--r--src/load_save.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/load_save.c b/src/load_save.c
index 917c1dfe1..0c6df7662 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -180,32 +180,32 @@ void LoadPlayerParty(void)
gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i];
}
-void SaveMapObjects(void)
+void SaveEventObjects(void)
{
int i;
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
- gSaveBlock1Ptr->mapObjects[i] = gMapObjects[i];
+ for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+ gSaveBlock1Ptr->eventObjects[i] = gEventObjects[i];
}
-void LoadMapObjects(void)
+void LoadEventObjects(void)
{
int i;
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
- gMapObjects[i] = gSaveBlock1Ptr->mapObjects[i];
+ for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+ gEventObjects[i] = gSaveBlock1Ptr->eventObjects[i];
}
void SaveSerializedGame(void)
{
SavePlayerParty();
- SaveMapObjects();
+ SaveEventObjects();
}
void LoadSerializedGame(void)
{
LoadPlayerParty();
- LoadMapObjects();
+ LoadEventObjects();
}
void LoadPlayerBag(void)