diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-12-28 12:08:30 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-12-28 12:08:30 -0800 |
| commit | 0f65f8fd5008d06defcfae6c9d66270ff45a8e49 (patch) | |
| tree | a00d4ffa13c5d1e950f38e1bb6fa0fdfc0a442c3 /include/player.h | |
| parent | 9456e38606b3ebfe388bd810a4187a5c06c97947 (diff) | |
Identify player functions and update asm.h
Diffstat (limited to 'include/player.h')
| -rw-r--r-- | include/player.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/include/player.h b/include/player.h index 7d29812c..76350008 100644 --- a/include/player.h +++ b/include/player.h @@ -211,7 +211,7 @@ typedef struct { /* */ u8 filler14 : 6; /*0x3f*/ u8 field_0x3f; /*0x40*/ u8 hurtType[64]; - /*0x80*/ u16 field_0x80; + /*0x80*/ u16 speed_modifier; /*0x82*/ u8 field_0x82[9]; /*0x8b*/ u8 controlMode; /*0x8c*/ u16 vel_x; @@ -277,11 +277,23 @@ extern PlayerState gPlayerState; extern Stats gStats; extern Entity gPlayerEntity; -extern u32 GetInventoryValue(u32); -extern s32 ModHealth(s32); -extern void ModRupees(s32); +void SetPlayerControl(PlayerControlMode mode); +void ResetPlayer(void); +void ResetPlayerVelocity(void); +void ResetPlayerAnimationAndAction(void); +void SetPlayerActionNormal(void); +void RespawnAsMinish(void); -extern void SetPlayerControl(PlayerControlMode); +void ResolvePlayerAnimation(void); +void RegisterPlayerHitbox(void); +void UpdateFloorType(void); +void CreateEzloHint(u32, u32); + +u32 IsItemEquipped(u32); +u32 GetInventoryValue(u32); +s32 ModHealth(s32 delta); +void ModRupees(s32 delta); +void DeleteClones(void); #define COPY_FLAG_FROM_TO(base, src, dest) (base) = ((base) & ~(dest)) | (((dest) * ((base) & (src))) / src) |
