diff options
| author | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
| commit | 708f128568816f2c1efc14c5565a32240f83f171 (patch) | |
| tree | 62e58d7344f8c1ac83a21a86dc3c27d5867edbc0 /src/field_specials.c | |
| parent | 2136187c113be3c1bc0627c23915f88e0c8a6fc7 (diff) | |
| parent | d7a9fcb9755cd06e4e0245b848e44f4ff75e22cb (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 2ae494dad..20c2e6173 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1,4 +1,5 @@ #include "global.h" +#include "alloc.h" #include "battle.h" #include "battle_tower.h" #include "cable_club.h" @@ -20,7 +21,7 @@ #include "link.h" #include "list_menu.h" #include "main.h" -#include "alloc.h" +#include "mevent.h" #include "match_call.h" #include "menu.h" #include "overworld.h" @@ -31,7 +32,6 @@ #include "random.h" #include "rayquaza_scene.h" #include "region_map.h" -#include "rom_8011DC0.h" #include "rtc.h" #include "script.h" #include "script_menu.h" |