Skip to content

d_a_obj_swpush equivalent #2589

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 5 commits into from
Aug 18, 2025
Merged

d_a_obj_swpush equivalent #2589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31e035e
initial work
carter-ktb21 Aug 15, 2025
089900d
Create method done
carter-ktb21 Aug 15, 2025
91b3023
tiny work
carter-ktb21 Aug 16, 2025
7296f05
more work
carter-ktb21 Aug 16, 2025
ecd9eba
swpush equivalent
carter-ktb21 Aug 17, 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 @@ -1498,7 +1498,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_obj_carry"),
ActorRel(NonMatching, "d_a_obj_ito"),
ActorRel(NonMatching, "d_a_obj_movebox"),
ActorRel(NonMatching, "d_a_obj_swpush"),
ActorRel(Equivalent, "d_a_obj_swpush"), # weak func order
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_timer"),
ActorRel(MatchingFor("GZ2E01"), "d_a_path_line"),
ActorRel(NonMatching, "d_a_scene_exit"),
Expand Down
192 changes: 157 additions & 35 deletions include/d/actor/d_a_obj_swpush.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#ifndef D_A_OBJ_SWPUSH_H
#define D_A_OBJ_SWPUSH_H

#include "f_op/f_op_actor_mng.h"
#include "d/d_a_obj.h"
#include "d/d_bg_w_sv.h"
#include "d/d_com_inf_game.h"

/**
* @ingroup actors-objects
Expand All @@ -11,25 +13,93 @@
* @details This is a multi-purpose depression switch actor.
* Used by: Gold Pressure Switch, Lakebed Pressure Switch
*
*/
class daObjSwpush : public fopAc_ac_c {
public:
class Act_c {
*/
namespace daObjSwpush {
enum AttrFlag_e {
FLAG_OBEY_SAVE = 0x1,
FLAG_STAY_PRESSED = 0x2,
FLAG_IS_TOGGLE = 0x4,
FLAG_REQ_HEAVY = 0x8,
FLAG_ON_IS_UP = 0x10,
FLAG_UNK20 = 0x20,
};

class Hio_c {
public:
class Attr_c {
public:
/* § 踏みスイッチ §\n - Foot Switch */
/* 0x00 */ AttrFlag_e flags;
/* 0x04 */ f32 scale;
/* 0x08 */ f32 draw_spring; // draw_spring
/* 0x0C */ f32 draw_resist; // draw_resist
/* 0x10 */ f32 draw_down_spd0; // draw_down_spd0
/* 0x14 */ f32 draw_pypcon_acc; // draw_pypcon_acc
/* 0x18 */ s16 bg_time_lag; // bg_time_lag
/* 0x1A */ s16 able_push_time_any; // able_push_time_any
/* 0x1C */ s16 able_push_time_heavy; // able_push_time_heavy
/* 0x1E */ s16 able_ride_time_middle; // able_ride_time_middle
/* 0x20 */ f32 step_up_space; // step_up_space
/* 0x24 */ f32 step_down_space; // step_down_space
/* 0x28 */ s16 demo_run_time; // demo_run_time
/* 0x2A */ u8 field_0x2a;
/* 0x2B */ u8 field_0x2b;
};
};

class Act_c : public fopAc_ac_c {
public:
struct Prm_e {};
enum Prm_e {
/* 0x00 */ PRM_0_e,
/* 0x01 */ PRM_1_e,
/* 0x03 */ PRM_3_e = 0x3,
/* 0x04 */ PRM_4_e,
/* 0x08 */ PRM_8_e = 0x8,
/* 0x10 */ PRM_10_e = 0X10,
/* 0x18 */ PRM_18_e = 0x18,
/* 0x1D */ PRM_1D_e = 0x1D,
};

enum Mode_e {
MODE_UPPER = 0,
MODE_U_L = 1,
MODE_LOWER = 2,
MODE_L_U = 3
};

enum DemoMode_e {
DEMO_MODE_NON = 0,
DEMO_MODE_REQ_PAUSE = 1,
DEMO_MODE_RUN_PAUSE = 2,
DEMO_MODE_REQ_SW = 3,
DEMO_MODE_RUN_SW = 4
};

const Hio_c::Attr_c& attr() const { return M_attr[mType]; }
u8 prmZ_get_swSave2() const { return mPrmZ & 0xFF; }
int prm_get_couple() const { return daObj::PrmAbstract(this, PRM_1_e, PRM_1D_e); }
u8 prm_get_evId() const { return daObj::PrmAbstract(this, PRM_8_e, PRM_0_e); }
int prm_get_mdl() const { return daObj::PrmAbstract(this, PRM_4_e, PRM_10_e); }
int prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_8_e, PRM_8_e); }
int prm_get_type() const { return daObj::PrmAbstract(this, PRM_3_e, PRM_18_e); }
bool is_switch() { return fopAcM_isSwitch(this, prm_get_swSave()); }
void fopAcM_revSwitch(fopAc_ac_c* i_actor, int param) { dComIfGs_revSwitch(param, fopAcM_GetHomeRoomNo(i_actor)); }
void rev_switch() { fopAcM_revSwitch(this, prm_get_swSave()); }
void off_switch() { fopAcM_offSwitch(this, prm_get_swSave()); }
void on_switch() { fopAcM_onSwitch(this, prm_get_swSave()); }

/* 80482D4C */ void prmZ_init();
/* 80482D7C */ void is_switch2() const;
/* 80482DC4 */ void solidHeapCB(fopAc_ac_c*);
/* 80482DE8 */ void create_heap();
/* 80482FE8 */ void create_res_load();
/* 80483038 */ void Mthd_Create();
/* 8048348C */ void Mthd_Delete();
/* 80482D7C */ bool is_switch2() const;
/* 80482DC4 */ static BOOL solidHeapCB(fopAc_ac_c*);
/* 80482DE8 */ bool create_heap();
/* 80482FE8 */ cPhs__Step create_res_load();
/* 80483038 */ cPhs__Step Mthd_Create();
/* 8048348C */ int Mthd_Delete();
/* 804834E8 */ void set_mtx();
/* 80483534 */ void init_mtx();
/* 80483570 */ void set_btp_frame();
/* 80483574 */ void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
/* 804839B4 */ void jnodeCB(J3DJoint*, int);
/* 80483574 */ static void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
/* 804839B4 */ static int jnodeCB(J3DJoint*, int);
/* 80483A5C */ void calc_top_pos();
/* 80483B70 */ void top_bg_aim_req(f32, s16);
/* 80483B7C */ void set_push_flag();
Expand All @@ -52,32 +122,84 @@ class daObjSwpush : public fopAc_ac_c {
/* 804847B4 */ void demo_reqSw();
/* 80484828 */ void demo_runSw_init();
/* 80484834 */ void demo_runSw();
/* 80484890 */ void check_ride_couple(s16);
/* 804848D8 */ void nr_ride_people(char);
/* 80484908 */ void Mthd_Execute();
/* 80484BB8 */ void Mthd_Draw();
/* 80484890 */ bool check_ride_couple(s16);
/* 804848D8 */ int nr_ride_people(char);
/* 80484908 */ int Mthd_Execute();
/* 80484BB8 */ int Mthd_Draw();

static u8 const M_bmd[6 + 2 /* padding */];
static u8 const M_dzb[6 + 2 /* padding */];
static u8 const M_heap_size[12];
static u8 const M_attr[220];
static u32 const M_op_vtx;
static void* M_arcname[3];
static s16 const M_bmd[3];
static s16 const M_dzb[3];
static u32 const M_heap_size[3];
static Hio_c::Attr_c const M_attr[5];
static u8 const M_op_vtx[4];
static char* M_arcname[3];

/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ dBgWSv* mpBgW;
/* 0x574 */ Mtx mMtx;
/* 0x5A4 */ f32 field_0x5a4;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ int mType;
/* 0x5B0 */ int mMode;
/* 0x5B4 */ int mDemoMode;
/* 0x5B8 */ s16 mPauseTimer;
/* 0x5BA */ s16 mEventID;
/* 0x5BC */ u16 mPrmZ;
/* 0x5BE */ bool mPrmZInit;
/* 0x5BF */ u8 mVibTimer;
/* 0x5C0 */ u8 mRidingMode;
/* 0x5C1 */ bool mPrevRiding;
/* 0x5C2 */ s16 mMiniPushTimer;
/* 0x5C4 */ bool mMiniPushFlg;
/* 0x5C5 */ u8 field_0x5c5;
/* 0x5C6 */ bool mHeavyRiding;
/* 0x5C7 */ bool mPrevHeavyRiding;
/* 0x5C8 */ s16 mPushTimer;
/* 0x5CA */ bool mPushFlg;
/* 0x5CB */ bool mChangingState;
/* 0x5CC */ f32 mTargetHFrac;
/* 0x5D0 */ f32 mCurHFrac;
/* 0x5D4 */ f32 mSpeed;
/* 0x5D8 */ f32 field_0x5d8;
/* 0x5DC */ f32 field_0x5dc;
/* 0x5E0 */ s16 field_0x5e0;
/* 0x5E4 */ f32 field_0x5e4;
/* 0x5E8 */ f32 field_0x5e8;
/* 0x5EC */ f32 mTopPos;
/* 0x5F0 */ s16 mDebounceTimer;
/* 0x5F2 */ s8 field_0x5f2;
/* 0x5F3 */ u8 field_0x5f3;
/* 0x5F4 */ u8 mMdl;
/* 0x5F8 */ cXyz field_0x5f8;
};

private:
/* 0x568 */ u8 field_0x568[0x604 - 0x568];
};
#ifdef DEBUG
class Hio_c : public JORReflexible {
public:
void ct() {
if (mCount++ == 0) {
daObj::HioVarious_c::init(this, "踏みスイッチ"); // Foot Switch
}
}

STATIC_ASSERT(sizeof(daObjSwpush) == 0x604);
void default_set() {
for (int i = 0; i < 5; i++) {
field_0x8[i] = Act_c::M_attr[i];
}
}

struct daObj {
public:
template <typename A1>
void PrmAbstract(/* ... */);
/* 80484CE4 */ /* daObj::PrmAbstract<daObjSwpush::Act_c::Prm_e> */
void func_80484CE4(void* _this, fopAc_ac_c const*, daObjSwpush::Act_c::Prm_e,
daObjSwpush::Act_c::Prm_e);
void dt() {
if (--mCount == 0) {
daObj::HioVarious_c::clean(this);
}
}

/* 0x4 */ int mCount;
/* 0x8 */ Attr_c field_0x8[5];
};
#endif
};

STATIC_ASSERT(sizeof(daObjSwpush::Act_c) == 0x604);

#endif /* D_A_OBJ_SWPUSH_H */
3 changes: 3 additions & 0 deletions include/d/d_bg_w.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ class cBgW : public dBgW_Base {
bool ChkRoofRegist() { return field_0x91 & 4;}
cBgD_Vtx_t* GetVtxTbl() const { return pm_vtx_tbl; }
int GetVtxNum() const { return pm_bgd->m_v_num; }
void ClrNoCalcVtx() { mFlags &= ~NO_CALC_VTX_e; }
void SetBaseMtxP(MtxP mtx) { pm_base = mtx; }
void SetNoCalcVtx() { mFlags |= NO_CALC_VTX_e; }

public:
/* 0x18 */ MtxP pm_base; // Model Matrix
Expand Down
4 changes: 4 additions & 0 deletions include/d/d_com_inf_game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2105,6 +2105,10 @@ inline void dComIfGs_offTransformLV(int i_no) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().offTransformLV(i_no);
}

inline void dComIfGs_revSwitch(int i_no, int i_roomNo) {
g_dComIfG_gameInfo.info.revSwitch(i_no, i_roomNo);
}

void dComIfGp_setSelectItem(int index);
s32 dComIfGp_offHeapLockFlag(int flag);
void dComIfGp_createSubExpHeap2D();
Expand Down
Loading