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

d_a_obj_waterPillar + d_a_obj_syRock Equivalent (weak ordering) #2281

Merged
merged 3 commits into from
Jan 3, 2025

Conversation

marwernerh
Copy link
Contributor

  • Added fake struct padding (comes before dEvLib_callback_c inheritance)
  • Basic documentation
  • Added fake Chk inlines to dBgS_Acch
  • Added AT_TYPE_100 to cCcD_ObjAtType

* Added fake struct padding
* Added fake Chk inlines to dBgS_Acch
* Added AT_TYPE_100 to cCcD_ObjAtType
* Deleted fake Chk inlines from dBgS_Acch
* Removed duplicated, but commented, static check for struct size
* Renamed two d_a_obj_waterPillar fields according to comments
Comment on lines 78 to 95
inline BOOL getArg0() {
return shape_angle.x & 0xF;
}

// Switch to determine whether or not the stalactite has been broken
inline u32 getSwBit1() {
return fopAcM_GetParamBit(this, 0, 8);
}

// Switch to determine whether or not the stalactite should be broken automatically when player is in range
inline u32 getSwBit2() {
return fopAcM_GetParamBit(this, 8, 8);
}

// Event ID for Midna to stop and note the stalactite that fell by itself
inline s32 getEvetID() {
return fopAcM_GetParamBit(this, 16, 8);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

not a major thing but just for future reference, functions you define in the class like this don't need the inline keyword. they will automatically be inlined

// NONMATCHING
// Set base transform matrix of current model and the background matrix both to the contents of now
mpModels[mIsUnbroken]->setBaseTRMtx(mDoMtx_stack_c::get());
PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
Copy link
Contributor

Choose a reason for hiding this comment

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

another minor thing, you can leave off the PS prefix and just use MTXCopy for example

@TakaRikka TakaRikka merged commit 960b08e into zeldaret:main Jan 3, 2025
1 check passed
@marwernerh marwernerh deleted the OBJ_WATERPILLAR branch January 3, 2025 22:59
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.

2 participants