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

Decompiled ovl_Obj_Bombiwa #13

Merged
merged 4 commits into from
Mar 20, 2020
Merged

Decompiled ovl_Obj_Bombiwa #13

merged 4 commits into from
Mar 20, 2020

Conversation

Thar0
Copy link
Contributor

@Thar0 Thar0 commented Mar 20, 2020

Bombiwa


static void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx)
{
ObjBombiwa* thisLocal = this;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Im assuming this temp is needed to match? If it could just be pad I think it'd look cleaner, but oh well if not.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That is required unfortunately, padding doesn't match

0x00, 0x00, 0x00, 0x00,
0x00, 0x01, 0x01, 0x00,
0x0037, 0x0046, 0x0000,
0x0000, 0x0000, 0x0000
Copy link
Collaborator

Choose a reason for hiding this comment

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

I believe we want to start adding trailing commas to multi-line arrays, but confirm with roman

if ((Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) != 0))
{
Actor_Kill(&this->actor);
return;
Copy link
Collaborator

Choose a reason for hiding this comment

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

I believe you could get rid of this return and make the block below and else of the outer if

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't really agree with removing this return since the blocks have such wildly different sizes. I think it looks cleaner this way.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think its better in the sense that you can scan the code and quickly realize that it is an if else. Personally dont feel like the aesthetics of the code block sizes should matter for that

func_80078884(NA_SE_SY_CORRECT_CHIME);
}
Actor_Kill(&this->actor);
return;
Copy link
Collaborator

Choose a reason for hiding this comment

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

same here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will remove this return though.

@fig02 fig02 merged commit 9c9ad61 into zeldaret:master Mar 20, 2020
@Thar0 Thar0 deleted the ovl_Obj_Bombiwa branch March 31, 2020 22:12
AngheloAlf pushed a commit to AngheloAlf/oot that referenced this pull request Feb 17, 2022
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