From d5547a3744104140bc8a3e5390f13a9bc903d249 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 7 Nov 2017 23:53:30 -0500
Subject: main.c common syms

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

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 665a4dd84..80993f0d0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,7 +38,6 @@ extern u8 gHeap[];
 extern struct SaveBlock2 gSaveblock2;
 extern struct PokemonStorage gPokemonStorage;
 extern u32 gBattleTypeFlags;
-extern u8 gUnknown_03002748;
 extern u32 *gUnknown_0203CF5C;
 
 void Timer3Intr(void);
@@ -79,19 +78,19 @@ const IntrFunc gIntrTableTemplate[] =
 
 static u16 gUnknown_03000000;
 
-extern u16 gKeyRepeatStartDelay;
-extern u8 gUnknown_030022B4;
-extern struct Main gMain;
-extern u16 gKeyRepeatContinueDelay;
-extern u8 gSoftResetDisabled;
-extern IntrFunc gIntrTable[INTR_COUNT];
-extern bool8 gLinkVSyncDisabled;
-extern u32 IntrMain_Buffer[0x200];
-extern u8 gPcmDmaCounter;
+u16 gKeyRepeatStartDelay;
+u8 gUnknown_030022B4;
+struct Main gMain;
+u16 gKeyRepeatContinueDelay;
+bool8 gSoftResetDisabled;
+IntrFunc gIntrTable[INTR_COUNT];
+u8 gUnknown_03002748;
+u32 IntrMain_Buffer[0x200];
+u8 gPcmDmaCounter;
 
-extern u16 gTrainerId;
+static EWRAM_DATA u16 gTrainerId = 0;
 
-EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL;
+//EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL;
 
 static void UpdateLinkAndCallCallbacks(void);
 static void InitMainCallbacks(void);
-- 
cgit v1.2.3