All Changes

include/prop.h

@@ -87,7 +87,7 @@ typedef struct actorMarker_s{
     MarkerCollisionFunc dieFunc;
     s32         unk20;
     ActorUpdateFunc actorUpdateFunc;
-    s32         unk28;
+    s32         commonParticleIndex;
     u32         actrArrayIdx:11; //unk2C
     u32         pitch:9;
     u32         roll:9;
@@ -99,7 +99,7 @@ typedef struct actorMarker_s{
     s16         unk38[3];
     u16         pad3E_15:1;
     u16         modelId:13;
-    u16         unk3E_1:1;
+    u16         isBanjoOnTop: TRUE;
     u16         unk3E_0:1; //scaled
     u32         unk40_31:4;
     u32         unk40_27:4;
@@ -200,7 +200,7 @@ typedef struct actor_s{
     f32 unk74;
     u32 unk78_31:9;
     u32 unk78_22:9;
-    u32 unk78_13:12; //default_spawn_yaw?
+    u32 secondaryId:12; //default_spawn_yaw? This seems to be a different ID to differentiate actors that are the same- IE orange switches or tolls
     u32 stored_anctrl_forwards:1; //animCtrlDirection
     u32 stored_anctrl_smoothTransistion:1; //animCtrlSmoothTransition
     union
@@ -230,12 +230,13 @@ typedef struct actor_s{
     u32 unkF4_22:1;
     u32 initialized:1; //unkF4_21;
     u32 unkF4_20:12;
-    u32 unkF4_8:9; /* jinjo id in final fight.
+    u32 actorTypeSpecificField:9; /* jinjo id in final fight.
                     *  Is used to determine file progress related stuff, can also be a file_progress_e
+                    *  Also related to jigsaw pictures, as an id for each
                     */
     f32 stored_anctrl_subrangeMin; //animCtrl_SubRangeStart
     f32 stored_anctrl_subrangeMax; //animCtrl_SubRangeEnd
-    ActorMarker *unk100; // child actor marker ?
+    ActorMarker *partnerActor; // child actor marker ? Calling this "partner" since it seems to relate to actors that are "paired" and not necessarily parent/child
     ActorMarker *unk104;
     Struct62s *unk108;
     // void ( *unk108)(struct actorMarker_s *, s32); //saved from marker->collisionFunc