Skip to content

d_a_obj_laundry_rope Matching #2464

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 7 commits into from
May 31, 2025
Merged

d_a_obj_laundry_rope Matching #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
953078f
Add create implementation
ArnautS Apr 18, 2025
6159ee6
Add create_init
ArnautS Apr 25, 2025
2380845
Almost all matching
ArnautS May 30, 2025
006f11d
Full match
ArnautS May 30, 2025
8d20bc6
Matching laundry rope
ArnautS May 30, 2025
2158966
Cleanup
ArnautS May 30, 2025
03043d9
Fix PR comments
ArnautS May 31, 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 @@ -1948,7 +1948,7 @@ def MatchingFor(*versions):
ActorRel(Equivalent, "d_a_obj_kwheel01"), # weak func order
ActorRel(NonMatching, "d_a_obj_kznkarm"),
ActorRel(Equivalent, "d_a_obj_laundry"), # weak func order
ActorRel(NonMatching, "d_a_obj_laundry_rope"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_laundry_rope"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lbox"),
ActorRel(NonMatching, "d_a_obj_lp"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv1Candle00"),
Expand Down
55 changes: 52 additions & 3 deletions include/d/actor/d_a_obj_laundry_rope.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
#ifndef D_A_OBJ_LAUNDRY_ROPE_H
#define D_A_OBJ_LAUNDRY_ROPE_H

#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor.h"

struct daObjLndRope_Attr_c {
f32 mGravity;
f32 field_0x4;
f32 field_0x8;
f32 field_0xc;
f32 field_0x10;
};

struct daObjLndRope_Hio_c {
f32 mGravity;
f32 field_0x4;
f32 field_0x8;
f32 field_0xc;
f32 field_0x10;
};

/**
* @ingroup actors-objects
Expand All @@ -18,10 +35,42 @@ class daObjLndRope_c : public fopAc_ac_c {
/* 80C52890 */ void setBaseMtx();
/* 80C528E0 */ void setNormalRopePos();

static u8 const M_attr[20];
inline ~daObjLndRope_c();
inline int create();
inline int createHeap();
inline int draw();
inline int execute();
inline u8 getPathId();
inline cXyz* getRopeStartPos();
inline float getStartRate(cXyz* param_1);


#ifdef DEBUG
const daObjLndRope_Hio_c* attr() const {
return &M_Hio;
};
#else
const daObjLndRope_Attr_c* attr() const {
return &mAttr;
};
#endif

static const daObjLndRope_Attr_c mAttr;
static const daObjLndRope_Hio_c M_Hio;

private:
/* 0x568 */ u8 field_0x568[0x1774 - 0x568];
/* 0x0568 */ mDoExt_3DlineMat1_c mRopeMat;
/* 0x05a4 */ request_of_phase_process_class mPhase;
/* 0x05ac */ Mtx mMtx;
/* 0x05dc */ dCcD_Stts mStts;
/* 0x0618 */ dCcD_Sph mSphs[13];
/* 0x15f0 */ cXyz mPositions1[13];
/* 0x168c */ cXyz mPositions2[13];
/* 0x1728 */ fpc_ProcID mProcIds[13];
/* 0x175c */ cXyz mPos;
/* 0x1768 */ f32 mScale;
/* 0x176c */ f32 mSegmentLength;
/* 0x1770 */ u8 mFlag;
};

STATIC_ASSERT(sizeof(daObjLndRope_c) == 0x1774);
Expand Down
Loading