Skip to content

zLightning: Match Progress #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JoshSanch wants to merge 5 commits into
base: main
Choose a base branch
from
+256 −112
Draft

zLightning: Match Progress #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16af448
zLightning: Match non-function data
JoshSanch Dec 20, 2025
8176d70
zLightning: Partial match on zLightning_Update
JoshSanch Dec 20, 2025
26daaf9
xDebug: Migrate add tweak weak functions
JoshSanch Dec 21, 2025
efb16d3
zLightning: 90% match on zLightningInit
JoshSanch Dec 21, 2025
95b4248
Migrate all remaining tweak debug func definitions to xDebug header
JoshSanch Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]),
Expand All @@ -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"),
Expand Down Expand Up @@ -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"),
Expand Down
6 changes: 0 additions & 6 deletions src/SB/Core/x/xCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
31 changes: 29 additions & 2 deletions src/SB/Core/x/xDebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions src/SB/Game/zFX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,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);
Expand Down
3 changes: 0 additions & 3 deletions src/SB/Game/zFX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading