Updated CC collision (#80)

* c_cc_d soooo close * d_cc_shape_colliders -> d_cc_d * ported over changes from #43 * Oops, didnt save * use better collision functions in bombf * bombf fixes * bombf actorPostCreate matching * fix * small fix for cCcD_UnkAttr Set function * more cleanup(?) for c_cc_d * d_cc_mass_s OK * Initial d_cc_s setup * some easy funcs --------- Co-authored-by: robojumper <[email protected]>
zeldaret · Nov 1, 2024 · 8a37108 · 8a37108
1 parent 1d17e35
commit 8a37108
Show file tree

Hide file tree

Showing 74 changed files with 4,513 additions and 1,953 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,17 +1,18 @@
 {
     "[c]": {
+        "files.autoSave": "onFocusChange",
         "files.encoding": "utf8",
         "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
     },
     "[cpp]": {
+        "files.autoSave": "onFocusChange",
         "files.encoding": "utf8",
         "editor.defaultFormatter": "xaver.clang-format"
     },
     // "[python]": {
     //     "editor.defaultFormatter": "ms-python.black-formatter"
     // },
     // "editor.tabSize": 2,
-    "files.autoSave": "onFocusChange",
     "files.insertFinalNewline": true,
     "files.trimFinalNewlines": true,
     "files.associations": {

diff --git a/config/SOUE01/rels/d_a_bombfNP/splits.txt b/config/SOUE01/rels/d_a_bombfNP/splits.txt
@@ -17,3 +17,4 @@ REL/global_destructor_chain.c:
 REL/d/a/d_a_bombf.cpp:
 	.text       start:0x000000F0 end:0x00001358
 	.ctors      start:0x00000000 end:0x00000004
+	.rodata     start:0x00000000 end:0x00000044
diff --git a/config/SOUE01/rels/d_a_bombfNP/symbols.txt b/config/SOUE01/rels/d_a_bombfNP/symbols.txt
@@ -8,15 +8,15 @@ __dt__23sFState_c<10dAcBombf_c>Fv = .text:0x000001F0; // type:function size:0x58
 __dt__26sFStateFct_c<10dAcBombf_c>Fv = .text:0x00000250; // type:function size:0x6C
 __dt__79sStateMgr_c<10dAcBombf_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002C0; // type:function size:0xA0
 __dt__49sFStateMgr_c<10dAcBombf_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000360; // type:function size:0xA4
-fn_17_410 = .text:0x00000410; // type:function size:0x68
-AcBombf__init1 = .text:0x00000480; // type:function size:0x184
+createHeap__10dAcBombf_cFv = .text:0x00000410; // type:function size:0x68
+actorCreate__10dAcBombf_cFv = .text:0x00000480; // type:function size:0x184
 changeState__79sStateMgr_c<10dAcBombf_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000610; // type:function size:0x10
-AcBombf__init2 = .text:0x00000620; // type:function size:0x2A4
-fn_17_8D0 = .text:0x000008D0; // type:function size:0x8
-fn_17_8E0 = .text:0x000008E0; // type:function size:0x138
+actorPostCreate__10dAcBombf_cFv = .text:0x00000620; // type:function size:0x2A4
+doDelete__10dAcBombf_cFv = .text:0x000008D0; // type:function size:0x8
+actorExecute__10dAcBombf_cFv = .text:0x000008E0; // type:function size:0x138
 executeState__79sStateMgr_c<10dAcBombf_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000A20; // type:function size:0x10
-fn_17_A30 = .text:0x00000A30; // type:function size:0x50
-AcBombf__regrowBomb = .text:0x00000A80; // type:function size:0x124
+draw__10dAcBombf_cFv = .text:0x00000A30; // type:function size:0x50
+regrowBomb__10dAcBombf_cFv = .text:0x00000A80; // type:function size:0x124
 initializeState_Wait__10dAcBombf_cFv = .text:0x00000BB0; // type:function size:0x4
 executeState_Wait__10dAcBombf_cFv = .text:0x00000BC0; // type:function size:0x2DC
 finalizeState_Wait__10dAcBombf_cFv = .text:0x00000EA0; // type:function size:0x4
@@ -36,7 +36,7 @@ getOldStateID__79sStateMgr_c<10dAcBombf_c,20sStateMethodUsr_FI_c,12sFStateFct_c,
 finalizeState__25sFStateID_c<10dAcBombf_c>CFR10dAcBombf_c = .text:0x000010D0; // type:function size:0x30
 executeState__25sFStateID_c<10dAcBombf_c>CFR10dAcBombf_c = .text:0x00001100; // type:function size:0x30
 initializeState__25sFStateID_c<10dAcBombf_c>CFR10dAcBombf_c = .text:0x00001130; // type:function size:0x30
-__sinit_\d_a_bombf_cpp = .text:0x00001160; // type:function size:0x10C scope:local
+__sinit_\d_a_bombf_cpp = .text:0x00001160; // type:function size:0x10C
 __dt__25sFStateID_c<10dAcBombf_c>Fv = .text:0x00001270; // type:function size:0x58
 isSameName__25sFStateID_c<10dAcBombf_c>CFPCc = .text:0x000012D0; // type:function size:0x88
 _ctors = .ctors:0x00000000; // type:label scope:global
@@ -49,11 +49,11 @@ g_profile_BOMBF = .data:0x00000000; // type:object size:0x10 data:4byte
 lbl_17_data_10 = .data:0x00000010; // type:object size:0xC
 lbl_17_data_1C = .data:0x0000001C; // type:object size:0xC
 lbl_17_data_28 = .data:0x00000028; // type:object size:0x18 data:string
-lbl_17_data_40 = .data:0x00000040; // type:object size:0x80
-lbl_17_data_C0 = .data:0x000000C0; // type:object size:0x30
-lbl_17_data_F0 = .data:0x000000F0; // type:object size:0x30
-lbl_17_data_120 = .data:0x00000120; // type:object size:0x18
-lbl_17_data_138 = .data:0x00000138; // type:object size:0x58
+__vt__10dAcBombf_c = .data:0x00000040; // type:object size:0x80
+__vt__49sFStateMgr_c<10dAcBombf_c,20sStateMethodUsr_FI_c> = .data:0x000000C0; // type:object size:0x30
+__vt__79sStateMgr_c<10dAcBombf_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000000F0; // type:object size:0x30
+__vt__26sFStateFct_c<10dAcBombf_c> = .data:0x00000120; // type:object size:0x18
+__vt__23sFState_c<10dAcBombf_c> = .data:0x00000138; // type:object size:0x58
 lbl_17_data_190 = .data:0x00000190; // type:object size:0x34
 lbl_17_data_1C4 = .data:0x000001C4; // type:object size:0x8
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global

diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
@@ -997,6 +997,7 @@ d/col/c/c_m3d_g_lin.cpp:
 
 d/col/c/c_m3d_g_pla.cpp:
 	.text       start:0x80338430 end:0x80338678
+	.sdata2     start:0x8057D048 end:0x8057D04C
 
 d/col/c/c_m3d_g_sph.cpp:
 	.text       start:0x80338680 end:0x803388D8
@@ -1114,10 +1115,20 @@ d/col/bg/d_bg_w_time.cpp:
 	.sdata2     start:0x8057D230 end:0x8057D240
 	.bss        start:0x805D0F90 end:0x805D0FB4
 
-d/col/cc/d_cc_shape_colliders.cpp:
+d/col/cc/d_cc_d.cpp:
 	.text       start:0x80353B50 end:0x80354298
 	.data       start:0x80548340 end:0x80548580
 
+d/col/cc/d_cc_mass_s.cpp:
+	.text       start:0x803543F0 end:0x80355080
+	.data       start:0x80548580 end:0x805485A4
+	.sdata2     start:0x8057D240 end:0x8057D254
+
+d/col/cc/d_cc_s.cpp:
+	.text       start:0x80355080 end:0x80358654
+	.data       start:0x805485A8 end:0x805485B4
+	.sbss       start:0x80575D20 end:0x80575D24
+
 rvl/CX/cx.c:
 	.text       start:0x803CEE90 end:0x803D0B20