diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
| commit | 4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch) | |
| tree | 47bfb4286c03f021d48ffadde5da675a9f903f61 /src/main.c | |
| parent | aaa09d735451cced915bc6bacfce45ced8e33fa1 (diff) | |
| parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) | |
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 2 |
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" |