diff options
author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-02 19:06:22 +0100 |
---|---|---|
committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-02 10:06:22 -0800 |
commit | 1f222c04ef1d10ff5a5c6bb98cd4380ecf2bba86 (patch) | |
tree | 573d6368233110b17292e498f49532c1c9244404 /src/rom4.c | |
parent | 4258e60771aa9fdabd678930eca534423bd371b8 (diff) |
[WIP] Extract all external function declarations to headers (#114)
* Extract other external function declarations
* Fix GBA compilation
* Revert `sub_803C434` to asm
Diffstat (limited to 'src/rom4.c')
-rw-r--r-- | src/rom4.c | 131 |
1 files changed, 6 insertions, 125 deletions
diff --git a/src/rom4.c b/src/rom4.c index 493f37513..2fdee966c 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -1,5 +1,10 @@ #include "global.h" #include "rom4.h" +#include "asm.h" +#include "asm_fieldmap.h" +#include "battle_setup.h" +#include "berry.h" +#include "field_map_obj.h" #include "field_player_avatar.h" #include "menu.h" #include "weather.h" @@ -11,6 +16,7 @@ #include "new_game.h" #include "heal_location.h" #include "field_message_box.h" +#include "safari_zone.h" #include "script.h" #include "songs.h" #include "sound.h" @@ -23,7 +29,6 @@ #include "field_camera.h" #include "field_effect.h" #include "wild_encounter.h" -#include "asm_fieldmap.h" #ifdef SAPPHIRE #define LEGENDARY_MUSIC BGM_OOAME // Heavy Rain @@ -37,37 +42,6 @@ struct UnkTVStruct u32 tv_field_4; }; -struct UnkPlayerStruct -{ - u8 player_field_0; - u8 player_field_1; -}; - -struct UnkInputStruct -{ - u8 input_field_0; - u8 input_field_1; - u8 input_field_2; - u8 input_field_3; -}; - -struct UnkStruct_8054FF8_Substruct -{ - s16 x; - s16 y; - u8 field_8; -}; - -struct UnkStruct_8054FF8 -{ - u8 a; - u8 b; - u8 c; - u8 d; - struct UnkStruct_8054FF8_Substruct sub; - u16 field_C; -}; - struct LinkPlayerMapObject { u8 active; @@ -140,99 +114,6 @@ extern const struct WarpData gDummyWarpData; extern s32 gUnknown_0839ACE8; extern u32 gUnknown_08216694[]; -extern u8 sub_810D32C(void); -extern void sub_8080B60(void); -extern void sub_810CC80(void); -extern void sub_8080AC4(void); -extern void sub_8080A3C(void); -extern void atk17_seteffectuser(void); -extern void sub_80809B0(void); -extern void sub_8080990(void); -extern u8 sub_80BBB24(void); -extern u8 *sub_80682A8(void *, u8, u8); -extern u8 *sub_8068E24(struct UnkStruct_8054FF8_Substruct *); -extern u8 ZCoordToPriority(u8); - -void sub_8082BD0(u16, u16); -void player_avatar_init_params_reset(void); -u8 player_get_direction_lower_nybble(void); -u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16, u8); -u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8, u16, u8); -u8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8); -bool8 sub_8056F24(u8); -bool8 sub_8056F08(u8); -bool8 MetatileBehavior_IsDoor(u8); -bool8 MetatileBehavior_IsSouthArrowWarp(u8); -bool8 MetatileBehavior_IsNorthArrowWarp(u8); -bool8 MetatileBehavior_IsWestArrowWarp(u8); -bool8 MetatileBehavior_IsEastArrowWarp(u8); -bool8 MetatileBehavior_IsLadder(u8); -u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void); -bool32 sub_8053C44(void); -void sub_8053C98(void); -void sub_8053F0C(void); -u8 is_light_level_8_or_9(u8); -void sub_8054164(void); -void sub_8055354(void); -void c2_overworld(void); -void CB2_LoadMap2(void); -void c2_80567AC(void); -void c2_exit_to_overworld_2_link(void); -void c2_exit_to_overworld_2_local(void); -void FieldClearVBlankHBlankCallbacks(void); -void SetFieldVBlankCallback(void); -void VBlankCB_Field(void); -bool32 sub_805483C(u8 *); -bool32 sub_805493C(u8 *, u32); -bool32 sub_8054A4C(u8 *); -bool32 sub_8054A9C(u8 *a1); -void do_load_map_stuff_loop(u8 *a1); -void sub_8054BA8(void); -void sub_8054C2C(void); -void sub_8054C54(void); -void sub_8054D4C(u32 a1); -void sub_8054D90(void); -void mli4_mapscripts_and_other(void); -void sub_8054E20(void); -void sub_8054E34(void); -void sub_8054E60(void); -void sub_8054E7C(void); -void sub_8054E98(void); -void sub_8054EC8(void); -void sub_8054F48(void); -void sub_8054F70(void); -u16 sub_805530C(u16); -void sub_8055340(u16 *); -u16 sub_8055390(u32); -u16 sub_80553E4(u32); -u16 sub_8055408(u32); -u16 sub_8055438(u32); -bool32 sub_8055618(struct UnkStruct_8054FF8 *); -bool32 sub_8055630(struct UnkStruct_8054FF8 *); -u8 *sub_8055648(struct UnkStruct_8054FF8 *); -bool32 sub_8055660(struct UnkStruct_8054FF8 *); -u8 *sub_805568C(struct UnkStruct_8054FF8 *); -u16 sub_8055758(u8 *); -void sub_80557E8(void); -void sub_80557F4(void); -void sub_8055808(u8 *); -void sub_8055824(void); -void sub_8055840(u8 *); -void sub_805585C(void); -bool32 sub_8055870(void); -void SpawnLinkPlayerMapObject(u8, s16, s16, u8); -void InitLinkPlayerMapObjectPos(struct MapObject *, s16, s16); -void sub_80555B0(int, int, struct UnkStruct_8054FF8 *); -u8 sub_8055AE8(u8); -void sub_8055B08(u8, u16 *, u16 *); -u8 sub_8055B30(u8); -u8 sub_8055B50(u8); -u8 GetLinkPlayerIdAt(s16, s16); -void sub_8055BFC(u8, u8); -u8 npc_something3(u8, u8); -u8 LinkPlayerDetectCollision(u8, u8, s16, s16); -void CreateLinkPlayerSprite(u8); -void SpriteCB_LinkPlayer(struct Sprite *); void sub_8052F5C(void) { |