diff options
author | huderlem <huderlem@gmail.com> | 2019-10-19 08:08:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-19 08:08:03 -0500 |
commit | d63e99c418de98005eac31ba3e6c1abdd6e3ecaf (patch) | |
tree | f8352a8edfbc7209588cd783e485ba6b6d2e0b00 /src/main.c | |
parent | 11170ce90c0baf77b196e378441d25e7f16e2cf3 (diff) | |
parent | e97f37077c793a388e3a98c13f09846839e80b22 (diff) |
Merge pull request #754 from camthesaxman/emerald_diff
resolve more emerald differences
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 ad4a669b7..972c8486f 100644 --- a/src/main.c +++ b/src/main.c @@ -2,13 +2,13 @@ #include "gba/flash_internal.h" #include "gba/m4a_internal.h" #include "main.h" +#include "battle_controllers.h" #include "intro.h" #include "link.h" #include "load_save.h" #include "m4a.h" #include "play_time.h" #include "random.h" -#include "rom3.h" #include "overworld.h" #include "rtc.h" #include "siirtc.h" |