zParCmd equivalent (#286)

* Work on zParCmd * zParCmd equivalent
bfbbdecomp · Jul 3, 2024 · 61f1fe2 · 61f1fe2
1 parent 9131fee
commit 61f1fe2
Show file tree

Hide file tree

Showing 5 changed files with 329 additions and 13 deletions.
diff --git a/configure.py b/configure.py
@@ -374,7 +374,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(Equivalent, "SB/Game/zMenu.cpp"),
             Object(NonMatching, "SB/Game/zMovePoint.cpp"),
             Object(NonMatching, "SB/Game/zMusic.cpp"),
-            Object(NonMatching, "SB/Game/zParCmd.cpp"),
+            Object(Equivalent, "SB/Game/zParCmd.cpp"),
             Object(Matching, "SB/Game/zParEmitter.cpp"),
             Object(NonMatching, "SB/Game/zPendulum.cpp"),
             Object(Matching, "SB/Game/zPickupTable.cpp"),

diff --git a/src/SB/Core/x/xBound.h b/src/SB/Core/x/xBound.h
@@ -37,6 +37,7 @@ void xBoundUpdate(xBound* b);
 void xBoundHitsBound(const xBound* a, const xBound* b, xCollis* c);
 void xRayHitsBound(const xRay3* r, const xBound* b, xCollis* c);
 void xSphereHitsBound(const xSphere* o, const xBound* b, xCollis* c);
+void xVecHitsBound(const xVec3* v, const xBound* b, xCollis* c);
 float32 xsqrt(float32 x);
 
-#endif
+#endif
diff --git a/src/SB/Core/x/xParCmd.h b/src/SB/Core/x/xParCmd.h
@@ -206,6 +206,12 @@ struct xParCmdRandomVelocityPar : xParCmdAsset
 
 // XPARCMD_TYPE_CUSTOM
 void xParCmdCustom_Update(xParCmd* c, xParGroup* ps, float32 dt);
+
+struct xParCmdCustom : xParCmdAsset // not in dwarf
+{
+    uint32 unknown;
+};
+
 void xParCmdCustom_Grass_Update(xParCmd* c, xParGroup* ps, float32 dt);
 
 // XPARCMD_TYPE_KILLDISTANCE
@@ -291,6 +297,11 @@ void xParCmdClipVolumes_Update(xParCmd* c, xParGroup* ps, float32 dt);
 // XPARCMD_TYPE_ANIMALMAGENTISM
 void xParCmdAnimalMagentism_Update(xParCmd* c, xParGroup* ps, float32 dt);
 
+struct xParCmdAnimalMagnetism : xParCmdAsset // not in dwarf
+{
+    float32 unknown;
+};
+
 // XPARCMD_TYPE_DAMAGEPLAYER
 void xParCmdDamagePlayer_Update(xParCmd* c, xParGroup* ps, float32 dt);
 
@@ -352,4 +363,4 @@ struct xParCmdCollideFallSticky : xParCmdCollideFall
     float32 sticky;
 };
 
-#endif
+#endif
diff --git a/src/SB/Game/zEntPlayer.h b/src/SB/Game/zEntPlayer.h
@@ -366,6 +366,7 @@ extern _CurrentPlayer gCurrentPlayer;
 void zEntPlayer_Load(xEnt*, xSerial*);
 
 int32 zEntPlayer_Damage(xBase* src, uint32 damage);
+int32 zEntPlayer_Damage(xBase* src, uint32 damage, const xVec3* knockback);
 
 uint32 WalkCheck(xAnimTransition* tran, xAnimSingle* anim, void* param_3);
 uint32 RunCheck(xAnimTransition* tran, xAnimSingle* anim, void* param_3);