Merge branch 'master' into slot_machine

1 files changed, 8 insertions, 7 deletions

diff --git a/src/load_save.c b/src/load_save.c
index 6f388e451..0a7bbbfc5 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -6,8 +6,9 @@
 #include "random.h"
 #include "malloc.h"
 #include "item.h"
+#include "save_location.h"
 
-extern void sub_8099E44(void);
+extern void SetBagPocketsPointers(void);
 extern void sub_8110840(void *oldSave);
 extern void sub_8055778(int);
 extern void sub_8054F38(u32 newKey);
@@ -80,7 +81,7 @@ void SetSaveBlocksPointers(void)
     *sav1_LocalVar = (void*)(&gSaveBlock1) + offset;
     gPokemonStoragePtr = (void*)(&gPokemonStorage) + offset;
 
-    sub_8099E44();
+    SetBagPocketsPointers();
     sub_8110840(oldSave);
 }
 
@@ -132,28 +133,28 @@ void MoveSaveBlocks_ResetHeap(void)
 
 u32 sav2_x1_query_bit1(void)
 {
-    return gSaveBlock2Ptr->specialSaveWarp & 1;
+    return gSaveBlock2Ptr->specialSaveWarpFlags & CONTINUE_GAME_WARP;
 }
 
 void sav2_x9_clear_bit1(void)
 {
-    gSaveBlock2Ptr->specialSaveWarp &= ~1;
+    gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP;
 }
 
 void sub_804C1AC(void)
 {
-    gSaveBlock2Ptr->specialSaveWarp |= 1;
+    gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP;
 }
 
 void sub_804C1C0(void)
 {
     sub_8055778(0);
-    gSaveBlock2Ptr->specialSaveWarp |= 1;
+    gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP;
 }
 
 void sav2_gender2_inplace_and_xFE(void)
 {
-    gSaveBlock2Ptr->specialSaveWarp &= ~1;
+    gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP;
 }
 
 void SavePlayerParty(void)