summaryrefslogtreecommitdiff
path: root/src/pokedex.c
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-01-17 14:13:04 +0100
committerMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-01-17 15:00:04 +0100
commitc9722602cb47eb5b6ecbccddf13df5f286a8ef7b (patch)
treef88f9a53cf98c06890cd9e561dc9d1f851393220 /src/pokedex.c
parent648c6c7093f5173694562929f615380f297ad306 (diff)
Sort includes
Diffstat (limited to 'src/pokedex.c')
-rw-r--r--src/pokedex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokedex.c b/src/pokedex.c
index 48e3a57aa..15563a150 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1,18 +1,18 @@
#include "global.h"
#include "pokedex.h"
#include "asm.h"
+#include "decompress.h"
+#include "event_data.h"
#include "gba/m4a_internal.h"
-#include "string_util.h"
#include "m4a.h"
-#include "decompress.h"
#include "main.h"
#include "menu.h"
#include "palette.h"
#include "rng.h"
#include "songs.h"
#include "sound.h"
+#include "string_util.h"
#include "task.h"
-#include "event_data.h"
// I'm #define-ing these just for now so I can keep using the old unkXXX member names
#define unk60E selectedPokemon