diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-29 09:27:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-29 09:27:45 -0400 |
commit | 75ae00beff77e166c4ae573300ed5cb31175e8ac (patch) | |
tree | ec15c56d3b09c2cec74ac907110c9111e18e8729 /src/load_save.c | |
parent | d8c9214e0a911882daf28dec07204de3c3c2df80 (diff) | |
parent | 9cfc34f2ec26d45085d9c4006b21406f8f968ed6 (diff) |
Merge pull request #315 from PikalaxALT/overworld
Overworld
Diffstat (limited to 'src/load_save.c')
-rw-r--r-- | src/load_save.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/load_save.c b/src/load_save.c index 7ab28ffc3..9dff59928 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -127,24 +127,24 @@ void MoveSaveBlocks_ResetHeap(void) gSaveBlock2Ptr->encryptionKey = encryptionKey; } -u32 sav2_x1_query_bit1(void) +u32 UseContinueGameWarp(void) { return gSaveBlock2Ptr->specialSaveWarpFlags & CONTINUE_GAME_WARP; } -void sav2_x9_clear_bit1(void) +void ClearContinueGameWarpStatus(void) { gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP; } -void sub_804C1AC(void) +void SetContinueGameWarpStatus(void) { gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP; } void SetContinueGameWarpStatusToDynamicWarp(void) { - sub_8055778(0); + SetContinueGameWarpToDynamicWarp(0); gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP; } @@ -286,7 +286,7 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey) for(i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->trainerTower[i].bestTime, encryptionKey); - sub_8054F38(encryptionKey); + ApplyNewEncryptionKeyToGameStats(encryptionKey); ApplyNewEncryptionKeyToBagItems_(encryptionKey); ApplyNewEncryptionKeyToBerryPowder(encryptionKey); ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->money, encryptionKey); |