summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorfig02 <fig02srl@gmail.com>2023-09-26 12:48:41 -0400
committerGitHub <noreply@github.com>2023-09-26 12:48:41 -0400
commit2cb4ff4fd3d36157dd03d68321dbeb99ba5c6845 (patch)
tree3fd5ee26441b24b6c226659b3dc4b55466d2cea9 /include
parent092f6026384b193df93a9836548bc788dec7c81c (diff)
Player Docs: csMode -> csAction (#1547)
* csmode -> cs action * format
Diffstat (limited to 'include')
-rw-r--r--include/functions.h4
-rw-r--r--include/z64.h2
-rw-r--r--include/z64camera.h2
-rw-r--r--include/z64player.h214
4 files changed, 111 insertions, 111 deletions
diff --git a/include/functions.h b/include/functions.h
index 8ce39ff86..479281d03 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -385,8 +385,8 @@ void func_8002DE74(PlayState* play, Player* player);
void Actor_MountHorse(PlayState* play, Player* player, Actor* horse);
s32 func_8002DEEC(Player* player);
void func_8002DF18(PlayState* play, Player* player);
-s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode);
-s32 func_8002DF54(PlayState* play, Actor* actor, u8 csMode);
+s32 func_8002DF38(PlayState* play, Actor* actor, u8 csAction);
+s32 func_8002DF54(PlayState* play, Actor* actor, u8 csAction);
void func_8002DF90(DynaPolyActor* dynaActor);
void func_8002DFA4(DynaPolyActor* dynaActor, f32 arg1, s16 arg2);
s32 Player_IsFacingActor(Actor* actor, s16 maxAngle, PlayState* play);
diff --git a/include/z64.h b/include/z64.h
index 0e7698115..e962e4f33 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -402,7 +402,7 @@ typedef struct PlayState {
/* 0x11D44 */ s32 (*isPlayerDroppingFish)(struct PlayState* play);
/* 0x11D48 */ s32 (*startPlayerFishing)(struct PlayState* play);
/* 0x11D4C */ s32 (*grabPlayer)(struct PlayState* play, Player* player);
- /* 0x11D50 */ s32 (*startPlayerCutscene)(struct PlayState* play, Actor* actor, s32 csMode);
+ /* 0x11D50 */ s32 (*startPlayerCutscene)(struct PlayState* play, Actor* actor, s32 csAction);
/* 0x11D54 */ void (*func_11D54)(Player* player, struct PlayState* play);
/* 0x11D58 */ s32 (*damagePlayer)(struct PlayState* play, s32 damage);
/* 0x11D5C */ void (*talkWithPlayer)(struct PlayState* play, Actor* actor);
diff --git a/include/z64camera.h b/include/z64camera.h
index 48d4f1cc7..f6c458918 100644
--- a/include/z64camera.h
+++ b/include/z64camera.h
@@ -1254,7 +1254,7 @@ typedef enum {
#define ONEPOINT_CS_INIT_FIELD_NONE 0xFF
#define ONEPOINT_CS_INIT_FIELD_ACTORCAT(actorCat) (0x80 | ((actorCat) & 0x0F))
#define ONEPOINT_CS_INIT_FIELD_HUD_VISIBILITY(camHudVisibility) (0xC0 | ((camHudVisibility) & 0x0F))
-#define ONEPOINT_CS_INIT_FIELD_PLAYER_CS(csMode) ((csMode) & 0x7F)
+#define ONEPOINT_CS_INIT_FIELD_PLAYER_CS(csAction) ((csAction) & 0x7F)
#define ONEPOINT_CS_INIT_FIELD_IS_TYPE_ACTORCAT(field) ((field & 0xF0) == 0x80)
#define ONEPOINT_CS_INIT_FIELD_IS_TYPE_HUD_VISIBILITY(field) ((field & 0xF0) == 0xC0)
diff --git a/include/z64player.h b/include/z64player.h
index 1796b47d8..ae497a395 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -353,111 +353,111 @@ typedef enum {
#define PLAYER_LIMB_BUF_COUNT LIMB_BUF_COUNT(PLAYER_LIMB_MAX)
typedef enum {
- /* 0x00 */ PLAYER_CSMODE_NONE,
- /* 0x01 */ PLAYER_CSMODE_1,
- /* 0x02 */ PLAYER_CSMODE_2,
- /* 0x03 */ PLAYER_CSMODE_3,
- /* 0x04 */ PLAYER_CSMODE_4,
- /* 0x05 */ PLAYER_CSMODE_5,
- /* 0x06 */ PLAYER_CSMODE_6,
- /* 0x07 */ PLAYER_CSMODE_7,
- /* 0x08 */ PLAYER_CSMODE_8,
- /* 0x09 */ PLAYER_CSMODE_9,
- /* 0x0A */ PLAYER_CSMODE_10,
- /* 0x0B */ PLAYER_CSMODE_11,
- /* 0x0C */ PLAYER_CSMODE_12,
- /* 0x0D */ PLAYER_CSMODE_13,
- /* 0x0E */ PLAYER_CSMODE_14,
- /* 0x0F */ PLAYER_CSMODE_15,
- /* 0x10 */ PLAYER_CSMODE_16,
- /* 0x11 */ PLAYER_CSMODE_17,
- /* 0x12 */ PLAYER_CSMODE_18,
- /* 0x13 */ PLAYER_CSMODE_19,
- /* 0x14 */ PLAYER_CSMODE_20,
- /* 0x15 */ PLAYER_CSMODE_21,
- /* 0x16 */ PLAYER_CSMODE_22,
- /* 0x17 */ PLAYER_CSMODE_23,
- /* 0x18 */ PLAYER_CSMODE_24,
- /* 0x19 */ PLAYER_CSMODE_25,
- /* 0x1A */ PLAYER_CSMODE_26,
- /* 0x1B */ PLAYER_CSMODE_27,
- /* 0x1C */ PLAYER_CSMODE_28,
- /* 0x1D */ PLAYER_CSMODE_29,
- /* 0x1E */ PLAYER_CSMODE_30,
- /* 0x1F */ PLAYER_CSMODE_31,
- /* 0x20 */ PLAYER_CSMODE_32,
- /* 0x21 */ PLAYER_CSMODE_33,
- /* 0x22 */ PLAYER_CSMODE_34,
- /* 0x23 */ PLAYER_CSMODE_35,
- /* 0x24 */ PLAYER_CSMODE_36,
- /* 0x25 */ PLAYER_CSMODE_37,
- /* 0x26 */ PLAYER_CSMODE_38,
- /* 0x27 */ PLAYER_CSMODE_39,
- /* 0x28 */ PLAYER_CSMODE_40,
- /* 0x29 */ PLAYER_CSMODE_41,
- /* 0x2A */ PLAYER_CSMODE_42,
- /* 0x2B */ PLAYER_CSMODE_43,
- /* 0x2C */ PLAYER_CSMODE_44,
- /* 0x2D */ PLAYER_CSMODE_45,
- /* 0x2E */ PLAYER_CSMODE_46,
- /* 0x2F */ PLAYER_CSMODE_47,
- /* 0x30 */ PLAYER_CSMODE_48,
- /* 0x31 */ PLAYER_CSMODE_49,
- /* 0x32 */ PLAYER_CSMODE_50,
- /* 0x33 */ PLAYER_CSMODE_51,
- /* 0x34 */ PLAYER_CSMODE_52,
- /* 0x35 */ PLAYER_CSMODE_53,
- /* 0x36 */ PLAYER_CSMODE_54,
- /* 0x37 */ PLAYER_CSMODE_55,
- /* 0x38 */ PLAYER_CSMODE_56,
- /* 0x39 */ PLAYER_CSMODE_57,
- /* 0x3A */ PLAYER_CSMODE_58,
- /* 0x3B */ PLAYER_CSMODE_59,
- /* 0x3C */ PLAYER_CSMODE_60,
- /* 0x3D */ PLAYER_CSMODE_61,
- /* 0x3E */ PLAYER_CSMODE_62,
- /* 0x3F */ PLAYER_CSMODE_63,
- /* 0x40 */ PLAYER_CSMODE_64,
- /* 0x41 */ PLAYER_CSMODE_65,
- /* 0x42 */ PLAYER_CSMODE_66,
- /* 0x43 */ PLAYER_CSMODE_67,
- /* 0x44 */ PLAYER_CSMODE_68,
- /* 0x45 */ PLAYER_CSMODE_69,
- /* 0x46 */ PLAYER_CSMODE_70,
- /* 0x47 */ PLAYER_CSMODE_71,
- /* 0x48 */ PLAYER_CSMODE_72,
- /* 0x49 */ PLAYER_CSMODE_73,
- /* 0x4A */ PLAYER_CSMODE_74,
- /* 0x4B */ PLAYER_CSMODE_75,
- /* 0x4C */ PLAYER_CSMODE_76,
- /* 0x4D */ PLAYER_CSMODE_77,
- /* 0x4E */ PLAYER_CSMODE_78,
- /* 0x4F */ PLAYER_CSMODE_79,
- /* 0x50 */ PLAYER_CSMODE_80,
- /* 0x51 */ PLAYER_CSMODE_81,
- /* 0x52 */ PLAYER_CSMODE_82,
- /* 0x53 */ PLAYER_CSMODE_83,
- /* 0x54 */ PLAYER_CSMODE_84,
- /* 0x55 */ PLAYER_CSMODE_85,
- /* 0x56 */ PLAYER_CSMODE_86,
- /* 0x57 */ PLAYER_CSMODE_87,
- /* 0x58 */ PLAYER_CSMODE_88,
- /* 0x59 */ PLAYER_CSMODE_89,
- /* 0x5A */ PLAYER_CSMODE_90,
- /* 0x5B */ PLAYER_CSMODE_91,
- /* 0x5C */ PLAYER_CSMODE_92,
- /* 0x5D */ PLAYER_CSMODE_93,
- /* 0x5E */ PLAYER_CSMODE_94,
- /* 0x5F */ PLAYER_CSMODE_95,
- /* 0x60 */ PLAYER_CSMODE_96,
- /* 0x61 */ PLAYER_CSMODE_97,
- /* 0x62 */ PLAYER_CSMODE_98,
- /* 0x63 */ PLAYER_CSMODE_99,
- /* 0x64 */ PLAYER_CSMODE_100,
- /* 0x65 */ PLAYER_CSMODE_101,
- /* 0x66 */ PLAYER_CSMODE_102,
- /* 0x67 */ PLAYER_CSMODE_MAX
-} PlayerCutsceneMode;
+ /* 0x00 */ PLAYER_CSACTION_NONE,
+ /* 0x01 */ PLAYER_CSACTION_1,
+ /* 0x02 */ PLAYER_CSACTION_2,
+ /* 0x03 */ PLAYER_CSACTION_3,
+ /* 0x04 */ PLAYER_CSACTION_4,
+ /* 0x05 */ PLAYER_CSACTION_5,
+ /* 0x06 */ PLAYER_CSACTION_6,
+ /* 0x07 */ PLAYER_CSACTION_7,
+ /* 0x08 */ PLAYER_CSACTION_8,
+ /* 0x09 */ PLAYER_CSACTION_9,
+ /* 0x0A */ PLAYER_CSACTION_10,
+ /* 0x0B */ PLAYER_CSACTION_11,
+ /* 0x0C */ PLAYER_CSACTION_12,
+ /* 0x0D */ PLAYER_CSACTION_13,
+ /* 0x0E */ PLAYER_CSACTION_14,
+ /* 0x0F */ PLAYER_CSACTION_15,
+ /* 0x10 */ PLAYER_CSACTION_16,
+ /* 0x11 */ PLAYER_CSACTION_17,
+ /* 0x12 */ PLAYER_CSACTION_18,
+ /* 0x13 */ PLAYER_CSACTION_19,
+ /* 0x14 */ PLAYER_CSACTION_20,
+ /* 0x15 */ PLAYER_CSACTION_21,
+ /* 0x16 */ PLAYER_CSACTION_22,
+ /* 0x17 */ PLAYER_CSACTION_23,
+ /* 0x18 */ PLAYER_CSACTION_24,
+ /* 0x19 */ PLAYER_CSACTION_25,
+ /* 0x1A */ PLAYER_CSACTION_26,
+ /* 0x1B */ PLAYER_CSACTION_27,
+ /* 0x1C */ PLAYER_CSACTION_28,
+ /* 0x1D */ PLAYER_CSACTION_29,
+ /* 0x1E */ PLAYER_CSACTION_30,
+ /* 0x1F */ PLAYER_CSACTION_31,
+ /* 0x20 */ PLAYER_CSACTION_32,
+ /* 0x21 */ PLAYER_CSACTION_33,
+ /* 0x22 */ PLAYER_CSACTION_34,
+ /* 0x23 */ PLAYER_CSACTION_35,
+ /* 0x24 */ PLAYER_CSACTION_36,
+ /* 0x25 */ PLAYER_CSACTION_37,
+ /* 0x26 */ PLAYER_CSACTION_38,
+ /* 0x27 */ PLAYER_CSACTION_39,
+ /* 0x28 */ PLAYER_CSACTION_40,
+ /* 0x29 */ PLAYER_CSACTION_41,
+ /* 0x2A */ PLAYER_CSACTION_42,
+ /* 0x2B */ PLAYER_CSACTION_43,
+ /* 0x2C */ PLAYER_CSACTION_44,
+ /* 0x2D */ PLAYER_CSACTION_45,
+ /* 0x2E */ PLAYER_CSACTION_46,
+ /* 0x2F */ PLAYER_CSACTION_47,
+ /* 0x30 */ PLAYER_CSACTION_48,
+ /* 0x31 */ PLAYER_CSACTION_49,
+ /* 0x32 */ PLAYER_CSACTION_50,
+ /* 0x33 */ PLAYER_CSACTION_51,
+ /* 0x34 */ PLAYER_CSACTION_52,
+ /* 0x35 */ PLAYER_CSACTION_53,
+ /* 0x36 */ PLAYER_CSACTION_54,
+ /* 0x37 */ PLAYER_CSACTION_55,
+ /* 0x38 */ PLAYER_CSACTION_56,
+ /* 0x39 */ PLAYER_CSACTION_57,
+ /* 0x3A */ PLAYER_CSACTION_58,
+ /* 0x3B */ PLAYER_CSACTION_59,
+ /* 0x3C */ PLAYER_CSACTION_60,
+ /* 0x3D */ PLAYER_CSACTION_61,
+ /* 0x3E */ PLAYER_CSACTION_62,
+ /* 0x3F */ PLAYER_CSACTION_63,
+ /* 0x40 */ PLAYER_CSACTION_64,
+ /* 0x41 */ PLAYER_CSACTION_65,
+ /* 0x42 */ PLAYER_CSACTION_66,
+ /* 0x43 */ PLAYER_CSACTION_67,
+ /* 0x44 */ PLAYER_CSACTION_68,
+ /* 0x45 */ PLAYER_CSACTION_69,
+ /* 0x46 */ PLAYER_CSACTION_70,
+ /* 0x47 */ PLAYER_CSACTION_71,
+ /* 0x48 */ PLAYER_CSACTION_72,
+ /* 0x49 */ PLAYER_CSACTION_73,
+ /* 0x4A */ PLAYER_CSACTION_74,
+ /* 0x4B */ PLAYER_CSACTION_75,
+ /* 0x4C */ PLAYER_CSACTION_76,
+ /* 0x4D */ PLAYER_CSACTION_77,
+ /* 0x4E */ PLAYER_CSACTION_78,
+ /* 0x4F */ PLAYER_CSACTION_79,
+ /* 0x50 */ PLAYER_CSACTION_80,
+ /* 0x51 */ PLAYER_CSACTION_81,
+ /* 0x52 */ PLAYER_CSACTION_82,
+ /* 0x53 */ PLAYER_CSACTION_83,
+ /* 0x54 */ PLAYER_CSACTION_84,
+ /* 0x55 */ PLAYER_CSACTION_85,
+ /* 0x56 */ PLAYER_CSACTION_86,
+ /* 0x57 */ PLAYER_CSACTION_87,
+ /* 0x58 */ PLAYER_CSACTION_88,
+ /* 0x59 */ PLAYER_CSACTION_89,
+ /* 0x5A */ PLAYER_CSACTION_90,
+ /* 0x5B */ PLAYER_CSACTION_91,
+ /* 0x5C */ PLAYER_CSACTION_92,
+ /* 0x5D */ PLAYER_CSACTION_93,
+ /* 0x5E */ PLAYER_CSACTION_94,
+ /* 0x5F */ PLAYER_CSACTION_95,
+ /* 0x60 */ PLAYER_CSACTION_96,
+ /* 0x61 */ PLAYER_CSACTION_97,
+ /* 0x62 */ PLAYER_CSACTION_98,
+ /* 0x63 */ PLAYER_CSACTION_99,
+ /* 0x64 */ PLAYER_CSACTION_100,
+ /* 0x65 */ PLAYER_CSACTION_101,
+ /* 0x66 */ PLAYER_CSACTION_102,
+ /* 0x67 */ PLAYER_CSACTION_MAX
+} PlayerCsAction;
typedef enum {
/* 0 */ PLAYER_LEDGE_CLIMB_NONE,
@@ -640,8 +640,8 @@ typedef struct Player {
/* 0x043C */ s8 mountSide;
/* 0x043D */ char unk_43D[0x003];
/* 0x0440 */ Actor* rideActor;
- /* 0x0444 */ u8 csMode;
- /* 0x0445 */ u8 prevCsMode;
+ /* 0x0444 */ u8 csAction;
+ /* 0x0445 */ u8 prevCsAction;
/* 0x0446 */ u8 cueId;
/* 0x0447 */ u8 unk_447;
/* 0x0448 */ Actor* unk_448;