diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-16 23:59:58 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-06-16 23:59:58 -0400 |
| commit | 8b97aa28047d5bbc24448b47cbda901a3adb9d0e (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/pokedex.c | |
| parent | dda361afb7e2abafc15a498968580be6d1a83cfe (diff) | |
| parent | f568060cae85a1e8c70a0216ea5d1c6e79d6a528 (diff) | |
Merge remote-tracking branch 'marijn/clean/headers'
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index be6ef03a9..8674c3d2b 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1,7 +1,8 @@ + #include "global.h" #include "gba/m4a_internal.h" #include "pokedex.h" -#include "asm.h" +#include "battle.h" #include "data2.h" #include "decompress.h" #include "event_data.h" @@ -11,7 +12,11 @@ #include "menu.h" #include "menu_cursor.h" #include "palette.h" +#include "pokedex_area_screen.h" +#include "pokedex_cry_screen.h" +#include "pokemon.h" #include "rng.h" +#include "rom4.h" #include "songs.h" #include "sound.h" #include "species.h" @@ -19,6 +24,7 @@ #include "strings.h" #include "task.h" #include "trig.h" +#include "unknown_task.h" #define NATIONAL_DEX_COUNT 386 @@ -159,26 +165,13 @@ extern const u16 gPokedexMenu2_Pal[]; extern const struct SpriteSheet gTrainerFrontPicTable[]; extern const struct MonCoords gTrainerFrontPicCoords[]; extern const struct PokedexEntry gPokedexEntries[]; -extern const struct BaseStats gBaseStats[]; extern const u8 gPokedexMenuSearch_Gfx[]; extern const u8 gUnknown_08E96D2C[]; extern const u16 gPokedexMenuSearch_Pal[]; extern const u8 gTypeNames[][7]; extern const u8 gPokedexMenu2_Gfx[]; -extern u16 NationalPokedexNumToSpecies(u16); -extern void ShowPokedexAreaScreen(u16 species, u8 *string); -extern void sub_814AD7C(u8, u8); -extern void sub_800D74C(); -extern const u16 *species_and_otid_get_pal(u16, u32, u32); -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); +static u8 sub_8091E3C(void); static const u16 sPokedexSearchPalette[] = INCBIN_U16("graphics/pokedex/search.gbapal"); static const u16 sNationalPokedexPalette[] = INCBIN_U16("graphics/pokedex/national.gbapal"); @@ -1297,6 +1290,7 @@ static u8 sub_8092E10(u8, u8); static void sub_8092EB0(u8); static void sub_809308C(u8); + void ResetPokedex(void) { u16 i; |