From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 14:53:51 +0200
Subject: Add headers

---
 src/pokedex.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'src/pokedex.c')

diff --git a/src/pokedex.c b/src/pokedex.c
index 97bac3390..89dcd293b 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1,7 +1,8 @@
+
+#include "unknown_task.h"
 #include "global.h"
 #include "gba/m4a_internal.h"
 #include "pokedex.h"
-#include "asm.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "m4a.h"
@@ -15,6 +16,9 @@
 #include "strings.h"
 #include "task.h"
 #include "trig.h"
+#include "rom4.h"
+#include "pokedex_cry_screen.h"
+#include "pokedex_area_screen.h"
 
 // I'm #define-ing these just for now so I can keep using the old unkXXX member names
 #define unk60E selectedPokemon
@@ -92,23 +96,10 @@ extern u8 gUnknown_08E96B58[];
 
 extern struct PokedexEntry gPokedexEntries[];
 
-extern void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
-extern bool8 BeginNormalPaletteFade(u32, s8, u8, u8, u16);
-extern void remove_some_task(void);
-extern u8 sub_8091E3C(void);
-extern void DisableNationalPokedex(void);
-extern void sub_805469C(void);
-extern u16 HoennToNationalOrder(u16);
-extern u16 NationalToHoennOrder(u16);
 extern u16 gPokedexOrder_Alphabetical[];
 extern u16 gPokedexOrder_Weight[];
 extern u16 gPokedexOrder_Height[];
 
-u16 NationalPokedexNumToSpecies(u16);
-
-//  asm/pokedex_area_screen
-void ShowPokedexAreaScreen(u16 species, u8 *string);
-
 void ResetPokedex(void)
 {
     u16 i;
-- 
cgit v1.2.3


From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:01:42 +0200
Subject: Sort includes

---
 src/pokedex.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/pokedex.c')

diff --git a/src/pokedex.c b/src/pokedex.c
index 89dcd293b..53becdb1f 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1,5 +1,4 @@
 
-#include "unknown_task.h"
 #include "global.h"
 #include "gba/m4a_internal.h"
 #include "pokedex.h"
@@ -9,16 +8,17 @@
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
+#include "pokedex_area_screen.h"
+#include "pokedex_cry_screen.h"
 #include "rng.h"
+#include "rom4.h"
 #include "songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "trig.h"
-#include "rom4.h"
-#include "pokedex_cry_screen.h"
-#include "pokedex_area_screen.h"
+#include "unknown_task.h"
 
 // I'm #define-ing these just for now so I can keep using the old unkXXX member names
 #define unk60E selectedPokemon
-- 
cgit v1.2.3