From 3d3ef45a8c3d4f974dac94ab49fe906d26a8edab Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 20 Jan 2017 23:20:02 -0600 Subject: decompile more of bike (#205) * start decompiling bike.c * decompile more of bike.c * decompile MovePlayerOnAcroBike and CheckMovementInputAcroBike * decompile more of bike --- include/field_player_avatar.h | 26 +++++++++++++------------- include/global.fieldmap.h | 4 ++++ 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index b07690f61..9636c2dc1 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -34,28 +34,28 @@ void SetPlayerAvatarTransitionFlags(u16 a); // sub_80591F4 void sub_8059204(void); // player_get_x22 -// player_npc_set_state_and_x22_etc +void player_npc_set_state_and_x22_etc(u8 a, u8 b); void PlayerGoSpeed0(u8 a); void sub_80593C4(u8 a); void npc_use_some_d2s(u8 a); // sub_80593F4 void sub_805940C(u8 a); -// PlayerOnBikeCollide +void PlayerOnBikeCollide(u8); void PlayerFaceDirection(u8 a); void PlayerTurnInPlace(u8 a); void PlayerJumpLedge(u8 a); void sub_80594C0(void); -// sub_8059504 -// sub_805951C -// sub_8059534 -// sub_805954C -// sub_8059570 -// sub_8059594 -// sub_80595B8 -// sub_80595DC -// sub_8059600 -// sub_8059618 -// sub_8059630 +void sub_8059504(u8 a); +void sub_805951C(u8 a); +void sub_8059534(u8 a); +void sub_805954C(u8 a); +void sub_8059570(u8 a); +void sub_8059594(u8 a); +void sub_80595B8(u8 a); +void sub_80595DC(u8 a); +void sub_8059600(u8 a); +void sub_8059618(u8 a); +void sub_8059630(u8 a); void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y); void PlayerGetDestCoords(s16 *, s16 *); u8 player_get_direction_lower_nybble(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 64c2e8181..eac2c0cf1 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -316,6 +316,10 @@ struct PlayerAvatar /* 0x202E858 */ u8 unk9; u8 unkA; u8 unkB; + u32 unkC; + u32 unk10; + u8 unk14[8]; + u8 unk1C[8]; // TODO: rest of struct }; -- cgit v1.2.3