pat boss progress

bfbbdecomp · Jul 20, 2024 · 6a1d06c · 6a1d06c
1 parent 67d49c0
commit 6a1d06c
Show file tree

Hide file tree

Showing 11 changed files with 1,317 additions and 107 deletions.
diff --git a/src/SB/Core/x/xEnt.h b/src/SB/Core/x/xEnt.h
@@ -180,7 +180,7 @@ struct xEnt : xBase
     xShadowSimpleCache* simpShadow;
     xEntShadow* entShadow;
     anim_coll_data* anim_coll;
-    void* user_data;
+    void* user_data; // 0xCC
 };
 
 // collision types

diff --git a/src/SB/Core/x/xMath3.h b/src/SB/Core/x/xMath3.h
@@ -121,6 +121,7 @@ void xMat3x3Scale(xMat3x3* m, const xVec3* s);
 void xMat3x3ScaleC(xMat3x3* m, F32 x, F32 y, F32 z);
 void xMat3x3RMulRotY(xMat3x3* o, const xMat3x3* m, F32 t);
 void xMat3x3Mul(xMat3x3* o, const xMat3x3* a, const xMat3x3* b);
+void xMat3x3SMul(xMat3x3*, const xMat3x3*, F32);
 void xBoxFromLine(xBox& box, const xLine3& line);
 void xBoxFromRay(xBox& box, const xRay3& ray);
 void xMat3x3Identity(xMat3x3* matrix);

diff --git a/src/SB/Core/x/xModel.h b/src/SB/Core/x/xModel.h
@@ -135,6 +135,7 @@ void xModelAnimCollStart(xModelInstance& m);
 void xModelSetFrame(xModelInstance* modelInst, const xMat4x3* frame);
 xModelInstance* xModelInstanceAlloc(RpAtomic* data, void* object, U16 flags, U8 boneIndex,
                                     U8* boneRemap);
+void xModelInstanceFree(xModelInstance* modelInst);
 void xModelInstanceAttach(xModelInstance* inst, xModelInstance* parent);
 void xModelRender(xModelInstance* modelInst);
 void xModelRender2D(const xModelInstance& model, const basic_rect<F32>& r, const xVec3& from,

diff --git a/src/SB/Game/zGlobals.h b/src/SB/Game/zGlobals.h
@@ -210,7 +210,7 @@ struct zPlayerGlobals
     F32 IdleSitTimer;
     S32 Transparent;
     zEnt* FireTarget;
-    U32 ControlOff;
+    U32 ControlOff; // 0x1788
     U32 ControlOnEvent;
 
     // Offset: 0x1790

diff --git a/src/SB/Game/zLightning.h b/src/SB/Game/zLightning.h
@@ -101,14 +101,14 @@ void zLightningKill(zLightning* l);
 void RenderLightning(zLightning* l);
 void zLightningRender();
 void zLightningModifyEndpoints(zLightning* l, xVec3* start, xVec3* end);
-void xDebugAddTweak(char* name, U8* property, U8 param_3, U8 param_4,
-                    tweak_callback* callback, void* param_6, U32 param_7);
+void xDebugAddTweak(char* name, U8* property, U8 param_3, U8 param_4, tweak_callback* callback,
+                    void* param_6, U32 param_7);
 void xDebugAddFlagTweak(char* name, U32* property, U32 param_3, tweak_callback* callback,
                         void* param_5, U32 param_6);
-void xDebugAddSelectTweak(char* name, U32* param_2, char** param_3, U32* param_4,
-                          U32 param_5, tweak_callback* callback, void* param_7, U32 param_8);
-void xDebugAddTweak(char* name, S16* property, S16 param_3, S16 param_4,
-                    tweak_callback* callback, void* param_6, U32 param_7);
+void xDebugAddSelectTweak(char* name, U32* param_2, char** param_3, U32* param_4, U32 param_5,
+                          tweak_callback* callback, void* param_7, U32 param_8);
+void xDebugAddTweak(char* name, S16* property, S16 param_3, S16 param_4, tweak_callback* callback,
+                    void* param_6, U32 param_7);
 
 void zLightningInit();
 void zLightningUpdate(F32 seconds);

diff --git a/src/SB/Game/zNPCTypeBoss.cpp b/src/SB/Game/zNPCTypeBoss.cpp
@@ -11,6 +11,10 @@
 
 U32 g_hash_bossanim[ANIM_COUNT] = {};
 
+void foo(zNPCBPatrick* pat)
+{
+}
+
 // clang-format off
 char* g_strz_bossanim[ANIM_COUNT] =
 {