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

Decompile ST0 EntityRelicOrb #1633

Merged
merged 5 commits into from
Sep 21, 2024
Merged

Decompile ST0 EntityRelicOrb #1633

merged 5 commits into from
Sep 21, 2024

Conversation

bismurphy
Copy link
Collaborator

First working version of this.

Next steps will involve doing #ifdef to unify the function, but wanted to start by getting something in that matches by itself.

break;

case 5:
g_api.PlaySfx(0x618);
Copy link
Collaborator

Choose a reason for hiding this comment

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

SFX_UNK_618

break;

case 8:
isObtainedTextStored = self->ext.relicOrb.unk7C;
Copy link
Collaborator

Choose a reason for hiding this comment

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

I kind of think this should be renamed temp or something since it's reused but it's fine either way

Copy link
Owner

@Xeeynamo Xeeynamo left a comment

Choose a reason for hiding this comment

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

very minor stuff, but overall it looks good. I did not realise ST0 had its own EntityRelicOrb

msg = g_RelicOrbTexts[0];
} else {
ch = (ch << 8) | *msg++;
chPixSrc = g_api_func_80106A28(ch, 1);
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
chPixSrc = g_api_func_80106A28(ch, 1);
chPixSrc = g_api.func_80106A28(ch, 1);

I realised src/st/entity_relic_orb.h has the same issue

Comment on lines 45 to 47
case 0:

InitializeEntity(g_InitializeData0);
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
case 0:
InitializeEntity(g_InitializeData0);
case 0:
InitializeEntity(g_InitializeData0);

nit: let's try to avoid new empty lines when it does not make sense having them

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch, this was from a removed block of code that exists in the main EntityRelicOrb and is omitted from ST0.

@sozud sozud merged commit 1fbcf68 into Xeeynamo:master Sep 21, 2024
15 checks passed
@bismurphy bismurphy deleted the st0_relicorb branch September 21, 2024 02:32
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.

3 participants