diff options
author | PikalaxALT <pikalax1@gmail.com> | 2017-09-21 17:55:30 -0400 |
---|---|---|
committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-21 17:55:30 -0400 |
commit | d87ed69449da253a374170a8135200657fb0426b (patch) | |
tree | 94baba568fc6dd25d082b309746198d41d07bd1b /src/main.c | |
parent | aecddc277130652a90e00ad0cc314b7ef9765bbb (diff) | |
parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) |
Merge branch 'master' into field_effect_helpers
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" |