Merge branch 'master' into 'document/level-setup-related-code'

# Conflicts: # src/core2/nc/dynamicCam12.c
2024-10-20 05:05:12 +00:00
parent c9e87f0363 4c916bdaca
commit 85e682f349
355 changed files with 3866 additions and 3828 deletions
--- a/include/prop.h
+++ b/include/prop.h
@@ -155,7 +155,7 @@ typedef struct actor_s{
    u32 state:6; /* unk10_31*/
    u32 unk10_25:7;
    u32 unk10_18:6;
-    u32 unk10_12:4;
+    u32 unk10_12:4; // number of defeated enemies in SM attack tutorial
    u32 unk10_8:1;
    u32 unk10_7:1;
    u32 unk10_6:2;
@@ -186,7 +186,7 @@ typedef struct actor_s{
    f32 unk4C;
    /* 0x50 */ f32 yaw; //0x50
    f32 unk54; //0x54
-    u32 unk58_31: 15;
+    u32 animctrl_asset_id: 15; // animation asset id (enum asset_id)
    u32 stored_animctrl_index: 14; //animctrlAnimIndex;
    u32 unk58_2: 1;
    u32 unk58_1: 1;