Skip to content
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.

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

Match Jetski::HandleClick #1380

Merged
merged 4 commits into from
Feb 2, 2025

Conversation

jonschz
Copy link
Collaborator

@jonschz jonschz commented Feb 1, 2025

Closes #1368. The BETA10 match cannot be improved significantly since it has been changed a lot.

m_unk0x160 = ((DuneBuggy::GetColorOffset(g_varJSWNSHY5) * 5 + 15) * 2);
m_unk0x160 += DuneBuggy::GetColorOffset(g_varJSFRNTY5);
MxS32 local8 = DuneBuggy::GetColorOffset(g_varJSWNSHY5);
m_unk0x160 = 10 * (local8 + 3);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use the constants from the actions header here. I believe it's the base offset 40 + local8*10 iirc. The compiler will change the math to the same assembly

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean to use JetskiScript::c_Jetski_Actor for the 3? Not sure what you have in mind for the 10.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try IsleScript::c_JetskiFuelMeter + (local8 - 1) * 10 (untested)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you look at the constants in that header it should become clearer

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the hint! While your suggestion matches LEGO1, it does not match BETA10, unfortunately. I have commented what the code does and also cleaned things up a little. While I was at it, I also (roughly) decompiled the BETA10 version - it still has one issue which may be entropy related.

@jonschz jonschz merged commit bc0344a into isledecomp:master Feb 2, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Match Jetski::HandleClick
2 participants