Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A first pass over m3d #13

Merged
merged 35 commits into from
Sep 12, 2024
Merged

A first pass over m3d #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
da31523
A first pass over m3d
robojumper Jun 20, 2024
aa372b1
d_a_obj_ring OK
robojumper Jun 20, 2024
f0e8914
m3d::calcRatio_c
robojumper Jun 20, 2024
c0b3821
m_mdl cleanup
robojumper Jun 20, 2024
669c428
m_anmtexsrt
robojumper Jun 21, 2024
fd4a600
d_a_obj_sun_light OK
robojumper Jun 21, 2024
5014135
m_anmChr OK
robojumper Jun 21, 2024
15a8177
m_anmChrBlend OK
robojumper Jun 21, 2024
a4d16c8
m_anmMatClr_c OK
robojumper Jun 21, 2024
144c874
anmTexPat_c OK
robojumper Jun 21, 2024
9b9d760
proc_c OK
robojumper Jun 21, 2024
0183069
anmMdl_c, anmShp_c OK
robojumper Jun 22, 2024
1a5dfa2
Cleanup and progress
robojumper Jun 22, 2024
1d9827c
m_mdl "OK"
robojumper Jun 23, 2024
4c6b151
cleanup
robojumper Jun 23, 2024
b43adc8
m_fanm OK
robojumper Jun 23, 2024
11eed4b
simpler fanm match (thank you LagoLunatic!)
robojumper Jun 23, 2024
4797d9e
m_scnmdl OK
robojumper Jun 23, 2024
5a5811a
dAcOmoleSoil_c OK
robojumper Jun 25, 2024
25cf783
d_a_obj_smoke
robojumper Jun 25, 2024
df9010f
dAcOlavaF200_c OK
robojumper Jun 25, 2024
2f32c5b
Fix create return values
robojumper Jun 26, 2024
3fd8ac3
d_a_e_hb_leaf OK
robojumper Jun 28, 2024
548da27
Cleanup
robojumper Jul 1, 2024
a3a8396
Rebase/warning fixes
robojumper Jul 1, 2024
66a7b0a
Don't reinvent SpawnStruct
robojumper Jul 5, 2024
5728051
Update m3d
elijah-thomas774 Sep 9, 2024
16bca79
Merge branch 'main' into m3d
elijah-thomas774 Sep 9, 2024
51fe00e
fix extern
elijah-thomas774 Sep 9, 2024
ed5fe5c
fix CopiedMatAccess size
elijah-thomas774 Sep 9, 2024
37da66e
Added m3d bline_c
elijah-thomas774 Sep 11, 2024
6fed118
m3d matching + some EGG declarations
elijah-thomas774 Sep 12, 2024
1085063
bline progress, stopping for now
elijah-thomas774 Sep 12, 2024
bd2a5f1
Merge branch 'main' into m3d
elijah-thomas774 Sep 12, 2024
48d627f
temp from a Dowsing PR merge
elijah-thomas774 Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/SOUE01/rels/d_a_e_hb_leafNP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ REL/executor.c:

REL/d/a/e/d_a_e_hb_leaf.cpp:
.text start:0x00000070 end:0x000005E4
.rodata start:0x00000000 end:0x00000024
.data start:0x00000000 end:0x000000D0
30 changes: 17 additions & 13 deletions config/SOUE01/rels/d_a_e_hb_leafNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
fn_157_70 = .text:0x00000070; // type:function size:0xD4
fn_157_150 = .text:0x00000150; // type:function size:0xE8
fn_157_240 = .text:0x00000240; // type:function size:0x1A0
fn_157_3E0 = .text:0x000003E0; // type:function size:0x8
fn_157_3F0 = .text:0x000003F0; // type:function size:0xF0
fn_157_4E0 = .text:0x000004E0; // type:function size:0x6C
fn_157_550 = .text:0x00000550; // type:function size:0x14
fn_157_570 = .text:0x00000570; // type:function size:0x74
dAcEhb_leaf_c_classInit__Fv = .text:0x00000070; // type:function size:0xD4
createHeap__13dAcEhb_leaf_cFv = .text:0x00000150; // type:function size:0xE8
create__13dAcEhb_leaf_cFv = .text:0x00000240; // type:function size:0x1A0
doDelete__13dAcEhb_leaf_cFv = .text:0x000003E0; // type:function size:0x8
actorExecute__13dAcEhb_leaf_cFv = .text:0x000003F0; // type:function size:0xF0
draw__13dAcEhb_leaf_cFv = .text:0x000004E0; // type:function size:0x6C
setAnm__13dAcEhb_leaf_cFPCcf = .text:0x00000550; // type:function size:0x14
__dt__13dAcEhb_leaf_cFv = .text:0x00000570; // type:function size:0x74
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_157_rodata_0 = .rodata:0x00000000; // type:object size:0x20 data:float
lbl_157_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float
lbl_157_data_0 = .data:0x00000000; // type:object size:0x34
lbl_157_data_34 = .data:0x00000034; // type:object size:0x1C
lbl_157_data_50 = .data:0x00000050; // type:object size:0x80
unkFloat0__13dAcEhb_leaf_c = .rodata:0x00000000; // type:object size:0x4 data:float
unkFloat1__13dAcEhb_leaf_c = .rodata:0x00000004; // type:object size:0x4 data:float
lbl_157_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
g_profile_E_HB_LEAF = .data:0x00000000; // type:object size:0x10
lbl_157_data_10 = .data:0x00000010; // type:object size:0x9 scope:local data:string
lbl_157_data_1C = .data:0x0000001C; // type:object size:0x7 scope:local data:string
lbl_157_data_24 = .data:0x00000024; // type:object size:0xE scope:local data:string
lbl_157_data_34 = .data:0x00000034; // type:object size:0x1B scope:local data:string
__vt__13dAcEhb_leaf_c = .data:0x00000050; // type:object size:0x80
2 changes: 2 additions & 0 deletions config/SOUE01/rels/d_a_obj_lava_F200NP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ REL/executor.c:

REL/d/a/obj/d_a_obj_lava_F200.cpp:
.text start:0x00000070 end:0x000006C4
.rodata start:0x00000000 end:0x00000008
.data start:0x00000000 end:0x000000C8
32 changes: 16 additions & 16 deletions config/SOUE01/rels/d_a_obj_lava_F200NP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
fn_429_70 = .text:0x00000070; // type:function size:0xB4
fn_429_130 = .text:0x00000130; // type:function size:0x64
fn_429_1A0 = .text:0x000001A0; // type:function size:0x64
fn_429_210 = .text:0x00000210; // type:function size:0x1C4
fn_429_3E0 = .text:0x000003E0; // type:function size:0x14C
fn_429_530 = .text:0x00000530; // type:function size:0x8
fn_429_540 = .text:0x00000540; // type:function size:0x7C
fn_429_5C0 = .text:0x000005C0; // type:function size:0x60
fn_429_620 = .text:0x00000620; // type:function size:0xA4
dAcOlavaF200_c_classInit__Fv = .text:0x00000070; // type:function size:0xB4
__ct__Q23m3d11anmTexSrt_cFv = .text:0x00000130; // type:function size:0x64
__ct__Q23m3d11anmMatClr_cFv = .text:0x000001A0; // type:function size:0x64
createHeap__14dAcOlavaF200_cFv = .text:0x00000210; // type:function size:0x1C4
create__14dAcOlavaF200_cFv = .text:0x000003E0; // type:function size:0x14C
doDelete__14dAcOlavaF200_cFv = .text:0x00000530; // type:function size:0x8
actorExecute__14dAcOlavaF200_cFv = .text:0x00000540; // type:function size:0x7C
draw__14dAcOlavaF200_cFv = .text:0x000005C0; // type:function size:0x60
__dt__14dAcOlavaF200_cFv = .text:0x00000620; // type:function size:0xA4
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_429_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float
lbl_429_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float
lbl_429_data_0 = .data:0x00000000; // type:object size:0x10
lbl_429_data_10 = .data:0x00000010; // type:object size:0xC
lbl_429_data_1C = .data:0x0000001C; // type:object size:0xC
lbl_429_data_28 = .data:0x00000028; // type:object size:0x20
lbl_429_data_48 = .data:0x00000048; // type:object size:0x80
lbl_429_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float
lbl_429_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local data:float
g_profile_OBJ_LAVA_F200 = .data:0x00000000; // type:object size:0x10
lbl_429_data_10 = .data:0x00000010; // type:object size:0xC scope:local
lbl_429_data_1C = .data:0x0000001C; // type:object size:0xC scope:local
lbl_429_data_28 = .data:0x00000028; // type:object size:0x20 scope:local
__vt__14dAcOlavaF200_c = .data:0x00000048; // type:object size:0x80
3 changes: 3 additions & 0 deletions config/SOUE01/rels/d_a_obj_mole_soilNP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ REL/global_destructor_chain.c:
REL/d/a/obj/d_a_obj_mole_soil.cpp:
.text start:0x000000F0 end:0x00000F18
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x00000030
.data start:0x00000000 end:0x0000024C
.bss start:0x00000008 end:0x000000C8
114 changes: 57 additions & 57 deletions config/SOUE01/rels/d_a_obj_mole_soilNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,64 @@ _epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
__register_global_object = .text:0x00000070; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global
fn_101_F0 = .text:0x000000F0; // type:function size:0xC0
fn_101_1B0 = .text:0x000001B0; // type:function size:0x58
fn_101_210 = .text:0x00000210; // type:function size:0x6C
fn_101_280 = .text:0x00000280; // type:function size:0xA0
fn_101_320 = .text:0x00000320; // type:function size:0xA4
fn_101_3D0 = .text:0x000003D0; // type:function size:0x9C
fn_101_470 = .text:0x00000470; // type:function size:0xCC
fn_101_540 = .text:0x00000540; // type:function size:0x10
fn_101_550 = .text:0x00000550; // type:function size:0x8
fn_101_560 = .text:0x00000560; // type:function size:0x174
fn_101_6E0 = .text:0x000006E0; // type:function size:0x10
fn_101_6F0 = .text:0x000006F0; // type:function size:0x10
fn_101_700 = .text:0x00000700; // type:function size:0x34
fn_101_740 = .text:0x00000740; // type:function size:0xC
fn_101_750 = .text:0x00000750; // type:function size:0x4
fn_101_760 = .text:0x00000760; // type:function size:0x4
fn_101_770 = .text:0x00000770; // type:function size:0xC
fn_101_780 = .text:0x00000780; // type:function size:0x7C
fn_101_800 = .text:0x00000800; // type:function size:0x24
fn_101_830 = .text:0x00000830; // type:function size:0xC
fn_101_840 = .text:0x00000840; // type:function size:0xA8
fn_101_8F0 = .text:0x000008F0; // type:function size:0x24
fn_101_920 = .text:0x00000920; // type:function size:0xCC
fn_101_9F0 = .text:0x000009F0; // type:function size:0x60
fn_101_A50 = .text:0x00000A50; // type:function size:0xC
fn_101_A60 = .text:0x00000A60; // type:function size:0x1C
fn_101_A80 = .text:0x00000A80; // type:function size:0x1C
fn_101_AA0 = .text:0x00000AA0; // type:function size:0x1C
fn_101_AC0 = .text:0x00000AC0; // type:function size:0x10
fn_101_AD0 = .text:0x00000AD0; // type:function size:0x10
fn_101_AE0 = .text:0x00000AE0; // type:function size:0x10
fn_101_AF0 = .text:0x00000AF0; // type:function size:0x10
fn_101_B00 = .text:0x00000B00; // type:function size:0x10
fn_101_B10 = .text:0x00000B10; // type:function size:0x10
fn_101_B20 = .text:0x00000B20; // type:function size:0x30
fn_101_B50 = .text:0x00000B50; // type:function size:0x30
fn_101_B80 = .text:0x00000B80; // type:function size:0x30
fn_101_BB0 = .text:0x00000BB0; // type:function size:0x27C
fn_101_E30 = .text:0x00000E30; // type:function size:0x58
fn_101_E90 = .text:0x00000E90; // type:function size:0x88
dAcOmoleSoil_c_classInit__Fv = .text:0x000000F0; // type:function size:0xC0
__dt__27sFState_c<14dAcOmoleSoil_c>Fv = .text:0x000001B0; // type:function size:0x58
__dt__30sFStateFct_c<14dAcOmoleSoil_c>Fv = .text:0x00000210; // type:function size:0x6C
__dt__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000280; // type:function size:0xA0
__dt__53sFStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000320; // type:function size:0xA4
createHeap__14dAcOmoleSoil_cFv = .text:0x000003D0; // type:function size:0x9C
create__14dAcOmoleSoil_cFv = .text:0x00000470; // type:function size:0xCC
changeState__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000540; // type:function size:0x10
doDelete__14dAcOmoleSoil_cFv = .text:0x00000550; // type:function size:0x8
actorExecute__14dAcOmoleSoil_cFv = .text:0x00000560; // type:function size:0x174
getStateID__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x000006E0; // type:function size:0x10
executeState__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000006F0; // type:function size:0x10
draw__14dAcOmoleSoil_cFv = .text:0x00000700; // type:function size:0x34
initializeState_Wait__14dAcOmoleSoil_cFv = .text:0x00000740; // type:function size:0xC
executeState_Wait__14dAcOmoleSoil_cFv = .text:0x00000750; // type:function size:0x4
finalizeState_Wait__14dAcOmoleSoil_cFv = .text:0x00000760; // type:function size:0x4
initializeState_Appear__14dAcOmoleSoil_cFv = .text:0x00000770; // type:function size:0xC
executeState_Appear__14dAcOmoleSoil_cFv = .text:0x00000780; // type:function size:0x7C
finalizeState_Appear__14dAcOmoleSoil_cFv = .text:0x00000800; // type:function size:0x24
initializeState_DisAppear__14dAcOmoleSoil_cFv = .text:0x00000830; // type:function size:0xC
executeState_DisAppear__14dAcOmoleSoil_cFv = .text:0x00000840; // type:function size:0xA8
finalizeState_DisAppear__14dAcOmoleSoil_cFv = .text:0x000008F0; // type:function size:0x24
__dt__14dAcOmoleSoil_cFv = .text:0x00000920; // type:function size:0xCC
build__30sFStateFct_c<14dAcOmoleSoil_c>FRC12sStateIDIf_c = .text:0x000009F0; // type:function size:0x60
dispose__30sFStateFct_c<14dAcOmoleSoil_c>FRP10sStateIf_c = .text:0x00000A50; // type:function size:0xC
initialize__27sFState_c<14dAcOmoleSoil_c>Fv = .text:0x00000A60; // type:function size:0x1C
execute__27sFState_c<14dAcOmoleSoil_c>Fv = .text:0x00000A80; // type:function size:0x1C
finalize__27sFState_c<14dAcOmoleSoil_c>Fv = .text:0x00000AA0; // type:function size:0x1C
initializeState__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000AC0; // type:function size:0x10
finalizeState__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000AD0; // type:function size:0x10
refreshState__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000AE0; // type:function size:0x10
getState__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000AF0; // type:function size:0x10
getNewStateID__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000B00; // type:function size:0x10
getOldStateID__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000B10; // type:function size:0x10
finalizeState__29sFStateID_c<14dAcOmoleSoil_c>CFR14dAcOmoleSoil_c = .text:0x00000B20; // type:function size:0x30
executeState__29sFStateID_c<14dAcOmoleSoil_c>CFR14dAcOmoleSoil_c = .text:0x00000B50; // type:function size:0x30
initializeState__29sFStateID_c<14dAcOmoleSoil_c>CFR14dAcOmoleSoil_c = .text:0x00000B80; // type:function size:0x30
__sinit_\d_a_obj_mole_soil_cpp = .text:0x00000BB0; // type:function size:0x27C scope:local
__dt__29sFStateID_c<14dAcOmoleSoil_c>Fv = .text:0x00000E30; // type:function size:0x58
isSameName__29sFStateID_c<14dAcOmoleSoil_c>CFPCc = .text:0x00000E90; // type:function size:0x88
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
__destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
lbl_101_rodata_0 = .rodata:0x00000000; // type:object size:0x8 data:float
lbl_101_rodata_8 = .rodata:0x00000008; // type:object size:0x10 data:float
lbl_101_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float
lbl_101_rodata_1C = .rodata:0x0000001C; // type:object size:0x14 data:float
lbl_101_data_0 = .data:0x00000000; // type:object size:0x10 data:4byte
lbl_101_data_10 = .data:0x00000010; // type:object size:0xC
lbl_101_data_1C = .data:0x0000001C; // type:object size:0x1C data:string
lbl_101_data_38 = .data:0x00000038; // type:object size:0x80
lbl_101_data_B8 = .data:0x000000B8; // type:object size:0x30
lbl_101_data_E8 = .data:0x000000E8; // type:object size:0x30
lbl_101_data_118 = .data:0x00000118; // type:object size:0x18
lbl_101_data_130 = .data:0x00000130; // type:object size:0xE8
lbl_101_data_218 = .data:0x00000218; // type:object size:0x34
lbl_101_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:float
lbl_101_rodata_8 = .rodata:0x00000008; // type:object size:0x10 scope:local data:float
lbl_101_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float
lbl_101_rodata_1C = .rodata:0x0000001C; // type:object size:0x14 scope:local data:float
g_profile_OBJ_MOLE_SOIL = .data:0x00000000; // type:object size:0x10 data:4byte
lbl_101_data_10 = .data:0x00000010; // type:object size:0xA scope:local data:string
lbl_101_data_1C = .data:0x0000001C; // type:object size:0x1C scope:local data:string
__vt__14dAcOmoleSoil_c = .data:0x00000038; // type:object size:0x80
__vt__53sFStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c> = .data:0x000000B8; // type:object size:0x30
__vt__83sStateMgr_c<14dAcOmoleSoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000000E8; // type:object size:0x30
__vt__30sFStateFct_c<14dAcOmoleSoil_c> = .data:0x00000118; // type:object size:0x14
__vt__27sFState_c<14dAcOmoleSoil_c> = .data:0x00000130; // type:object size:0x18
__vt__29sFStateID_c<14dAcOmoleSoil_c> = .data:0x00000218; // type:object size:0x34
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_101_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte
lbl_101_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte
lbl_101_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte
lbl_101_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte
lbl_101_bss_8 = .bss:0x00000008; // type:object size:0xC scope:local data:4byte
StateID_Wait__14dAcOmoleSoil_c = .bss:0x00000018; // type:object size:0x30 data:4byte
StateID_Appear__14dAcOmoleSoil_c = .bss:0x00000058; // type:object size:0x30 data:4byte
StateID_DisAppear__14dAcOmoleSoil_c = .bss:0x00000098; // type:object size:0x30 data:4byte
3 changes: 3 additions & 0 deletions config/SOUE01/rels/d_a_obj_ringNP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ REL/global_destructor_chain.c:
REL/d/a/obj/d_a_obj_ring.cpp:
.text start:0x000000F0 end:0x00000B98
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x00000010
.data start:0x00000000 end:0x000001CC
.bss start:0x00000008 end:0x00000048
Loading