player unions (#1453)

1 files changed, 9 insertions, 5 deletions

diff --git a/include/z64player.h b/include/z64player.h
index a5f268627..fac153052 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -1151,9 +1151,9 @@ typedef struct Player {
     /* 0x3AC */ Vec3f unk_3AC;
     /* 0x3B8 */ u16 unk_3B8;
     /* 0x3BA */ union {
-                    s16 doorBgCamIndex;
-                    s16 unk_3BA; // When in a cutscene, boolean to determine if `PLAYER_STATE1_20000000` is set
-                };
+                    s16 haltActorsDuringCsAction; // If true, halt actors belonging to certain categories during a `csAction`
+                    s16 doorBgCamIndex; // `BgCamIndex` used during a sliding door and spiral staircase cutscenes
+                } cv; // "Cutscene Variable": context dependent variable that has different meanings depending on what function is called
     /* 0x3BC */ s16 subCamId;
     /* 0x3BE */ char unk_3BE[2];
     /* 0x3C0 */ Vec3f unk_3C0;
@@ -1221,8 +1221,12 @@ typedef struct Player {
     /* 0xADE */ u8 unk_ADE;
     /* 0xADF */ s8 unk_ADF[4]; // Circular buffer used for testing for triggering a quickspin
     /* 0xAE3 */ s8 unk_AE3[4]; // Circular buffer used for ?
-    /* 0xAE7 */ s8 actionVar1; // context dependent variable that has different meanings depending on what action is currently running
-    /* 0xAE8 */ s16 actionVar2; // context dependent variable that has different meanings depending on what action is currently running
+    /* 0xAE7 */ union { 
+        s8 actionVar1;
+    } av1; // "Action Variable 1": context dependent variable that has different meanings depending on what action is currently running
+    /* 0xAE8 */ union { 
+        s16 actionVar2;
+    } av2; // "Action Variable 2": context dependent variable that has different meanings depending on what action is currently running
     /* 0xAEC */ f32 unk_AEC;
     /* 0xAF0 */ union {
                     Vec3f unk_AF0[2];