From 2c2c179eb9b92d0998922cc96a115d3d1671a64b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 12:49:16 -0400 Subject: Finish trade code --- src/load_save.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 0a7bbbfc5..583844d17 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -146,13 +146,13 @@ void sub_804C1AC(void) gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP; } -void sub_804C1C0(void) +void SetContinueGameWarpStatusToDynamicWarp(void) { sub_8055778(0); gSaveBlock2Ptr->specialSaveWarpFlags |= CONTINUE_GAME_WARP; } -void sav2_gender2_inplace_and_xFE(void) +void ClearContinueGameWarpStatus2(void) { gSaveBlock2Ptr->specialSaveWarpFlags &= ~CONTINUE_GAME_WARP; } -- cgit v1.2.3 From 2b0bcdcad9336defc82f50a329b12e631b1f33ce Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 31 Oct 2019 09:19:33 -0400 Subject: Resolve externed prototypes in C files --- src/load_save.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 583844d17..da469d4e6 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -7,13 +7,10 @@ #include "malloc.h" #include "item.h" #include "save_location.h" - -extern void SetBagPocketsPointers(void); -extern void sub_8110840(void *oldSave); -extern void sub_8055778(int); -extern void sub_8054F38(u32 newKey); -extern void ApplyNewEncryptionKeyToBagItems_(u32 newKey); -extern void sub_815EE6C(u32 newKey); +#include "berry_powder.h" +#include "item.h" +#include "overworld.h" +#include "quest_log.h" #define SAVEBLOCK_MOVE_RANGE 128 -- cgit v1.2.3