mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_octhashi equivalent except for weak func ordering of cCcD_GStts dtor (#2287)

Browse Source 
* Initial d_a_obj_octhashi work

* More d_a_obj_octhashi work

* d_a_obj_octhashi has 100% completion, but rodata doesn't match

* d_a_obj_octhashi equivalent. Would fully match except for cCcD_GStts dtor

* d_a_obj_octhashi update after feedback from Taka and hatal
This commit is contained in:
YunataSavior
2025-01-19 03:45:55 -08:00
committed by GitHub
parent 4996e91556
commit 7137f49bfc
6 changed files with 343 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+6 -1
View File
@@ -453,6 +453,9 @@ public:
u32 ChkNoCrr() const { return MskSPrm(0x100); }
void OnNoCrrBit() { OnSPrmBit(0x100); }
u32 ChkSph3DCrr() const { return MskSPrm(0x80); }
u32 ChkCoSameActorHit() const { return MskSPrm(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); }
void OnCoSameActorHit() { OnSPrmBit(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); }
void OffCoSameActorHit() { OffSPrmBit(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); }
void ClrSet() { OffSPrmBit(1); }
u32 ChkHit() { return MskRPrm(1); }
@@ -481,7 +484,9 @@ public:
bool ChkTgSet() const { return mObjTg.ChkSet(); }
bool ChkAtSet() const { return mObjAt.ChkSet(); }
bool ChkCoSet() const { return mObjCo.ChkSet(); }
u32 ChkCoSameActorHit() const { return mObjCo.MskSPrm(0x400); }
u32 ChkCoSameActorHit() const { return mObjCo.ChkCoSameActorHit(); }
void OnCoSameActorHit() { mObjCo.OnCoSameActorHit(); }
void OffCoSameActorHit() { mObjCo.OffCoSameActorHit(); }
u32 GetCoVsGrp() const { return mObjCo.GetVsGrp(); }
u32 GetCoIGrp() const { return mObjCo.GetIGrp(); }
u8 GetAtAtp() const { return mObjAt.GetAtp(); }
include/d/actor/d_a_obj_octhashi.h
+37 -9
View File
@@ -1,7 +1,8 @@
#ifndef D_A_OBJ_OCTHASHI_H
#define D_A_OBJ_OCTHASHI_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_com_inf_game.h"
/**
* @ingroup actors-objects
@@ -11,7 +12,7 @@
* @details
*
*/
class daObjOCTHASHI_c : public fopAc_ac_c {
class daObjOCTHASHI_c : public dBgS_MoveBgActor {
public:
/* 80CA4BB8 */ void initCcCylinder();
/* 80CA4DFC */ void SetCoSph();
@@ -23,15 +24,42 @@ public:
/* 80CA5844 */ void SphAction2();
/* 80CA58F4 */ void Action();
/* 80CA59BC */ void setBaseMtx();
/* 80CA5AE0 */ void CreateHeap();
/* 80CA5B98 */ void create();
/* 80CA62A4 */ void Create();
/* 80CA62F8 */ void Execute(f32 (**)[3][4]);
/* 80CA636C */ void Draw();
/* 80CA6444 */ void Delete();
/* 80CA5AE0 */ int CreateHeap();
/* 80CA5B98 */ int create();
/* 80CA62A4 */ int Create();
/* 80CA62F8 */ int Execute(Mtx**);
/* 80CA636C */ int Draw();
/* 80CA6444 */ int Delete();
private:
/* 0x568 */ u8 field_0x568[0x14b0 - 0x568];
/* 0x5a0 */ cXyz field_0x5a0[8];
/* 0x600 */ cXyz field_0x600[8];
/* 0x660 */ csXyz field_0x660[8];
/* 0x690 */ csXyz field_0x690[8];
/* 0x6c0 */ u8 field_0x6c0[8];
/* 0x6c8 */ u8 field_0x6c8;
/* 0x6c9 */ u8 field_0x6c9[0x6cb - 0x6c9];
/* 0x6cb */ u8 field_0x6cb;
/* 0x6cc */ s16 field_0x6cc;
/* 0x6d0 */ f32 field_0x6d0;
/* 0x6d4 */ f32 field_0x6d4;
/* 0x6d8 */ f32 field_0x6d8;
/* 0x6dc */ s16 field_0x6dc;
/* 0x6de */ s16 field_0x6de;
/* 0x6e0 */ int mPieceNum;
/* 0x6e4 */ u32 field_0x6e4;
public:
/* 0x6e8 */ s16 field_0x6e8;
/* 0x6ec */ Z2Creature mSound;
private:
/* 0x77c */ u8 field_0x77c[4];
/* 0x780 */ J3DModel* mpModel[8];
/* 0x7a0 */ u8 field_0x7a0[0x7a4 - 0x7a0];
/* 0x7a4 */ request_of_phase_process_class mPhaseReq;
/* 0x7ac */ dCcD_Stts field_0x7ac[8];
/* 0x98c */ dCcD_Sph mColliders[8];
/* 0x134c */ dCcD_Cyl mCyl;
/* 0x1488 */ u8 field_0x1488[0x14b0 - 0x1488];
};
STATIC_ASSERT(sizeof(daObjOCTHASHI_c) == 0x14b0);