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/pokeblock.c | |
| parent | 216c388001bf4342ecb1298237d748baf69e7a33 (diff) | |
| parent | 4311fd8b89903a35a4485ff7db8a44036bfd1bdc (diff) | |
Merge pull request #382 from Slawter666/synchronise
Move field effects enum to defines
Diffstat (limited to 'src/pokeblock.c')
| -rw-r--r-- | src/pokeblock.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c index c8f2c67ed..01343c6eb 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -1,35 +1,35 @@ #include "global.h" -#include "pokeblock.h" -#include "bg.h" -#include "strings.h" -#include "text.h" -#include "text_window.h" -#include "menu.h" -#include "task.h" -#include "menu_helpers.h" -#include "pokemon.h" -#include "graphics.h" -#include "malloc.h" -#include "main.h" #include "battle.h" #include "battle_controllers.h" -#include "palette.h" -#include "scanline_effect.h" -#include "list_menu.h" -#include "gpu_regs.h" +#include "battle_message.h" +#include "berry.h" +#include "bg.h" #include "decompress.h" +#include "event_data.h" +#include "gpu_regs.h" +#include "graphics.h" #include "international_string_util.h" #include "item.h" -#include "constants/items.h" -#include "string_util.h" -#include "constants/songs.h" -#include "sound.h" -#include "berry.h" -#include "event_data.h" -#include "battle_message.h" -#include "safari_zone.h" #include "lilycove_lady.h" +#include "list_menu.h" +#include "main.h" +#include "malloc.h" +#include "menu.h" +#include "menu_helpers.h" #include "overworld.h" +#include "palette.h" +#include "pokeblock.h" +#include "pokemon.h" +#include "safari_zone.h" +#include "scanline_effect.h" +#include "sound.h" +#include "string_util.h" +#include "strings.h" +#include "task.h" +#include "text.h" +#include "text_window.h" +#include "constants/items.h" +#include "constants/songs.h" #define POKEBLOCK_MAX_FEEL 99 #define FIELD_E75_COUNT 7 |