Mark some files as matching (#293)

* Mark xEnv as matching * Mark xEvent as matching
bfbbdecomp · Jul 6, 2024 · 8cf0e9d · 8cf0e9d
1 parent 6c678cf
commit 8cf0e9d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/configure.py b/configure.py
@@ -291,8 +291,8 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/x/xEnt.cpp"),
             Object(NonMatching, "SB/Core/x/xEntDrive.cpp"),
             Object(NonMatching, "SB/Core/x/xEntMotion.cpp"),
-            Object(NonMatching, "SB/Core/x/xEnv.cpp"),
-            Object(NonMatching, "SB/Core/x/xEvent.cpp"), # breaks build
+            Object(Matching, "SB/Core/x/xEnv.cpp"),
+            Object(Matching, "SB/Core/x/xEvent.cpp"),
             Object(NonMatching, "SB/Core/x/xFFX.cpp"),
             Object(Equivalent, "SB/Core/x/xFog.cpp"),
             Object(NonMatching, "SB/Core/x/xFont.cpp"),

diff --git a/src/SB/Core/x/xEnv.cpp b/src/SB/Core/x/xEnv.cpp
@@ -1,7 +1,6 @@
 #include "xEnv.h"
 
-// TODO: move from xEntMotion.s
-extern xEnv* gCurXEnv;
+xEnv* gCurXEnv;
 
 void xEnvLoadBsp(xEnv* env, const void* data, uint32 datasize, int32 dataType)
 {

diff --git a/src/SB/Core/x/xEvent.cpp b/src/SB/Core/x/xEvent.cpp
@@ -6,6 +6,8 @@
 
 #include "zScene.h"
 
+int8 zEventLogBuf[256][20];
+
 void zEntEvent(char* to, uint32 toEvent)
 {
     uint32 id = xStrHash(to);