Merge branch 'master' into fix_saveblock_reorder

2021-11-13 23:19:57 -05:00
parent 9d3345a6d6 9a932cd9c3
commit 159bb37bbe
26 changed files with 723 additions and 640 deletions
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -48,8 +48,8 @@ void SavePlayerParty(void);
 void LoadPlayerParty(void);
 void SaveObjectEvents(void);
 void LoadObjectEvents(void);
-void SaveSerializedGame(void);
-void LoadSerializedGame(void);
+void CopyPartyAndObjectsToSave(void);
+void CopyPartyAndObjectsFromSave(void);
 void LoadPlayerBag(void);
 void SavePlayerBag(void);
 void ApplyNewEncryptionKeyToHword(u16 *hWord, u32 newKey);