mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 22:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_bsGate, d_a_obj_window OK (#2041)

Browse Source 
* d_a_obj_bsGate, d_a_obj_window OK

* MInor fixes
This commit is contained in:
Caroline Madsen
2024-01-23 07:42:38 -05:00
committed by GitHub
parent ea041b9d95
commit 69328d71ed
59 changed files with 384 additions and 3152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_ext.h
+4
View File
@@ -581,6 +581,10 @@ public:
/* 0x28 */ u8 field_0x28;
};
inline void mDoExt_bckAnmRemove(J3DModelData* i_modelData) {
i_modelData->getJointNodePointer(0)->setMtxCalc(NULL);
}
JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32 i_size, u32 i_alignment);
void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap);
u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap);
include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h
+49 -1
View File
@@ -1,6 +1,54 @@
#ifndef D_A_OBJ_BSGATE_H
#define D_A_OBJ_BSGATE_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_phase.h"
#include "m_Do/m_Do_hostIO.h"
#include "d/bg/d_bg_s_movebg_actor.h"
class daBsGate_c : public dBgS_MoveBgActor {
public:
enum Mode {
/* 0 */ MODE_WAIT,
/* 1 */ MODE_OPEN,
/* 2 */ MODE_CLOSE,
};
/* 80BC2910 */ void setBaseMtx();
/* 80BC29AC */ int CreateHeap();
/* 80BC2A18 */ cPhs__Step create();
/* 80BC2B6C */ int Execute(Mtx**);
/* 80BC2BBC */ void moveGate();
/* 80BC2CC4 */ void init_modeWait();
/* 80BC2CD0 */ void modeWait();
/* 80BC2CD4 */ void init_modeOpen();
/* 80BC2CE0 */ void modeOpen();
/* 80BC2E34 */ void init_modeClose();
/* 80BC2E40 */ void modeClose();
/* 80BC2F94 */ int Draw();
/* 80BC3038 */ int Delete();
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ u8 mMode;
/* 0x5AD */ u8 field_0x5ad;
/* 0x5AE */ u8 mOpen;
/* 0x5AF */ u8 mSide;
/* 0x5B0 */ f32 mTargetDist;
/* 0x5B4 */ f32 mOpenDist;
};
STATIC_ASSERT(sizeof(daBsGate_c) == 0x5B8);
class daBsGate_HIO_c : public mDoHIO_entry_c {
public:
/* 80BC288C */ daBsGate_HIO_c();
/* 80BC30F4 */ ~daBsGate_HIO_c() {}
/* 0x4 */ f32 mOpenSpeed;
/* 0x8 */ f32 mCloseSpeed;
/* 0xC */ u8 mShockStrength;
};
STATIC_ASSERT(sizeof(daBsGate_HIO_c) == 0x10);
#endif /* D_A_OBJ_BSGATE_H */
include/rel/d/a/obj/d_a_obj_window/d_a_obj_window.h
+26 -2
View File
@@ -1,9 +1,33 @@
#ifndef D_A_OBJ_WINDOW_H
#define D_A_OBJ_WINDOW_H
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor_mng.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/cc/d_cc_d.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daObjWindow_c : public dBgS_MoveBgActor {
public:
/* 80D38758 */ void initBaseMtx();
/* 80D387B8 */ void setBaseMtx();
/* 80D38840 */ int Create();
/* 80D388F0 */ int CreateHeap();
/* 80D38A68 */ cPhs__Step create1st();
/* 80D38B04 */ int Execute(Mtx**);
/* 80D38F28 */ int Draw();
/* 80D39000 */ int Delete();
u8 getType() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getLightInf() { return fopAcM_GetParamBit(this, 8, 8); }
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ mDoExt_bckAnm* mpBckAnm;
/* 0x5B0 */ u8 mType;
/* 0x5B4 */ dCcD_Stts mStts;
/* 0x5F0 */ dCcD_Cyl mCyl;
};
STATIC_ASSERT(sizeof(daObjWindow_c) == 0x72C);
#endif /* D_A_OBJ_WINDOW_H */