From c497f4685d25841d74bd017741e74a5059c49b6f Mon Sep 17 00:00:00 2001 From: Joey Ballentine Date: Fri, 21 Feb 2025 17:33:37 -0600 Subject: [PATCH 1/3] Un-extern some strings --- src/SB/Game/zLightning.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/SB/Game/zLightning.cpp b/src/SB/Game/zLightning.cpp index c0a5f69ff..1041c73bb 100644 --- a/src/SB/Game/zLightning.cpp +++ b/src/SB/Game/zLightning.cpp @@ -12,16 +12,13 @@ extern RwRaster* sLightningRaster; extern xVec3 sTweakStart; extern xVec3 sTweakEnd; -extern char stringBase0[]; - void xDebugAddTweak(const char*, F32*, F32, F32, const tweak_callback*, void*, U32) { } void lightningTweakChangeType(const tweak_info& t) { - // "Lightning|\x01Type Info" - xDebugRemoveTweak(stringBase0 + 0x18); + xDebugRemoveTweak("Lightning|\x01Type Info" + 0x18); switch (gLightningTweakAddInfo.type) { @@ -29,22 +26,17 @@ void lightningTweakChangeType(const tweak_info& t) break; case 1: - // "Lightning|\x01Type Info|Setup Degrees" - xDebugAddTweak(stringBase0 + 0x2d, &gLightningTweakAddInfo.setup_degrees, -1e9, 1e9, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Setup Degrees" + 0x18, &gLightningTweakAddInfo.setup_degrees, -1e9, 1e9, NULL, NULL, 2); - // "Lightning|\x01Type Info|Move Degrees" - xDebugAddTweak(stringBase0 + 0x50, &gLightningTweakAddInfo.move_degrees, -1e9, 1e9, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Move Degrees" + 0x18, &gLightningTweakAddInfo.move_degrees, -1e9, 1e9, NULL, NULL, 2); break; case 2: - // "Lightning|\x01Type Info|Normal Offset" - xDebugAddTweak(stringBase0 + 0x72, &gLightningTweakAddInfo.zeus_normal_offset, -100.0, 100.0, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Normal Offset" + 0x18, &gLightningTweakAddInfo.zeus_normal_offset, -100.0, 100.0, NULL, NULL, 2); - // "Lightning|\x01Type Info|Back Offset" - xDebugAddTweak(stringBase0 + 0x95, &gLightningTweakAddInfo.zeus_back_offset, -100.0, 100.0, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Back Offset" + 0x18, &gLightningTweakAddInfo.zeus_back_offset, -100.0, 100.0, NULL, NULL, 2); - // "Lightning|\x01Type Info|Side Offset" - xDebugAddTweak(stringBase0 + 0xb6, &gLightningTweakAddInfo.zeus_side_offset, 0.0, 100.0, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Side Offset" + 0x18, &gLightningTweakAddInfo.zeus_side_offset, 0.0, 100.0, NULL, NULL, 2); break; } } From db11ab35bcb5008daf554f7a7c59074cf10bfc25 Mon Sep 17 00:00:00 2001 From: Joey Ballentine Date: Fri, 21 Feb 2025 20:23:23 -0600 Subject: [PATCH 2/3] Use different syntax --- src/SB/Game/zLightning.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SB/Game/zLightning.cpp b/src/SB/Game/zLightning.cpp index 1041c73bb..b53ea9ede 100644 --- a/src/SB/Game/zLightning.cpp +++ b/src/SB/Game/zLightning.cpp @@ -18,7 +18,7 @@ void xDebugAddTweak(const char*, F32*, F32, F32, const tweak_callback*, void*, U void lightningTweakChangeType(const tweak_info& t) { - xDebugRemoveTweak("Lightning|\x01Type Info" + 0x18); + xDebugRemoveTweak(&"Lightning|\x01Type Info"[0x18]); switch (gLightningTweakAddInfo.type) { @@ -26,17 +26,17 @@ void lightningTweakChangeType(const tweak_info& t) break; case 1: - xDebugAddTweak("Lightning|\x01Type Info|Setup Degrees" + 0x18, &gLightningTweakAddInfo.setup_degrees, -1e9, 1e9, NULL, NULL, 2); + xDebugAddTweak(&"Lightning|\x01Type Info|Setup Degrees"[0x18], &gLightningTweakAddInfo.setup_degrees, -1e9, 1e9, NULL, NULL, 2); - xDebugAddTweak("Lightning|\x01Type Info|Move Degrees" + 0x18, &gLightningTweakAddInfo.move_degrees, -1e9, 1e9, NULL, NULL, 2); + xDebugAddTweak(&"Lightning|\x01Type Info|Move Degrees"[0x18], &gLightningTweakAddInfo.move_degrees, -1e9, 1e9, NULL, NULL, 2); break; case 2: - xDebugAddTweak("Lightning|\x01Type Info|Normal Offset" + 0x18, &gLightningTweakAddInfo.zeus_normal_offset, -100.0, 100.0, NULL, NULL, 2); + xDebugAddTweak(&"Lightning|\x01Type Info|Normal Offset"[0x18], &gLightningTweakAddInfo.zeus_normal_offset, -100.0, 100.0, NULL, NULL, 2); - xDebugAddTweak("Lightning|\x01Type Info|Back Offset" + 0x18, &gLightningTweakAddInfo.zeus_back_offset, -100.0, 100.0, NULL, NULL, 2); + xDebugAddTweak(&"Lightning|\x01Type Info|Back Offset"[0x18], &gLightningTweakAddInfo.zeus_back_offset, -100.0, 100.0, NULL, NULL, 2); - xDebugAddTweak("Lightning|\x01Type Info|Side Offset" + 0x18, &gLightningTweakAddInfo.zeus_side_offset, 0.0, 100.0, NULL, NULL, 2); + xDebugAddTweak(&"Lightning|\x01Type Info|Side Offset"[0x18], &gLightningTweakAddInfo.zeus_side_offset, 0.0, 100.0, NULL, NULL, 2); break; } } From 9d2ad482df1dade3d916665344b39675a833ac1e Mon Sep 17 00:00:00 2001 From: Joey Ballentine Date: Sat, 22 Feb 2025 08:57:15 -0600 Subject: [PATCH 3/3] This appears to be more correct --- src/SB/Game/zLightning.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/SB/Game/zLightning.cpp b/src/SB/Game/zLightning.cpp index b53ea9ede..d790890e9 100644 --- a/src/SB/Game/zLightning.cpp +++ b/src/SB/Game/zLightning.cpp @@ -12,13 +12,15 @@ extern RwRaster* sLightningRaster; extern xVec3 sTweakStart; extern xVec3 sTweakEnd; +char* _ = "Line"; + void xDebugAddTweak(const char*, F32*, F32, F32, const tweak_callback*, void*, U32) { } void lightningTweakChangeType(const tweak_info& t) { - xDebugRemoveTweak(&"Lightning|\x01Type Info"[0x18]); + xDebugRemoveTweak("Lightning|\x01Type Info"); switch (gLightningTweakAddInfo.type) { @@ -26,17 +28,17 @@ void lightningTweakChangeType(const tweak_info& t) break; case 1: - xDebugAddTweak(&"Lightning|\x01Type Info|Setup Degrees"[0x18], &gLightningTweakAddInfo.setup_degrees, -1e9, 1e9, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Setup Degrees", &gLightningTweakAddInfo.setup_degrees, -1e9, 1e9, NULL, NULL, 2); - xDebugAddTweak(&"Lightning|\x01Type Info|Move Degrees"[0x18], &gLightningTweakAddInfo.move_degrees, -1e9, 1e9, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Move Degrees", &gLightningTweakAddInfo.move_degrees, -1e9, 1e9, NULL, NULL, 2); break; case 2: - xDebugAddTweak(&"Lightning|\x01Type Info|Normal Offset"[0x18], &gLightningTweakAddInfo.zeus_normal_offset, -100.0, 100.0, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Normal Offset", &gLightningTweakAddInfo.zeus_normal_offset, -100.0, 100.0, NULL, NULL, 2); - xDebugAddTweak(&"Lightning|\x01Type Info|Back Offset"[0x18], &gLightningTweakAddInfo.zeus_back_offset, -100.0, 100.0, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Back Offset", &gLightningTweakAddInfo.zeus_back_offset, -100.0, 100.0, NULL, NULL, 2); - xDebugAddTweak(&"Lightning|\x01Type Info|Side Offset"[0x18], &gLightningTweakAddInfo.zeus_side_offset, 0.0, 100.0, NULL, NULL, 2); + xDebugAddTweak("Lightning|\x01Type Info|Side Offset", &gLightningTweakAddInfo.zeus_side_offset, 0.0, 100.0, NULL, NULL, 2); break; } }