port BaddieBiteEffect

LostArtefacts · Mar 7, 2021 · 18ecb01 · 18ecb01
1 parent 6788421
commit 18ecb01
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/docs/progress.svg b/docs/progress.svg
diff --git a/docs/progress.txt b/docs/progress.txt
@@ -882,7 +882,7 @@ S_StartSyncedAudio              0x00439030  0x000000FC  -
 TestCollision                   0x00439130  0x00000128  +
 GetSpheres                      0x00439260  0x000002EF  +
 GetJointAbsPosition             0x00439550  0x0000019C  +
-BaddieBiteEffect                0x004396F0  0x0000005D  *
+BaddieBiteEffect                0x004396F0  0x0000005D  +
 
 # text.cpp
 T_InitPrint                     0x00439750  0x00000022  +

diff --git a/src/game/sphere.c b/src/game/sphere.c
@@ -1,5 +1,6 @@
 #include "3dsystem/3d_gen.h"
 #include "game/draw.h"
+#include "game/effects.h"
 #include "game/sphere.h"
 #include "game/vars.h"
 #include "util.h"
@@ -183,9 +184,21 @@ void GetJointAbsPosition(ITEM_INFO* item, PHD_VECTOR* vec, int32_t joint)
     phd_PopMatrix();
 }
 
+void BaddieBiteEffect(ITEM_INFO* item, BITE_INFO* bite)
+{
+    PHD_VECTOR pos;
+    pos.x = bite->x;
+    pos.y = bite->y;
+    pos.z = bite->z;
+    GetJointAbsPosition(item, &pos, bite->mesh_num);
+    DoBloodSplat(
+        pos.x, pos.y, pos.z, item->speed, item->pos.y_rot, item->room_number);
+}
+
 void T1MInjectGameSphere()
 {
     INJECT(0x00439130, TestCollision);
     INJECT(0x00439260, GetSpheres);
     INJECT(0x00439550, GetJointAbsPosition);
+    INJECT(0x004396F0, BaddieBiteEffect);
 }
diff --git a/src/game/sphere.h b/src/game/sphere.h
@@ -4,13 +4,10 @@
 #include "game/types.h"
 #include <stdint.h>
 
-// clang-format off
-#define BaddieBiteEffect    ((void          (*)(ITEM_INFO *item, BITE_INFO *bite))0x004396F0)
-// clang-format on
-
 int32_t TestCollision(ITEM_INFO* item, ITEM_INFO* lara_item);
 int32_t GetSpheres(ITEM_INFO* item, SPHERE* slist, int32_t world_space);
 void GetJointAbsPosition(ITEM_INFO* item, PHD_VECTOR* vec, int32_t joint);
+void BaddieBiteEffect(ITEM_INFO* item, BITE_INFO* bite);
 
 void T1MInjectGameSphere();