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

progress on d_a_obj_ivy_rope #109

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

progress on d_a_obj_ivy_rope #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c62d55d
init
elijah-thomas774 Nov 16, 2024
8b39459
couple more funcs
elijah-thomas774 Nov 17, 2024
7bb27a1
progress
elijah-thomas774 Nov 18, 2024
f225f80
smol progress
elijah-thomas774 Nov 22, 2024
47b3cec
smol progress 2
elijah-thomas774 Nov 23, 2024
a8aaa7a
Merge remote-tracking branch 'upstream/main' into d_a_obj_ivy_rope
elijah-thomas774 Feb 1, 2025
d657e80
Dont get your hopes up, I just had some lingering things :P
elijah-thomas774 Feb 1, 2025
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
3 changes: 3 additions & 0 deletions config/SOUE01/rels/d_a_obj_ivy_ropeNP/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_ivy_rope.cpp:
.text start:0x000000F0 end:0x0000F2E8
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x00000310
.data start:0x00000000 end:0x000005D4
.bss start:0x00000008 end:0x000002A0
110 changes: 56 additions & 54 deletions config/SOUE01/rels/d_a_obj_ivy_ropeNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ _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_256_F0 = .text:0x000000F0; // type:function size:0x40
__dt__7mVec3_cFv = .text:0x000000F0; // type:function size:0x40
dAcOivyRope_c_classInit__Fv = .text:0x00000130; // type:function size:0x22C
fn_256_360 = .text:0x00000360; // type:function size:0x58
__dt__15dShadowCircle_cFv = .text:0x00000360; // type:function size:0x58
__dt__26sFState_c<13dAcOivyRope_c>Fv = .text:0x000003C0; // type:function size:0x58
__dt__29sFStateFct_c<13dAcOivyRope_c>Fv = .text:0x00000420; // type:function size:0x6C
__dt__82sStateMgr_c<13dAcOivyRope_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000490; // type:function size:0xA0
__dt__52sFStateMgr_c<13dAcOivyRope_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000530; // type:function size:0xA4
fn_256_5E0 = .text:0x000005E0; // type:function size:0x4
__ct__7mVec3_cFv = .text:0x000005E0; // type:function size:0x4 scope:weak
__dt__13dAcOivyRope_cFv = .text:0x000005F0; // type:function size:0x1F4
AcOivyRope__initTightRope = .text:0x000007F0; // type:function size:0x54C
initTightRope__13dAcOivyRope_cFv = .text:0x000007F0; // type:function size:0x54C
AcOivyRope__handleSubtype1update = .text:0x00000D40; // type:function size:0x37C
fn_256_10C0 = .text:0x000010C0; // type:function size:0xDC
fn_256_11A0 = .text:0x000011A0; // type:function size:0x94
Expand Down Expand Up @@ -45,7 +45,7 @@ fn_256_4520 = .text:0x00004520; // type:function size:0x238
fn_256_4760 = .text:0x00004760; // type:function size:0x514
fn_256_4C80 = .text:0x00004C80; // type:function size:0x14
fn_256_4CA0 = .text:0x00004CA0; // type:function size:0x298
fn_256_4F40 = .text:0x00004F40; // type:function size:0x250
createBase__13dAcOivyRope_cFv = .text:0x00004F40; // type:function size:0x250
fn_256_5190 = .text:0x00005190; // type:function size:0x3FC
fn_256_5590 = .text:0x00005590; // type:function size:0x258
fn_256_57F0 = .text:0x000057F0; // type:function size:0x304
Expand All @@ -71,8 +71,8 @@ finalizeState_TerryRopePlayerCarry__13dAcOivyRope_cFv = .text:0x00006630; // typ
initializeState_TerryRopeWait__13dAcOivyRope_cFv = .text:0x00006640; // type:function size:0x74
executeState_TerryRopeWait__13dAcOivyRope_cFv = .text:0x000066C0; // type:function size:0x5C
finalizeState_TerryRopeWait__13dAcOivyRope_cFv = .text:0x00006720; // type:function size:0x4
AcOivyRope__initModels = .text:0x00006730; // type:function size:0x478
AcOivyRope__init = .text:0x00006BB0; // type:function size:0x748
createHeap__13dAcOivyRope_cFv = .text:0x00006730; // type:function size:0x478
create__13dAcOivyRope_cFv = .text:0x00006BB0; // type:function size:0x748
fn_256_7300 = .text:0x00007300; // type:function size:0x8
fn_256_7310 = .text:0x00007310; // type:function size:0xB8
fn_256_73D0 = .text:0x000073D0; // type:function size:0x18C
Expand Down Expand Up @@ -102,44 +102,44 @@ fn_256_9C80 = .text:0x00009C80; // type:function size:0x3BC
fn_256_A040 = .text:0x0000A040; // type:function size:0x27C
fn_256_A2C0 = .text:0x0000A2C0; // type:function size:0x488
fn_256_A750 = .text:0x0000A750; // type:function size:0x2E4
fn_256_AA40 = .text:0x0000AA40; // type:function size:0x64
fn_256_AAB0 = .text:0x0000AAB0; // type:function size:0x38
fn_256_AAF0 = .text:0x0000AAF0; // type:function size:0xA8
fn_256_ABA0 = .text:0x0000ABA0; // type:function size:0x5C
fn_256_AC00 = .text:0x0000AC00; // type:function size:0x1FC
fn_256_AE00 = .text:0x0000AE00; // type:function size:0x4A8
fn_256_B2B0 = .text:0x0000B2B0; // type:function size:0x7F4
fn_256_BAB0 = .text:0x0000BAB0; // type:function size:0xB4
fn_256_BB70 = .text:0x0000BB70; // type:function size:0x304
fn_256_BE80 = .text:0x0000BE80; // type:function size:0x170
fn_256_BFF0 = .text:0x0000BFF0; // type:function size:0x204
fn_256_C200 = .text:0x0000C200; // type:function size:0x210
fn_256_C410 = .text:0x0000C410; // type:function size:0x2DC
fn_256_C6F0 = .text:0x0000C6F0; // type:function size:0x44
fn_256_C740 = .text:0x0000C740; // type:function size:0xD0
fn_256_C810 = .text:0x0000C810; // type:function size:0x144
fn_256_C960 = .text:0x0000C960; // type:function size:0x14
fn_256_C980 = .text:0x0000C980; // type:function size:0x30
fn_256_C9B0 = .text:0x0000C9B0; // type:function size:0x384
fn_256_CD40 = .text:0x0000CD40; // type:function size:0xDC
fn_256_CE20 = .text:0x0000CE20; // type:function size:0x17C
fn_256_CFA0 = .text:0x0000CFA0; // type:function size:0xAC
fn_256_D050 = .text:0x0000D050; // type:function size:0xB8
fn_256_D110 = .text:0x0000D110; // type:function size:0x94
fn_256_D1B0 = .text:0x0000D1B0; // type:function size:0xF8
fn_256_D2B0 = .text:0x0000D2B0; // type:function size:0x118
fn_256_D3D0 = .text:0x0000D3D0; // type:function size:0x35C
fn_256_D730 = .text:0x0000D730; // type:function size:0x70
fn_256_D7A0 = .text:0x0000D7A0; // type:function size:0xA4
fn_256_D850 = .text:0x0000D850; // type:function size:0x244
fn_256_DAA0 = .text:0x0000DAA0; // type:function size:0x3D8
fn_256_DE80 = .text:0x0000DE80; // type:function size:0x58
fn_256_DEE0 = .text:0x0000DEE0; // type:function size:0x4C
fn_256_DF30 = .text:0x0000DF30; // type:function size:0x4A4
fn_256_E3E0 = .text:0x0000E3E0; // type:function size:0x3A8
fn_256_E790 = .text:0x0000E790; // type:function size:0xB4
fn_256_E850 = .text:0x0000E850; // type:function size:0x68
fn_256_E8C0 = .text:0x0000E8C0; // type:function size:0x88
fn_256_AA40__13dAcOivyRope_cFv = .text:0x0000AA40; // type:function size:0x64
fn_256_AAB0__13dAcOivyRope_cFff = .text:0x0000AAB0; // type:function size:0x38
fn_256_AAF0__13dAcOivyRope_cFff = .text:0x0000AAF0; // type:function size:0xA8
fn_256_ABA0__13dAcOivyRope_cFv = .text:0x0000ABA0; // type:function size:0x5C
fn_256_AC00__13dAcOivyRope_cFv = .text:0x0000AC00; // type:function size:0x1FC
fn_256_AE00__13dAcOivyRope_cFv = .text:0x0000AE00; // type:function size:0x4A8
fn_256_B2B0__13dAcOivyRope_cFv = .text:0x0000B2B0; // type:function size:0x7F4
fn_256_BAB0__13dAcOivyRope_cFR7mVec3_ciss = .text:0x0000BAB0; // type:function size:0xB4
fn_256_BB70__13dAcOivyRope_cFv = .text:0x0000BB70; // type:function size:0x304
fn_256_BE80__13dAcOivyRope_cFv = .text:0x0000BE80; // type:function size:0x170
fn_256_BFF0__13dAcOivyRope_cFiff = .text:0x0000BFF0; // type:function size:0x204
fn_256_C200__13dAcOivyRope_cFi = .text:0x0000C200; // type:function size:0x210
fn_256_C410__13dAcOivyRope_cFv = .text:0x0000C410; // type:function size:0x2DC
fn_256_C6F0__13dAcOivyRope_cFv = .text:0x0000C6F0; // type:function size:0x44
fn_256_C740__13dAcOivyRope_cFv = .text:0x0000C740; // type:function size:0xD0
fn_256_C810__13dAcOivyRope_cFR7mVec3_ci = .text:0x0000C810; // type:function size:0x144
fn_256_C960__13dAcOivyRope_cFv = .text:0x0000C960; // type:function size:0x14
fn_256_C980__13dAcOivyRope_cFff = .text:0x0000C980; // type:function size:0x30
fn_256_C9B0__13dAcOivyRope_cFv = .text:0x0000C9B0; // type:function size:0x384
fn_256_CD40__13dAcOivyRope_cFv = .text:0x0000CD40; // type:function size:0xDC
fn_256_CE20__13dAcOivyRope_cFPfPfPf = .text:0x0000CE20; // type:function size:0x17C
fn_256_CFA0__13dAcOivyRope_cFb = .text:0x0000CFA0; // type:function size:0xAC
fn_256_D050__13dAcOivyRope_cFv = .text:0x0000D050; // type:function size:0xB8
fn_256_D110__13dAcOivyRope_cFv = .text:0x0000D110; // type:function size:0x94
fn_256_D1B0__13dAcOivyRope_cFv = .text:0x0000D1B0; // type:function size:0xF8
fn_256_D2B0__13dAcOivyRope_cFv = .text:0x0000D2B0; // type:function size:0x118
fn_256_D3D0__13dAcOivyRope_cFR7mVec3_cR7mVec3_csbf = .text:0x0000D3D0; // type:function size:0x35C
fn_256_D730__13dAcOivyRope_cFl = .text:0x0000D730; // type:function size:0x70
fn_256_D7A0__13dAcOivyRope_cFlRC7mVec3_c = .text:0x0000D7A0; // type:function size:0xA4
fn_256_D850__13dAcOivyRope_cFv = .text:0x0000D850; // type:function size:0x244
fn_256_DAA0__13dAcOivyRope_cFbbff = .text:0x0000DAA0; // type:function size:0x3D8
fn_256_DE80__13dAcOivyRope_cFv = .text:0x0000DE80; // type:function size:0x58
fn_256_DEE0__13dAcOivyRope_cFv = .text:0x0000DEE0; // type:function size:0x4C
fn_256_DF30__13dAcOivyRope_cFv = .text:0x0000DF30; // type:function size:0x4A4
fn_256_E3E0__13dAcOivyRope_cFv = .text:0x0000E3E0; // type:function size:0x3A8
fn_256_E790__13dAcOivyRope_cFv = .text:0x0000E790; // type:function size:0xB4
canBeLinkedToWoodTag__13dAcOivyRope_cFv = .text:0x0000E850; // type:function size:0x68
drop__13dAcOivyRope_cFv = .text:0x0000E8C0; // type:function size:0x88
build__29sFStateFct_c<13dAcOivyRope_c>FRC12sStateIDIf_c = .text:0x0000E950; // type:function size:0x60
dispose__29sFStateFct_c<13dAcOivyRope_c>FRP10sStateIf_c = .text:0x0000E9B0; // type:function size:0xC
initialize__26sFState_c<13dAcOivyRope_c>Fv = .text:0x0000E9C0; // type:function size:0x1C
Expand Down Expand Up @@ -200,15 +200,17 @@ lbl_256_data_2A0 = .data:0x000002A0; // type:object size:0x30
lbl_256_data_2D0 = .data:0x000002D0; // type:object size:0x18
lbl_256_data_2E8 = .data:0x000002E8; // type:object size:0x18
lbl_256_data_300 = .data:0x00000300; // type:object size:0x2A0
lbl_256_data_5A0 = .data:0x000005A0; // type:object size:0x34
__vt__28sFStateID_c<13dAcOivyRope_c> = .data:0x000005A0; // type:object size:0x34
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_256_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte
lbl_256_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte
lbl_256_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte
lbl_256_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte
lbl_256_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte
lbl_256_bss_118 = .bss:0x00000118; // type:object size:0xC0 data:4byte
lbl_256_bss_1D8 = .bss:0x000001D8; // type:object size:0x40 data:4byte
lbl_256_bss_218 = .bss:0x00000218; // type:object size:0x70 data:4byte
lbl_256_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte
StateID_RopeWait__13dAcOivyRope_c = .bss:0x00000018; // type:object size:0x30 data:4byte
StateID_PlayerGrip__13dAcOivyRope_c = .bss:0x00000058; // type:object size:0x30 data:4byte
StateID_RopeReturn__13dAcOivyRope_c = .bss:0x00000098; // type:object size:0x30 data:4byte
StateID_RopeCut__13dAcOivyRope_c = .bss:0x000000D8; // type:object size:0x30 data:4byte
StateID_TerryRopeWait__13dAcOivyRope_c = .bss:0x00000118; // type:object size:0x30 data:4byte
StateID_TerryRopeUp__13dAcOivyRope_c = .bss:0x00000158; // type:object size:0x30 data:4byte
StateID_TerryRopeDown__13dAcOivyRope_c = .bss:0x00000198; // type:object size:0x30 data:4byte
StateID_TerryRopeInit__13dAcOivyRope_c = .bss:0x000001D8; // type:object size:0x30 data:4byte
StateID_TerryRopePlayerCarry__13dAcOivyRope_c = .bss:0x00000218; // type:object size:0x30 data:4byte
lbl_256_bss_288 = .bss:0x00000288; // type:object size:0x8 data:byte
lbl_256_bss_290 = .bss:0x00000290; // type:object size:0x10 data:float
4 changes: 1 addition & 3 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,9 +1661,7 @@ def MatchingFor(*versions):
Rel(NonMatching, "d_a_obj_tornado", "REL/d/a/obj/d_a_obj_tornado.cpp"),
Rel(NonMatching, "d_a_obj_tower_bomb", "REL/d/a/obj/d_a_obj_tower_bomb.cpp"),
Rel(NonMatching, "d_a_obj_tower_D101", "REL/d/a/obj/d_a_obj_tower_D101.cpp"),
Rel(
Matching, "d_a_obj_tower_gearD101", "REL/d/a/obj/d_a_obj_tower_gearD101.cpp"
),
Rel(Matching, "d_a_obj_tower_gearD101", "REL/d/a/obj/d_a_obj_tower_gearD101.cpp"),
Rel(
NonMatching,
"d_a_obj_tower_hand_D101",
Expand Down
1 change: 1 addition & 0 deletions include/c/c_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace cLib {

s32 targetAngleY(const mVec3_c &target, const mVec3_c &source);
f32 addCalcPosXZ(mVec3_c *src, const mVec3_c &target, f32 scale, f32 maxStep, f32 minStep);
f32 addCalcPos(mVec3_c *src, const mVec3_c &target, f32 scale, f32 maxStep, f32 minStep);

} // namespace cLib

Expand Down
2 changes: 1 addition & 1 deletion include/d/a/d_a_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class dAcPy_c : public dAcObjBase_c {
/* vt 0x0D8 */ virtual void getItemFromClawshotsMaybe();
/* vt 0x0DC */ virtual void vt_0x0DC(dAcBase_c *, mVec3_c &);
/* vt 0x0E0 */ virtual void isUsingBomb();
/* vt 0x0E4 */ virtual void vt_0x0E4();
/* vt 0x0E4 */ virtual mVec3_c &getCenterTranslation() const;
/* vt 0x0E8 */ virtual void vt_0x0E8();
/* vt 0x0EC */ virtual void vt_0x0EC();
/* vt 0x0F0 */ virtual void vt_0x0F0();
Expand Down
Loading