diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
| commit | 00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch) | |
| tree | 5707f8764920abcd4cffca84c675e5c53c32559d /src/main.c | |
| parent | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into pokemon_data
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 19891459c..afaa0e77a 100644 --- a/src/main.c +++ b/src/main.c @@ -2,17 +2,18 @@ #include "gba/flash_internal.h" #include "gba/m4a_internal.h" #include "main.h" -#include "asm.h" #include "intro.h" #include "link.h" #include "load_save.h" #include "m4a.h" #include "play_time.h" #include "rng.h" +#include "rom3.h" #include "rom4.h" #include "rtc.h" #include "siirtc.h" #include "sound.h" +#include "unknown_task.h" extern struct SoundInfo gSoundInfo; extern u32 IntrMain[]; |