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/battle_transition.c | |
| parent | 216c388001bf4342ecb1298237d748baf69e7a33 (diff) | |
| parent | 4311fd8b89903a35a4485ff7db8a44036bfd1bdc (diff) | |
Merge pull request #382 from Slawter666/synchronise
Move field effects enum to defines
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index fc8c0eeee..759f15eee 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1,25 +1,25 @@ #include "global.h" #include "battle_transition.h" -#include "unk_transition.h" +#include "bg.h" +#include "decompress.h" +#include "field_camera.h" +#include "field_effect.h" +#include "gpu_regs.h" #include "main.h" +#include "malloc.h" #include "overworld.h" -#include "task.h" #include "palette.h" -#include "trig.h" -#include "field_effect.h" -#include "field_camera.h" #include "random.h" -#include "sprite.h" +#include "scanline_effect.h" #include "sound.h" +#include "sprite.h" +#include "task.h" +#include "trig.h" +#include "unk_transition.h" +#include "util.h" +#include "constants/field_effects.h" #include "constants/songs.h" #include "constants/trainers.h" -#include "field_camera.h" -#include "scanline_effect.h" -#include "malloc.h" -#include "gpu_regs.h" -#include "decompress.h" -#include "bg.h" -#include "util.h" struct TransitionData { |