diff --git a/asm/include/ov04.inc b/asm/include/ov04.inc index b428fe85..314f3659 100644 --- a/asm/include/ov04.inc +++ b/asm/include/ov04.inc @@ -1397,7 +1397,7 @@ .extern func_ov00_020d0530 .extern func_ov00_020d0530 .extern func_0204f614 -.extern data_ov00_020e5a48 +.extern _ZTV13LinkStateItem .extern data_02057200 .extern func_ov00_020b7d74 .extern func_0204f754 diff --git a/asm/include/ov05.inc b/asm/include/ov05.inc index 5d193098..8b0083e5 100644 --- a/asm/include/ov05.inc +++ b/asm/include/ov05.inc @@ -1931,7 +1931,7 @@ .extern data_027e0fac .extern func_ov00_020bbb64 .extern func_ov00_020b1e98 -.extern func_ov00_020abf70 +.extern _ZN13LinkStateItem18func_ov00_020abf70Ev .extern func_ov00_020bd318 .extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev .extern func_ov00_020a9180 diff --git a/asm/ov00/Player/LinkStateDamage.s b/asm/ov00/Player/LinkStateDamage.s index 0cab3b76..766054af 100644 --- a/asm/ov00/Player/LinkStateDamage.s +++ b/asm/ov00/Player/LinkStateDamage.s @@ -955,7 +955,7 @@ _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi: ; 0x020acb6c bl _ZN11ItemManager12GetEquipItemEi cmp r0, #0 beq _020acbb0 - bl func_ov00_020abf50 + bl _ZN13LinkStateItem15GetEquipBombchuEv bl func_ov14_0213ec64 _020acbb0: str r4, [r6, #0x18] diff --git a/asm/ov00/Player/LinkStateItem.s b/asm/ov00/Player/LinkStateItem.s index 2936071b..5a7961e0 100644 --- a/asm/ov00/Player/LinkStateItem.s +++ b/asm/ov00/Player/LinkStateItem.s @@ -3,23 +3,23 @@ .text - .global func_ov00_020abd78 - thumb_func_start func_ov00_020abd78 -func_ov00_020abd78: ; 0x020abd78 + .global _ZN13LinkStateItem8vfunc_00Ev + thumb_func_start _ZN13LinkStateItem8vfunc_00Ev +_ZN13LinkStateItem8vfunc_00Ev: ; 0x020abd78 bx lr .align 2, 0 - thumb_func_end func_ov00_020abd78 + thumb_func_end _ZN13LinkStateItem8vfunc_00Ev - .global func_ov00_020abd7c - arm_func_start func_ov00_020abd7c -func_ov00_020abd7c: ; 0x020abd7c + .global _ZN13LinkStateItem5GetIdEv + arm_func_start _ZN13LinkStateItem5GetIdEv +_ZN13LinkStateItem5GetIdEv: ; 0x020abd7c mov r0, #1 bx lr - arm_func_end func_ov00_020abd7c + arm_func_end _ZN13LinkStateItem5GetIdEv - .global func_ov00_020abd84 - arm_func_start func_ov00_020abd84 -func_ov00_020abd84: ; 0x020abd84 + .global _ZN13LinkStateItem16IsHammerEquippedEv + arm_func_start _ZN13LinkStateItem16IsHammerEquippedEv +_ZN13LinkStateItem16IsHammerEquippedEv: ; 0x020abd84 ldr r0, [r0, #0x14] cmp r0, #8 bne _020abd98 @@ -28,11 +28,11 @@ func_ov00_020abd84: ; 0x020abd84 _020abd98: mvn r0, #0 bx lr - arm_func_end func_ov00_020abd84 + arm_func_end _ZN13LinkStateItem16IsHammerEquippedEv - .global func_ov00_020abda0 - arm_func_start func_ov00_020abda0 -func_ov00_020abda0: ; 0x020abda0 + .global _ZN13LinkStateItem12OnStateLeaveEi + arm_func_start _ZN13LinkStateItem12OnStateLeaveEi +_ZN13LinkStateItem12OnStateLeaveEi: ; 0x020abda0 stmdb sp!, {r4, r5, r6, lr} mov r5, r0 mov r4, r1 @@ -60,7 +60,7 @@ _020abdec: ldrb r0, [r0, #0xe0] cmp r0, #0 bne _020abe0c - bl func_ov00_020abf50 + bl _ZN13LinkStateItem15GetEquipBombchuEv bl func_ov14_0213ec64 _020abe0c: ldr r0, _020abf48 ; =data_027e1098 @@ -128,7 +128,7 @@ _020abed4: cmp r4, #4 cmpne r4, #2 beq _020abef4 - bl func_ov00_020abf60 + bl _ZN13LinkStateItem16GetLinkStateMoveEv mov r1, #1 strb r1, [r0, #0x14] _020abef4: @@ -156,34 +156,34 @@ _020abf38: strb r0, [r5, #0x26] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_020abda0 + arm_func_end _ZN13LinkStateItem12OnStateLeaveEi _020abf44: .word data_027e103c _020abf48: .word data_027e1098 _020abf4c: .word data_027e0fb8 - .global func_ov00_020abf50 - arm_func_start func_ov00_020abf50 -func_ov00_020abf50: ; 0x020abf50 + .global _ZN13LinkStateItem15GetEquipBombchuEv + arm_func_start _ZN13LinkStateItem15GetEquipBombchuEv +_ZN13LinkStateItem15GetEquipBombchuEv: ; 0x020abf50 ldr ip, _020abf5c ; =func_01fffcec mov r0, #7 bx ip .align 2, 0 - arm_func_end func_ov00_020abf50 + arm_func_end _ZN13LinkStateItem15GetEquipBombchuEv _020abf5c: .word func_01fffcec - .global func_ov00_020abf60 - arm_func_start func_ov00_020abf60 -func_ov00_020abf60: ; 0x020abf60 + .global _ZN13LinkStateItem16GetLinkStateMoveEv + arm_func_start _ZN13LinkStateItem16GetLinkStateMoveEv +_ZN13LinkStateItem16GetLinkStateMoveEv: ; 0x020abf60 ldr ip, _020abf6c ; =func_01fffcd8 mov r0, #0 bx ip .align 2, 0 - arm_func_end func_ov00_020abf60 + arm_func_end _ZN13LinkStateItem16GetLinkStateMoveEv _020abf6c: .word func_01fffcd8 - .global func_ov00_020abf70 - arm_func_start func_ov00_020abf70 -func_ov00_020abf70: ; 0x020abf70 + .global _ZN13LinkStateItem18func_ov00_020abf70Ev + arm_func_start _ZN13LinkStateItem18func_ov00_020abf70Ev +_ZN13LinkStateItem18func_ov00_020abf70Ev: ; 0x020abf70 ldr r1, _020abf88 ; =data_027e0f74 mov r2, r0 ldr r0, [r1] @@ -191,36 +191,36 @@ func_ov00_020abf70: ; 0x020abf70 ldr r1, [r2, #0x5c] bx ip .align 2, 0 - arm_func_end func_ov00_020abf70 + arm_func_end _ZN13LinkStateItem18func_ov00_020abf70Ev _020abf88: .word data_027e0f74 _020abf8c: .word func_ov00_02097b9c - .global func_ov00_020abf90 - arm_func_start func_ov00_020abf90 -func_ov00_020abf90: ; 0x020abf90 + .global _ZN13LinkStateItem8vfunc_28Ev + arm_func_start _ZN13LinkStateItem8vfunc_28Ev +_ZN13LinkStateItem8vfunc_28Ev: ; 0x020abf90 ldr r0, [r0, #0x5c] cmp r0, #0 movlt r0, #1 movge r0, #0 bx lr - arm_func_end func_ov00_020abf90 + arm_func_end _ZN13LinkStateItem8vfunc_28Ev .data .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global data_ov00_020e5a48 -data_ov00_020e5a48: ; 0x020e5a48 - .word func_ov00_020abd78 + .global _ZTV13LinkStateItem +_ZTV13LinkStateItem: ; 0x020e5a48 + .word _ZN13LinkStateItem8vfunc_00Ev .word func_ov04_02109ae8 .word func_ov04_02109b08 - .word func_ov00_020abd7c - 1 + .word _ZN13LinkStateItem5GetIdEv - 1 .word func_ov04_0210adf8 .word func_ov05_0210540c - .word func_ov00_020abda0 - 1 + .word _ZN13LinkStateItem12OnStateLeaveEi - 1 .word func_ov05_021055e0 .word func_ov05_02105670 .word func_ov05_021057c4 - .word func_ov00_020abf90 - 1 + .word _ZN13LinkStateItem8vfunc_28Ev - 1 .word func_ov05_0210f704 .word func_ov05_0210f708 .word _ZN13LinkStateBase8vfunc_34EP5Vec3p diff --git a/asm/ov00/Player/include/LinkStateDamage.inc b/asm/ov00/Player/include/LinkStateDamage.inc index 07f006bd..93466f0a 100644 --- a/asm/ov00/Player/include/LinkStateDamage.inc +++ b/asm/ov00/Player/include/LinkStateDamage.inc @@ -142,7 +142,7 @@ .extern func_ov00_0207b89c .extern data_ov00_020e9c88 .extern _ZN11ItemManager12GetEquipItemEi -.extern func_ov00_020abf50 +.extern _ZN13LinkStateItem15GetEquipBombchuEv .extern func_ov14_0213ec64 .extern func_01ffa0f4 .extern _ZN13LinkStateBase14GetPlayerAngleEv diff --git a/asm/ov00/include/ov00_020ae7a4.inc b/asm/ov00/include/ov00_020ae7a4.inc index 5a44bbf4..f6abe0f8 100644 --- a/asm/ov00/include/ov00_020ae7a4.inc +++ b/asm/ov00/include/ov00_020ae7a4.inc @@ -816,7 +816,7 @@ .extern func_ov00_02097738 .extern func_ov00_02097750 .extern _ZN13LinkStateBase16GetLinkItemStateEv -.extern func_ov00_020abd84 +.extern _ZN13LinkStateItem16IsHammerEquippedEv .extern _ZNK11ItemManager16GetEquippedFairyEv .extern _ZNK11ItemManager8GetFairyEi .extern _ZNK11ItemManager16GetEquippedFairyEv @@ -987,7 +987,7 @@ .extern func_ov00_020b4558 .extern func_01ffa0f4 .extern func_ov00_020b44d4 -.extern func_ov00_020abf60 +.extern _ZN13LinkStateItem16GetLinkStateMoveEv .extern func_ov05_021113d0 .extern data_027e0fd0 .extern data_027e0fac diff --git a/asm/ov00/ov00_020ae7a4.s b/asm/ov00/ov00_020ae7a4.s index 690ae7f3..b3872fed 100644 --- a/asm/ov00/ov00_020ae7a4.s +++ b/asm/ov00/ov00_020ae7a4.s @@ -12704,7 +12704,7 @@ _020b8978: movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} bl _ZN13LinkStateBase16GetLinkItemStateEv - bl func_ov00_020abd84 + bl _ZN13LinkStateItem16IsHammerEquippedEv mvn r1, #0 cmp r0, r1 bne _020b89f0 @@ -16292,7 +16292,7 @@ func_ov00_020bb6d4: ; 0x020bb6d4 ldr r0, [r2] mov r2, #0x1000 bl func_ov00_020b44d4 - bl func_ov00_020abf60 + bl _ZN13LinkStateItem16GetLinkStateMoveEv bl func_ov05_021113d0 ldr r1, [sp, #8] add sp, sp, #0x10 diff --git a/asm/ov04.s b/asm/ov04.s index c3810028..803e3f5d 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -18460,7 +18460,7 @@ func_ov04_02109a58: ; 0x02109a58 sub sp, #4 add r4, r0, #0 bl func_ov04_0210add4 - ldr r0, _02109ad8 ; =data_ov00_020e5a48 + ldr r0, _02109ad8 ; =_ZTV13LinkStateItem ldr r3, _02109adc ; =func_ov04_021079d4 str r0, [r4] ldr r0, _02109ae0 ; =data_02057200 @@ -18520,7 +18520,7 @@ func_ov04_02109a58: ; 0x02109a58 pop {r3, r4, pc} .align 2, 0 thumb_func_end func_ov04_02109a58 -_02109ad8: .word data_ov00_020e5a48 +_02109ad8: .word _ZTV13LinkStateItem _02109adc: .word func_ov04_021079d4 _02109ae0: .word data_02057200 _02109ae4: .word func_ov00_020b7d74 diff --git a/asm/ov05.s b/asm/ov05.s index 45bd851b..967bbf48 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -19570,7 +19570,7 @@ func_ov05_02111358: ; 0x02111358 cmp r0, #0 bne _0211138c bl func_ov05_02107870 - bl func_ov00_020abf70 + bl _ZN13LinkStateItem18func_ov00_020abf70Ev cmp r0, #0 beq _02111394 _0211138c: diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp index dfd2ef62..1faf16ab 100644 --- a/src/00_Core/Player/LinkStateItem.cpp +++ b/src/00_Core/Player/LinkStateItem.cpp @@ -9,5 +9,6 @@ void LinkStateItem::OnStateLeave(s32 param1) {} EquipBombchu* LinkStateItem::GetEquipBombchu() {} LinkStateMove* LinkStateItem::GetLinkStateMove() {} bool LinkStateItem::func_ov00_020abf70() {} +bool LinkStateItem::vfunc_28() {} #endif