Skip to content

d_a_obj_zdoor matching #2334

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.

Sign up for GitHub

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

Merged
hatal175 merged 3 commits into from
Mar 20, 2025
Merged

d_a_obj_zdoor matching #2334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50b3634
Fully matching
Mar 19, 2025
e5eec79
Fix PR comments
Mar 19, 2025
4eb9ede
Fix PR comments (rename parameter in callback functions)
Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2133,7 +2133,7 @@ def MatchingFor(*versions):
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_yel_bag"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ystone"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zcloth"),
ActorRel(NonMatching, "d_a_obj_zdoor"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zdoor"),
ActorRel(NonMatching, "d_a_obj_zrTurara"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zrTuraraRock"),
ActorRel(Equivalent, "d_a_obj_zraMark"), # weak func order
Expand Down
11 changes: 5 additions & 6 deletions include/d/actor/d_a_obj_zdoor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,16 @@ class daZdoor_c : public dBgS_MoveBgActor {

u32 getType() { return fopAcM_GetParamBit(this, 0, 4); }

private:
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ dBgS_ObjAcch mObjAcch;
/* 0x784 */ dBgS_AcchCir mAcchCir;
/* 0x7C4 */ dCcD_Stts mStts;
/* 0x800 */ dCcD_Cyl field_0x800[4];
/* 0xCF0 */ dCcD_Cyl field_0xcf0;
/* 0xE2C */ s16 field_0xe2c;
/* 0xE2E */ s16 field_0xe2e;
/* 0xE30 */ u8 field_0xe30;
/* 0x800 */ dCcD_Cyl mCallbackCylinders[4];
/* 0xCF0 */ dCcD_Cyl mCylinder;
/* 0xE2C */ s16 mOpenSpeed;
/* 0xE2E */ s16 mOpenAngle;
/* 0xE30 */ u8 mDoorType;
};

STATIC_ASSERT(sizeof(daZdoor_c) == 0xE34);
Expand Down
Loading