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

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 13:45:55 +02: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
config/GZ2E01/rels/d_a_obj_octhashi/splits.txt
+2 -2
View File
@@ -11,6 +11,6 @@ REL/executor.c:
d/actor/d_a_obj_octhashi.cpp:
.text start:0x00000078 end:0x00001938
.rodata start:0x00000000 end:0x00000104
.rodata start:0x00000000 end:0x00000103
.data start:0x00000000 end:0x000000FC
.bss start:0x00000000 end:0x00000004
.bss start:0x00000000 end:0x00000001
config/GZ2E01/rels/d_a_obj_octhashi/symbols.txt
+9 -9
View File
@@ -2,8 +2,8 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
initCcCylinder__15daObjOCTHASHI_cFv = .text:0x00000078; // type:function size:0x1E0 scope:global
daObjOCTHASHI_Create__FP10fopAc_ac_c = .text:0x00000258; // type:function size:0x20 scope:global
daObjOCTHASHI_Delete__FP15daObjOCTHASHI_c = .text:0x00000278; // type:function size:0x44 scope:global
daObjOCTHASHI_Create__FP10fopAc_ac_c = .text:0x00000258; // type:function size:0x20 scope:local
daObjOCTHASHI_Delete__FP15daObjOCTHASHI_c = .text:0x00000278; // type:function size:0x44 scope:local
SetCoSph__15daObjOCTHASHI_cFv = .text:0x000002BC; // type:function size:0xA8 scope:global
SetCoCyl__15daObjOCTHASHI_cFv = .text:0x00000364; // type:function size:0x80 scope:global
HakaiSet2__15daObjOCTHASHI_cFi = .text:0x000003E4; // type:function size:0x3CC scope:global
@@ -15,9 +15,9 @@ SphAction__15daObjOCTHASHI_cFv = .text:0x00000A84; // type:function size:0x280 s
SphAction2__15daObjOCTHASHI_cFv = .text:0x00000D04; // type:function size:0xB0 scope:global
Action__15daObjOCTHASHI_cFv = .text:0x00000DB4; // type:function size:0xC8 scope:global
setBaseMtx__15daObjOCTHASHI_cFv = .text:0x00000E7C; // type:function size:0xCC scope:global
rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x00000F48; // type:function size:0xC scope:global
daObjOCTHASHI_Draw__FP15daObjOCTHASHI_c = .text:0x00000F54; // type:function size:0x2C scope:global
daObjOCTHASHI_Execute__FP15daObjOCTHASHI_c = .text:0x00000F80; // type:function size:0x20 scope:global
rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x00000F48; // type:function size:0xC scope:local
daObjOCTHASHI_Draw__FP15daObjOCTHASHI_c = .text:0x00000F54; // type:function size:0x2C scope:local
daObjOCTHASHI_Execute__FP15daObjOCTHASHI_c = .text:0x00000F80; // type:function size:0x20 scope:local
CreateHeap__15daObjOCTHASHI_cFv = .text:0x00000FA0; // type:function size:0xB8 scope:global
create__15daObjOCTHASHI_cFv = .text:0x00001058; // type:function size:0x34C scope:global
__dt__8cM3dGCylFv = .text:0x000013A4; // type:function size:0x48 scope:global
@@ -30,7 +30,7 @@ __ct__9dCcD_SttsFv = .text:0x0000165C; // type:function size:0x54 scope:global
__dt__10dCcD_GSttsFv = .text:0x000016B0; // type:function size:0x5C scope:global
__ct__5csXyzFv = .text:0x0000170C; // type:function size:0x4 scope:global
__ct__4cXyzFv = .text:0x00001710; // type:function size:0x4 scope:global
daObjOCTHASHI_IsDelete__FP15daObjOCTHASHI_c = .text:0x00001714; // type:function size:0x8 scope:global
daObjOCTHASHI_IsDelete__FP15daObjOCTHASHI_c = .text:0x00001714; // type:function size:0x8 scope:local
__dt__10cCcD_GSttsFv = .text:0x0000171C; // type:function size:0x48 scope:global
Create__15daObjOCTHASHI_cFv = .text:0x00001764; // type:function size:0x54 scope:global
Execute__15daObjOCTHASHI_cFPPA3_A4_f = .text:0x000017B8; // type:function size:0x74 scope:global
@@ -72,9 +72,9 @@ ccSphSrc$3655 = .rodata:0x00000000; // type:object size:0x40 scope:local
@4166 = .rodata:0x000000C8; // type:object size:0x4 scope:local
@4167 = .rodata:0x000000CC; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x000000D0; // type:object size:0x33 scope:local data:string_table
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
ccCylSrc$3656 = .data:0x00000004; // type:object size:0x44 scope:local data:float
l_daObjOCTHASHI_Method = .data:0x00000048; // type:object size:0x20 scope:global
l_daObjOCTHASHI_Method = .data:0x00000048; // type:object size:0x20 scope:local
g_profile_OCTHASHI = .data:0x00000068; // type:object size:0x30 scope:global
__vt__10cCcD_GStts = .data:0x00000098; // type:object size:0xC scope:global
__vt__10dCcD_GStts = .data:0x000000A4; // type:object size:0xC scope:global
@@ -82,4 +82,4 @@ __vt__8cM3dGSph = .data:0x000000B0; // type:object size:0xC scope:global
__vt__8cM3dGCyl = .data:0x000000BC; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x000000C8; // type:object size:0xC scope:global
__vt__15daObjOCTHASHI_c = .data:0x000000D4; // type:object size:0x28 scope:global
lbl_584_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_584_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
configure.py
+1 -1
View File
@@ -1968,7 +1968,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_nan"),
ActorRel(NonMatching, "d_a_obj_ndoor"),
ActorRel(NonMatching, "d_a_obj_nougu"),
ActorRel(NonMatching, "d_a_obj_octhashi"),
ActorRel(Equivalent, "d_a_obj_octhashi"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_oiltubo"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_onsen"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_onsenFire"),
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);
src/d/actor/d_a_obj_octhashi.cpp
+288 -536
View File
File diff suppressed because it is too large Load Diff