From 92892d140a2ed704a1cfa2748ea015c9007da14c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 4 Sep 2017 18:26:39 +0200
Subject: begin load_save.c

---
 src/main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 7c8075a6f..7da51c65a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,9 +34,9 @@ extern struct SoundInfo gSoundInfo;
 extern u32 gFlashMemoryPresent;
 extern u32 IntrMain[];
 extern u8 gHeap[];
-extern struct SaveBlock2 gUnknown_02024A54;
-extern char *gUnknown_03005D94;
-extern char gUnknown_02029808[];
+extern struct SaveBlock2 gSaveblock2;
+extern char *gPokemonStoragePtr;
+extern char gPokemonStorage[];
 extern u32 gBattleTypeFlags;
 extern u8 gUnknown_03002748;
 extern u32 *gUnknown_0203CF5C;
@@ -185,8 +185,8 @@ static void InitMainCallbacks(void)
     gMain.vblankCounter2 = 0;
     gMain.callback1 = NULL;
     SetMainCallback2(c2_copyright_1);
-    gSaveBlock2Ptr = &gUnknown_02024A54;
-    gUnknown_03005D94 = gUnknown_02029808;
+    gSaveBlock2Ptr = &gSaveblock2;
+    gPokemonStoragePtr = gPokemonStorage;
 }
 
 static void CallCallbacks(void)
@@ -368,7 +368,7 @@ static void VBlankIntr(void)
     gMain.intrCheck |= INTR_FLAG_VBLANK;
 }
 
-void StartFlashMemoryTimer(void)
+void InitFlashTimer(void)
 {
     SetFlashTimerIntr(2, gIntrTable + 0x7);
 }
-- 
cgit v1.2.3


From b6661e7736138bb61c4d58e61add686cec9e7739 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 5 Sep 2017 20:13:34 +0200
Subject: name some pokemon and battle labels

---
 src/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 7da51c65a..15f1ec3eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,6 +5,7 @@
 #include "rng.h"
 #include "dma3.h"
 #include "gba/flash_internal.h"
+#include "battle.h"
 
 extern u16 GetGpuReg(u8);
 extern void SetGpuReg(u8, u16);
@@ -359,7 +360,7 @@ static void VBlankIntr(void)
     m4aSoundMain();
     sub_8033648();
 
-    if (!gMain.inBattle || (gBattleTypeFlags & 0x013F0102) == 0)
+    if (!gMain.inBattle || !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED)))
         Random();
 
     sub_800E174();
-- 
cgit v1.2.3


From c3cc1b3370fabcba0ce3997a9f3f6193ee9b13b5 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 6 Sep 2017 18:39:03 +0200
Subject: make it compile

---
 src/main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 15f1ec3eb..5707e18af 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)
-- 
cgit v1.2.3