Skip to content

d_a_obj_ihasi Matching #2373

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
TakaRikka merged 3 commits into from
Apr 4, 2025
Merged

d_a_obj_ihasi Matching #2373

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
9de9d45
d_a_obj_ihasi matching
ItsNiklas Apr 3, 2025
6a3ab4e
d_a_obj_ihasi cleanup
ItsNiklas Apr 3, 2025
b5371a7
d_a_obj_ihasi style
ItsNiklas Apr 4, 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 @@ -1921,7 +1921,7 @@ def MatchingFor(*versions):
ActorRel(NonMatching, "d_a_obj_ice_s"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_iceblock"),
ActorRel(NonMatching, "d_a_obj_iceleaf"),
ActorRel(NonMatching, "d_a_obj_ihasi"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ihasi"),
ActorRel(NonMatching, "d_a_obj_ikada"),
ActorRel(NonMatching, "d_a_obj_inobone"),
ActorRel(NonMatching, "d_a_obj_ita"),
Expand Down
21 changes: 17 additions & 4 deletions include/d/actor/d_a_obj_ihasi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#ifndef D_A_OBJ_IHASI_H
#define D_A_OBJ_IHASI_H

#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_phase.h"

#include "d/d_bg_w.h"
#include "f_op/f_op_actor.h"

/**
* @ingroup actors-objects
Expand All @@ -12,11 +15,21 @@
*
*/
class obj_ihasi_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x5c4 - 0x568];
public:
/* 0x568 */ request_of_phase_process_class mPhaseReq;
/* 0x570 */ J3DModel* mpModel1;
/* 0x574 */ J3DModel* mpModel2;
/* 0x578 */ mDoExt_btkAnm* mpBtkAnm;
/* 0x57C */ s16 field_0x57c;
/* 0x57E */ s16 mFlag1;
/* 0x580 */ s16 field_0x580;
/* 0x582 */ s16 mArr[2];
/* 0x586 */ s8 mFlag2;
/* 0x588 */ Mtx mMtx;
/* 0x5B8 */ dBgW* mpBgW;
/* 0x5BC */ u8 field_0x5bc[8];
};

STATIC_ASSERT(sizeof(obj_ihasi_class) == 0x5c4);


#endif /* D_A_OBJ_IHASI_H */
Loading