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

d_a_obj_metalbox matching (#2333)

Browse Source 
* Started work on d_a_obj_stick

* Lots of green

* Fixed mAcch vtable

* Only missing switch/if problem in create

* All green

* Set stick matching

* Cleanup

* Addressed PR comments

* Reset vscode config

* d_a_ob_metalbox mostly complete

* Completed d_a_obj_metalbox

* Addressed PR issues
This commit is contained in:
Emma
2025-03-20 06:11:32 -04:00
committed by GitHub
parent 131548b015
commit 1a5a81976a
3 changed files with 113 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_metalbox.h
+18 -10
View File
@@ -2,6 +2,9 @@
#define D_A_OBJ_METALBOX_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
/**
* @ingroup actors-objects
@@ -11,19 +14,24 @@
* @details
*
*/
class daObjMBox_c : public fopAc_ac_c {
class daObjMBox_c : public dBgS_MoveBgActor {
private:
/* 0x5a0 */ request_of_phase_process_class mPhase;
/* 0x5a8 */ J3DModel* mpModel;
/* 0x5ac */ dBgS_ObjAcch mAcch;
/* 0x784 */ dBgS_AcchCir mAcchCir;
/* 0x7c4 */ dCcD_Stts mStts;
/* 0x7e4 */ dCcD_Cyl mCyl;
/* 0x904 */ u8 field_0x804[0x944 - 0x93c];
public:
/* 80592E98 */ void initBaseMtx();
/* 80592ED4 */ void setBaseMtx();
/* 80592F48 */ void Create();
/* 80592FD4 */ void CreateHeap();
/* 80593044 */ void create();
/* 805932C4 */ void Execute(f32 (**)[3][4]);
/* 805932F0 */ void Draw();
/* 80593394 */ void Delete();
private:
/* 0x568 */ u8 field_0x568[0x944 - 0x568];
/* 80592F48 */ int Create();
/* 80592FD4 */ int CreateHeap();
/* 80593044 */ int create();
/* 805932C4 */ int Execute(f32 (**)[3][4]);
/* 805932F0 */ int Draw();
/* 80593394 */ int Delete();
};
STATIC_ASSERT(sizeof(daObjMBox_c) == 0x944);