diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /include/load_save.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/load_save.h')
| -rw-r--r-- | include/load_save.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/load_save.h b/include/load_save.h index 5fb5f6c42..c64a1179b 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -17,7 +17,7 @@ void SetSaveBlocksPointers(u16 offset); void MoveSaveBlocks_ResetHeap(void); u32 GetSecretBase2Field_9(void); void ClearSecretBase2Field_9(void); -void sub_8076D48(void); +void SetSecretBase2Field_9(void); void sub_8076D5C(void); void sav2_gender2_inplace_and_xFE(void); void SavePlayerParty(void); @@ -30,6 +30,5 @@ void LoadPlayerBag(void); void SavePlayerBag(void); void ApplyNewEncryptionKeyToHword(u16 *hWord, u32 newKey); void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey); -void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey); #endif // GUARD_LOAD_SAVE_H |