From 8e8fe3bf443cec46c0b7cc2072748c90bedc964d Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 28 Jun 2019 05:55:49 +0800 Subject: finished save_location --- src/load_save.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 8d09a86a8..00db946c0 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -132,28 +132,28 @@ void MoveSaveBlocks_ResetHeap(void) u32 sav2_x1_query_bit1(void) { - return gSaveBlock2Ptr->specialSaveWarp & 1; + return gSaveBlock2Ptr->specialSaveWarpFlags & 1; } void sav2_x9_clear_bit1(void) { - gSaveBlock2Ptr->specialSaveWarp &= ~1; + gSaveBlock2Ptr->specialSaveWarpFlags &= ~1; } void sub_804C1AC(void) { - gSaveBlock2Ptr->specialSaveWarp |= 1; + gSaveBlock2Ptr->specialSaveWarpFlags |= 1; } void sub_804C1C0(void) { sub_8055778(0); - gSaveBlock2Ptr->specialSaveWarp |= 1; + gSaveBlock2Ptr->specialSaveWarpFlags |= 1; } void sav2_gender2_inplace_and_xFE(void) { - gSaveBlock2Ptr->specialSaveWarp &= ~1; + gSaveBlock2Ptr->specialSaveWarpFlags &= ~1; } void SavePlayerParty(void) -- cgit v1.2.3 From 5384fd020c0e390a677cecfe544529f55d0f0c9f Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 2 Jul 2019 09:38:28 +0800 Subject: multiple fixes --- src/load_save.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 00db946c0..0a7bbbfc5 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -6,6 +6,7 @@ #include "random.h" #include "malloc.h" #include "item.h" +#include "save_location.h" extern void SetBagPocketsPointers(void); extern void sub_8110840(void *oldSave); @@ -132,28 +133,28 @@ void MoveSaveBlocks_ResetHeap(void) u32 sav2_x1_query_bit1(void) { - return gSaveBlock2Ptr->specialSaveWarpFlags & 1; + return gSaveBlock2Ptr->specialSaveWarpFlags & CONTINUE_GAME_WARP; } void sav2_x9_clear_bit1(void) { - gSaveBlock2Ptr->specialSaveWarpFlags &= ~1; + gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP; } void sub_804C1AC(void) { - gSaveBlock2Ptr->specialSaveWarpFlags |= 1; + gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP; } void sub_804C1C0(void) { sub_8055778(0); - gSaveBlock2Ptr->specialSaveWarpFlags |= 1; + gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP; } void sav2_gender2_inplace_and_xFE(void) { - gSaveBlock2Ptr->specialSaveWarpFlags &= ~1; + gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP; } void SavePlayerParty(void) -- cgit v1.2.3