summaryrefslogtreecommitdiff
path: root/src/fldeff_flash.c
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-11-15 14:24:22 -0600
committerGitHub <noreply@github.com>2018-11-15 14:24:22 -0600
commit39f54b346d8121849250b18e4af2855e1d34c22d (patch)
tree3004b8fb87a9d7c5801eb435ead4a9461a500f0b /src/fldeff_flash.c
parent216c388001bf4342ecb1298237d748baf69e7a33 (diff)
parent4311fd8b89903a35a4485ff7db8a44036bfd1bdc (diff)
Merge pull request #382 from Slawter666/synchronise
Move field effects enum to defines
Diffstat (limited to 'src/fldeff_flash.c')
-rw-r--r--src/fldeff_flash.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index fe219422d..9771232f2 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -1,20 +1,19 @@
#include "global.h"
-#include "constants/songs.h"
#include "braille_puzzles.h"
#include "event_data.h"
#include "event_scripts.h"
#include "field_effect.h"
#include "gpu_regs.h"
-#include "gba/io_reg.h"
#include "main.h"
+#include "overworld.h"
#include "palette.h"
#include "party_menu.h"
-#include "overworld.h"
#include "rom6.h"
#include "script.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
+#include "constants/songs.h"
// structures
struct FlashStruct