diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-06 10:34:53 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 20:34:53 -0300 |
| commit | f8a5f11d6d53f5bb3982eef9a8fdebd491ec98ff (patch) | |
| tree | 8dbf28eb2ac1e7aecfcb0a2c9284ea48bb860cd3 /include | |
| parent | 10a14feb2c9a484597fce6e29df0ab5f7fa62848 (diff) | |
Player Docs: public facing csAction things (#1459)
* public cs
* comments
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/z64.h | 2 | ||||
| -rw-r--r-- | include/z64player.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/functions.h b/include/functions.h index c6c3667d6..9d4e9617d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -312,8 +312,8 @@ s32 func_800B7128(Player* player); s32 func_800B715C(PlayState* play); void Actor_SetCameraHorseSetting(PlayState* play, Player* player); void Actor_MountHorse(PlayState* play, Player* player, Actor* horse); -s32 func_800B724C(PlayState* play, Actor* actor, u8 csAction); -s32 func_800B7298(PlayState* play, Actor* actor, u8 csAction); +s32 Player_SetCsAction(PlayState* play, Actor* csActor, u8 csAction); +s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* csActor, u8 csAction); void func_800B72F8(DynaPolyActor* dyna, f32 extraPushForce, s16 yRotation); s32 Player_IsFacingActor(Actor* actor, s16 maxAngleDiff, PlayState* play); diff --git a/include/z64.h b/include/z64.h index 072a1296a..28ae04de7 100644 --- a/include/z64.h +++ b/include/z64.h @@ -208,7 +208,7 @@ typedef struct PlayState { /* 0x18770 */ void (*unk_18770)(struct PlayState* play, Player* player); /* 0x18774 */ s32 (*startPlayerFishing)(struct PlayState* play); /* 0x18778 */ s32 (*grabPlayer)(struct PlayState* play, Player* player); - /* 0x1877C */ s32 (*startPlayerCutscene)(struct PlayState* play, Player* player, PlayerCsAction csAction); + /* 0x1877C */ s32 (*tryPlayerCsAction)(struct PlayState* play, Player* player, PlayerCsAction csAction); /* 0x18780 */ void (*func_18780)(Player* player, struct PlayState* play); /* 0x18784 */ s32 (*damagePlayer)(struct PlayState* play, s32 damage); /* 0x18788 */ void (*talkWithPlayer)(struct PlayState* play, Actor* actor); diff --git a/include/z64player.h b/include/z64player.h index fac153052..32b673fe4 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -607,6 +607,7 @@ typedef struct struct_80122744_arg1 { } struct_80122744_arg1; // size = 0x8 typedef enum PlayerCsAction { + /* -1 */ PLAYER_CSACTION_NEG1 = -1, // Specific to Kafei, any negative number works /* 0x00 */ PLAYER_CSACTION_NONE, /* 0x01 */ PLAYER_CSACTION_1, /* 0x02 */ PLAYER_CSACTION_2, @@ -1145,7 +1146,7 @@ typedef struct Player { /* 0x395 */ u8 prevCsAction; // PlayerCsAction enum /* 0x396 */ u8 cueId; // PlayerCueId enum /* 0x397 */ u8 unk_397; // PlayerDoorType enum - /* 0x398 */ Actor* csActor; + /* 0x398 */ Actor* csActor; // Actor involved in a `csAction`. Typically the actor that invoked the cutscene. /* 0x39C */ UNK_TYPE1 unk_39C[0x4]; /* 0x3A0 */ Vec3f unk_3A0; /* 0x3AC */ Vec3f unk_3AC; |