Player Docs: csMode -> csAction (#1547)

* csmode -> cs action

* format

6 files changed, 128 insertions, 128 deletions

diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 4ef0bf10f..3edfbaeee 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1050,27 +1050,27 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) {
 }
 
 s32 func_8002DEEC(Player* player) {
-    return (player->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_29)) || (player->csMode != PLAYER_CSMODE_NONE);
+    return (player->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_29)) || (player->csAction != PLAYER_CSACTION_NONE);
 }
 
 void func_8002DF18(PlayState* play, Player* player) {
     func_8006DC68(play, player);
 }
 
-s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode) {
+s32 func_8002DF38(PlayState* play, Actor* actor, u8 csAction) {
     Player* player = GET_PLAYER(play);
 
-    player->csMode = csMode;
+    player->csAction = csAction;
     player->unk_448 = actor;
     player->doorBgCamIndex = 0;
 
     return true;
 }
 
-s32 func_8002DF54(PlayState* play, Actor* actor, u8 csMode) {
+s32 func_8002DF54(PlayState* play, Actor* actor, u8 csAction) {
     Player* player = GET_PLAYER(play);
 
-    func_8002DF38(play, actor, csMode);
+    func_8002DF38(play, actor, csAction);
     player->doorBgCamIndex = 1;
 
     return true;
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 9858cfdfa..d62b94596 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -5263,10 +5263,10 @@ s32 Camera_Unique9(Camera* camera) {
                 } else if (ONEPOINT_CS_INIT_FIELD_IS_TYPE_HUD_VISIBILITY(rwData->curKeyFrame->initField)) {
                     Camera_UpdateInterface(
                         CAM_INTERFACE_FIELD(CAM_LETTERBOX_IGNORE, rwData->curKeyFrame->initField, 0));
-                } else { // initField is of type PlayerCsMode
+                } else { // initField is a PlayerCsAction
                     if ((camera->player->stateFlags1 & PLAYER_STATE1_27) &&
                         (player->currentBoots != PLAYER_BOOTS_IRON)) {
-                        func_8002DF38(camera->play, camera->target, PLAYER_CSMODE_8);
+                        func_8002DF38(camera->play, camera->target, PLAYER_CSACTION_8);
                         osSyncPrintf("camera: demo: player demo set WAIT\n");
                     } else {
                         osSyncPrintf("camera: demo: player demo set %d\n", rwData->curKeyFrame->initField);
@@ -6236,14 +6236,14 @@ s32 Camera_Demo5(Camera* camera) {
             framesDiff = camera->play->state.frames - sDemo5PrevAction12Frame;
             if (player->stateFlags1 & PLAYER_STATE1_11) {
                 // holding object over head.
-                func_8002DF54(camera->play, camera->target, PLAYER_CSMODE_8);
+                func_8002DF54(camera->play, camera->target, PLAYER_CSACTION_8);
             } else if (ABS(framesDiff) > 3000) {
-                func_8002DF54(camera->play, camera->target, PLAYER_CSMODE_12);
+                func_8002DF54(camera->play, camera->target, PLAYER_CSACTION_12);
             } else {
-                func_8002DF54(camera->play, camera->target, PLAYER_CSMODE_69);
+                func_8002DF54(camera->play, camera->target, PLAYER_CSACTION_69);
             }
         } else {
-            func_8002DF54(camera->play, camera->target, PLAYER_CSMODE_1);
+            func_8002DF54(camera->play, camera->target, PLAYER_CSACTION_1);
         }
     }
 
@@ -6305,7 +6305,7 @@ s32 Camera_Demo6(Camera* camera) {
             FALLTHROUGH;
         case 1:
             if (stateTimers[camera->animState] < rwData->animTimer) {
-                func_8002DF54(camera->play, &camera->player->actor, PLAYER_CSMODE_8);
+                func_8002DF54(camera->play, &camera->player->actor, PLAYER_CSACTION_8);
                 Actor_GetWorld(&focusPosRot, camFocus);
                 rwData->atTarget.x = focusPosRot.pos.x;
                 rwData->atTarget.y = focusPosRot.pos.y - 20.0f;
@@ -7841,8 +7841,8 @@ void Camera_Finish(Camera* camera) {
             player->actor.freezeTimer = 0;
             player->stateFlags1 &= ~PLAYER_STATE1_29;
 
-            if (player->csMode != PLAYER_CSMODE_NONE) {
-                func_8002DF54(camera->play, &player->actor, PLAYER_CSMODE_7);
+            if (player->csAction != PLAYER_CSACTION_NONE) {
+                func_8002DF54(camera->play, &player->actor, PLAYER_CSACTION_7);
                 osSyncPrintf("camera: player demo end!!\n");
             }
 
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 61548559a..fc7f7a5d4 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -278,7 +278,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
         case 2290: {
             Actor* rideActor = player->rideActor;
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             if (rideActor != NULL) {
                 rideActor->freezeTimer = 180;
             }
@@ -290,7 +290,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
         } break;
 
         case 5120:
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
 
             csInfo->keyFrames = D_80121314;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80121314);
@@ -301,7 +301,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
         case 4510:
             D_8012133C[0].eyeTargetInit = actor->world.pos;
             D_8012133C[0].eyeTargetInit.y = player->actor.world.pos.y + 40.0f;
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
 
             csInfo->keyFrames = D_8012133C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_8012133C);
@@ -320,7 +320,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             OnePointCutscene_AddVecGeoToVec3f(&spB4, &spC0, &spD0);
             Play_ChangeCameraSetting(play, subCamId, CAM_SET_FREE2);
             Play_SetCameraAtEye(play, subCamId, &spC0, &spB4);
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             subCam->roll = 0;
             subCam->fov = 50.0f;
             if (subCam->childCamId != CAM_ID_MAIN) {
@@ -335,7 +335,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             if (Rand_ZeroOne() < 0.0f) {
                 D_801213B4[3].eyeTargetInit.x = -D_801213B4[3].eyeTargetInit.x;
             }
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
 
             csInfo->keyFrames = D_801213B4;
             csInfo->keyFrameCount = ARRAY_COUNT(D_801213B4);
@@ -382,11 +382,11 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             Play_SetCameraAtEye(play, subCamId, &spC0, &spB4);
             subCam->roll = 6;
             subCam->fov = 75.0f;
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             break;
 
         case 3040:
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             D_8012151C[0].timerInit = timer - 1;
 
             csInfo->keyFrames = D_8012151C;
@@ -411,7 +411,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrameCount = ARRAY_COUNT(D_8012156C);
 
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             break;
 
         case 3010:
@@ -443,7 +443,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             break;
 
         case 3090:
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
 
             csInfo->keyFrames = D_80121814;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80121814);
@@ -460,7 +460,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             Play_SetCameraAtEye(play, subCamId, &spC0, &spB4);
             subCam->roll = 0;
             subCam->fov = 70.0f;
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             break;
 
         case 3380:
@@ -468,7 +468,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_801218B4;
             csInfo->keyFrameCount = ARRAY_COUNT(D_801218B4);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
 
             i = Quake_Request(subCam, QUAKE_TYPE_1);
@@ -481,13 +481,13 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80121904;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80121904);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
 
         case 3050:
             Play_ChangeCameraSetting(play, subCamId, CAM_SET_CS_3);
-            func_8002DF54(play, &player->actor, PLAYER_CSMODE_5);
+            func_8002DF54(play, &player->actor, PLAYER_CSACTION_5);
             OnePointCutscene_SetCsCamPoints(subCam, D_80120304 | 0x2000, D_80120300, D_8012013C, D_8012021C);
             Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
             OnePointCutscene_Vec3sToVec3f(&mainCam->at, &D_8012013C[D_801202FC - 2].pos);
@@ -517,7 +517,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             subCam->stateFlags |= CAM_STATE_1;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80121954[0]);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
 
@@ -525,7 +525,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80121A44;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80121A44);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             subCam->stateFlags |= CAM_STATE_1;
             break;
@@ -552,7 +552,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             Play_SetCameraAtEye(play, subCamId, &spC0, &spB4);
             subCam->roll = 0x50;
             subCam->fov = 55.0f;
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             break;
 
         case 3170:
@@ -569,7 +569,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             Play_CopyCamera(play, CAM_ID_MAIN, subCamId);
             subCam->roll = -1;
             subCam->fov = 55.0f;
-            func_8002DF38(play, actor, PLAYER_CSMODE_1);
+            func_8002DF38(play, actor, PLAYER_CSACTION_1);
             break;
 
         case 3160:
@@ -583,7 +583,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             Play_SetCameraAtEye(play, subCamId, &spC0, &spB4);
             subCam->roll = 0;
             subCam->fov = 55.0f;
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             break;
 
         case 3180:
@@ -598,13 +598,13 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             Play_SetCameraAtEye(play, subCamId, &spC0, &spB4);
             subCam->roll = 0;
             subCam->fov = 60.0f;
-            func_8002DF38(play, actor, PLAYER_CSMODE_1);
+            func_8002DF38(play, actor, PLAYER_CSACTION_1);
             break;
 
         case 3190:
             Play_ChangeCameraSetting(play, subCamId, CAM_SET_FOREST_DEFEAT_POE);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
-            func_8002DF38(play, actor, PLAYER_CSMODE_12);
+            func_8002DF38(play, actor, PLAYER_CSACTION_12);
             break;
 
         case 3230:
@@ -618,7 +618,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             Play_SetCameraAtEye(play, subCamId, &spC0, &spB4);
             subCam->roll = 0x1E;
             subCam->fov = 75.0f;
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             Actor_GetWorldPosShapeRot(&spA0, actor);
             Actor_GetFocus(&sp8C, &player->actor);
             spC0.x = sp8C.pos.x;
@@ -648,7 +648,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             Play_SetCameraAtEye(play, subCamId, &spC0, &spB4);
             subCam->roll = 0;
             subCam->fov = 45.0f;
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             break;
 
         case 3220:
@@ -665,7 +665,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             subCam->roll = 0;
             subCam->fov = 75.0f;
             player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = spD0.yaw + 0x7FFF;
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             break;
 
         case 3240:
@@ -674,13 +674,13 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80121D3C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80121D3C);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
 
         case 6001:
             Play_ChangeCameraSetting(play, subCamId, CAM_SET_CS_3);
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Actor_GetWorld(&spA0, actor);
             if (spA0.pos.z > -750.0f) {
                 OnePointCutscene_SetCsCamPoints(subCam, D_801208E8, D_801208E4, D_801206A0, D_80120820);
@@ -696,7 +696,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
 
         case 3400:
             Play_ChangeCameraSetting(play, subCamId, CAM_SET_CS_3);
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             OnePointCutscene_SetCsCamPoints(subCam, D_8012069C | 0x2000, D_80120698, D_801204D4, D_801205B4);
             OnePointCutscene_Vec3sToVec3f(&mainCam->eye, &D_801205B4[D_80120694 - 2].pos);
             OnePointCutscene_Vec3sToVec3f(&mainCam->at, &D_801204D4[D_80120694 - 2].pos);
@@ -713,13 +713,13 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80121DB4;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80121DB4);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
 
         case 3310:
             Play_ChangeCameraSetting(play, subCamId, CAM_SET_FIRE_STAIRCASE);
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_CopyCamera(play, subCamId, CAM_ID_MAIN);
 
             i = Quake_Request(subCam, QUAKE_TYPE_1);
@@ -754,7 +754,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80121FBC;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80121FBC);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
 
             i = Quake_Request(subCam, QUAKE_TYPE_3);
@@ -767,7 +767,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_8012205C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_8012205C);
 
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
 
@@ -783,7 +783,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
                 D_801220D4[1].eyeTargetInit.y = 80.0f;
                 D_801220D4[1].eyeTargetInit.x = -D_801220D4[1].eyeTargetInit.x;
             }
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
 
             csInfo->keyFrames = D_801220D4;
             csInfo->keyFrameCount = ARRAY_COUNT(D_801220D4);
@@ -795,7 +795,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_8012219C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_8012219C);
 
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
 
@@ -803,7 +803,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_801222B4;
             csInfo->keyFrameCount = ARRAY_COUNT(D_801222B4);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
 
             i = Quake_Request(subCam, QUAKE_TYPE_1);
@@ -816,7 +816,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_8012237C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_8012237C);
 
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
 
             i = Quake_Request(subCam, QUAKE_TYPE_1);
@@ -829,7 +829,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_801223CC;
             csInfo->keyFrameCount = ARRAY_COUNT(D_801223CC);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             player->stateFlags1 |= PLAYER_STATE1_29;
             player->actor.freezeTimer = 90;
@@ -844,7 +844,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_801224BC;
             csInfo->keyFrameCount = ARRAY_COUNT(D_801224BC);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
 
             i = Quake_Request(subCam, QUAKE_TYPE_1);
@@ -859,19 +859,19 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
 
             player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = 0x3FFC;
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             break;
 
         case 4110:
             csInfo->keyFrames = D_8012269C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_8012269C);
 
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
 
         case 4120:
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             D_80122714[1].timerInit = 80;
             csInfo->keyFrames = D_80122714;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80122714);
@@ -891,7 +891,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_801228A4;
             csInfo->keyFrameCount = ARRAY_COUNT(D_801228A4);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
@@ -900,7 +900,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_8012296C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_8012296C);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
@@ -909,7 +909,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80122A0C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80122A0C);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
@@ -918,7 +918,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80122A5C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80122A5C);
 
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
@@ -927,7 +927,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80122B9C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80122B9C);
 
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_8);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_8);
             Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
@@ -951,7 +951,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrameCount = ARRAY_COUNT(D_80122C3C);
 
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
-            func_8002DF38(play, &player->actor, PLAYER_CSMODE_1);
+            func_8002DF38(play, &player->actor, PLAYER_CSACTION_1);
 
             i = Quake_Request(subCam, QUAKE_TYPE_3);
             Quake_SetSpeed(i, 12000);
@@ -963,12 +963,12 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             csInfo->keyFrames = D_80122C8C;
             csInfo->keyFrameCount = ARRAY_COUNT(D_80122C8C);
 
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             Play_InitCameraDataUsingPlayer(play, subCamId, player, CAM_SET_CS_C);
             break;
 
         case 3260:
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             D_80122CB4[1].timerInit = timer - 5;
 
             csInfo->keyFrames = D_80122CB4;
@@ -978,7 +978,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
             break;
 
         case 3261:
-            func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+            func_8002DF54(play, NULL, PLAYER_CSACTION_8);
             D_80122D04[1].timerInit = timer - 10;
 
             csInfo->keyFrames = D_80122D04;
diff --git a/src/code/z_onepointdemo_data.inc.c b/src/code/z_onepointdemo_data.inc.c
index f88e9e39b..be16be1ce 100644
--- a/src/code/z_onepointdemo_data.inc.c
+++ b/src/code/z_onepointdemo_data.inc.c
@@ -121,7 +121,7 @@ static s16 D_801208E8 = 8;
 static OnePointCsFull D_801208EC[3] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0101,
         1,
         0,
@@ -182,7 +182,7 @@ static OnePointCsFull D_80120964[2] = {
 static OnePointCsFull D_801209B4[4] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0101,
         1,
         0,
@@ -193,7 +193,7 @@ static OnePointCsFull D_801209B4[4] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0100,
         29,
         0,
@@ -287,7 +287,7 @@ static OnePointCsFull D_80120ACC[5] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0442,
         10,
         0,
@@ -323,7 +323,7 @@ static OnePointCsFull D_80120ACC[5] = {
 static OnePointCsFull D_80120B94[11] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x2142,
         1,
         0,
@@ -447,7 +447,7 @@ static OnePointCsFull D_80120B94[11] = {
 static OnePointCsFull D_80120D4C[7] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x2142,
         1,
         0,
@@ -527,7 +527,7 @@ static OnePointCsFull D_80120D4C[7] = {
 static OnePointCsFull D_80120E64[8] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, true, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x2142,
         20,
         0,
@@ -618,7 +618,7 @@ static OnePointCsFull D_80120E64[8] = {
 static OnePointCsFull D_80120FA4[6] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x2143,
         30,
         0,
@@ -687,7 +687,7 @@ static OnePointCsFull D_80120FA4[6] = {
 static OnePointCsFull D_80121094[3] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x2101,
         20,
         0,
@@ -698,7 +698,7 @@ static OnePointCsFull D_80121094[3] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x2101,
         50,
         0,
@@ -723,7 +723,7 @@ static OnePointCsFull D_80121094[3] = {
 static OnePointCsFull D_8012110C[3] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_5),
         0x2142,
         1,
         0,
@@ -759,7 +759,7 @@ static OnePointCsFull D_8012110C[3] = {
 static OnePointCsFull D_80121184[2] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0101,
         40,
         0,
@@ -784,7 +784,7 @@ static OnePointCsFull D_80121184[2] = {
 static OnePointCsFull D_801211D4[2] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0101,
         50,
         0,
@@ -809,7 +809,7 @@ static OnePointCsFull D_801211D4[2] = {
 static OnePointCsFull D_80121224[6] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x4141,
         2,
         0,
@@ -831,7 +831,7 @@ static OnePointCsFull D_80121224[6] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_52),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_52),
         0x4104,
         80,
         0,
@@ -842,7 +842,7 @@ static OnePointCsFull D_80121224[6] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0000,
         20,
         0,
@@ -878,7 +878,7 @@ static OnePointCsFull D_80121224[6] = {
 static OnePointCsFull D_80121314[1] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x4141,
         1000,
         0,
@@ -892,7 +892,7 @@ static OnePointCsFull D_80121314[1] = {
 static OnePointCsFull D_8012133C[3] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0141,
         40,
         0,
@@ -928,7 +928,7 @@ static OnePointCsFull D_8012133C[3] = {
 static OnePointCsFull D_801213B4[5] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0xC2C2,
         40,
         0,
@@ -939,7 +939,7 @@ static OnePointCsFull D_801213B4[5] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0xC2C2,
         120,
         0,
@@ -950,7 +950,7 @@ static OnePointCsFull D_801213B4[5] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_83),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_83),
         0xC2C2,
         30,
         0,
@@ -961,7 +961,7 @@ static OnePointCsFull D_801213B4[5] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_69),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_69),
         0x4222,
         30,
         0,
@@ -986,7 +986,7 @@ static OnePointCsFull D_801213B4[5] = {
 static OnePointCsFull D_8012147C[4] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0101,
         40,
         0,
@@ -997,7 +997,7 @@ static OnePointCsFull D_8012147C[4] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0142,
         1,
         0,
@@ -1008,7 +1008,7 @@ static OnePointCsFull D_8012147C[4] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0142,
         89,
         -4,
@@ -1033,7 +1033,7 @@ static OnePointCsFull D_8012147C[4] = {
 static OnePointCsFull D_8012151C[2] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0101,
         29,
         0,
@@ -1058,7 +1058,7 @@ static OnePointCsFull D_8012151C[2] = {
 static OnePointCsFull D_8012156C[2] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_77),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_77),
         0x4242,
         1,
         0,
@@ -1097,7 +1097,7 @@ static OnePointCsFull D_801215BC[1] = {
 static OnePointCsFull D_801215E4[10] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x4141,
         20,
         0,
@@ -1108,7 +1108,7 @@ static OnePointCsFull D_801215E4[10] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0101,
         1,
         4,
@@ -1141,7 +1141,7 @@ static OnePointCsFull D_801215E4[10] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_9),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_9),
         0x0101,
         40,
         -5,
@@ -1152,7 +1152,7 @@ static OnePointCsFull D_801215E4[10] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0101,
         1,
         0,
@@ -1210,7 +1210,7 @@ static OnePointCsFull D_801215E4[10] = {
 static OnePointCsFull D_80121774[4] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0101,
         1,
         -2,
@@ -1221,7 +1221,7 @@ static OnePointCsFull D_80121774[4] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0142,
         39,
         2,
@@ -1232,7 +1232,7 @@ static OnePointCsFull D_80121774[4] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_5),
         0x0121,
         20,
         0,
@@ -1257,7 +1257,7 @@ static OnePointCsFull D_80121774[4] = {
 static OnePointCsFull D_80121814[4] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_76),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_76),
         0x0101,
         5,
         0,
@@ -1429,7 +1429,7 @@ static OnePointCsFull D_80121954[3][2] = {
 static OnePointCsFull D_80121A44[12] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_5),
         0x2121,
         10,
         0,
@@ -1440,7 +1440,7 @@ static OnePointCsFull D_80121A44[12] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, true, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x4242,
         30,
         0,
@@ -1462,7 +1462,7 @@ static OnePointCsFull D_80121A44[12] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_5),
         0x2222,
         40,
         5,
@@ -1473,7 +1473,7 @@ static OnePointCsFull D_80121A44[12] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x4242,
         40,
         5,
@@ -1517,7 +1517,7 @@ static OnePointCsFull D_80121A44[12] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x2242,
         40,
         0,
@@ -1528,7 +1528,7 @@ static OnePointCsFull D_80121A44[12] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, true, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x22C2,
         140,
         0,
@@ -1564,7 +1564,7 @@ static OnePointCsFull D_80121A44[12] = {
 static OnePointCsFull D_80121C24[7] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_5),
         0x0101,
         1,
         0,
@@ -1586,7 +1586,7 @@ static OnePointCsFull D_80121C24[7] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0101,
         40,
         4,
@@ -1724,7 +1724,7 @@ static OnePointCsFull D_80121DB4[9] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_57),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_57),
         0x2121,
         1,
         8,
@@ -1746,7 +1746,7 @@ static OnePointCsFull D_80121DB4[9] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_9, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_56),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_56),
         0x2121,
         149,
         -20,
@@ -1782,7 +1782,7 @@ static OnePointCsFull D_80121DB4[9] = {
 static OnePointCsFull D_80121F1C[4] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0101,
         10,
         0,
@@ -1804,7 +1804,7 @@ static OnePointCsFull D_80121F1C[4] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_2),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_2),
         0x2121,
         23,
         0,
@@ -1898,7 +1898,7 @@ static OnePointCsFull D_8012205C[3] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x21A1,
         10,
         0,
@@ -1912,7 +1912,7 @@ static OnePointCsFull D_8012205C[3] = {
 static OnePointCsFull D_801220D4[5] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0101,
         5,
         0,
@@ -2282,7 +2282,7 @@ static OnePointCsFull D_801224BC[7] = {
 static OnePointCsFull D_801225D4[5] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0101,
         1,
         0,
@@ -2293,7 +2293,7 @@ static OnePointCsFull D_801225D4[5] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_59),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_59),
         0x0101,
         60,
         4,
@@ -2315,7 +2315,7 @@ static OnePointCsFull D_801225D4[5] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x2323,
         2,
         0,
@@ -2492,7 +2492,7 @@ static OnePointCsFull D_801227B4[6] = {
 static OnePointCsFull D_801228A4[5] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0101,
         20,
         5,
@@ -2514,7 +2514,7 @@ static OnePointCsFull D_801228A4[5] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_8),
         0x0101,
         90,
         2,
@@ -2972,7 +2972,7 @@ static OnePointCsFull D_80122E44[2][7] = {
         },
         {
             ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false),
-            ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+            ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
             0x4343,
             160,
             10,
@@ -3051,7 +3051,7 @@ static OnePointCsFull D_80122E44[2][7] = {
         },
         {
             ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false),
-            ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+            ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
             0x4343,
             160,
             -10,
@@ -3254,7 +3254,7 @@ static OnePointCsFull D_80123254[2] = {
 static OnePointCsFull D_801232A4[1] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_69),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_69),
         0x0101,
         9999,
         0,
@@ -3384,7 +3384,7 @@ static OnePointCsFull D_80123394[5] = {
 static OnePointCsFull D_8012345C[4] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x4242,
         40,
         0,
@@ -3395,7 +3395,7 @@ static OnePointCsFull D_8012345C[4] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_77),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_77),
         0x4242,
         40,
         0,
@@ -3406,7 +3406,7 @@ static OnePointCsFull D_8012345C[4] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x2121,
         10,
         0,
@@ -3431,7 +3431,7 @@ static OnePointCsFull D_8012345C[4] = {
 static OnePointCsFull D_801234FC[5] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_5),
         0x0441,
         10,
         0,
@@ -3453,7 +3453,7 @@ static OnePointCsFull D_801234FC[5] = {
     },
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x0000,
         1,
         0,
@@ -3489,7 +3489,7 @@ static OnePointCsFull D_801234FC[5] = {
 static OnePointCsFull D_801235C4[5] = {
     {
         ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false),
-        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1),
+        ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSACTION_1),
         0x4141,
         1,
         0,
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 86687ca92..42644bbda 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -3816,7 +3816,7 @@ void Interface_Draw(PlayState* play) {
                                                 gSaveContext.subTimerState = SUBTIMER_STATE_RESPAWN;
                                                 gSaveContext.save.cutsceneIndex = 0;
                                                 Message_StartTextbox(play, 0x71B0, NULL);
-                                                func_8002DF54(play, NULL, PLAYER_CSMODE_8);
+                                                func_8002DF54(play, NULL, PLAYER_CSACTION_8);
                                             } else {
                                                 sSubTimerStateTimer = 40;
                                                 gSaveContext.subTimerState = SUBTIMER_STATE_STOP;
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 57fdfd532..a14934d2c 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -488,7 +488,7 @@ void Player_SetBootData(PlayState* play, Player* this) {
 }
 
 s32 Player_InBlockingCsMode(PlayState* play, Player* this) {
-    return (this->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_29)) || (this->csMode != PLAYER_CSMODE_NONE) ||
+    return (this->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_29)) || (this->csAction != PLAYER_CSACTION_NONE) ||
            (play->transitionTrigger == TRANS_TRIGGER_START) || (this->stateFlags1 & PLAYER_STATE1_0) ||
            (this->stateFlags3 & PLAYER_STATE3_7) ||
            ((gSaveContext.magicState != MAGIC_STATE_IDLE) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0));
@@ -578,7 +578,7 @@ void func_8008EC70(Player* this) {
 }
 
 void Player_SetEquipmentData(PlayState* play, Player* this) {
-    if (this->csMode != PLAYER_CSMODE_86) {
+    if (this->csAction != PLAYER_CSACTION_86) {
         this->currentShield = SHIELD_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD));
         this->currentTunic = TUNIC_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC));
         this->currentBoots = BOOTS_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS));