summaryrefslogtreecommitdiff
path: root/soh/include/functions.h
diff options
context:
space:
mode:
authorPepe20129 <72659707+Pepe20129@users.noreply.github.com>2024-10-17 20:55:31 +0200
committerGitHub <noreply@github.com>2024-10-17 11:55:31 -0700
commitb5c6545d6f97b7762aa3f0cc308c2b0e6ec9fd84 (patch)
tree176c9870f3587de7362f2537e7abd006ef4814b6 /soh/include/functions.h
parent3c5d9faba38346d1aa3355d14cce3b8286f1290b (diff)
`z_player` documentation 2024-10-11 (#4407)
* Add names to start of typedefs * Idle stuff * 2 functions * Player state flags * Name functions + misc * ActionChange => ActionHandler * Some player unks * More player unks * Header misc * Misc * More misc * Player Actions * Missed comments * Move ship specific stuff * Fix build * CsCmdActorAction to CsCmdActorCue * Fix build
Diffstat (limited to 'soh/include/functions.h')
-rw-r--r--soh/include/functions.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/soh/include/functions.h b/soh/include/functions.h
index 82b03e637..41b325236 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -415,7 +415,7 @@ f32 Actor_WorldDistXZToPoint(Actor* actor, Vec3f* refPoint);
void func_8002DBD0(Actor* actor, Vec3f* result, Vec3f* arg2);
f32 Actor_HeightDiff(Actor* actorA, Actor* actorB);
f32 Player_GetHeight(Player* player);
-s32 Player_ActionChange_2(Player* player, PlayState* play);
+s32 Player_ActionHandler_2(Player* player, PlayState* play);
f32 func_8002DCE4(Player* player);
s32 func_8002DD6C(Player* player);
s32 func_8002DD78(Player* player);
@@ -1107,7 +1107,7 @@ void Player_SetBootData(PlayState* play, Player* player);
s32 Player_InBlockingCsMode(PlayState* play, Player* player);
s32 Player_TryCsAction(PlayState* play, Actor* actor, s32 csAction);
s32 Player_InCsMode(PlayState* play);
-s32 func_8008E9C4(Player* player);
+s32 Player_CheckHostileLockOn(Player* player);
s32 Player_IsChildWithHylianShield(Player* player);
s32 Player_ActionToModelGroup(Player* player, s32 actionParam);
void Player_SetModelsForHoldingShield(Player* player);
@@ -1117,9 +1117,9 @@ void func_8008EC70(Player* player);
void Player_SetEquipmentData(PlayState* play, Player* player);
void Player_UpdateBottleHeld(PlayState* play, Player* player, s32 item, s32 actionParam);
void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, s16 arg5, s32 arg6);
-void func_8008EDF0(Player* player);
-void func_8008EE08(Player* player);
-void func_8008EEAC(PlayState* play, Actor* actor);
+void Player_ReleaseLockOn(Player* player);
+void Player_ClearZTargeting(Player* player);
+void Player_SetAutoLockOnActor(PlayState* play, Actor* actor);
s32 func_8008EF44(PlayState* play, s32 ammo);
s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 radius, f32 arg3);
s32 Player_GetStrength(void);