diff options
Diffstat (limited to 'src/load_save.c')
| -rw-r--r-- | src/load_save.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/load_save.c b/src/load_save.c index 917c1dfe1..005af7c42 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -38,7 +38,7 @@ EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; EWRAM_DATA u8 gSaveblock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0}; -EWRAM_DATA u32 gLastEncryptionKey = {0}; +EWRAM_DATA u32 gLastEncryptionKey = 0; // IWRAM common IWRAM_DATA bool32 gFlashMemoryPresent; @@ -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) |