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/main_menu.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/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 966f93f0d..eb5867d5d 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1,4 +1,6 @@ #include "global.h" +#include "save_menu_util.h" +#include "option_menu.h" #include "text.h" #include "sprite.h" #include "task.h" @@ -11,6 +13,8 @@ #include "pokemon.h" #include "menu.h" #include "sound.h" +#include "title_screen.h" +#include "decompress.h" #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24)) @@ -19,15 +23,8 @@ extern void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3 extern bool32 IsMysteryGiftAvailable(void); extern void CB2_ContinueSavedGame(void); extern void CB2_InitMysteryEventMenu(void); -extern void CB2_InitOptionMenu(void); -extern void CB2_InitTitleScreen(void); -extern void FormatPlayTime(u8 *str, u16 hours, u16 minutes, bool16 colon); -extern u16 GetPokedexSeenCount(void); -extern u8 GetBadgeCount(void); extern void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCallback s4); extern void CB2_NewGame(void); -extern void DecompressPicFromTable_2(const struct SpriteSheet *, u8, u8, void *, void *, u32); -extern void LoadCompressedObjectPalette(const struct SpritePalette *); extern u8 CreateBirchSprite(u8, u8, u8); extern u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); |