xEntDrive equivalent

configure.py

@@ -289,7 +289,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/x/xCutscene.cpp"),
             Object(NonMatching, "SB/Core/x/xDebug.cpp"),
             Object(Equivalent, "SB/Core/x/xEnt.cpp"),
-            Object(NonMatching, "SB/Core/x/xEntDrive.cpp"),
+            Object(Equivalent, "SB/Core/x/xEntDrive.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xEntMotion.cpp"),
             Object(Matching, "SB/Core/x/xEnv.cpp"),
             Object(Matching, "SB/Core/x/xEvent.cpp"),

src/SB/Core/gc/iTRC.cpp

@@ -3,74 +3,65 @@
 #include <types.h>
 #include <string.h>
 
-bool ROMFont::Init()
+namespace ResetButton
 {
+    bool mResetEnabled = 1;
+}
 
+bool ROMFont::Init()
+{
 }
 
 void ROMFont::InitGX()
 {
-
 }
 
 void ROMFont::InitVI()
 {
-
 }
 
 void ROMFont::RenderBegin()
 {
-
 }
 
 void ROMFont::RenderEnd()
 {
-
 }
 
 void ROMFont::SwapBuffers()
 {
-
 }
 
 void ROMFont::DrawCell(int, int, int, int)
 {
-
 }
 
 void GXEnd()
 {
-
 }
 
 void GXPosition3s16()
 {
-
 }
 
 void ROMFont::LoadSheet(void*)
 {
-
 }
 
 void GXSetTexCoordGen()
 {
-
 }
 
 void ROMFont::DrawString(int, int, char*)
 {
-
 }
 
 void ROMFont::GetWidth(char*)
 {
-
 }
 
 void ROMFont::DrawTextBox(int, int, int, int, char*)
 {
-
 }
 
 void ResetButton::EnableReset()
@@ -90,7 +81,6 @@ void ResetButton::SetSndKillFunction(void (*Func)())
 
 void ResetButton::CheckResetButton()
 {
-
 }
 
 bool iTRCDisk::Init(void)
@@ -140,20 +130,16 @@ void iTRCDisk::SetMovieResumeFunction(void (*Func)())
 
 bool iTRCDisk::IsDiskIDed()
 {
-
 }
 
 void iTRCDisk::DisplayErrorMessage()
 {
-
 }
 
 void iTRCDisk::SetDVDState()
 {
-
 }
 
 bool iTRCDisk::CheckDVDAndResetState()
 {
-
 }

src/SB/Core/gc/iTRC.h

@@ -23,7 +23,7 @@ namespace ROMFont
     void DrawString(int, int, char*);
     void GetWidth(char*);
     void DrawTextBox(int, int, int, int, char*);
-}
+} // namespace ROMFont
 
 // Yes, this is a namespace, not a class.
 namespace iTRCDisk
@@ -53,7 +53,6 @@ namespace iTRCDisk
 
 namespace ResetButton
 {
-    bool mResetEnabled;
     void (*mSndKill)();
 
     void EnableReset();

src/SB/Core/x/xCollide.h

@@ -6,20 +6,30 @@
 #include "xQuickCull.h"
 #include "iMath3.h"
 
+struct xModelInstance;
+
 struct xCollis
 {
     struct tri_data
     {
         U32 index;
         F32 r;
         F32 d;
+
+        tri_data& operator=(const tri_data& o)
+        {
+            index = o.index;
+            r = o.r;
+            d = o.d;
+            return *this;
+        };
     };
 
     U32 flags;
     U32 oid;
     void* optr;
     xModelInstance* mptr;
-    F32 dist; // 0x30
+    F32 dist; // 0x10
     xVec3 norm;
     xVec3 tohit;
     xVec3 depen;
@@ -116,5 +126,8 @@ void xParabolaEvalPos(const xParabola*, xVec3*, F32);
 void xParabolaEvalVel(const xParabola*, xVec3*, F32);
 
 void xVec3AddScaled(xVec3*, const xVec3*, F32);
+xVec3 xCollisTriHit(const xCollis::tri_data& tri, const xModelInstance& model);
+bool xModelAnimCollDirty(const xModelInstance& cm);
+void xModelAnimCollRefresh(const xModelInstance& cm);
 
 #endif