1 files changed, 16 insertions, 19 deletions
diff --git a/src/main.c b/src/main.c
index ef7e76df6..76ac3d6d9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,11 +1,17 @@
 #include "global.h"
-#include "gba/m4a_internal.h"
-#include "gba/flash_internal.h"
-#include "siirtc.h"
 #include "main.h"
-#include "rtc.h"
+#include "asm.h"
+#include "gba/flash_internal.h"
+#include "gba/m4a_internal.h"
+#include "intro.h"
 #include "link.h"
+#include "load_save.h"
+#include "m4a.h"
+#include "play_time.h"
 #include "rng.h"
+#include "rom4.h"
+#include "rtc.h"
+#include "siirtc.h"
 #include "sound.h"
 
 extern struct SoundInfo gSoundInfo;
@@ -26,7 +32,7 @@ static void IntrDummy(void);
 
 const u8 gGameVersion = GAME_VERSION;
 
-const u8 gGameLanguage = 2; // English
+const u8 gGameLanguage = GAME_LANGUAGE; // English
 
 const char BuildDateTime[] = "2002 10 15 20:34";
 
@@ -54,21 +60,13 @@ u16 gKeyRepeatStartDelay;
 u8 gUnknown_3001764;
 struct Main gMain;
 u16 gKeyRepeatContinueDelay;
-u8 gUnknown_3001BB4;
+u8 gSoftResetDisabled;
 IntrFunc gIntrTable[INTR_COUNT];
 bool8 gLinkVSyncDisabled;
 u32 IntrMain_Buffer[0x200];
 u8 gPcmDmaCounter;
 
-EWRAM_DATA void (*gFlashTimerIntrFunc)(void) = NULL;
-
-extern void sub_800C35C(void);
-extern void remove_some_task(void);
-extern void c2_copyright_1();
-extern u32 sub_80558AC(void);
-extern u32 sub_8055910(void);
-extern u32 sub_8055940(void);
-extern void CheckForFlashMemory(void);
+EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL;
 
 static void UpdateLinkAndCallCallbacks(void);
 static void InitMainCallbacks(void);
@@ -93,7 +91,7 @@ void AgbMain()
     InitMapMusic();
     SeedRngWithRtc();
 
-    gUnknown_3001BB4 = 0;
+    gSoftResetDisabled = FALSE;
 
     if (gUnknown_3004820 != 1)
         SetMainCallback2(0);
@@ -104,7 +102,7 @@ void AgbMain()
     {
         ReadKeys();
 
-        if (!gUnknown_3001BB4
+        if (gSoftResetDisabled == FALSE
          && (gMain.heldKeysRaw & A_BUTTON)
          && (gMain.heldKeysRaw & B_START_SELECT) == B_START_SELECT)
             DoSoftReset();
@@ -335,8 +333,7 @@ static void SerialIntr(void)
 }
 
 static void IntrDummy(void)
-{
-}
+{}
 
 static void WaitForVBlank(void)
 {