Fix merge conflicts

1 files changed, 5 insertions, 5 deletions

diff --git a/include/load_save.h b/include/load_save.h
index c64a1179b..bf50bffd7 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -15,11 +15,11 @@ void ClearSav2(void);
 void ClearSav1(void);
 void SetSaveBlocksPointers(u16 offset);
 void MoveSaveBlocks_ResetHeap(void);
-u32 GetSecretBase2Field_9(void);
-void ClearSecretBase2Field_9(void);
-void SetSecretBase2Field_9(void);
-void sub_8076D5C(void);
-void sav2_gender2_inplace_and_xFE(void);
+u32 UseContinueGameWarp(void);
+void ClearContinueGameWarpStatus(void);
+void SetContinueGameWarpStatus(void);
+void SetContinueGameWarpStatusToDynamicWarp(void);
+void ClearContinueGameWarpStatus2(void);
 void SavePlayerParty(void);
 void LoadPlayerParty(void);
 void SaveEventObjects(void);