From 16f2e40576b29fd85366305b4165da3aff4aef0e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 17 Sep 2017 23:42:44 -0400
Subject: Fix naming conflicts

---
 src/berry.c           |  6 +++---
 src/load_save.c       |  4 ----
 src/reset_save_heap.c | 32 ++++++++++++++++++++++++++++++++
 src/rom_81700F8.c     | 32 --------------------------------
 4 files changed, 35 insertions(+), 39 deletions(-)
 create mode 100644 src/reset_save_heap.c
 delete mode 100644 src/rom_81700F8.c

(limited to 'src')

diff --git a/src/berry.c b/src/berry.c
index b6eaa14a0..46b93d6ff 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -807,7 +807,7 @@ const struct Berry gBerries[] =
 // unused
 void ClearEnigmaBerries(void)
 {
-    CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry));
+    CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/);
 }
 
 void SetEnigmaBerry(u8 *src)
@@ -815,7 +815,7 @@ void SetEnigmaBerry(u8 *src)
     u32 i;
     u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry;
 
-    for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry); i++)
+    for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/; i++)
         dest[i] = src[i];
 }
 
@@ -827,7 +827,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
 
     dest = (u8*)enigmaBerry;
     checksum = 0;
-    for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry) - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
+    for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/ - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
     {
         checksum += dest[i];
     }
diff --git a/src/load_save.c b/src/load_save.c
index 588387186..68d978e3d 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -6,15 +6,11 @@
 #include "rng.h"
 #include "malloc.h"
 
-extern u8 gPlayerPartyCount;
-extern struct PokemonStorage* gPokemonStoragePtr;
 extern void* gUnknown_0203CF5C;
-extern u8 gHeap[0x1C000];
 
 extern bool16 IdentifyFlash(void);
 extern void SetBagItemsPointers(void);
 extern void SetDecorationInventoriesPointers(void);
-extern void InitHeap(void *heapStart, u32 heapSize);
 
 void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey);
 
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
new file mode 100644
index 000000000..b786ff9f8
--- /dev/null
+++ b/src/reset_save_heap.c
@@ -0,0 +1,32 @@
+#include "global.h"
+#include "main.h"
+#include "gpu_regs.h"
+#include "m4a.h"
+#include "load_save.h"
+#include "save.h"
+#include "new_game.h"
+#include "rom4.h"
+#include "malloc.h"
+
+void sub_81700F8(void)
+{
+    u16 imeBackup;
+
+    imeBackup = REG_IME;
+    REG_IME = 0;
+    RegisterRamReset(0x00000001);
+    ClearGpuRegBits(REG_OFFSET_DISPCNT, 0x80);
+    REG_IME = imeBackup;
+    gMain.inBattle = FALSE;
+    SetSaveBlocksPointers(sub_815355C());
+    sub_808447C();
+    ResetSaveCounters();
+    sub_81534D0(0);
+    if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
+    {
+        Sav2_ClearSetDefault();
+    }
+    SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
+    InitHeap(gHeap, 0x1c000);
+    SetMainCallback2(sub_8086230);
+}
diff --git a/src/rom_81700F8.c b/src/rom_81700F8.c
deleted file mode 100644
index b786ff9f8..000000000
--- a/src/rom_81700F8.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "global.h"
-#include "main.h"
-#include "gpu_regs.h"
-#include "m4a.h"
-#include "load_save.h"
-#include "save.h"
-#include "new_game.h"
-#include "rom4.h"
-#include "malloc.h"
-
-void sub_81700F8(void)
-{
-    u16 imeBackup;
-
-    imeBackup = REG_IME;
-    REG_IME = 0;
-    RegisterRamReset(0x00000001);
-    ClearGpuRegBits(REG_OFFSET_DISPCNT, 0x80);
-    REG_IME = imeBackup;
-    gMain.inBattle = FALSE;
-    SetSaveBlocksPointers(sub_815355C());
-    sub_808447C();
-    ResetSaveCounters();
-    sub_81534D0(0);
-    if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
-    {
-        Sav2_ClearSetDefault();
-    }
-    SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
-    InitHeap(gHeap, 0x1c000);
-    SetMainCallback2(sub_8086230);
-}
-- 
cgit v1.2.3