mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 15:01:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add PlayerControl and move all .inc files

Browse Source 
My worktree was too big to make two separate commits :p
This commit is contained in:
Aetias
2024-04-06 09:26:14 +02:00
parent c7ee2f1258
commit cab451da34
163 changed files with 3540 additions and 3325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dtcm.inc
+1
View File
@@ -0,0 +1 @@
#pragma once
asm/dtcm.s
+1
View File
@@ -1,3 +1,4 @@
.include "dtcm.inc"
.include "macros/function.inc"
.data
asm/include/itcm.inc → asm/itcm.inc
View File
asm/itcm.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/itcm.inc"
.include "itcm.inc"
.text
asm/include/main.inc → asm/main.inc
View File
asm/main.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/main.inc"
.include "main.inc"
.text
.ifdef EUR
asm/ov00/Item/Item.inc
+1
View File
@@ -0,0 +1 @@
#pragma once
asm/ov00/Item/Item.s
+1
View File
@@ -1,3 +1,4 @@
.include "ov00/Item/Item.inc"
.include "macros/function.inc"
.text
asm/ov00/Item/include/ItemManager.inc → asm/ov00/Item/ItemManager.inc
View File
asm/ov00/Item/ItemManager.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/Item/include/ItemManager.inc"
.include "ov00/Item/ItemManager.inc"
.text
asm/ov00/Player/include/LinkStateBase.inc → asm/ov00/Player/LinkStateBase.inc
+2 -2
View File
@@ -4,7 +4,8 @@
.extern _ZN10PlayerBase6LookAtEP5Vec3p
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern _ZN13LinkStateRoll18func_ov00_020aeeacEv
.extern _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
.extern _ZN13PlayerControl18func_ov00_020af4a4Ev
.extern data_02050f54
.extern data_027e0618
.extern data_027e0c68
@@ -33,7 +34,6 @@
.extern func_ov00_0208b180
.extern func_ov00_02097bbc
.extern func_ov00_020a5e9c
.extern func_ov00_020af4a4
.extern func_ov00_020b1498
.extern func_ov00_020b1a4c
.extern func_ov00_020b44d4
asm/ov00/Player/LinkStateBase.s
+4 -4
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/Player/include/LinkStateBase.inc"
.include "ov00/Player/LinkStateBase.inc"
.text
@@ -68,7 +68,7 @@ _020a8010: ; jump table
_020a8030:
cmp r4, #0
beq _020a8048
bl _ZN13LinkStateRoll18func_ov00_020aeeacEv
bl _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
@@ -83,7 +83,7 @@ _020a8050:
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
bne _020a807c
bl _ZN13LinkStateRoll18func_ov00_020aeeacEv
bl _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
@@ -113,7 +113,7 @@ _020a80c8:
beq _020a80e8
ldr r0, _020a8104 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af4a4
bl _ZN13PlayerControl18func_ov00_020af4a4Ev
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
asm/ov00/Player/include/LinkStateDamage.inc → asm/ov00/Player/LinkStateDamage.inc
View File
asm/ov00/Player/LinkStateDamage.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/Player/include/LinkStateDamage.inc"
.include "ov00/Player/LinkStateDamage.inc"
.text
asm/ov00/Player/include/LinkStateInteract.inc → asm/ov00/Player/LinkStateInteract.inc
+7 -7
View File
@@ -28,6 +28,13 @@
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern _ZN13LinkStateBase8vfunc_24Ei
.extern _ZN13LinkStateBase8vfunc_28Ev
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl14GetFollowActorEv
.extern _ZN13PlayerControl18func_ov00_020afe88Eib
.extern _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb
.extern _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
.extern _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor
.extern _ZN13PlayerControl9SetUnk_80Ev
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern data_02050f54
@@ -48,13 +55,6 @@
.extern func_0202da8c
.extern func_020350b4
.extern func_020351b8
.extern func_ov00_020aeffc
.extern func_ov00_020af044
.extern func_ov00_020af050
.extern func_ov00_020afe88
.extern func_ov00_020b049c
.extern func_ov00_020b05e8
.extern func_ov00_020b0ad0
.extern func_ov00_020ba458
.extern func_ov00_020c1908
.extern func_ov00_020c2a0c
asm/ov00/Player/LinkStateInteract.s
+14 -14
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/Player/include/LinkStateInteract.inc"
.include "ov00/Player/LinkStateInteract.inc"
.text
@@ -282,7 +282,7 @@ _020aa590:
_020aa5a0:
ldr r0, _020aa78c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r1, _020aa790 ; =data_ov00_020e592c
mov r0, r4
mov r2, #1
@@ -345,7 +345,7 @@ _020aa674:
_020aa684:
ldr r0, _020aa78c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r0, _020aa7a8 ; =data_027e0fe4
add r1, r4, #0x10
ldr r0, [r0]
@@ -406,7 +406,7 @@ _020aa74c:
_020aa75c:
ldr r0, _020aa78c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
b _020aa778
_020aa76c:
mov r0, r4
@@ -441,7 +441,7 @@ _ZN17LinkStateInteract12OnStateLeaveEi: ; 0x020aa7b0
ldrb r1, [r0, #0x80]
cmp r1, #0
beq _020aa7d4
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
_020aa7d4:
mov r0, r4
bl _ZN13LinkStateBase12GetGrabActorEv
@@ -810,7 +810,7 @@ _020aacf4:
ldr r0, _020ab3cc ; =data_027e0fb8
add r1, r4, #0x18
ldr r0, [r0]
bl func_ov00_020b05e8
bl _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
cmp r0, #0
beq _020aad64
_020aad3c:
@@ -831,7 +831,7 @@ _020aad64:
mov r2, r5
ldr r0, [r0]
add r1, r4, #0x18
bl func_ov00_020b049c
bl _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb
cmp r0, #0
beq _020aadb0
_020aad88:
@@ -867,7 +867,7 @@ _020aadbc:
ldr r2, _020ab3cc ; =data_027e0fb8
ldr r1, [r0, #0xe0]
ldr r0, [r2]
bl func_ov00_020b0ad0
bl _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor
cmp r0, #0
beq _020aae2c
mov r0, r4
@@ -897,12 +897,12 @@ _020aae54:
ldr r1, [r6, #0x12c]
ldr r0, [r0]
moveq r2, #0
bl func_ov00_020afe88
bl _ZN13PlayerControl18func_ov00_020afe88Eib
cmp r0, #0
bne _020aae90
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
add sp, sp, #0xc8
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
@@ -999,7 +999,7 @@ _020aafd8:
bge _020aaff4
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
_020aaff4:
add sp, sp, #0xc8
mov r0, #0
@@ -1120,7 +1120,7 @@ _020ab170:
strb r1, [r2, #0x79]
strb r1, [r2, #0x7b]
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
mov r0, #3
str r0, [r4, #4]
ldr r1, [sp, #0x14]
@@ -1253,7 +1253,7 @@ _020ab38c:
_020ab398:
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
add sp, sp, #0xc8
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, pc}
@@ -1561,7 +1561,7 @@ _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p: ; 0x020ab770
mov r6, r0
ldr r0, [r2]
mov r5, r1
bl func_ov00_020aeffc
bl _ZN13PlayerControl14GetFollowActorEv
movs r4, r0
beq _020ab7a8
mov r0, r6
asm/ov00/Player/include/LinkStateItem.inc → asm/ov00/Player/LinkStateItem.inc
+1 -1
View File
@@ -3,6 +3,7 @@
.extern _ZN13LinkStateBase12OnStateLeaveEi
.extern _ZN13LinkStateBase18EquipItem_vfunc_28Ev
.extern _ZN13LinkStateBase8vfunc_34EP5Vec3p
.extern _ZN13PlayerControl13StopFollowingEv
.extern data_027e0f74
.extern data_027e0fb8
.extern data_027e103c
@@ -10,7 +11,6 @@
.extern func_01fffcd8
.extern func_01fffcec
.extern func_ov00_02097b9c
.extern func_ov00_020af050
.extern func_ov00_020b7e6c
.extern func_ov00_020cf01c
.extern func_ov00_020cf9dc
asm/ov00/Player/LinkStateItem.s
+2 -2
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/Player/include/LinkStateItem.inc"
.include "ov00/Player/LinkStateItem.inc"
.text
@@ -150,7 +150,7 @@ _020abf20:
ldrb r1, [r0, #0x80]
cmp r1, #0
beq _020abf38
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
_020abf38:
mov r0, #0
strb r0, [r5, #0x26]
asm/ov00/Player/include/LinkStateRoll.inc → asm/ov00/Player/LinkStateRoll.inc
+4 -5
View File
@@ -20,18 +20,17 @@
.extern _ZN13LinkStateBase8vfunc_24Ei
.extern _ZN13LinkStateBase8vfunc_28Ev
.extern _ZN13LinkStateBase8vfunc_34EP5Vec3p
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
.extern _ZN13PlayerControl18func_ov00_020b034cEv
.extern _ZN13PlayerControl18func_ov00_020b12d0EPs
.extern data_02050f54
.extern data_02056be4
.extern data_027e0618
.extern data_027e077c
.extern data_027e0e58
.extern data_027e0fb8
.extern data_ov00_020eec9c
.extern func_ov00_0207c39c
.extern func_ov00_0207c444
.extern func_ov00_020af050
.extern func_ov00_020b034c
.extern func_ov00_020b12d0
.extern func_ov00_020b4c2c
.extern func_ov00_020b7e6c
.extern func_ov00_020d7a84
asm/ov00/Player/LinkStateRoll.s
+6 -33
View File
@@ -1,4 +1,4 @@
.include "ov00/Player/include/LinkStateRoll.inc"
.include "ov00/Player/LinkStateRoll.inc"
.include "macros/function.inc"
.text
@@ -117,7 +117,7 @@ _020ae7e8:
_020ae8f0:
ldr r0, _020aeb18 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
ldr r1, _020aeb1c ; =data_ov00_020e6078
mov r0, r4
mov r2, #1
@@ -366,7 +366,7 @@ _ZN13LinkStateRoll8vfunc_20Ei: ; 0x020aec10
bl _ZN13LinkStateBase14GetPlayerAngleEv
mov r1, r0
mov r0, r6
bl func_ov00_020b12d0
bl _ZN13PlayerControl18func_ov00_020b12d0EPs
cmp r0, #0
beq _020aecc8
mov r0, r5
@@ -421,12 +421,12 @@ _020aed08:
blt _020aed70
ldr r0, _020aed84 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
cmp r0, #0
ble _020aed70
ldr r0, _020aed84 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
mov r2, #0
mov r1, r0
mov r0, r5
@@ -496,7 +496,7 @@ _020aee14:
bl func_ov05_0211139c
cmp r0, #0
bne _020aee48
bl _ZN13LinkStateRoll18func_ov00_020aeeacEv
bl _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
cmp r0, #0
beq _020aee48
mov r0, #1
@@ -542,33 +542,6 @@ _ZN13LinkStateRoll18func_ov00_020aee84Ev: ; 0x020aee84
bx lr
arm_func_end _ZN13LinkStateRoll18func_ov00_020aee84Ev
.global _ZN13LinkStateRoll18func_ov00_020aeeacEv
arm_func_start _ZN13LinkStateRoll18func_ov00_020aeeacEv
_ZN13LinkStateRoll18func_ov00_020aeeacEv: ; 0x020aeeac
ldr r0, _020aeef0 ; =data_027e077c
ldr r2, _020aeef4 ; =data_02056be4
ldr r1, [r0]
mov r3, r1
ldrb r1, [r2, r1]
tst r1, #1
bne _020aeed4
ldrb r1, [r2, r3]
tst r1, #4
beq _020aeedc
_020aeed4:
mov r0, #0
bx lr
_020aeedc:
ldr r0, [r0, #4]
cmp r3, r0
moveq r0, #1
movne r0, #0
bx lr
.align 2, 0
arm_func_end _ZN13LinkStateRoll18func_ov00_020aeeacEv
_020aeef0: .word data_027e077c
_020aeef4: .word data_02056be4
.data
.global data_ov00_020e6078
data_ov00_020e6078: ; 0x020e6078
asm/ov00/Player/include/PlayerBase.inc → asm/ov00/Player/PlayerBase.inc
+1 -1
View File
@@ -1,6 +1,7 @@
#pragma once
.extern _ZN11ItemManager18EquipItem_vfunc_2cEi
.extern _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
.extern _ZN13PlayerControl9UpdateAimEv
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern data_027e0c54
@@ -25,7 +26,6 @@
.extern func_ov00_0208ae94
.extern func_ov00_0208f030
.extern func_ov00_02097700
.extern func_ov00_020aef68
.extern func_ov00_020c357c
.extern func_ov04_0210b258
.extern func_ov04_0210b280
asm/ov00/Player/PlayerBase.s
+2 -2
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/Player/include/PlayerBase.inc"
.include "ov00/Player/PlayerBase.inc"
.text
@@ -358,7 +358,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
ldr r0, _020a7f78 ; =data_027e0fb8
str r5, [r1, #8]
ldr r0, [r0]
blx func_ov00_020aef68
blx _ZN13PlayerControl9UpdateAimEv
ldr r0, _020a7f7c ; =data_027e0fe4
ldrb r1, [sp, #0x18]
ldr r0, [r0]
asm/ov00/Player/PlayerControl.inc
+79
View File
@@ -0,0 +1,79 @@
#pragma once
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZNK11ItemManager15GetEquippedItemEv
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager9HasPotionEj
.extern data_02050f54
.extern data_02056be4
.extern data_027e05f8
.extern data_027e077c
.extern data_027e0c68
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0e2c
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fc8
.extern data_027e0fcc
.extern data_027e0fe4
.extern data_027e0ffc
.extern data_027e103c
.extern data_ov00_020eec60
.extern data_ov00_020eec9c
.extern func_01ff991c
.extern func_01ff992c
.extern func_01ff9958
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffe468
.extern func_02002c14
.extern func_0202b2e8
.extern func_0202d95c
.extern func_ov00_02078b40
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083c7c
.extern func_ov00_020840c4
.extern func_ov00_02085108
.extern func_ov00_02085594
.extern func_ov00_0208b180
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_020a5e9c
.extern func_ov00_020b78a0
.extern func_ov00_020b7924
.extern func_ov00_020b7d4c
.extern func_ov00_020b7d6c
.extern func_ov00_020ba204
.extern func_ov00_020baca8
.extern func_ov00_020bad18
.extern func_ov00_020bc46c
.extern func_ov00_020c28ec
.extern func_ov00_020c2a0c
.extern func_ov00_020c3484
.extern func_ov00_020c3674
.extern func_ov00_020cebcc
.extern func_ov00_020ced64
.extern func_ov00_020ced7c
.extern func_ov00_020cf20c
.extern func_ov00_020cf2b8
.extern func_ov00_020cf330
.extern func_ov00_020d6be4
.extern func_ov00_020d77e4
.extern func_ov05_02103f4c
.extern func_ov15_0213ce4c
.extern func_ov15_0213dcb0
.extern func_ov15_0213dcb8
.extern func_ov24_02178348
.extern gItemManager
asm/ov00/Player/PlayerControl.s
+2959
View File
File diff suppressed because it is too large Load Diff
asm/ov00/Player/include/TouchControl.inc → asm/ov00/Player/TouchControl.inc
View File
asm/ov00/Player/TouchControl.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/Player/include/TouchControl.inc"
.include "ov00/Player/TouchControl.inc"
.text
asm/ov00/include/ov00_020773c0.inc → asm/ov00/ov00_020773c0.inc
View File
asm/ov00/ov00_020773c0.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/include/ov00_020773c0.inc"
.include "ov00/ov00_020773c0.inc"
.text
asm/ov00/include/ov00_0207af9c.inc → asm/ov00/ov00_0207af9c.inc
View File
asm/ov00/ov00_0207af9c.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/include/ov00_0207af9c.inc"
.include "ov00/ov00_0207af9c.inc"
.text
asm/ov00/include/ov00_020a8e04.inc → asm/ov00/ov00_020a8e04.inc
+2 -2
View File
@@ -11,6 +11,8 @@
.extern _ZN13LinkStateBase8vfunc_28Ev
.extern _ZN13LinkStateBase8vfunc_34EP5Vec3p
.extern _ZN13LinkStateBase9GetHealthEv
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl18func_ov00_020af01cEPc
.extern _ZN9SysObjectdlEPv
.extern data_02050f54
.extern data_027e016c
@@ -65,8 +67,6 @@
.extern func_ov00_02083a1c
.extern func_ov00_02083c7c
.extern func_ov00_020840c4
.extern func_ov00_020af01c
.extern func_ov00_020af050
.extern func_ov00_020b3ea8
.extern func_ov00_020b3eac
.extern func_ov00_020c06b0
asm/ov00/ov00_020a8e04.s
+29 -3
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/include/ov00_020a8e04.inc"
.include "ov00/ov00_020a8e04.inc"
.text
@@ -227,7 +227,7 @@ func_ov00_020a9028: ; 0x020a9028
ldrb r1, [r0, #0x80]
cmp r1, #0
beq _020a904c
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
_020a904c:
ldr r0, [r5, #4]
cmp r0, #6
@@ -351,7 +351,7 @@ func_ov00_020a9180: ; 0x020a9180
mov r0, r3
strb r2, [sp]
strb r2, [sp, #1]
bl func_ov00_020af01c
bl _ZN13PlayerControl18func_ov00_020af01cEPc
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
@@ -2387,3 +2387,29 @@ data_ov00_020e58e0: ; 0x020e58e0
.global data_ov00_020e58e4
data_ov00_020e58e4: ; 0x020e58e4
.word func_ov00_020a9eb4 - 1
.sbss
.global data_ov00_020ee178
data_ov00_020ee178:
.space 0x4
.global data_ov00_020ee17c
data_ov00_020ee17c:
.space 0x4
.global data_ov00_020ee180
data_ov00_020ee180:
.space 0x4
.global data_ov00_020ee184
data_ov00_020ee184:
.space 0x4
.global data_ov00_020ee188
data_ov00_020ee188:
.space 0x4
.global data_ov00_020ee18c
data_ov00_020ee18c:
.space 0x4
.global data_ov00_020ee190
data_ov00_020ee190:
.space 0x4
.global data_ov00_020ee194
data_ov00_020ee194:
.space 0x4
asm/ov00/include/ov00_020ae7a4.inc → asm/ov00/ov00_020ae7a4.inc
+4 -11
View File
@@ -46,7 +46,10 @@
.extern _ZN13LinkStateBase8vfunc_34EP5Vec3p
.extern _ZN13LinkStateItem16GetLinkStateMoveEv
.extern _ZN13LinkStateItem16IsHammerEquippedEv
.extern _ZN13LinkStateRoll18func_ov00_020aeeacEv
.extern _ZN13PlayerControl13GetTouchAngleEv
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl18func_ov00_020aeef8Ev
.extern _ZN13PlayerControl18func_ov00_020b034cEv
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
.extern _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
@@ -62,14 +65,12 @@
.extern _ZN4Item18func_ov00_020ad068Ei
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager15GetEquippedItemEv
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZNK11ItemManager19GetEquippedShipPartEj
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager9HasPotionEj
.extern data_02050f54
.extern data_02051f54
.extern data_02052f54
@@ -86,7 +87,6 @@
.extern data_027e0438
.extern data_027e045c
.extern data_027e0468
.extern data_027e05f8
.extern data_027e0618
.extern data_027e0764
.extern data_027e077c
@@ -103,7 +103,6 @@
.extern data_027e0d84
.extern data_027e0db0
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
@@ -450,9 +449,7 @@
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern func_ov00_02084c5c
.extern func_ov00_02085108
.extern func_ov00_020853fc
.extern func_ov00_02085594
.extern func_ov00_020872e8
.extern func_ov00_02087338
.extern func_ov00_0208766c
@@ -651,9 +648,6 @@
.extern func_ov14_02153144
.extern func_ov14_021532a4
.extern func_ov15_0213a524
.extern func_ov15_0213ce4c
.extern func_ov15_0213dcb0
.extern func_ov15_0213dcb8
.extern func_ov15_0214d21c
.extern func_ov15_0214d238
.extern func_ov15_0214d248
@@ -663,7 +657,6 @@
.extern func_ov23_02176034
.extern func_ov23_021763c0
.extern func_ov23_02177e7c
.extern func_ov24_02178348
.extern func_ov26_0216ebc0
.extern func_ov26_0216ecb8
.extern func_ov26_021767ec
asm/ov00/ov00_020ae7a4.s
+7 -2955
View File
File diff suppressed because it is too large Load Diff
asm/ov00/include/ov00_init.inc → asm/ov00/ov00_init.inc
View File
asm/ov00/ov00_init.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "ov00/include/ov00_init.inc"
.include "ov00/ov00_init.inc"
.section .init, 4, 1, 4
.global func_ov00_020df338
asm/include/ov01.inc → asm/ov01.inc
View File
asm/ov01.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov01.inc"
.include "ov01.inc"
.text
asm/include/ov02.inc → asm/ov02.inc
View File
asm/ov02.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov02.inc"
.include "ov02.inc"
.text
asm/include/ov03.inc → asm/ov03.inc
View File
asm/ov03.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov03.inc"
.include "ov03.inc"
.text
asm/include/ov04.inc → asm/ov04.inc
+1 -1
View File
@@ -6,6 +6,7 @@
.extern _ZN11ItemManager6CreateEv
.extern _ZN11ItemManager7DestroyEv
.extern _ZN12TouchControlC2Ev
.extern _ZN13PlayerControl18func_ov00_020aef30Ev
.extern _ZN14OverlayManager4LoadEjj
.extern _ZN14OverlayManager6UnloadEj
.extern _ZN9SysObjectdlEPv
@@ -540,7 +541,6 @@
.extern func_ov00_020a9ab8
.extern func_ov00_020aa084
.extern func_ov00_020aa0f0
.extern func_ov00_020aef30
.extern func_ov00_020b4250
.extern func_ov00_020b4b90
.extern func_ov00_020b78a0
asm/ov04.s
+2 -2
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov04.inc"
.include "ov04.inc"
.text
@@ -14962,7 +14962,7 @@ func_ov04_02107e9c: ; 0x02107e9c
_02107ef6:
ldr r0, _02107f34 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020aef30
bl _ZN13PlayerControl18func_ov00_020aef30Ev
ldr r0, _02107f2c ; =gItemManager
ldr r0, [r0]
bl _ZN11ItemManager21ClearPrevEquippedItemEv
asm/include/ov05.inc → asm/ov05.inc
+23 -23
View File
@@ -76,6 +76,28 @@
.extern _ZN13LinkStateItem18func_ov00_020abf70Ev
.extern _ZN13LinkStateRoll18func_ov00_020aee58Est
.extern _ZN13LinkStateRoll18func_ov00_020aee84Ev
.extern _ZN13PlayerControl13GetTouchAngleEv
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl14CheckTouchFastEj
.extern _ZN13PlayerControl14GetFollowActorEv
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN13PlayerControl16CheckNotTouchingEv
.extern _ZN13PlayerControl17IsNotUntouchedNowEv
.extern _ZN13PlayerControl18func_ov00_020aeef8Ev
.extern _ZN13PlayerControl18func_ov00_020af01cEPc
.extern _ZN13PlayerControl18func_ov00_020af538Ev
.extern _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
.extern _ZN13PlayerControl18func_ov00_020afb6cEv
.extern _ZN13PlayerControl18func_ov00_020afeecEib
.extern _ZN13PlayerControl18func_ov00_020b014cEv
.extern _ZN13PlayerControl18func_ov00_020b034cEv
.extern _ZN13PlayerControl18func_ov00_020b0418Ev
.extern _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
.extern _ZN13PlayerControl18func_ov00_020b0b0cEPsPiS1_Pb
.extern _ZN13PlayerControl18func_ov00_020b129cEv
.extern _ZN13PlayerControl18func_ov00_020b13c4Ev
.extern _ZN13PlayerControl20UpdateUsingEquipItemEv
.extern _ZN13PlayerControl9SetUnk_80Ev
.extern _ZN15LinkStateDamage18func_ov00_020ac9e4Ei
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
@@ -86,7 +108,7 @@
.extern _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Ve
.extern _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
.extern _ZN4Item18func_ov00_020ad020Ei
.extern _ZN9SysObjectdlEPv
.extern _ZNK11ItemManager13HasAllPotionsEv
@@ -377,28 +399,6 @@
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
.extern func_ov00_020a990c
.extern func_ov00_020aeef8
.extern func_ov00_020aeffc
.extern func_ov00_020af01c
.extern func_ov00_020af044
.extern func_ov00_020af050
.extern func_ov00_020af298
.extern func_ov00_020af454
.extern func_ov00_020af538
.extern func_ov00_020afad8
.extern func_ov00_020afb6c
.extern func_ov00_020afeec
.extern func_ov00_020b014c
.extern func_ov00_020b0328
.extern func_ov00_020b034c
.extern func_ov00_020b0418
.extern func_ov00_020b0778
.extern func_ov00_020b0ab4
.extern func_ov00_020b0b0c
.extern func_ov00_020b1214
.extern func_ov00_020b129c
.extern func_ov00_020b134c
.extern func_ov00_020b13c4
.extern func_ov00_020b1940
.extern func_ov00_020b199c
.extern func_ov00_020b1bfc
asm/ov05.s
+58 -58
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov05.inc"
.include "ov05.inc"
.text
@@ -5965,7 +5965,7 @@ func_ov05_02105850: ; 0x02105850
ldr r0, _02105bf0 ; =data_027e0fb8
strb r1, [r6, #0x25]
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
mov r0, r4
bl func_ov00_020bf028
cmp r0, #0
@@ -6041,12 +6041,12 @@ _02105968:
beq _02105b6c
ldr r0, _02105bf0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020aeffc
bl _ZN13PlayerControl14GetFollowActorEv
cmp r0, #0
beq _021059e0
ldr r0, _02105bf0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020aeffc
bl _ZN13PlayerControl14GetFollowActorEv
mov r5, r0
mov r0, r6
bl _ZN13LinkStateBase12GetPlayerPosEv
@@ -6480,7 +6480,7 @@ _02105f4c:
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _021065f0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
ldr r1, _021065f4 ; =0x00000ccd
cmp r0, r1
blt _02105fd8
@@ -6840,7 +6840,7 @@ _021064e0:
_021064f4:
ldr r0, _021065f0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
mov r7, r0
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8c64Ev
@@ -6853,7 +6853,7 @@ _021064f4:
ble _0210653c
ldr r0, _021065f0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b0328
bl _ZN13PlayerControl13GetTouchAngleEv
mov r1, r0
b _02106554
_0210653c:
@@ -7042,7 +7042,7 @@ func_ov05_02106740: ; 0x02106740
mov r0, r7
add r3, r6, #0x1c
str ip, [sp]
bl func_ov00_020b0b0c
bl _ZN13PlayerControl18func_ov00_020b0b0cEPsPiS1_Pb
cmp r0, #0
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, r6, r7, pc}
@@ -7248,7 +7248,7 @@ func_ov05_02106a50: ; 0x02106a50
ldrb r1, [r0, #0x80]
cmp r1, #0
beq _02106a84
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
_02106a84:
mov r0, #4
bl func_01fffcd8
@@ -7360,7 +7360,7 @@ func_ov05_02106bbc: ; 0x02106bbc
ldr r0, _02106c6c ; =data_027e0fb8
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020af01c
bl _ZN13PlayerControl18func_ov00_020af01cEPc
cmp r0, #0
beq _02106c64
mov r0, r5
@@ -7547,7 +7547,7 @@ _02106e0c:
blt _02106ee0
ldr r0, _021071dc ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
ldr r1, _021071e0 ; =0x00000ccd
cmp r0, r1
blt _02106eac
@@ -7754,7 +7754,7 @@ _02107188:
bl _ZN13LinkStateBase12GetPlayerPosEv
mov r1, r0
mov r0, r4
bl func_ov00_020b014c
bl _ZN13PlayerControl18func_ov00_020b014cEv
ldr r0, _021071f4 ; =data_027e103c
mov r1, #1
ldr r0, [r0]
@@ -7807,7 +7807,7 @@ func_ov05_02107214: ; 0x02107214
mov r4, r0
ldr r0, [r1]
mov r1, #1
bl func_ov00_020af454
bl _ZN13PlayerControl14CheckTouchFastEj
cmp r0, #0
movne r0, #5
strneh r0, [r4, #0xe]
@@ -7922,7 +7922,7 @@ func_ov05_021073b8: ; 0x021073b8
ldr r1, _0210759c ; =data_027e0fb8
mov r5, r0
ldr r0, [r1]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
mov r4, r0
cmp r4, #0
ble _02107430
@@ -7931,7 +7931,7 @@ func_ov05_021073b8: ; 0x021073b8
ldr r1, _0210759c ; =data_027e0fb8
ldr r6, [r0]
ldr r0, [r1]
bl func_ov00_020b0328
bl _ZN13PlayerControl13GetTouchAngleEv
smull r1, r2, r4, r6
adds r3, r1, #0x800
mov r1, r0
@@ -7999,7 +7999,7 @@ _021074c8:
bl _ZN13LinkStateBase6TurnToEsii
ldr r0, _0210759c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b0328
bl _ZN13PlayerControl13GetTouchAngleEv
sub r0, r0, r6
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -8255,7 +8255,7 @@ func_ov05_02107880: ; 0x02107880
mov r5, r0
ldr r0, [r1]
mov r1, #1
bl func_ov00_020af454
bl _ZN13PlayerControl14CheckTouchFastEj
cmp r0, #0
beq _021078b4
mov r0, r5
@@ -8350,7 +8350,7 @@ _021079d0:
ble _02107a08
ldr r0, _02107b64 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b134c
bl _ZN13PlayerControl14IsTouchingFastEv
cmp r0, #0
beq _02107b1c
ldrsh r1, [r4, #0x10]
@@ -8857,7 +8857,7 @@ func_ov05_02108094: ; 0x02108094
ldr r0, _02108184 ; =data_027e0fb8
mov r1, #1
ldr r0, [r0]
bl func_ov00_020af454
bl _ZN13PlayerControl14CheckTouchFastEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -9572,7 +9572,7 @@ func_ov05_021089f4: ; 0x021089f4
bl _ZN13LinkStateBase18func_ov00_020a82acEv
ldr r0, _02108ce0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r0, [r4, #0x74]
cmp r0, #0x87
bne _02108a70
@@ -9962,7 +9962,7 @@ func_ov05_02108f38: ; 0x02108f38
ldmgeia sp!, {r4, pc}
ldr r0, _02108f94 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1214
bl _ZN13PlayerControl17IsNotUntouchedNowEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
_02108f88:
@@ -11142,7 +11142,7 @@ _02109f78:
func_ov05_02109f88: ; 0x02109f88
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020aeef8
bl _ZN13PlayerControl18func_ov00_020aeef8Ev
cmp r0, #0
beq _02109fdc
ldrsh r0, [r4, #0x7e]
@@ -12432,7 +12432,7 @@ _0210ae98:
add r1, sp, #0x1c
add r3, sp, #8
mov r0, r6
bl func_ov00_020b0778
bl _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
cmp r0, #0
beq _0210b244
ldr r1, [sp, #8]
@@ -12548,7 +12548,7 @@ func_ov05_0210b2a4: ; 0x0210b2a4
_0210b2fc:
ldr r0, _0210b3b4 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b0ab4
bl _ZN13PlayerControl16CheckNotTouchingEv
cmp r0, #0
bne _0210b324
ldr r0, _0210b3b8 ; =data_027e0f74
@@ -12784,7 +12784,7 @@ _0210b5f4:
_0210b608:
ldr r0, _0210b95c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
mov r0, r5
bl _ZN13LinkStateBase18EquipItem_vfunc_28Ev
ldr r1, _0210b960 ; =data_ov05_02112984
@@ -12807,7 +12807,7 @@ _0210b634:
ldr r1, _0210b95c ; =data_027e0fb8
strh r2, [r0]
ldr r0, [r1]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r1, _0210b964 ; =data_ov05_021129f4
mov r0, r5
mov r2, #1
@@ -12817,7 +12817,7 @@ _0210b634:
_0210b684:
ldr r0, _0210b95c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r1, _0210b968 ; =data_027e0e60
add r0, sp, #0x12
ldr r4, [r1]
@@ -12898,7 +12898,7 @@ _0210b79c:
_0210b7b0:
ldr r0, _0210b95c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
bl func_020385b8
add r1, r5, #0x24
bl _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p
@@ -13156,7 +13156,7 @@ _0210bb10:
ldmeqia sp!, {r3, r4, pc}
ldr r0, _0210bb4c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
mov r0, r4
mov r1, #0
bl _ZN13LinkStateBase15ChangeLinkStateEi
@@ -13239,7 +13239,7 @@ _0210bc18:
add r1, sp, #0x20
add r3, sp, #4
mov r0, r6
bl func_ov00_020b0778
bl _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
cmp r0, #0
beq _0210bccc
mov r0, #0x1000
@@ -13359,7 +13359,7 @@ _0210bdd8:
_0210bdec:
ldr r0, _0210bf44 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b0ab4
bl _ZN13PlayerControl16CheckNotTouchingEv
cmp r0, #0
bne _0210be14
ldr r0, _0210bf48 ; =data_027e0f74
@@ -13523,7 +13523,7 @@ _0210c004:
_0210c040:
ldr r0, _0210c200 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
cmp r0, #0xcd
addle sp, sp, #0x14
ldmleia sp!, {r4, r5, r6, r7, r8, sb, pc}
@@ -13533,7 +13533,7 @@ _0210c040:
bl _ZN13LinkStateBase14GetPlayerAngleEv
mov r5, r0
mov r0, r6
bl func_ov00_020b0328
bl _ZN13PlayerControl13GetTouchAngleEv
strh r0, [r5]
bl func_ov05_0210b96c
bl func_ov14_0213d420
@@ -13546,7 +13546,7 @@ _0210c040:
beq _0210c19c
ldr r0, _0210c200 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b0328
bl _ZN13PlayerControl13GetTouchAngleEv
ldrsh r1, [r4, #0x16]
sub r0, r1, r0
mov r0, r0, lsl #0x10
@@ -13611,7 +13611,7 @@ _0210c040:
_0210c19c:
ldr r0, _0210c200 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b13c4
bl _ZN13PlayerControl18func_ov00_020b13c4Ev
cmp r0, #0
addeq sp, sp, #0x14
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc}
@@ -13659,7 +13659,7 @@ func_ov05_0210c20c: ; 0x0210c20c
add r1, sp, #8
strb r2, [sp, #8]
strb r2, [sp, #9]
bl func_ov00_020af01c
bl _ZN13PlayerControl18func_ov00_020af01cEPc
cmp r0, #0
beq _0210c2a8
ldr r0, _0210c950 ; =data_027e0e60
@@ -13787,12 +13787,12 @@ _0210c3f8:
ldr r0, [r0]
moveq r2, #0
mov r1, r6
bl func_ov00_020afeec
bl _ZN13PlayerControl18func_ov00_020afeecEib
cmp r0, #0
bne _0210c454
ldr r0, _0210c94c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
add sp, sp, #0x78
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -13829,7 +13829,7 @@ _0210c4b4:
bl _ZN13LinkStateBase6LookAtEP5Vec3p
ldr r0, _0210c94c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
add sp, sp, #0x78
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -13839,7 +13839,7 @@ _0210c4d8:
bl _ZN13LinkStateBase6LookAtEP5Vec3p
ldr r0, _0210c94c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
ldr r1, [r7, #0x24]
ldr r0, _0210c950 ; =data_027e0e60
str r1, [sp, #0x3c]
@@ -13994,7 +13994,7 @@ _0210c680:
bl _ZN13LinkStateBase6LookAtEP5Vec3p
ldr r0, _0210c94c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
add sp, sp, #0x78
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -14011,7 +14011,7 @@ _0210c738:
bl _ZN13LinkStateBase6LookAtEP5Vec3p
ldr r0, _0210c94c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
mov r0, r7
add r2, r7, #0x24
mov r1, #0
@@ -14032,7 +14032,7 @@ _0210c788:
_0210c7a8:
ldr r0, _0210c94c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
bl func_020385b8
add r1, r5, #0x18
bl _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
@@ -14131,7 +14131,7 @@ _0210c88c:
ldr r0, [r1]
sub r1, r3, r2
str r1, [sp, #0x50]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
add sp, sp, #0x78
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -16237,7 +16237,7 @@ func_ov05_0210e4e4: ; 0x0210e4e4
ldr r0, _0210e878 ; =data_027e0fb8
mov r1, r2
ldr r0, [r0]
bl func_ov00_020af538
bl _ZN13PlayerControl18func_ov00_020af538Ev
ldr r1, _0210e878 ; =data_027e0fb8
mov r0, r6
ldr r4, [r1]
@@ -16246,7 +16246,7 @@ func_ov05_0210e4e4: ; 0x0210e4e4
moveq r1, #1
movne r1, #0
mov r0, r4
bl func_ov00_020afb6c
bl _ZN13PlayerControl18func_ov00_020afb6cEv
_0210e52c:
mov r0, r6
mov r1, r5
@@ -16799,7 +16799,7 @@ _0210ecd0:
ldmltia sp!, {r4, r5, r6, pc}
ldr r0, _0210f688 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
ldr r1, _0210f68c ; =0x00000ccd
cmp r0, r1
addlt sp, sp, #0x20
@@ -16945,7 +16945,7 @@ _0210eedc:
ldr r1, _0210f688 ; =data_027e0fb8
str r2, [r0, #0x24]
ldr r0, [r1]
bl func_ov00_020b134c
bl _ZN13PlayerControl14IsTouchingFastEv
cmp r0, #0
bne _0210ef34
mov r0, r6
@@ -17424,7 +17424,7 @@ _0210f5d8:
ldr r1, _0210f688 ; =data_027e0fb8
strb r2, [r0, #0xbe]
ldr r0, [r1]
bl func_ov00_020af298
bl _ZN13PlayerControl20UpdateUsingEquipItemEv
mov r0, r6
mov r1, #0
bl _ZN13LinkStateBase15ChangeLinkStateEi
@@ -17647,7 +17647,7 @@ _0210f884:
ble _0210f89c
ldr r0, _021101d8 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b0328
bl _ZN13PlayerControl13GetTouchAngleEv
mov r5, r0
_0210f89c:
ldr r0, [sl, #8]
@@ -17770,7 +17770,7 @@ _0210fa38:
ldr r0, _021101d8 ; =data_027e0fb8
mov r1, r6
ldr r0, [r0]
bl func_ov00_020afad8
bl _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
cmp r0, #0
beq _0210fc30
_0210fa80:
@@ -17888,7 +17888,7 @@ _0210fc04:
_0210fc30:
ldr r0, _021101d8 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
mov sb, #0
b _0210fc74
_0210fc44:
@@ -17898,7 +17898,7 @@ _0210fc44:
beq _0210fc74
ldr r0, _021101d8 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b129c
bl _ZN13PlayerControl18func_ov00_020b129cEv
mov r3, r0
mov r0, sl
mov r1, sb
@@ -18258,7 +18258,7 @@ _0211016c:
bl _ZN13LinkStateBase12GetPlayerPosEv
mov r1, r0
mov r0, r5
bl func_ov00_020b014c
bl _ZN13PlayerControl18func_ov00_020b014cEv
_021101a8:
ldr r0, _0211021c ; =data_027e103c
mov r1, #1
@@ -19745,7 +19745,7 @@ _02111594:
beq _021116a4
ldr r0, _02111a68 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b0418
bl _ZN13PlayerControl18func_ov00_020b0418Ev
mov r7, r0
mov r0, r5
bl func_ov00_020a8f2c
@@ -19849,12 +19849,12 @@ _021116a4:
_02111734:
ldr r0, _02111a68 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
b _02111960
_02111744:
ldr r0, _02111a68 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
cmp r6, #0
movne r3, #1
mov r1, r0
@@ -20086,7 +20086,7 @@ func_ov05_02111a98: ; 0x02111a98
ldr r1, _02111af4 ; =data_027e0fb8
mov r4, r0
ldr r0, [r1]
bl func_ov00_020aeffc
bl _ZN13PlayerControl14GetFollowActorEv
cmp r0, #0
bne _02111aec
ldr r0, _02111af4 ; =data_027e0fb8
asm/include/ov06.inc → asm/ov06.inc
View File
asm/ov06.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov06.inc"
.include "ov06.inc"
.text
asm/include/ov07.inc → asm/ov07.inc
View File
asm/ov07.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov07.inc"
.include "ov07.inc"
.text
asm/include/ov08.inc → asm/ov08.inc
View File
asm/ov08.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov08.inc"
.include "ov08.inc"
.text
asm/include/ov09.inc → asm/ov09.inc
View File
asm/ov09.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov09.inc"
.include "ov09.inc"
.text
asm/include/ov10.inc → asm/ov10.inc
View File
asm/ov10.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov10.inc"
.include "ov10.inc"
.text
asm/include/ov11.inc → asm/ov11.inc
View File
asm/ov11.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov11.inc"
.include "ov11.inc"
.text
asm/include/ov12.inc → asm/ov12.inc
View File
asm/ov12.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov12.inc"
.include "ov12.inc"
.text
asm/include/ov13.inc → asm/ov13.inc
View File
asm/ov13.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov13.inc"
.include "ov13.inc"
.text
asm/include/ov14.inc → asm/ov14.inc
+2 -2
View File
@@ -18,6 +18,8 @@
.extern _ZN11ItemManager8GiveItemEjjj
.extern _ZN11ItemManager8GiveKeysEj
.extern _ZN11ItemManager9SetPotionEjj
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN13PlayerControl20UpdateUsingEquipItemEv
.extern _ZN15LinkStateDamage18func_ov00_020aca94Ev
.extern _ZN4Item18func_ov00_020ad020Ei
.extern _ZN9SysObjectdlEPv
@@ -492,8 +494,6 @@
.extern func_ov00_020a9e28
.extern func_ov00_020aa0f0
.extern func_ov00_020aa124
.extern func_ov00_020af298
.extern func_ov00_020b1338
.extern func_ov00_020b18d8
.extern func_ov00_020b2f70
.extern func_ov00_020b3ea8
asm/ov14.s
+7 -7
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov14.inc"
.include "ov14.inc"
.text
@@ -1089,7 +1089,7 @@ func_ov14_02120300: ; 0x02120300
_02120360:
ldr r0, _02120750 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1338
bl _ZN13PlayerControl13IsNotTouchingEv
cmp r0, #0
moveq r0, #0
streq r0, [r6, #0x1a8]
@@ -2599,7 +2599,7 @@ _02121838:
beq _02121868
ldr r0, _021219d0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1338
bl _ZN13PlayerControl13IsNotTouchingEv
cmp r0, #0
movne r0, #1
bne _0212186c
@@ -2738,7 +2738,7 @@ func_ov14_021219f8: ; 0x021219f8
beq _02121a50
ldr r0, _02121a84 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1338
bl _ZN13PlayerControl13IsNotTouchingEv
cmp r0, #0
movne r0, #1
bne _02121a54
@@ -4674,7 +4674,7 @@ _02123460:
beq _02123484
ldr r0, _0212355c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1338
bl _ZN13PlayerControl13IsNotTouchingEv
cmp r0, #0
movne r0, #1
bne _02123488
@@ -5181,7 +5181,7 @@ _02123ab0:
beq _02123ad4
ldr r0, _02123ba0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1338
bl _ZN13PlayerControl13IsNotTouchingEv
cmp r0, #0
movne r0, #1
bne _02123ad8
@@ -40025,7 +40025,7 @@ _0213f644:
ldr r1, _0213f714 ; =data_027e0fb8
strb r2, [r0, #0x28]
ldr r0, [r1]
bl func_ov00_020af298
bl _ZN13PlayerControl20UpdateUsingEquipItemEv
bl func_ov14_0213f724
bl func_ov05_02110bb4
ldr r1, _0213f708 ; =data_027e0fd4
asm/include/ov15.inc → asm/ov15.inc
+7 -7
View File
@@ -16,6 +16,13 @@
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager19SetTreasureSalvagedEj
.extern _ZN11ItemManager8GiveItemEjjj
.extern _ZN13PlayerControl11IsTappedNowEv
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl17IsNotUntouchedNowEv
.extern _ZN13PlayerControl18func_ov00_020af2d4Ejb
.extern _ZN13PlayerControl18func_ov00_020af538Ev
.extern _ZN13PlayerControl9UpdateAimEv
.extern _ZN4Item18func_ov00_020ad020Ei
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
@@ -530,13 +537,6 @@
.extern func_ov00_020a9b18
.extern func_ov00_020a9b6c
.extern func_ov00_020a9b78
.extern func_ov00_020aef68
.extern func_ov00_020af050
.extern func_ov00_020af2d4
.extern func_ov00_020af538
.extern func_ov00_020b1214
.extern func_ov00_020b1338
.extern func_ov00_020b137c
.extern func_ov00_020b153c
.extern func_ov00_020b1550
.extern func_ov00_020b157c
asm/ov15.s
+11 -11
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov15.inc"
.include "ov15.inc"
.text
@@ -27176,7 +27176,7 @@ func_ov15_021364b0: ; 0x021364b0
cmp r1, #0
addeq sp, sp, #0x20
ldmeqia sp!, {r4, pc}
bl func_ov00_020b137c
bl _ZN13PlayerControl11IsTappedNowEv
cmp r0, #0
ldrneb r0, [r4, #0x26c]
cmpne r0, #0
@@ -29307,7 +29307,7 @@ _02138224:
blt _02138268
ldr r0, _021382f8 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1214
bl _ZN13PlayerControl17IsNotUntouchedNowEv
cmp r0, #0
beq _02138268
ldr r0, _021382fc ; =data_ov00_020eec9c
@@ -30146,7 +30146,7 @@ _02138e84:
beq _02138e9c
ldr r0, _02138fc0 ; =data_027e0fb8
ldr r0, [r0]
blx func_ov00_020aef68
blx _ZN13PlayerControl9UpdateAimEv
b _02138eb8
_02138e9c:
mov r0, r4
@@ -30418,7 +30418,7 @@ _0213922c:
bl func_ov15_02135d78
ldr r0, _021394f0 ; =data_027e0fb8
ldr r0, [r0]
blx func_ov00_020aef68
blx _ZN13PlayerControl9UpdateAimEv
b _021393f4
_02139268:
ldr r0, _021394e8 ; =data_027e0d38
@@ -30525,7 +30525,7 @@ _021392cc:
_021393f4:
ldr r0, _021394f0 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
ldr r1, [r5]
add r0, sp, #0x24
str r1, [sp, #0x24]
@@ -31547,7 +31547,7 @@ _0213a260:
streqb r0, [r5, #0x26c]
ldr r0, _0213a46c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af2d4
bl _ZN13PlayerControl18func_ov00_020af2d4Ejb
cmp r0, #0
moveq r0, #0
streqb r0, [r5, #0x26c]
@@ -34884,7 +34884,7 @@ func_ov15_0213cfb4: ; 0x0213cfb4
ldr r0, [r2]
mov r2, r1
mov r1, #1
bl func_ov00_020af538
bl _ZN13PlayerControl18func_ov00_020af538Ev
mov r0, r4
bl func_ov15_0213dbb8
mov r0, r4
@@ -54742,7 +54742,7 @@ _0214da40:
beq _0214da70
ldr r0, _0214dbe8 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1338
bl _ZN13PlayerControl13IsNotTouchingEv
cmp r0, #0
movne r0, #1
bne _0214da74
@@ -54888,7 +54888,7 @@ func_ov15_0214dc1c: ; 0x0214dc1c
beq _0214dc74
ldr r0, _0214dca8 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1338
bl _ZN13PlayerControl13IsNotTouchingEv
cmp r0, #0
movne r0, #1
bne _0214dc78
@@ -55025,7 +55025,7 @@ _0214de3c:
mov r1, #1
ldr r0, [r0]
mov r2, r1
bl func_ov00_020af2d4
bl _ZN13PlayerControl18func_ov00_020af2d4Ejb
cmp r0, #0
beq _0214dec4
ldr r0, _0214e070 ; =data_027e0fb8
asm/include/ov16.inc → asm/ov16.inc
View File
asm/ov16.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov16.inc"
.include "ov16.inc"
.text
asm/include/ov17.inc → asm/ov17.inc
+1 -1
View File
@@ -3,6 +3,7 @@
.extern Divide
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager19GetDungeonItemModelEj
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
@@ -286,7 +287,6 @@
.extern func_ov00_020a9a98
.extern func_ov00_020a9aac
.extern func_ov00_020a9ab8
.extern func_ov00_020b1338
.extern func_ov00_020b3ea8
.extern func_ov00_020b7d74
.extern func_ov00_020b7df0
asm/ov17.s
+2 -2
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov17.inc"
.include "ov17.inc"
.text
@@ -15763,7 +15763,7 @@ _02167b9c:
_02167bd4:
ldr r0, _02167ccc ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b1338
bl _ZN13PlayerControl13IsNotTouchingEv
cmp r0, #0
bne _02167c48
ldr r0, [r4, #0x48]
asm/include/ov18.inc → asm/ov18.inc
View File
asm/ov18.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov18.inc"
.include "ov18.inc"
.text
asm/include/ov19.inc → asm/ov19.inc
+2 -2
View File
@@ -12,6 +12,8 @@
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN13PlayerControl18func_ov00_020aeef8Ev
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
@@ -197,8 +199,6 @@
.extern func_ov00_020a9ab8
.extern func_ov00_020a9b6c
.extern func_ov00_020a9b78
.extern func_ov00_020aeef8
.extern func_ov00_020b134c
.extern func_ov00_020b1bfc
.extern func_ov00_020b3ea8
.extern func_ov00_020b41ec
asm/ov19.s
+3 -3
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov19.inc"
.include "ov19.inc"
.text
@@ -10006,7 +10006,7 @@ func_ov19_02175a2c: ; 0x02175a2c
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x10
mov r4, r0
bl func_ov00_020aeef8
bl _ZN13PlayerControl18func_ov00_020aeef8Ev
cmp r0, #0
addeq sp, sp, #0x10
ldmeqia sp!, {r3, r4, r5, pc}
@@ -10019,7 +10019,7 @@ func_ov19_02175a2c: ; 0x02175a2c
ble _02175ae8
ldr r0, _02175c28 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b134c
bl _ZN13PlayerControl14IsTouchingFastEv
cmp r0, #0
ldrnesh r0, [r4, #0x10]
mov r1, #0
asm/include/ov20.inc → asm/ov20.inc
View File
asm/ov20.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov20.inc"
.include "ov20.inc"
.text
asm/include/ov21.inc → asm/ov21.inc
View File
asm/ov21.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov21.inc"
.include "ov21.inc"
.text
asm/include/ov22.inc → asm/ov22.inc
View File
asm/ov22.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov22.inc"
.include "ov22.inc"
.text
asm/include/ov23.inc → asm/ov23.inc
+5 -5
View File
@@ -20,6 +20,11 @@
.extern _ZN13LinkStateBase20GetPlayerControlDataEv
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
.extern _ZN13LinkStateBase6TurnToEsii
.extern _ZN13PlayerControl13GetTouchAngleEv
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl14GetFollowActorEv
.extern _ZN13PlayerControl18func_ov00_020b034cEv
.extern _ZN13PlayerControl9SetUnk_80Ev
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
@@ -258,11 +263,6 @@
.extern func_ov00_020a9b18
.extern func_ov00_020a9b6c
.extern func_ov00_020a9b78
.extern func_ov00_020aeffc
.extern func_ov00_020af044
.extern func_ov00_020af050
.extern func_ov00_020b0328
.extern func_ov00_020b034c
.extern func_ov00_020b1a4c
.extern func_ov00_020b3ea8
.extern func_ov00_020b41ec
asm/ov23.s
+11 -11
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov23.inc"
.include "ov23.inc"
.text
@@ -4876,7 +4876,7 @@ _02171510:
strh r4, [r0]
ldr r0, _02171698 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
mov r0, r7
bl func_ov23_0217216c
mov r0, r7
@@ -4943,7 +4943,7 @@ _02171614:
strh r4, [r0]
ldr r0, _02171698 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
mov r0, r7
bl func_ov23_0217216c
mov r0, r7
@@ -5043,7 +5043,7 @@ _02171788:
strh r4, [r0]
ldr r0, _0217180c ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af044
bl _ZN13PlayerControl9SetUnk_80Ev
mov r0, r5
bl func_ov23_0217216c
mov r0, r5
@@ -5201,11 +5201,11 @@ _021719b0:
_02171a18:
ldr r0, _02172088 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
ldr r1, _02172088 ; =data_027e0fb8
mov r5, r0
ldr r0, [r1]
bl func_ov00_020b0328
bl _ZN13PlayerControl13GetTouchAngleEv
mov r6, r0
_02171a38:
ldr r0, _0217208c ; =0x0000059a
@@ -5434,7 +5434,7 @@ _02171d34:
ldrb r1, [r0, #0x80]
cmp r1, #0
beq _02171de0
bl func_ov00_020aeffc
bl _ZN13PlayerControl14GetFollowActorEv
cmp r0, #0
ldrne r1, [r0, #4]
ldrne r0, _021720ac ; =0x50574253
@@ -5452,7 +5452,7 @@ _02171d34:
_02171dd4:
ldr r0, _02172088 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
_02171de0:
mov r0, #0
strb r0, [r4, #0x2b]
@@ -5463,12 +5463,12 @@ _02171dec:
ldr r1, [r0, #0xa0]
cmp r1, #0
bne _02171e18
bl func_ov00_020aeffc
bl _ZN13PlayerControl14GetFollowActorEv
cmp r0, #0
bne _02171e18
ldr r0, _02172088 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
bl _ZN13PlayerControl13StopFollowingEv
_02171e18:
cmp r5, #0x7b
mov r0, r4
@@ -12742,7 +12742,7 @@ func_ov23_02177e24: ; 0x02177e24
ldr r1, [r1]
cmp r2, r1
blt _02177e50
bl func_ov00_020b034c
bl _ZN13PlayerControl18func_ov00_020b034cEv
ldr r1, _02177e5c ; =0x0000099a
cmp r0, r1
movge r0, #1
asm/include/ov24.inc → asm/ov24.inc
+1 -1
View File
@@ -2,6 +2,7 @@
.extern Approach_thunk
.extern Divide
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN13PlayerControl13CheckTouchingEj
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
@@ -186,7 +187,6 @@
.extern func_ov00_020a9b2c
.extern func_ov00_020a9b38
.extern func_ov00_020a9b6c
.extern func_ov00_020af42c
.extern func_ov00_020b3ea8
.extern func_ov00_020b3ee8
.extern func_ov00_020b41ec
asm/ov24.s
+2 -2
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov24.inc"
.include "ov24.inc"
.text
@@ -13291,7 +13291,7 @@ func_ov24_02178348: ; 0x02178348
_021783f8:
mov r0, r6
mov r1, #1
bl func_ov00_020af42c
bl _ZN13PlayerControl13CheckTouchingEj
cmp r0, #0
beq _0217866c
mvn r1, #0
asm/include/ov25.inc → asm/ov25.inc
View File
asm/ov25.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov25.inc"
.include "ov25.inc"
.text
asm/include/ov26.inc → asm/ov26.inc
View File
asm/ov26.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov26.inc"
.include "ov26.inc"
.text
asm/include/ov27.inc → asm/ov27.inc
+1 -1
View File
@@ -1,5 +1,6 @@
#pragma once
.extern Divide
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetUnk_098Ej
@@ -157,7 +158,6 @@
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
.extern func_ov00_020a9b6c
.extern func_ov00_020b134c
.extern func_ov00_020b3ee8
.extern func_ov00_020b7df0
.extern func_ov00_020b7e6c
asm/ov27.s
+2 -2
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov27.inc"
.include "ov27.inc"
.text
@@ -3456,7 +3456,7 @@ _02170630:
bl func_ov00_0207c474
ldr r0, _021708c8 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020b134c
bl _ZN13PlayerControl14IsTouchingFastEv
cmp r0, #0
beq _0217078c
ldr r0, _021708b8 ; =data_027e0fc8
asm/include/ov28.inc → asm/ov28.inc
View File
asm/ov28.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov28.inc"
.include "ov28.inc"
.text
asm/include/ov29.inc → asm/ov29.inc
View File
asm/ov29.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov29.inc"
.include "ov29.inc"
.text
asm/include/ov30.inc → asm/ov30.inc
View File
asm/ov30.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov30.inc"
.include "ov30.inc"
.text
asm/include/ov31.inc → asm/ov31.inc
View File
asm/ov31.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov31.inc"
.include "ov31.inc"
.text
asm/include/ov32.inc → asm/ov32.inc
View File
asm/ov32.s
+1 -1
View File
@@ -1,5 +1,5 @@
.include "macros/function.inc"
.include "include/ov32.inc"
.include "ov32.inc"
.text

Some files were not shown because too many files have changed in this diff Show More