diff --git a/src/main.c b/src/main.c
index 15f1ec3eb8..5707e18aff 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,8 +36,7 @@ extern u32 gFlashMemoryPresent;
 extern u32 IntrMain[];
 extern u8 gHeap[];
 extern struct SaveBlock2 gSaveblock2;
-extern char *gPokemonStoragePtr;
-extern char gPokemonStorage[];
+extern struct PokemonStorage gPokemonStorage;
 extern u32 gBattleTypeFlags;
 extern u8 gUnknown_03002748;
 extern u32 *gUnknown_0203CF5C;
@@ -187,7 +186,7 @@ static void InitMainCallbacks(void)
     gMain.callback1 = NULL;
     SetMainCallback2(c2_copyright_1);
     gSaveBlock2Ptr = &gSaveblock2;
-    gPokemonStoragePtr = gPokemonStorage;
+    gPokemonStoragePtr = &gPokemonStorage;
 }
 
 static void CallCallbacks(void)
diff --git a/src/save.c b/src/save.c
index 2b3da38b18..5ca8552470 100644
--- a/src/save.c
+++ b/src/save.c
@@ -5,7 +5,6 @@
 
 extern struct SaveSectionOffsets gSaveSectionOffsets[0xE];
 extern struct SaveSectionLocation gRamSaveSectionLocations[0xE];
-extern void *gPokemonStoragePtr;
 extern u8 gDecompressionBuffer[];
 extern u32 gFlashMemoryPresent;
 extern u16 gUnknown_03006294;