mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 14:55:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_grz_rock and d_a_obj_h_saku matching (#2749)

Browse Source 
* matching

* h_saku initial work

* h_saku matching

* PR cleanup

* fixed header padding
This commit is contained in:
Carco_21
2025-10-22 21:38:51 -04:00
committed by GitHub
parent 8074d91ff1
commit d6711a18c8
5 changed files with 465 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_grz_rock.h
+17 -11
View File
@@ -1,7 +1,8 @@
#ifndef D_A_OBJ_GRZ_ROCK_H
#define D_A_OBJ_GRZ_ROCK_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_movebg_actor.h"
/**
* @ingroup actors-objects
@@ -10,26 +11,31 @@
*
* @details
*
*/
class daObjGrzRock_c : public fopAc_ac_c {
*/
class daObjGrzRock_c : public dBgS_MoveBgActor {
public:
/* 80C14BD8 */ void setBaseMtx();
/* 80C14C54 */ void setEnvTevColor();
/* 80C14CB0 */ void setRoomNo();
/* 80C14CF0 */ void setPrtcl();
/* 80C14DA0 */ void Create();
/* 80C14EE0 */ void CreateHeap();
/* 80C14F50 */ void create();
/* 80C1514C */ void Execute(Mtx**);
/* 80C151A4 */ void Draw();
/* 80C15248 */ void Delete();
/* 80C14DA0 */ int Create();
/* 80C14EE0 */ int CreateHeap();
/* 80C14F50 */ cPhs__Step create();
/* 80C1514C */ int Execute(Mtx**);
/* 80C151A4 */ int Draw();
/* 80C15248 */ int Delete();
void setSmashFlag(u8 i_smashFlag) { mSmashFlag = i_smashFlag; }
private:
/* 0x568 */ u8 field_0x568[0x801 - 0x568];
/* 0x568 */ request_of_phase_process_class mPhase[1];
/* 0x5A0 */ J3DModel* mpModel;
/* 0x5AC */ dBgS_ObjAcch mBgc;
/* 0x784 */ dBgS_AcchCir mAcchCir;
/* 0x7C4 */ cBgS_GndChk mGndChk;
/* 0x800 */ u8 field_0x800;
/* 0x801 */ u8 mSmashFlag;
/* 0x802 */ u8 field_0x802[0x804 - 0x802];
};
STATIC_ASSERT(sizeof(daObjGrzRock_c) == 0x804);
include/d/actor/d_a_obj_h_saku.h
+32 -10
View File
@@ -1,6 +1,9 @@
#ifndef D_A_OBJ_H_SAKU_H
#define D_A_OBJ_H_SAKU_H
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -10,23 +13,42 @@
*
* @details
*
*/
class daObjH_Saku_c : public fopAc_ac_c {
*/
class daObjH_Saku_c : public dBgS_MoveBgActor {
public:
/* 80C1552C */ void BreakSet();
/* 80C15810 */ void SpeedSet(cXyz*, cXyz*, f32);
/* 80C15810 */ u8 SpeedSet(cXyz*, cXyz*, f32);
/* 80C15A4C */ void Action();
/* 80C15E00 */ void initBaseMtx();
/* 80C15E44 */ void setBaseMtx();
/* 80C161E8 */ void CreateHeap();
/* 80C1629C */ void Create();
/* 80C162F4 */ void Execute(Mtx**);
/* 80C16340 */ void Draw();
/* 80C1641C */ void Delete();
/* 80C161E8 */ inline int CreateHeap();
/* 80C1629C */ inline int Create();
/* 80C162F4 */ inline int Execute(Mtx**);
/* 80C16340 */ inline int Draw();
/* 80C1641C */ inline int Delete();
inline cPhs__Step create();
/* 0x568 */ u8 field_0x568[0x5e0 - 0x568];
/* 0x5A0 */ u8 field_0x5a0;
/* 0x5A1 */ u8 field_0x5a1;
/* 0x5A4 */ cXyz field_0x5a4;
/* 0x5B0 */ cXyz field_0x5b0;
/* 0x5BC */ csXyz field_0x5bc;
/* 0x5C4 */ f32 field_0x5c4;
/* 0x5C8 */ s16 field_0x5c8;
/* 0x5CA */ csXyz field_0x5ca;
/* 0x5D0 */ csXyz field_0x5d0;
/* 0x5D6 */ csXyz field_0x5d6;
/* 0x5DC */ u8 field_0x5dc;
/* 0x5DD */ u8 field_0x5dd;
/* 0x5DE */ u8 field_0x5de;
/* 0x5E0 */ cXyz field_0x5e0;
/* 0x5EC */ u8 field_0x5ec[0x850 - 0x5ec];
/* 0x5EC */ dCcD_Stts mStts;
/* 0x628 */ J3DModel* field_0x628;
/* 0x62C */ J3DModel* field_0x62c;
/* 0x630 */ request_of_phase_process_class mPhase;
/* 0x638 */ dBgS_AcchCir mAcchCir;
/* 0x678 */ dBgS_ObjAcch mBgc;
};
STATIC_ASSERT(sizeof(daObjH_Saku_c) == 0x850);