Merge pull request #120 from PikalaxALT/trade

Trade

1 files changed, 6 insertions, 9 deletions

diff --git a/src/load_save.c b/src/load_save.c
index 0a7bbbfc5..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
 
@@ -146,13 +143,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;
 }