summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorYamaArashi <YamaArashi@users.noreply.github.com>2016-12-12 19:26:25 -0800
committerGitHub <noreply@github.com>2016-12-12 19:26:25 -0800
commite6c9d717dfad90e5423ebfc6aef53e0b19ef808d (patch)
tree6d18550f086819f3dee2918f9f04dea22ba9a9b1 /src/main.c
parent36214115534dd9329b5c02d78595967e671b6caf (diff)
parent6a07ab586cb3f472657a8572a6b7270ea8751f6a (diff)
Merge pull request #126 from marijnvdwerf/clean/up-warnings
Increase warnings and turn warnings into errors
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c
index ad131547b..c443de69b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,17 +1,18 @@
#include "global.h"
#include "main.h"
#include "asm.h"
-#include "play_time.h"
-#include "m4a.h"
-#include "gba/m4a_internal.h"
#include "gba/flash_internal.h"
-#include "siirtc.h"
-#include "rtc.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"
-#include "intro.h"
extern struct SoundInfo gSoundInfo;
extern u32 gUnknown_3004820;