summaryrefslogtreecommitdiff
path: root/src/load_save.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-10 13:10:44 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-10 13:10:44 -0400
commitb22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch)
tree7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/load_save.c
parent8626240b54d87449e5db70345840ccf20717d8c7 (diff)
parent2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff)
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/load_save.c')
-rw-r--r--src/load_save.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/load_save.c b/src/load_save.c
index 9dff59928..f17d31f37 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,10 +1,9 @@
#include "global.h"
+#include "gflib.h"
#include "gba/flash_internal.h"
#include "load_save.h"
-#include "main.h"
#include "pokemon.h"
#include "random.h"
-#include "malloc.h"
#include "item.h"
#include "save_location.h"
#include "berry_powder.h"
@@ -78,7 +77,7 @@ void SetSaveBlocksPointers(void)
gPokemonStoragePtr = (void*)(&gPokemonStorage) + offset;
SetBagPocketsPointers();
- sub_8110840(oldSave);
+ SetQuestLogRecordAndPlaybackPointers(oldSave);
}
void MoveSaveBlocks_ResetHeap(void)