Skip to content

Un-extern some strings in zLightningTweakChangeType #413

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

Merged
SquareMan merged 3 commits into from
Feb 23, 2025
Merged

Un-extern some strings in zLightningTweakChangeType #413

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c497f46
Un-extern some strings
joeyballentine Feb 21, 2025
db11ab3
Use different syntax
joeyballentine Feb 22, 2025
9d2ad48
This appears to be more correct
joeyballentine Feb 22, 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
20 changes: 7 additions & 13 deletions src/SB/Game/zLightning.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,33 @@ extern RwRaster* sLightningRaster;
extern xVec3 sTweakStart;
extern xVec3 sTweakEnd;

extern char stringBase0[];
char* _ = "Line";

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");

switch (gLightningTweakAddInfo.type)
{
case 0:
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", &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", &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", &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", &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", &gLightningTweakAddInfo.zeus_side_offset, 0.0, 100.0, NULL, NULL, 2);
break;
}
}
Expand Down