start decompiling zNPCGoalRobo, Fodder code

bfbbdecomp · Jul 3, 2024 · 188cae5 · 188cae5
1 parent d6c11ca
commit 188cae5
Show file tree

Hide file tree

Showing 10 changed files with 760 additions and 18 deletions.
diff --git a/src/SB/Core/x/xBehaviour.h b/src/SB/Core/x/xBehaviour.h
@@ -127,10 +127,10 @@ struct xPsyche : RyzMemData
 
 struct xGoal : xListItem<xGoal>, xFactoryInst
 {
-    xPsyche* psyche;
+    xPsyche* psyche; // 0x18
     int32 goalID;
     en_GOALSTATE stat;
-    int32 flg_able;
+    int32 flg_able; // 0x24
     xGoalProcessCallback fun_process;
     xGoalPreCalcCallback fun_precalc;
     xGoalChkRuleCallback fun_chkRule;
@@ -197,4 +197,4 @@ struct xGoal : xListItem<xGoal>, xFactoryInst
     ~xGoal(); // prevents implicit destructors from being generated in subclasses of xGoal
 };
 
-#endif
+#endif
diff --git a/src/SB/Core/x/xModel.h b/src/SB/Core/x/xModel.h
@@ -46,11 +46,11 @@ struct xModelInstance
 
     // Offset: 0x40
     void* Object;
-    uint16 Flags;
-    uint8 BoneCount;
-    uint8 BoneIndex;
-    uint8* BoneRemap;
-    RwMatrix* Mat;
+    uint16 Flags; // 0x44
+    uint8 BoneCount; // 0x46
+    uint8 BoneIndex; // 0x47
+    uint8* BoneRemap; // 0x48
+    RwMatrix* Mat; // 0x4C
 
     // Offset: 0x50
     xVec3 Scale;

diff --git a/src/SB/Game/zGlobals.h b/src/SB/Game/zGlobals.h
@@ -148,7 +148,7 @@ struct zPlayerGlobals
 
     // 0x16AC in globals
     uint32 Visible;
-    uint32 Health;
+    uint32 Health; // 0x16b0
     int32 Speed;
     float32 SpeedMult;
     int32 Sneak;
@@ -172,7 +172,7 @@ struct zPlayerGlobals
     float32 ScareTimer;
     xBase* ScareSource;
     float32 CowerTimer;
-    float32 DamageTimer;
+    float32 DamageTimer; // 0x1708
     float32 SundaeTimer;
     float32 ControlOffTimer;
     float32 HelmetTimer;

diff --git a/src/SB/Game/zNPCGoalCommon.h b/src/SB/Game/zNPCGoalCommon.h
@@ -9,11 +9,11 @@
 
 struct zNPCGoalCommon : xGoal
 {
-    int32 flg_npcgauto;
+    int32 flg_npcgauto; // 0x3c
     int32 flg_npcgable;
     uint32 anid_played;
-    int32 flg_info : 16;
-    int32 flg_user : 16;
+    int32 flg_info : 16; // 0x48
+    int32 flg_user : 16; // 0x4a
 
     zNPCGoalCommon(int32 goalID);