diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-01 03:51:24 +0100 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-30 18:51:24 -0800 |
| commit | 4258e60771aa9fdabd678930eca534423bd371b8 (patch) | |
| tree | ecca2ee7641abc0562f39b6c7dd907af2184e102 /src/starter_choose.c | |
| parent | 831f8cd4fd94613d6b52d87df1b4903bedfaa717 (diff) | |
Declare more non-static functions in header files (#111)
* Declare more non-static functions in header files
* Use `(void)` for functions without arguments.
* Move global-included data to seperate headers
* Don't import types or global in header
* Fix fieldmap imports
* Revert in-code changes
* Add missing newlines
Diffstat (limited to 'src/starter_choose.c')
| -rw-r--r-- | src/starter_choose.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c index a80401e8b..725d481be 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -1,22 +1,18 @@ #include "global.h" +#include "starter_choose.h" #include "main.h" #include "menu.h" #include "palette.h" -#include "pokemon.h" #include "songs.h" #include "sound.h" -#include "sprite.h" #include "string_util.h" #include "task.h" -#include "text.h" #include "trig.h" +#include "decompress.h" //Functions that need to be put in headers void remove_some_task(void); -void LoadCompressedObjectPic(void *); -void LoadCompressedObjectPalette(const struct SpritePalette *); u16 SpeciesToNationalPokedexNum(u16); -void DecompressPicFromTable_2(const struct SpriteSheet *, u8, u8, void *, void *, u32); struct MonCoords { @@ -50,7 +46,6 @@ extern struct SpritePalette gUnknown_083F77B4[]; extern struct SpriteTemplate gSpriteTemplate_83F77FC; extern struct SpriteTemplate gUnknown_02024E8C; -u16 GetStarterPokemon(u16); static void MainCallback2(void); static void Task_StarterChoose1(u8 taskId); static void Task_StarterChoose2(u8 taskId); @@ -62,7 +57,6 @@ static void Task_StarterChoose6(u8 taskId); extern u8 *GetPokemonCategory(u16); static void CreateStarterPokemonLabel(u8, u8); static u8 CreatePokemonFrontSprite(u16, u8, u8); -void StarterPokemonSpriteAnimCallback(struct Sprite *); //Position of the sprite of the selected starter Pokemon #define STARTER_PKMN_POS_X 120 |