Merge branch 'main' into doc/cutscene_index

include/z64.h

@@ -389,12 +389,18 @@ ALIGNED(4) typedef struct PreNmiBuff {
 } PreNmiBuff; // size = 0x18 (actually osAppNMIBuffer is 0x40 bytes large but the rest is unused)
 
 typedef enum ViModeEditState {
+#if OOT_VERSION < PAL_1_0
     /* -2 */ VI_MODE_EDIT_STATE_NEGATIVE_2 = -2,
     /* -1 */ VI_MODE_EDIT_STATE_NEGATIVE_1,
+    /*  0 */ VI_MODE_EDIT_STATE_INACTIVE,
+    /*  1 */ VI_MODE_EDIT_STATE_2, // active, more adjustments
+    /*  2 */ VI_MODE_EDIT_STATE_3  // active, more adjustments, print comparison with NTSC LAN1 mode
+#else
     /*  0 */ VI_MODE_EDIT_STATE_INACTIVE,
     /*  1 */ VI_MODE_EDIT_STATE_ACTIVE,
     /*  2 */ VI_MODE_EDIT_STATE_2, // active, more adjustments
     /*  3 */ VI_MODE_EDIT_STATE_3  // active, more adjustments, print comparison with NTSC LAN1 mode
+#endif
 } ViModeEditState;
 
 typedef struct ViMode {

include/z64actor.h

@@ -146,8 +146,9 @@ typedef struct ActorShape {
 //
 #define ACTOR_FLAG_10 (1 << 10)
 
-//
-#define ACTOR_FLAG_ENKUSA_CUT (1 << 11)
+// A clump of grass (EN_KUSA) has been destroyed.
+// This flag is used to communicate with the spawner actor (OBJ_MURE).
+#define ACTOR_FLAG_GRASS_DESTROYED (1 << 11)
 
 // Actor will not shake when a quake occurs
 #define ACTOR_FLAG_IGNORE_QUAKE (1 << 12)
@@ -155,11 +156,11 @@ typedef struct ActorShape {
 //
 #define ACTOR_FLAG_13 (1 << 13)
 
-//
-#define ACTOR_FLAG_14 (1 << 14)
+// When hit by an arrow, the actor will be able to attach to the arrow and fly with it in the air
+#define ACTOR_FLAG_CAN_ATTACH_TO_ARROW (1 << 14)
 
-//
-#define ACTOR_FLAG_15 (1 << 15)
+// Actor is currently attached to an arrow and flying with it in the air
+#define ACTOR_FLAG_ATTACHED_TO_ARROW (1 << 15)
 
 // Player automatically accepts a Talk Offer without needing to press the A button.
 // Player still has to meet all conditions to be able to receive a talk offer (for example, being in range).