diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-15 14:24:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 14:24:22 -0600 |
| commit | 39f54b346d8121849250b18e4af2855e1d34c22d (patch) | |
| tree | 3004b8fb87a9d7c5801eb435ead4a9461a500f0b /src/field_specials.c | |
| parent | 216c388001bf4342ecb1298237d748baf69e7a33 (diff) | |
| parent | 4311fd8b89903a35a4485ff7db8a44036bfd1bdc (diff) | |
Merge pull request #382 from Slawter666/synchronise
Move field effects enum to defines
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 1834f3523..113f46922 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1,5 +1,4 @@ #include "global.h" -#include "main.h" #include "battle.h" #include "battle_tower.h" #include "cable_club.h" @@ -13,7 +12,6 @@ #include "field_effect.h" #include "field_message_box.h" #include "field_player_avatar.h" -#include "field_region_map.h" #include "field_screen.h" #include "field_specials.h" #include "field_weather.h" @@ -21,6 +19,7 @@ #include "item_icon.h" #include "link.h" #include "list_menu.h" +#include "main.h" #include "malloc.h" #include "match_call.h" #include "menu.h" @@ -46,6 +45,7 @@ #include "wallclock.h" #include "window.h" #include "constants/event_objects.h" +#include "constants/field_effects.h" #include "constants/items.h" #include "constants/maps.h" #include "constants/songs.h" @@ -80,6 +80,7 @@ extern const u16 gEventObjectPalette34[]; extern void LoadPalette(const void *src, u32 offset, u16 size); // incorrect signature, needed to match extern void BlendPalettes(u32, u8, u16); +extern void FieldInitRegionMap(MainCallback callback); void UpdateMovedLilycoveFanClubMembers(void); void sub_813BF60(void); |