Skip to content

d_a_obj_stairBlock OK and linked #2656

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 1 commit into from
Sep 14, 2025
Merged

d_a_obj_stairBlock OK and linked #2656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -2158,7 +2158,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_obj_spinLift"),
ActorRel(NonMatching, "d_a_obj_ss_drink"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ss_item"),
ActorRel(NonMatching, "d_a_obj_stairBlock"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_stairBlock"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stone"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stopper"),
ActorRel(NonMatching, "d_a_obj_stopper2"),
Expand Down
34 changes: 22 additions & 12 deletions include/d/actor/d_a_obj_stairBlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef D_A_OBJ_STAIRBLOCK_H
#define D_A_OBJ_STAIRBLOCK_H

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

/**
Expand All @@ -14,27 +16,35 @@
class daStairBlock_c : public fopAc_ac_c {
public:
/* 80CE81F4 */ void setBaseMtx();
/* 80CE82A0 */ void CreateHeap();
/* 80CE83F0 */ void create();
/* 80CE8874 */ void createHeapCallBack(fopAc_ac_c*);
/* 80CE88A0 */ void Execute();
/* 80CE8B24 */ void Draw();
/* 80CE8C08 */ void Delete();
/* 80CE82A0 */ virtual int CreateHeap();
/* 80CE83F0 */ int create();
/* 80CE8874 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80CE88A0 */ virtual int Execute();
/* 80CE8B24 */ virtual int Draw();
/* 80CE8C08 */ virtual int Delete();

static u8 const mCcDObjInfo[48];
static u8 mCcDSph[64];
static dCcD_SrcGObjInf const mCcDObjInfo;
static dCcD_SrcSph mCcDSph;

private:
/* 0x568 */ u8 field_0x568[0x132c - 0x568];
/* 0x056C */ request_of_phase_process_class mPhaseReq;
/* 0x0574 */ J3DModel* mpModel[10];
/* 0x059C */ mDoExt_bckAnm mBckAnm[10];
/* 0x06B4 */ u8 mHit[10];
/* 0x06C0 */ dCcD_Stts mStts;
/* 0x06FC */ dCcD_Sph mSpheres[10];
};

STATIC_ASSERT(sizeof(daStairBlock_c) == 0x132c);

class daStairBlock_HIO_c {
class daStairBlock_HIO_c : public mDoHIO_entry_c {
public:
/* 80CE816C */ daStairBlock_HIO_c();
/* 80CE8CDC */ ~daStairBlock_HIO_c();
};
/* 80CE8CDC */ virtual ~daStairBlock_HIO_c() {}

void genMessage(JORMContext*);

/* 0x4 */ f32 collision_radius[10];
}; // Size: 0x2C

#endif /* D_A_OBJ_STAIRBLOCK_H */
Loading