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/intro.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/intro.c')
| -rw-r--r-- | src/intro.c | 63 |
1 files changed, 37 insertions, 26 deletions
diff --git a/src/intro.c b/src/intro.c index ac51e456c..3d32cb18e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1,4 +1,12 @@ #include "global.h" +#include "intro.h" +#include "gba/m4a_internal.h" +#include "m4a.h" +#include "libgncmultiboot.h" +#include "save.h" +#include "decompress.h" +#include "title_screen.h" +#include "new_game.h" #include "link.h" #include "main.h" #include "palette.h" @@ -6,16 +14,9 @@ #include "songs.h" #include "sound.h" #include "species.h" -#include "sprite.h" #include "task.h" #include "trig.h" -struct GcmbStruct -{ - u16 gcmb_field_0; - u8 gcmb_field_2; -}; - extern u16 gUnknown_02039318; extern u16 gUnknown_0203931A; extern u16 gUnknown_02039358; @@ -59,12 +60,38 @@ extern const u8 gIntroCopyright_Gfx[]; extern const u16 gIntroCopyright_Pal[]; extern const u16 gIntroCopyright_Tilemap[]; -extern void LoadCompressedObjectPic(const struct SpriteSheet *); -extern void LoadCompressedObjectPalette(const struct SpritePalette *); -extern void CB2_InitTitleScreen(void); +// rom_813BA94 +extern void sub_813CAF4(u8); +extern void intro_reset_and_hide_bgs(void); +extern void sub_813CCE8(u8); +extern void sub_813CE30(u16, u16, u16, u16); +extern u8 sub_813CE88(/*TODO: arg types*/); +extern u8 sub_813CFA8(/*TODO: arg types*/); +extern void sub_813D084(/*TODO: arg types*/); +extern u8 sub_813D584(/*TODO: arg types*/); +extern void sub_813D788(struct Sprite *); +extern void sub_813D880(struct Sprite *); +extern void sub_813D954(/*TODO: arg types*/); +extern void sub_813DB9C(struct Sprite *); +extern void sub_813DE70(struct Sprite *); +extern void sub_813E10C(struct Sprite *); +extern void sub_813E210(struct Sprite *); +extern void sub_813E7C0(u8); +extern void sub_813E930(/*TODO: arg types*/); +extern void sub_813EB4C(u8); +extern void sub_813EDBC(/*TODO: arg types*/); + +// rom_8148B8C +extern void load_intro_part2_graphics(/*TODO: arg types*/); +extern void sub_8148C78(/*TODO: arg types*/); extern u8 sub_8148EC0(/*TODO: arg types*/); +extern void sub_8149020(/*TODO: arg types*/); extern u8 intro_create_brendan_sprite(/*TODO: arg types*/); extern u8 intro_create_may_sprite(/*TODO: arg types*/); +extern u8 intro_create_latios_sprite(/*TODO: arg types*/); +extern u8 intro_create_latias_sprite(/*TODO: arg types*/); + +extern void remove_some_task(void); static void MainCB2_EndIntro(void); static void Task_IntroLoadPart1Graphics(u8); @@ -86,22 +113,6 @@ static void task_intro_16(u8); static void task_intro_17(u8); static void Task_IntroPokemonBattle(u8); static void task_intro_19(u8); -void sub_813CAF4(u8); -void intro_reset_and_hide_bgs(void); -void sub_813CCE8(u8); -void sub_813CE30(u16, u16, u16, u16); -u8 sub_813CE88(/*TODO: arg types*/); -u8 sub_813CFA8(/*TODO: arg types*/); -u8 sub_813D584(/*TODO: arg types*/); -void sub_813D788(struct Sprite *); -void sub_813D880(struct Sprite *); -sub_813D954(/*TODO: arg types*/); -void sub_813DB9C(struct Sprite *); -void sub_813DE70(struct Sprite *); -void sub_813E10C(struct Sprite *); -void sub_813E210(struct Sprite *); -void sub_813E7C0(u8); -void sub_813EB4C(u8); static void VBlankCB_Intro(void) { |