zLightning: Match Progress (#712)

* zLightning: Match non-function data

* zLightning: Partial match on zLightning_Update

* xDebug: Migrate add tweak weak functions

* zLightning: 90% match on zLightningInit

* Migrate all remaining tweak debug func definitions to xDebug header

* zLightning: Reorder FindFreeLightning; Close match on zLightningAdd

* xClimate: Import zParEmitter header

* zLightning: Match improvements for local scoping and zLightningInit

* zLightning: 70% match WIP for UpdateLightning

Author: JoshSanch

configure.py

@@ -417,7 +417,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Core/x/xCollide.cpp",  extra_cflags=["-sym on"]),
             Object(Matching, "SB/Core/x/xCollideFast.cpp"),
             Object(Matching, "SB/Core/x/xColor.cpp"),
-            Object(Matching, "SB/Core/x/xCounter.cpp"),
+            Object(Matching, "SB/Core/x/xCounter.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xCutscene.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xDebug.cpp", extra_cflags=["-sym on"]),
             Object(Equivalent, "SB/Core/x/xEnt.cpp", extra_cflags=["-sym on"]),
@@ -435,7 +435,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Core/x/xHudFontMeter.cpp"),
             Object(NonMatching, "SB/Core/x/xHudMeter.cpp"),
             Object(Equivalent, "SB/Core/x/xHudModel.cpp", extra_cflags=["-sym on"]),
-            Object(NonMatching, "SB/Core/x/xHudUnitMeter.cpp"),
+            Object(NonMatching, "SB/Core/x/xHudUnitMeter.cpp", extra_cflags=["-sym on   "]),
             Object(Matching, "SB/Core/x/xIni.cpp"),
             Object(NonMatching, "SB/Core/x/xMath.cpp"),
             Object(Matching, "SB/Core/x/xMath2.cpp"),
@@ -498,7 +498,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Game/zLasso.cpp"),
             Object(NonMatching, "SB/Game/zLight.cpp"),
             Object(Matching, "SB/Game/zLightEffect.cpp"),
-            Object(NonMatching, "SB/Game/zLightning.cpp"),
+            Object(NonMatching, "SB/Game/zLightning.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zLOD.cpp"),
             Object(NonMatching, "SB/Game/zMain.cpp"),
             Object(Equivalent, "SB/Game/zMenu.cpp"),

src/SB/Core/x/xClimate.h

@@ -3,9 +3,9 @@
 
 #include <types.h>
 #include "xVec3.h"
+#include "zParEmitter.h"
 
 struct xEnvAsset;
-struct zParEmitter;
 
 extern const float snow_life;
 

src/SB/Core/x/xCounter.cpp

@@ -152,9 +152,3 @@ int xCounterEventCB(xBase*, xBase* to, U32 toEvent, const F32*, xBase*)
 
     return 1;
 }
-
-// TODO: move to xDebug.cpp
-inline void xDebugRemoveTweak(const char*)
-{
-    return;
-}

src/SB/Core/x/xDebug.h

@@ -95,9 +95,36 @@ void xDebugUpdate();
 void xDebugExit();
 void xDebugTimestampScreen();
 
-void xDebugAddTweak(const char*, F32*, F32, F32, const tweak_callback*, void*, U32);
-void xDebugRemoveTweak(const char*);
+inline void xDebugRemoveTweak(const char*)
+{
+}
+
 void xDebugUpdate();
 
+inline void xDebugAddTweak(const char*, F32*, F32, F32, const tweak_callback*, void*, U32)
+{
+}
+
+inline void xDebugAddTweak(const char*, S16*, S16, S16, const tweak_callback*, void*, U32)
+{
+}
+
+inline void xDebugAddTweak(const char*, U8*, U8, U8, const tweak_callback*, void*, U32)
+{
+}
+
+inline void xDebugAddTweak(const char*, const char*, const tweak_callback*, void*, U32)
+{
+}
+
+
+inline void xDebugAddFlagTweak(const char*, U32*, U32, const tweak_callback*, void*, U32)
+{
+}
+
+inline void xDebugAddSelectTweak(const char*, U32*, const char**, const U32*, U32, const tweak_callback*,
+                          void*, U32)
+{
+}
 
 #endif

src/SB/Game/zFX.cpp

@@ -356,11 +356,6 @@ void zFXGooUpdate(F32 dt)
     }
 }
 
-void xDebugAddTweak(const char* unk1, const char* unk2, const tweak_callback* unk3, void* unk4,
-                    U32 unk5)
-{
-}
-
 xVec3& xVec3::up_normalize()
 {
     return safe_normalize(xVec3::m_UnitAxisY);

src/SB/Game/zFX.h

@@ -84,9 +84,6 @@ void update_poppers(F32 dt);
 
 void update_entrails(F32 dt);
 
-void xDebugAddTweak(const char* unk1, const char* unk2, const tweak_callback* unk3, void* unk4,
-                    U32 unk5);
-
 xFXRing* zFXMuscleArmWave(const xVec3* pos);
 
 void zFX_SpawnBubbleTrail(const xVec3*, unsigned int);