summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-29 21:05:29 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-29 21:06:07 -0400
commit22c795304d6c1edb568dfde9c6de2091d9470785 (patch)
treea8649b3252b5838f5edf0468f7645ae078fcb057 /src/main.c
parent8bbb75fba0d8dc81be6cfc88a4d7fd932efa900e (diff)
parentc1c2015f7046676b043641c0d1f9d9e29bc73647 (diff)
Merge branch 'master' into trade
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index afaa0e77a..d7c11b6c8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,7 +9,7 @@
#include "play_time.h"
#include "rng.h"
#include "rom3.h"
-#include "rom4.h"
+#include "overworld.h"
#include "rtc.h"
#include "siirtc.h"
#include "sound.h"