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_tp OK + other rels that matched almost as is (#2218)

Browse Source 
* d_a_tag_yami OK

* d_a_tag_watchge matched as is

* d_a_tag_wara_howl matched as is

* d_a_tag_waterfall matched as is

* daTagTheBHint_c matched as is

* daZraFreeze_c Matched as is

* Revert nosyminline argument

* d_a_obj_tp OK
This commit is contained in:
hatal175
2024-10-19 02:01:46 -07:00
committed by GitHub
parent 69dc7cbbf1
commit 3dadc80c5e
19 changed files with 573 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_obj_tp/symbols.txt
+9 -9
View File
@@ -1,15 +1,15 @@
_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
daObj_Tp_Draw__FP12obj_tp_class = .text:0x00000078; // type:function size:0x1EC scope:global
daObj_Tp_Draw__FP12obj_tp_class = .text:0x00000078; // type:function size:0x1EC scope:local
anm_init__FP12obj_tp_classifUcf = .text:0x00000264; // type:function size:0xEC scope:global
s_tp_sub__FPvPv = .text:0x00000350; // type:function size:0x78 scope:global
daObj_Tp_Execute__FP12obj_tp_class = .text:0x000003C8; // type:function size:0xB98 scope:global
daObj_Tp_IsDelete__FP12obj_tp_class = .text:0x00000F60; // type:function size:0x8 scope:global
daObj_Tp_Delete__FP12obj_tp_class = .text:0x00000F68; // type:function size:0x58 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00000FC0; // type:function size:0x448 scope:global
s_tp_sub__FPvPv = .text:0x00000350; // type:function size:0x78 scope:local
daObj_Tp_Execute__FP12obj_tp_class = .text:0x000003C8; // type:function size:0xB98 scope:local
daObj_Tp_IsDelete__FP12obj_tp_class = .text:0x00000F60; // type:function size:0x8 scope:local
daObj_Tp_Delete__FP12obj_tp_class = .text:0x00000F68; // type:function size:0x58 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x00000FC0; // type:function size:0x448 scope:local
__dt__12J3DFrameCtrlFv = .text:0x00001408; // type:function size:0x48 scope:global
daObj_Tp_Create__FP10fopAc_ac_c = .text:0x00001450; // type:function size:0x3A0 scope:global
daObj_Tp_Create__FP10fopAc_ac_c = .text:0x00001450; // type:function size:0x3A0 scope:local
__dt__8cM3dGCylFv = .text:0x000017F0; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x00001838; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00001880; // type:function size:0x5C scope:global
@@ -43,7 +43,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4583 = .rodata:0x00000068; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x0000006C; // type:object size:0x7 scope:local data:string_table
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
@4263 = .data:0x00000020; // type:object size:0x20 scope:local
bmd$4283 = .data:0x00000040; // type:object size:0x8 scope:local
@@ -52,7 +52,7 @@ eff_bmd$4296 = .data:0x00000050; // type:object size:0x8 scope:local
eff_btk$4297 = .data:0x00000058; // type:object size:0x8 scope:local
eff_brk$4298 = .data:0x00000060; // type:object size:0x8 scope:local
cc_cyl_src$4468 = .data:0x00000068; // type:object size:0x44 scope:local
l_daObj_Tp_Method = .data:0x000000AC; // type:object size:0x20 scope:global
l_daObj_Tp_Method = .data:0x000000AC; // type:object size:0x20 scope:local
g_profile_OBJ_TP = .data:0x000000CC; // type:object size:0x30 scope:global
__vt__10cCcD_GStts = .data:0x000000FC; // type:object size:0xC scope:global
__vt__10dCcD_GStts = .data:0x00000108; // type:object size:0xC scope:global
config/GZ2E01/rels/d_a_obj_zra_freeze/symbols.txt
+9 -9
View File
@@ -3,22 +3,22 @@ _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
setBaseMtx__13daZraFreeze_cFv = .text:0x00000078; // type:function size:0x6C scope:global
chkActorInScreen__13daZraFreeze_cFv = .text:0x000000E4; // type:function size:0x178 scope:global
createSolidHeap__FP10fopAc_ac_c = .text:0x0000025C; // type:function size:0x20 scope:global
createSolidHeap__FP10fopAc_ac_c = .text:0x0000025C; // type:function size:0x20 scope:local
Create__13daZraFreeze_cFv = .text:0x0000027C; // type:function size:0x180 scope:global
CreateHeap__13daZraFreeze_cFv = .text:0x000003FC; // type:function size:0x84 scope:global
setHitodamaPrtcl__13daZraFreeze_cFv = .text:0x00000480; // type:function size:0x1D8 scope:global
Execute__13daZraFreeze_cFv = .text:0x00000658; // type:function size:0x348 scope:global
Draw__13daZraFreeze_cFv = .text:0x000009A0; // type:function size:0xA4 scope:global
Delete__13daZraFreeze_cFv = .text:0x00000A44; // type:function size:0x34 scope:global
daZraFreeze_Draw__FP13daZraFreeze_c = .text:0x00000A78; // type:function size:0x20 scope:global
daZraFreeze_Execute__FP13daZraFreeze_c = .text:0x00000A98; // type:function size:0x20 scope:global
daZraFreeze_IsDelete__FP13daZraFreeze_c = .text:0x00000AB8; // type:function size:0x8 scope:global
daZraFreeze_Delete__FP13daZraFreeze_c = .text:0x00000AC0; // type:function size:0x20 scope:global
daZraFreeze_create__FP10fopAc_ac_c = .text:0x00000AE0; // type:function size:0x20 scope:global
daZraFreeze_Draw__FP13daZraFreeze_c = .text:0x00000A78; // type:function size:0x20 scope:local
daZraFreeze_Execute__FP13daZraFreeze_c = .text:0x00000A98; // type:function size:0x20 scope:local
daZraFreeze_IsDelete__FP13daZraFreeze_c = .text:0x00000AB8; // type:function size:0x8 scope:local
daZraFreeze_Delete__FP13daZraFreeze_c = .text:0x00000AC0; // type:function size:0x20 scope:local
daZraFreeze_create__FP10fopAc_ac_c = .text:0x00000AE0; // type:function size:0x20 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_DATA = .rodata:0x00000000; // type:object size:0x8 scope:global
l_DATA = .rodata:0x00000000; // type:object size:0x8 scope:local
@3763 = .rodata:0x00000008; // type:object size:0x4 scope:local
@3764 = .rodata:0x0000000C; // type:object size:0x4 scope:local
@3765 = .rodata:0x00000010; // type:object size:0x4 scope:local
@@ -31,7 +31,7 @@ id$3856 = .rodata:0x00000018; // type:object size:0x4 scope:local
@4051 = .rodata:0x00000030; // type:object size:0x8 scope:local
@4052 = .rodata:0x00000038; // type:object size:0x8 scope:local
@stringBase0 = .rodata:0x00000040; // type:object size:0x3B 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
l_bmdName$3845 = .data:0x00000004; // type:object size:0xC scope:local
l_daZraFreeze_Method = .data:0x00000010; // type:object size:0x20 scope:global
l_daZraFreeze_Method = .data:0x00000010; // type:object size:0x20 scope:local
g_profile_OBJ_ZRAFREEZE = .data:0x00000030; // type:object size:0x30 scope:global
config/GZ2E01/rels/d_a_tag_theB_hint/symbols.txt
+4 -4
View File
@@ -1,12 +1,12 @@
_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
daTagTheBHint_Create__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x74 scope:global
daTagTheBHint_Delete__FP15daTagTheBHint_c = .text:0x000000EC; // type:function size:0x30 scope:global
daTagTheBHint_Execute__FP15daTagTheBHint_c = .text:0x0000011C; // type:function size:0xD0 scope:global
daTagTheBHint_Create__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x74 scope:local
daTagTheBHint_Delete__FP15daTagTheBHint_c = .text:0x000000EC; // type:function size:0x30 scope:local
daTagTheBHint_Execute__FP15daTagTheBHint_c = .text:0x0000011C; // type:function size:0xD0 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
@3831 = .rodata:0x00000000; // type:object size:0x4 scope:local
@3832 = .rodata:0x00000008; // type:object size:0x8 scope:local data:double
l_daTagTheBHint_Method = .data:0x00000000; // type:object size:0x20 scope:global
l_daTagTheBHint_Method = .data:0x00000000; // type:object size:0x20 scope:local
g_profile_Tag_TheBHint = .data:0x00000020; // type:object size:0x30 scope:global
config/GZ2E01/rels/d_a_tag_wara_howl/symbols.txt
+5 -5
View File
@@ -9,13 +9,13 @@ draw__13daTagWrHowl_cFv = .text:0x00000174; // type:function size:0x8 scope:glob
execute__13daTagWrHowl_cFv = .text:0x0000017C; // type:function size:0x54 scope:global
init__13daTagWrHowl_cFv = .text:0x000001D0; // type:function size:0x24 scope:global
chkWlfInTag__13daTagWrHowl_cFv = .text:0x000001F4; // type:function size:0x90 scope:global
daTagWrHowl_create__FP13daTagWrHowl_c = .text:0x00000284; // type:function size:0x54 scope:global
daTagWrHowl_Delete__FP13daTagWrHowl_c = .text:0x000002D8; // type:function size:0x20 scope:global
daTagWrHowl_execute__FP13daTagWrHowl_c = .text:0x000002F8; // type:function size:0x20 scope:global
daTagWrHowl_draw__FP13daTagWrHowl_c = .text:0x00000318; // type:function size:0x20 scope:global
daTagWrHowl_create__FP13daTagWrHowl_c = .text:0x00000284; // type:function size:0x54 scope:local
daTagWrHowl_Delete__FP13daTagWrHowl_c = .text:0x000002D8; // type:function size:0x20 scope:local
daTagWrHowl_execute__FP13daTagWrHowl_c = .text:0x000002F8; // type:function size:0x20 scope:local
daTagWrHowl_draw__FP13daTagWrHowl_c = .text:0x00000318; // type:function size:0x20 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
@3680 = .rodata:0x00000000; // type:object size:0x4 scope:local
daTagWrHowl_METHODS = .data:0x00000000; // type:object size:0x20 scope:global
daTagWrHowl_METHODS = .data:0x00000000; // type:object size:0x20 scope:local
g_profile_Tag_WaraHowl = .data:0x00000020; // type:object size:0x30 scope:global
__vt__13daTagWrHowl_c = .data:0x00000050; // type:object size:0xC scope:global
config/GZ2E01/rels/d_a_tag_watchge/symbols.txt
+8 -8
View File
@@ -2,16 +2,16 @@ _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
draw__14daTagWatchGe_cFv = .text:0x00000078; // type:function size:0x8 scope:global
daTagWatchGe_Draw__FP14daTagWatchGe_c = .text:0x00000080; // type:function size:0x20 scope:global
s_watchge__FPvPv = .text:0x000000A0; // type:function size:0x38 scope:global
daTagWatchGe_Draw__FP14daTagWatchGe_c = .text:0x00000080; // type:function size:0x20 scope:local
s_watchge__FPvPv = .text:0x000000A0; // type:function size:0x38 scope:local
execute__14daTagWatchGe_cFv = .text:0x000000D8; // type:function size:0x90 scope:global
daTagWatchGe_Execute__FP14daTagWatchGe_c = .text:0x00000168; // type:function size:0x20 scope:global
daTagWatchGe_IsDelete__FP14daTagWatchGe_c = .text:0x00000188; // type:function size:0x8 scope:global
daTagWatchGe_Delete__FP14daTagWatchGe_c = .text:0x00000190; // type:function size:0x8 scope:global
daTagWatchGe_Execute__FP14daTagWatchGe_c = .text:0x00000168; // type:function size:0x20 scope:local
daTagWatchGe_IsDelete__FP14daTagWatchGe_c = .text:0x00000188; // type:function size:0x8 scope:local
daTagWatchGe_Delete__FP14daTagWatchGe_c = .text:0x00000190; // type:function size:0x8 scope:local
create__14daTagWatchGe_cFv = .text:0x00000198; // type:function size:0xB8 scope:global
daTagWatchGe_Create__FP14daTagWatchGe_c = .text:0x00000250; // type:function size:0x20 scope:global
daTagWatchGe_Create__FP14daTagWatchGe_c = .text:0x00000250; // type:function size:0x20 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
l_daTagWatchGe_Method = .data:0x00000000; // type:object size:0x20 scope:global
l_daTagWatchGe_Method = .data:0x00000000; // type:object size:0x20 scope:local
g_profile_Tag_WatchGe = .data:0x00000020; // type:object size:0x30 scope:global
m_group_count = .bss:0x00000000; // type:object size:0x4 scope:global
m_group_count = .bss:0x00000000; // type:object size:0x4 scope:local
config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt
+10 -10
View File
@@ -5,18 +5,18 @@ __register_global_object = .text:0x00000078; // type:function size:0x1C scope:gl
__destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
__ct__20daTagWaterFall_HIO_cFv = .text:0x000000EC; // type:function size:0x54 scope:global
draw__16daTagWaterFall_cFv = .text:0x00000140; // type:function size:0x8 scope:global
daTagWaterFall_Draw__FP16daTagWaterFall_c = .text:0x00000148; // type:function size:0x20 scope:global
s_waterfall__FPvPv = .text:0x00000168; // type:function size:0x7C scope:global
daTagWaterFall_Draw__FP16daTagWaterFall_c = .text:0x00000148; // type:function size:0x20 scope:local
s_waterfall__FPvPv = .text:0x00000168; // type:function size:0x7C scope:local
getEllipseY__16daTagWaterFall_cFf = .text:0x000001E4; // type:function size:0x44 scope:global
checkHitWaterFall__16daTagWaterFall_cF4cXyz = .text:0x00000228; // type:function size:0x104 scope:global
checkHitWaterFallCamera__16daTagWaterFall_cFv = .text:0x0000032C; // type:function size:0x48 scope:global
execute__16daTagWaterFall_cFv = .text:0x00000374; // type:function size:0x204 scope:global
daTagWaterFall_Execute__FP16daTagWaterFall_c = .text:0x00000578; // type:function size:0x20 scope:global
daTagWaterFall_IsDelete__FP16daTagWaterFall_c = .text:0x00000598; // type:function size:0x8 scope:global
daTagWaterFall_Execute__FP16daTagWaterFall_c = .text:0x00000578; // type:function size:0x20 scope:local
daTagWaterFall_IsDelete__FP16daTagWaterFall_c = .text:0x00000598; // type:function size:0x8 scope:local
_delete__16daTagWaterFall_cFv = .text:0x000005A0; // type:function size:0x20 scope:global
daTagWaterFall_Delete__FP16daTagWaterFall_c = .text:0x000005C0; // type:function size:0x20 scope:global
daTagWaterFall_Delete__FP16daTagWaterFall_c = .text:0x000005C0; // type:function size:0x20 scope:local
create__16daTagWaterFall_cFv = .text:0x000005E0; // type:function size:0x19C scope:global
daTagWaterFall_Create__FP16daTagWaterFall_c = .text:0x0000077C; // type:function size:0x20 scope:global
daTagWaterFall_Create__FP16daTagWaterFall_c = .text:0x0000077C; // type:function size:0x20 scope:local
__dt__20daTagWaterFall_HIO_cFv = .text:0x0000079C; // type:function size:0x48 scope:global
__sinit_d_a_tag_waterfall_cpp = .text:0x000007E4; // type:function size:0x3C scope:local
_ctors = .ctors:0x00000000; // type:label scope:global
@@ -29,11 +29,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@3803 = .rodata:0x0000000C; // type:object size:0x4 scope:local data:float
@3959 = .rodata:0x00000010; // type:object size:0x8 scope:local data:double
@3960 = .rodata:0x00000018; // type:object size:0x8 scope:local data:double
m_master_id = .data:0x00000000; // type:object size:0x4 scope:global
l_daTagWaterFall_Method = .data:0x00000004; // type:object size:0x20 scope:global
m_master_id = .data:0x00000000; // type:object size:0x4 scope:local
l_daTagWaterFall_Method = .data:0x00000004; // type:object size:0x20 scope:local
g_profile_Tag_WaterFall = .data:0x00000024; // type:object size:0x30 scope:global
__vt__20daTagWaterFall_HIO_c = .data:0x00000054; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_751_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
lbl_751_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
@3753 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte
l_HIO = .bss:0x00000018; // type:object size:0x24 scope:local data:byte
config/GZ2E01/rels/d_a_tag_yami/symbols.txt
+2 -2
View File
@@ -20,7 +20,7 @@ __dt__8cM3dGAabFv = .text:0x00000840; // type:function size:0x48 scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_sph_src = .rodata:0x00000000; // type:object size:0x44 scope:global
l_sph_src = .rodata:0x00000000; // type:object size:0x44 scope:local
@3726 = .rodata:0x00000044; // type:object size:0x4 scope:local
@3727 = .rodata:0x00000048; // type:object size:0x4 scope:local
@3820 = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float
@@ -28,7 +28,7 @@ l_sph_src = .rodata:0x00000000; // type:object size:0x44 scope:global
@3889 = .rodata:0x00000058; // type:object size:0x8 scope:local
@3890 = .rodata:0x00000060; // type:object size:0x8 scope:local
@3891 = .rodata:0x00000068; // type:object size:0x8 scope:local
l_daTagYami_Method = .data:0x00000000; // type:object size:0x20 scope:global
l_daTagYami_Method = .data:0x00000000; // type:object size:0x20 scope:local
g_profile_TAG_YAMI = .data:0x00000020; // type:object size:0x30 scope:global
__vt__10cCcD_GStts = .data:0x00000050; // type:object size:0xC scope:global
__vt__10dCcD_GStts = .data:0x0000005C; // type:object size:0xC scope:global
configure.py
+9 -9
View File
@@ -301,12 +301,12 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
}
# Helper function for actor RELs
def ActorRel(status, rel_name, extra_cflags=[]):
def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[str, Any]:
return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags)])
# Helper function for JSystem libraries
def JSystemLib(lib_name, objects, progress_category="third_party"):
def JSystemLib(lib_name: str, objects: List[Object], progress_category: str="third_party") -> Dict[str, Any]:
return {
"lib": lib_name,
"mw_version": "GC/2.7",
@@ -2017,7 +2017,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_tombo"),
ActorRel(Matching, "d_a_obj_tornado"),
ActorRel(Matching, "d_a_obj_tornado2"),
ActorRel(NonMatching, "d_a_obj_tp"),
ActorRel(Matching, "d_a_obj_tp"),
ActorRel(NonMatching, "d_a_obj_treesh"),
ActorRel(NonMatching, "d_a_obj_twGate"),
ActorRel(NonMatching, "d_a_obj_udoor"),
@@ -2048,7 +2048,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_zrTurara"),
ActorRel(Matching, "d_a_obj_zrTuraraRock"),
ActorRel(NonMatching, "d_a_obj_zraMark"),
ActorRel(NonMatching, "d_a_obj_zra_freeze"),
ActorRel(Matching, "d_a_obj_zra_freeze"),
ActorRel(NonMatching, "d_a_obj_zra_rock"),
ActorRel(NonMatching, "d_a_passer_mng"),
ActorRel(NonMatching, "d_a_peru"),
@@ -2096,12 +2096,12 @@ config.libs = [
ActorRel(Matching, "d_a_tag_sppath"),
ActorRel(Matching, "d_a_tag_ss_drink"),
ActorRel(Matching, "d_a_tag_stream"),
ActorRel(NonMatching, "d_a_tag_theB_hint"),
ActorRel(NonMatching, "d_a_tag_wara_howl"),
ActorRel(NonMatching, "d_a_tag_watchge"),
ActorRel(NonMatching, "d_a_tag_waterfall"),
ActorRel(Matching, "d_a_tag_theB_hint"),
ActorRel(Matching, "d_a_tag_wara_howl"),
ActorRel(Matching, "d_a_tag_watchge"),
ActorRel(Matching, "d_a_tag_waterfall"),
ActorRel(NonMatching, "d_a_tag_wljump"),
ActorRel(NonMatching, "d_a_tag_yami"),
ActorRel(Matching, "d_a_tag_yami", extra_cflags=['-pragma "nosyminline off"']),
ActorRel(Matching, "d_a_talk"),
ActorRel(Matching, "d_a_tboxSw"),
ActorRel(NonMatching, "d_a_title"),
include/d/actor/d_a_obj_tp.h
+34 -2
View File
@@ -1,6 +1,10 @@
#ifndef D_A_OBJ_TP_H
#define D_A_OBJ_TP_H
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_bg_w.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -12,8 +16,36 @@
*
*/
class obj_tp_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x784 - 0x568];
public:
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ mDoExt_McaMorf* mMorf;
/* 0x574 */ int field_0x574;
/* 0x578 */ mDoExt_brkAnm* mBrk;
/* 0x57C */ J3DModel* mModels[2];
/* 0x584 */ mDoExt_btkAnm* mBtks[2];
/* 0x58C */ mDoExt_brkAnm* mBrks[2];
/* 0x594 */ u8 field_0x594;
/* 0x595 */ u8 field_0x595;
/* 0x596 */ u8 field_0x596;
/* 0x597 */ u8 field_0x597;
/* 0x598 */ u8 field_0x598;
/* 0x59C */ int field_0x59c;
/* 0x5A0 */ int field_0x5a0;
/* 0x5A4 */ u8 field_0x5a4;
/* 0x5A5 */ u8 field_0x5a5;
/* 0x5A6 */ s16 field_0x5a6;
/* 0x5A8 */ s16 field_0x5a8;
/* 0x5AC */ cXyz field_0x5ac;
/* 0x5B8 */ s16 field_0x5b8[2];
/* 0x5BC */ s16 field_0x5bc;
/* 0x5C0 */ cXyz field_0x5c0;
/* 0x5CC */ s16 field_0x5cc;
/* 0x5D0 */ int field_0x5d0;
/* 0x5D4 */ Mtx field_0x5d4;
/* 0x604 */ dBgW* mBgw;
/* 0x608 */ dCcD_Stts mStts;
/* 0x644 */ dCcD_Cyl mCyl;
/* 0x780 */ int field_0x780;
};
STATIC_ASSERT(sizeof(obj_tp_class) == 0x784);
include/d/d_com_inf_game.h
+5
View File
@@ -3980,6 +3980,11 @@ inline J3DDrawBuffer* dComIfGd_getXluListBG() {
return g_dComIfG_gameInfo.drawlist.getXluListBG();
}
inline void dComIfGd_setListFilter() {
g_dComIfG_gameInfo.drawlist.setOpaListFilter();
g_dComIfG_gameInfo.drawlist.setXluListFilter();
}
inline void dComIfGd_init() {
g_dComIfG_gameInfo.drawlist.init();
}
include/d/d_drawlist.h
+2
View File
@@ -342,6 +342,8 @@ public:
void setOpaListMiddle() { setOpaDrawList(mDrawBuffers[DB_LIST_MIDDLE]); }
void setOpaListZxlu() { setOpaDrawList(mDrawBuffers[DB_LIST_Z_XLU]); }
void setXluListZxlu() { setXluDrawList(mDrawBuffers[DB_LIST_Z_XLU]); }
void setOpaListFilter() { setOpaDrawList(mDrawBuffers[DB_LIST_FILTER]); }
void setXluListFilter() { setXluDrawList(mDrawBuffers[DB_LIST_FILTER]); }
void set3DlineMat(mDoExt_3DlineMat_c *param_1) {
#ifndef NON_VIRTUAL_3DLINEMAT
m3DLineMatSortPacket[param_1->getMaterialID()].setMat(param_1);
include/m_Do/m_Do_graphic.h
+1
View File
@@ -102,6 +102,7 @@ public:
static GXTexObj* getFrameBufferTexObj() { return &mFrameBufferTexObj; }
static f32 getInvScale() { return 1.0f; }
static f32 getScale() { return 1.0f; }
static void setWideZoomLightProjection(Mtx m) {}
static GXTexObj mFrameBufferTexObj;
static GXTexObj mZbufferTexObj;
src/d/actor/d_a_obj_tp.cpp
+444 -422
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_zra_freeze.cpp
+1 -1
View File
@@ -235,4 +235,4 @@ extern actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = {
0x44100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_tag_theB_hint.cpp
+1 -1
View File
@@ -46,4 +46,4 @@ extern actor_process_profile_definition g_profile_Tag_TheBHint = {
0x40000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_tag_wara_howl.cpp
+1 -1
View File
@@ -111,4 +111,4 @@ extern actor_process_profile_definition g_profile_Tag_WaraHowl = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_tag_watchge.cpp
+1 -1
View File
@@ -117,4 +117,4 @@ extern actor_process_profile_definition g_profile_Tag_WatchGe = {
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
};
};
src/d/actor/d_a_tag_waterfall.cpp
+26 -37
View File
@@ -7,45 +7,9 @@
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
//
// Forward References:
//
static int daTagWaterFall_Draw(daTagWaterFall_c*);
static void* s_waterfall(void*, void*);
static int daTagWaterFall_Execute(daTagWaterFall_c*);
static int daTagWaterFall_IsDelete(daTagWaterFall_c*);
static int daTagWaterFall_Delete(daTagWaterFall_c*);
static int daTagWaterFall_Create(daTagWaterFall_c*);
/* 80D64D94-80D64D98 000000 0004+00 2/2 0/0 0/0 .data m_master_id */
static u32 m_master_id = static_cast<u32>(0xFFFFFFFF);
/* 80D64D98-80D64DB8 -00001 0020+00 1/0 0/0 0/0 .data l_daTagWaterFall_Method */
static actor_method_class l_daTagWaterFall_Method = {
(process_method_func)daTagWaterFall_Create, (process_method_func)daTagWaterFall_Delete,
(process_method_func)daTagWaterFall_Execute, (process_method_func)daTagWaterFall_IsDelete,
(process_method_func)daTagWaterFall_Draw,
};
/* 80D64DB8-80D64DE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaterFall */
extern actor_process_profile_definition g_profile_Tag_WaterFall = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_Tag_WaterFall,
&g_fpcLf_Method.mBase,
sizeof(daTagWaterFall_c),
0,
0,
&g_fopAc_Method.base,
198,
&l_daTagWaterFall_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
/* 80D6462C-80D64680 0000EC 0054+00 1/1 0/0 0/0 .text __ct__20daTagWaterFall_HIO_cFv */
daTagWaterFall_HIO_c::daTagWaterFall_HIO_c() {
field_0x04 = -1;
@@ -290,4 +254,29 @@ static int daTagWaterFall_Create(daTagWaterFall_c* i_this) {
}
/* 80D64CDC-80D64D24 00079C 0048+00 2/1 0/0 0/0 .text __dt__20daTagWaterFall_HIO_cFv */
daTagWaterFall_HIO_c::~daTagWaterFall_HIO_c() {}
daTagWaterFall_HIO_c::~daTagWaterFall_HIO_c() {}
/* 80D64D98-80D64DB8 -00001 0020+00 1/0 0/0 0/0 .data l_daTagWaterFall_Method */
static actor_method_class l_daTagWaterFall_Method = {
(process_method_func)daTagWaterFall_Create, (process_method_func)daTagWaterFall_Delete,
(process_method_func)daTagWaterFall_Execute, (process_method_func)daTagWaterFall_IsDelete,
(process_method_func)daTagWaterFall_Draw,
};
/* 80D64DB8-80D64DE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaterFall */
extern actor_process_profile_definition g_profile_Tag_WaterFall = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_Tag_WaterFall,
&g_fpcLf_Method.mBase,
sizeof(daTagWaterFall_c),
0,
0,
&g_fopAc_Method.base,
198,
&l_daTagWaterFall_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_tag_yami.cpp
+1 -1
View File
@@ -158,4 +158,4 @@ extern actor_process_profile_definition g_profile_TAG_YAMI = {
fopAc_CULLBOX_CUSTOM_e, // cullType
};
#pragma nosyminline on
#pragma nosyminline on