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

Misc FAKE fixes #1783

Open
wants to merge 40 commits into
base: main
Choose a base branch
from
Open

Misc FAKE fixes #1783

wants to merge 40 commits into from

Conversation

hensldm
Copy link
Collaborator

@hensldm hensldm commented Jan 7, 2025

Tried going through and fixing things marked as FAKE.
Note there are some that I couldn't fully fix, but was able to find a way to match with an if (1) instead. In those cases I did change them to imo the better fake match.

@@ -1687,9 +1687,8 @@ PlayerExplosive Player_GetExplosiveHeld(Player* player) {
PlayerSword Player_SwordFromIA(Player* player, PlayerItemAction itemAction) {
PlayerSword sword = PLAYER_SWORD_KOKIRI;

//! FAKE:
if ((itemAction == PLAYER_IA_LAST_USED) ||
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Note I just removed the fake label here as I actually don't think this is a fake.

//! FAKE:
// https://decomp.me/scratch/JrEnl
Matrix_MultVec3f(&(init->elements + i)->dim.vtx[j], &sp54[j]);
Matrix_MultVec3f(init->elements[i].dim.vtx + j, &sp54[j]);
Copy link
Collaborator Author

@hensldm hensldm Jan 7, 2025

Choose a reason for hiding this comment

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

Looks better (though might still be considered a fake). Note this matches what was already in func_809CE068 in BgSpdweb

//! FAKE:
csId = CutsceneManager_GetAdditionalCsId(this->csIdList[i] = csId);
// clang-format off
this->csIdList[i] = csId; \
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Perhaps still a fake, but I prefer this over what it was. Possibly a macro of some kind?

@hensldm hensldm removed the Needs-first-approval First approval label Jan 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants