encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

link d_a_obj_lv6SwGate (#2740)

Browse Source 
* link d_a_obj_lv6SwGate

* retrigger build

* resolving suggestions
This commit is contained in:
roeming
2025-10-17 18:27:09 +03:00
committed by GitHub
parent 43bf8abf48
commit 071e69e78a
3 changed files with 306 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -2086,7 +2086,7 @@ config.libs = [
ActorRel(Equivalent, "d_a_obj_lv6ChangeGate"), # weak func order ActorRel(Equivalent, "d_a_obj_lv6ChangeGate"), # weak func order
ActorRel(NonMatching, "d_a_obj_lv6FurikoTrap"), ActorRel(NonMatching, "d_a_obj_lv6FurikoTrap"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6Lblock"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6Lblock"),
ActorRel(NonMatching, "d_a_obj_lv6SwGate"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6SwGate"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6SzGate"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6SzGate"),
ActorRel(NonMatching, "d_a_obj_lv6Tenbin"), ActorRel(NonMatching, "d_a_obj_lv6Tenbin"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6TogeRoll"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6TogeRoll"),
include/d/actor/d_a_obj_lv6SwGate.h
+37 -13
View File
@@ -1,7 +1,9 @@
#ifndef D_A_OBJ_LV6SWGATE_H #ifndef D_A_OBJ_LV6SWGATE_H
#define D_A_OBJ_LV6SWGATE_H #define D_A_OBJ_LV6SWGATE_H
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_movebg_actor.h"
/** /**
* @ingroup actors-objects * @ingroup actors-objects
@@ -11,13 +13,13 @@
* @details * @details
* *
*/ */
class daLv6SwGate_c : public fopAc_ac_c { class daLv6SwGate_c : public dBgS_MoveBgActor {
public: public:
/* 80C74004 */ void setBaseMtx(); /* 80C74004 */ void setBaseMtx();
/* 80C74158 */ void CreateHeap(); /* 80C74158 */ int CreateHeap();
/* 80C7429C */ void create(); /* 80C7429C */ int create();
/* 80C74720 */ void isSwitch(); /* 80C74720 */ u8 isSwitch();
/* 80C7476C */ void Execute(Mtx**); /* 80C7476C */ int Execute(Mtx**);
/* 80C74A3C */ void moveGate(); /* 80C74A3C */ void moveGate();
/* 80C74B48 */ void init_modeWait(); /* 80C74B48 */ void init_modeWait();
/* 80C74B54 */ void modeWait(); /* 80C74B54 */ void modeWait();
@@ -27,22 +29,44 @@ public:
/* 80C74C94 */ void modeClose(); /* 80C74C94 */ void modeClose();
/* 80C74DBC */ void init_modeBreak(); /* 80C74DBC */ void init_modeBreak();
/* 80C74E40 */ void modeBreak(); /* 80C74E40 */ void modeBreak();
/* 80C7524C */ void Draw(); /* 80C7524C */ int Draw();
/* 80C752F8 */ void Delete(); /* 80C752F8 */ int Delete();
static u8 const mCcDObjInfo[48]; int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
static u8 mCcDCyl[68]; int getSwState() { return fopAcM_GetParamBit(this, 12, 4); }
int getSw2() { return fopAcM_GetParamBit(this, 16, 8); }
static const dCcD_SrcGObjInf mCcDObjInfo;
static dCcD_SrcCyl mCcDCyl;
private: private:
/* 0x568 */ u8 field_0x568[0x14f8 - 0x568]; /* 0x5A0 */ dCcD_Stts mCcStts;
/* 0x5DC */ dCcD_Cyl mCcDCyls[12];
/* 0x14AC */ request_of_phase_process_class mPhase;
/* 0x14B4 */ J3DModel* mModel1;
/* 0x14B8 */ J3DModel* mModel2;
/* 0x14BC */ u8 mMode;
/* 0x14BD */ u8 mUnderlyingSwitchState;
/* 0x14BE */ u8 mUnderylingSwitch;
/* 0x14BE */ u8 mIsSwitch;
/* 0x14C0 */ f32 mMovementAmount;
/* 0x14C4 */ dBgW* mpBgW;
/* 0x14C8 */ Mtx mMtx;
}; };
STATIC_ASSERT(sizeof(daLv6SwGate_c) == 0x14f8); STATIC_ASSERT(sizeof(daLv6SwGate_c) == 0x14f8);
class daLv6SwGate_HIO_c { class daLv6SwGate_HIO_c : public fOpAcm_HIO_entry_c {
public: public:
/* 80C73F0C */ daLv6SwGate_HIO_c(); /* 80C73F0C */
/* 80C75434 */ ~daLv6SwGate_HIO_c(); daLv6SwGate_HIO_c();
void genMessage(JORMContext*);
/* 0x8 */ float mSpeed;
/* 0xC */ float mMaximumSpeed;
/* 0x10 */ float mAcceleration;
/* 0x14 */ float mMovementAmount;
/* 0x18 */ u8 unk18; // UNUSED
}; };
src/d/actor/d_a_obj_lv6SwGate.cpp
+268 -474
View File
File diff suppressed because it is too large Load Diff