summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-06-20 20:41:33 -0400
committerGitHub <noreply@github.com>2017-06-20 20:41:33 -0400
commit4ba573ed1eba7c37160ce6107d95447f42902385 (patch)
tree5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/main.c
parent13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff)
parentb22e5219ba01c70da9a03397430bff10d0b99060 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 19891459c..afaa0e77a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,17 +2,18 @@
#include "gba/flash_internal.h"
#include "gba/m4a_internal.h"
#include "main.h"
-#include "asm.h"
#include "intro.h"
#include "link.h"
#include "load_save.h"
#include "m4a.h"
#include "play_time.h"
#include "rng.h"
+#include "rom3.h"
#include "rom4.h"
#include "rtc.h"
#include "siirtc.h"
#include "sound.h"
+#include "unknown_task.h"
extern struct SoundInfo gSoundInfo;
extern u32 IntrMain[];