Skip to content

d_a_obj_maki matching #2370

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 4 commits into from
Apr 3, 2025
+260 −327
Merged

d_a_obj_maki matching #2370

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66450af
Matching daObj_Maki_HIO_c::daObj_Maki_HIO_c()
tetrisdev Mar 27, 2025
d027124
more work on d_a_obj_maki
tetrisdev Apr 1, 2025
0f2dab7
d_a_obj_maki Matching
tetrisdev Apr 2, 2025
de1f46a
d_a_obj_maki matching
tetrisdev Apr 2, 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 @@ -2003,7 +2003,7 @@ def MatchingFor(*versions):
ActorRel(NonMatching, "d_a_obj_lv9SwShutter"),
ActorRel(Matching, "d_a_obj_magLift"),
ActorRel(NonMatching, "d_a_obj_magLiftRot"),
ActorRel(NonMatching, "d_a_obj_maki"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_maki"),
ActorRel(NonMatching, "d_a_obj_master_sword"),
ActorRel(NonMatching, "d_a_obj_mato"),
ActorRel(NonMatching, "d_a_obj_mhole"),
Expand Down
30 changes: 25 additions & 5 deletions include/d/actor/d_a_obj_maki.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#ifndef D_A_OBJ_MAKI_H
#define D_A_OBJ_MAKI_H

#include "f_op/f_op_actor_mng.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_cc_d.h"
#include "d/d_kankyo.h"
#include "d/d_particle.h"
#include "f_op/f_op_actor.h"

/**
* @ingroup actors-objects
Expand All @@ -12,16 +17,31 @@
*
*/
class obj_maki_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x730 - 0x568];
public:
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mModel1;
/* 0x574 */ mDoExt_brkAnm* mBrk;
/* 0x578 */ J3DModel* mModel2;
/* 0x57c */ u8 field_0x57c;
/* 0x57d */ char field_0x57d; // Undefined
/* 0x57e */ short field_0x57e;
/* 0x580 */ short field_0x580[2];
/* 0x584*/ dCcD_Stts mStts;
/* 0x5c0 */ dCcD_Sph mSph;
/* 0x6f8 */ u32 field_0x6f8[4];
/* 0x6fc */ char field_0x6fc[0x70c - 0x708]; // Undefined
/* 0x70c */ LIGHT_INFLUENCE mLightObj;
/* 0x72c */ u8 field_0x72c;
/* 0x72d */ char field_0x72d[0x730 - 0x72d]; //Undefined
Copy link
Copy Markdown
Contributor

@TakaRikka TakaRikka Apr 2, 2025

Choose a reason for hiding this comment

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

use s16 instead of short and u8 instead of char here

};

STATIC_ASSERT(sizeof(obj_maki_class) == 0x730);

class daObj_Maki_HIO_c {
public:
/* 80C8FE0C */ daObj_Maki_HIO_c();
/* 80C9089C */ ~daObj_Maki_HIO_c();
/* 80C9089C */ virtual ~daObj_Maki_HIO_c() {};

/* 0x04 */ s8 field_0x4;
};


Expand Down
Loading