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

Name gVec3p_ZERO

Browse Source
This commit is contained in:
Aetias
2024-05-25 10:34:55 +02:00
parent 0429948e80
commit c54922bc3a
72 changed files with 489 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dtcm.s
+3 -9
View File
@@ -3260,15 +3260,9 @@ data_027e0d09:
.global data_027e0d0a
data_027e0d0a:
.space 0x2
.global data_027e0d0c
data_027e0d0c:
.space 0x4
.global data_027e0d10
data_027e0d10:
.space 0x4
.global data_027e0d14
data_027e0d14:
.space 0x4
.global gVec3p_ZERO
gVec3p_ZERO:
.space 0xc
.global data_027e0d18
data_027e0d18:
.space 0x4
asm/main/main_02000000.inc
+1 -1
View File
@@ -103,7 +103,7 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d18
.extern data_027e0d28
.extern data_027e0d38
asm/main/main_02000000.s
+7 -7
View File
@@ -58528,7 +58528,7 @@ func_0202bfc0: ; 0x0202bfc0
mov r0, #0x4000
cmp r1, #0
ldmleia sp!, {r4, pc}
ldr r0, _0202c09c ; =data_027e0d0c
ldr r0, _0202c09c ; =gVec3p_ZERO
ldr r1, [r4]
ldr r2, [r0, #8]
ldr r0, [r0]
@@ -58547,7 +58547,7 @@ func_0202bfc0: ; 0x0202bfc0
orr r1, r1, r0, lsl #20
add r0, r3, r1
bl func_01ff9958
ldr r1, _0202c09c ; =data_027e0d0c
ldr r1, _0202c09c ; =gVec3p_ZERO
ldr r3, [r4, #4]
ldr r2, [r1, #4]
mov r1, r0
@@ -58578,7 +58578,7 @@ func_0202bfc0: ; 0x0202bfc0
movlt r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_0202c09c: .word data_027e0d0c
_0202c09c: .word gVec3p_ZERO
_0202c0a0: .word 0x60db9391
_0202c0a4: .word 0x000028be
arm_func_end func_0202bfc0
@@ -77190,7 +77190,7 @@ func_020386d8: ; 0x020386d8
mov r4, r0
bl func_02037750
ldr r0, _02038710 ; =data_02057d3c
ldr r1, _02038714 ; =data_027e0d0c
ldr r1, _02038714 ; =gVec3p_ZERO
str r0, [r4]
mvn r2, #0
add r0, r4, #0x24
@@ -77200,7 +77200,7 @@ func_020386d8: ; 0x020386d8
ldmia sp!, {r4, pc}
.align 2, 0
_02038710: .word data_02057d3c
_02038714: .word data_027e0d0c
_02038714: .word gVec3p_ZERO
arm_func_end func_020386d8
.global func_02038718
@@ -77212,7 +77212,7 @@ func_02038718: ; 0x02038718
mov r4, r0
bl func_02037750
ldr r0, _02038750 ; =data_02057d3c
ldr r1, _02038754 ; =data_027e0d0c
ldr r1, _02038754 ; =gVec3p_ZERO
str r0, [r4]
mvn r2, #0
add r0, r4, #0x24
@@ -77222,7 +77222,7 @@ func_02038718: ; 0x02038718
ldmia sp!, {r4, pc}
.align 2, 0
_02038750: .word data_02057d3c
_02038754: .word data_027e0d0c
_02038754: .word gVec3p_ZERO
arm_func_end func_02038718
.global func_02038758
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -23,7 +23,7 @@
.extern data_02063e4c
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d3c
.extern gMapManager
.extern gPlayer
asm/ov00/Actor/Actor.s
+2 -2
View File
@@ -2236,7 +2236,7 @@ _020c2fcc:
ldrb r0, [r5, #0x6a]
cmp r0, #0
beq _020c2ff4
ldr r0, _020c3000 ; =data_027e0d0c
ldr r0, _020c3000 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x60]
ldr r1, [r0, #4]
@@ -2248,7 +2248,7 @@ _020c2ff4:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020c3000: .word data_027e0d0c
_020c3000: .word gVec3p_ZERO
arm_func_end _ZN5Actor18func_ov00_020c2ed4Ev
.global _ZN5Actor15IsHitboxTouchedEb
asm/ov00/Player/LinkStateBase.inc
+1 -1
View File
@@ -9,7 +9,7 @@
.extern gSinCosTable
.extern data_027e0618
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0e58
.extern data_027e0f64
asm/ov00/Player/LinkStateBase.s
+2 -2
View File
@@ -354,7 +354,7 @@ _ZN13LinkStateBase12ApplyImpulseEii: ; 0x020a82c4
mov r1, r1, lsr #0x10
mov r1, r1, asr #0x4
mov r4, r1, lsl #0x1
ldr r3, _020a8358 ; =data_027e0d0c
ldr r3, _020a8358 ; =gVec3p_ZERO
ldr lr, _020a835c ; =gSinCosTable
mov r1, r4, lsl #0x1
ldrsh ip, [lr, r1]
@@ -387,7 +387,7 @@ _ZN13LinkStateBase12ApplyImpulseEii: ; 0x020a82c4
str r0, [r5, #0x28]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a8358: .word data_027e0d0c
_020a8358: .word gVec3p_ZERO
_020a835c: .word gSinCosTable
arm_func_end _ZN13LinkStateBase12ApplyImpulseEii
asm/ov00/Player/LinkStateInteract.inc
+1 -1
View File
@@ -42,7 +42,7 @@
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern gSinCosTable
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern gMapManager
.extern gPlayerControl
.extern gActorManager
asm/ov00/Player/LinkStateInteract.s
+4 -4
View File
@@ -751,7 +751,7 @@ _020aac14:
sub r0, r0, #9
cmp r0, #1
bhi _020aacf4
ldr r1, _020ab3c0 ; =data_027e0d0c
ldr r1, _020ab3c0 ; =gVec3p_ZERO
mov r0, r4
ldr r2, [r1]
str r2, [r4, #0x18]
@@ -1263,7 +1263,7 @@ _020ab3b0:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_020ab3bc: .word gItemManager
_020ab3c0: .word data_027e0d0c
_020ab3c0: .word gVec3p_ZERO
_020ab3c4: .word gSinCosTable
_020ab3c8: .word 0x000004cd
_020ab3cc: .word gPlayerControl
@@ -1454,7 +1454,7 @@ _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p: ; 0x020ab614
movs ip, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, pc}
ldr r0, _020ab67c ; =data_027e0d0c
ldr r0, _020ab67c ; =gVec3p_ZERO
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -1473,7 +1473,7 @@ _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p: ; 0x020ab614
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020ab67c: .word data_027e0d0c
_020ab67c: .word gVec3p_ZERO
arm_func_end _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.global _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
asm/ov00/Player/PlayerControl.inc
+1 -1
View File
@@ -23,7 +23,7 @@
.extern data_027e05f8
.extern data_027e077c
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0e2c
.extern gMapManager
asm/ov00/Player/PlayerControl.s
+6 -6
View File
@@ -118,7 +118,7 @@ _ZN13PlayerControl9UpdateAimEv: ; 0x020aef68
add r1, r4, #0
add r1, #0x81
strb r0, [r1]
ldr r1, _020aeff0 ; =data_027e0d0c
ldr r1, _020aeff0 ; =gVec3p_ZERO
add r0, r4, #0
ldr r2, [r1]
add r0, #0xb0
@@ -149,7 +149,7 @@ _020aefde:
str r1, [r4]
pop {r4, pc}
nop
_020aeff0: .word data_027e0d0c
_020aeff0: .word gVec3p_ZERO
_020aeff4: .word data_027e0d38
_020aeff8: .word data_027e103c
thumb_func_end _ZN13PlayerControl9UpdateAimEv
@@ -1514,7 +1514,7 @@ _020b0218: .word gItemManager
.global _ZN13PlayerControl6SetAimEv
arm_func_start _ZN13PlayerControl6SetAimEv
_ZN13PlayerControl6SetAimEv: ; 0x020b021c
ldr r1, _020b023c ; =data_027e0d0c
ldr r1, _020b023c ; =gVec3p_ZERO
ldr r2, [r1]
str r2, [r0, #0xb0]
ldr r2, [r1, #4]
@@ -1523,7 +1523,7 @@ _ZN13PlayerControl6SetAimEv: ; 0x020b021c
str r1, [r0, #0xb8]
bx lr
.align 2, 0
_020b023c: .word data_027e0d0c
_020b023c: .word gVec3p_ZERO
arm_func_end _ZN13PlayerControl6SetAimEv
.global _ZN13PlayerControl14UpdateAimWorldEP5Vec3p
@@ -1739,7 +1739,7 @@ _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb: ; 0x020b049c
beq _020b05d0
cmp r0, #0x400
bge _020b05bc
ldr r1, _020b05dc ; =data_027e0d0c
ldr r1, _020b05dc ; =gVec3p_ZERO
ldr r0, _020b05e0 ; =gPlayerAngle
ldr r2, [r1]
ldr ip, _020b05e4 ; =gSinCosTable
@@ -1793,7 +1793,7 @@ _020b05d0:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020b05d8: .word gPlayerPos
_020b05dc: .word data_027e0d0c
_020b05dc: .word gVec3p_ZERO
_020b05e0: .word gPlayerAngle
_020b05e4: .word gSinCosTable
arm_func_end _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -178,7 +178,7 @@
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
asm/ov00/ov00_020b1498.s
+15 -15
View File
@@ -1097,7 +1097,7 @@ _020b2144:
bl _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
mov r0, r4
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r1, _020b2478 ; =data_027e0d0c
ldr r1, _020b2478 ; =gVec3p_ZERO
ldr r2, [r1]
str r2, [r0]
ldr r2, [r1, #4]
@@ -1316,7 +1316,7 @@ _020b246c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020b2474: .word data_ov00_020ee698
_020b2478: .word data_027e0d0c
_020b2478: .word gVec3p_ZERO
_020b247c: .word gSinCosTable
_020b2480: .word 0x00000ccd
_020b2484: .word 0x000004cd
@@ -4454,7 +4454,7 @@ func_ov00_020b4b90: ; 0x020b4b90
add r0, r4, #0
add r0, #0xe0
str r2, [r0]
ldr r1, _020b4c04 ; =data_027e0d0c
ldr r1, _020b4c04 ; =gVec3p_ZERO
add r0, r4, #0
bl func_ov00_020b4c4c
add r0, r4, #0
@@ -4462,7 +4462,7 @@ func_ov00_020b4b90: ; 0x020b4b90
nop
_020b4bfc: .word data_ov00_020e64c8
_020b4c00: .word 0xffffb000
_020b4c04: .word data_027e0d0c
_020b4c04: .word gVec3p_ZERO
thumb_func_end func_ov00_020b4b90
.global func_ov00_020b4c08
@@ -5909,7 +5909,7 @@ _020b5e88:
b _020b5f34
_020b5f00:
ldr r1, [r7, #0x30]
ldr r0, _020b6acc ; =data_027e0d0c
ldr r0, _020b6acc ; =gVec3p_ZERO
str r1, [r7, #0x20]
ldr r1, [r7, #0x34]
str r1, [r7, #0x24]
@@ -6705,7 +6705,7 @@ _020b6aa0:
_020b6ac0: .word data_027e0ff8
_020b6ac4: .word 0x0000ffff
_020b6ac8: .word gMapManager
_020b6acc: .word data_027e0d0c
_020b6acc: .word gVec3p_ZERO
_020b6ad0: .word data_ov00_020e64a8
_020b6ad4: .word data_027e0d38
_020b6ad8: .word 0x0000063d
@@ -13793,7 +13793,7 @@ func_ov00_020bc280: ; 0x020bc280
bic r0, r0, #4
strh r0, [r5, #0x48]
bl func_ov00_020bc088
ldr r1, _020bc2d0 ; =data_027e0d0c
ldr r1, _020bc2d0 ; =gVec3p_ZERO
mov r2, r4
bl _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
mov r0, r5
@@ -13806,7 +13806,7 @@ _020bc2c0:
strneh r0, [r5, #0x48]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020bc2d0: .word data_027e0d0c
_020bc2d0: .word gVec3p_ZERO
arm_func_end func_ov00_020bc280
.global func_ov00_020bc2d4
@@ -16388,7 +16388,7 @@ func_ov00_020be1fc: ; 0x020be1fc
arm_func_start func_ov00_020be218
func_ov00_020be218: ; 0x020be218
mov ip, #0
ldr r1, _020be290 ; =data_027e0d0c
ldr r1, _020be290 ; =gVec3p_ZERO
str ip, [r0, #0x6c]
ldr r2, [r1]
sub r3, ip, #1
@@ -16418,7 +16418,7 @@ func_ov00_020be218: ; 0x020be218
mov r0, #1
bx lr
.align 2, 0
_020be290: .word data_027e0d0c
_020be290: .word gVec3p_ZERO
arm_func_end func_ov00_020be218
.global func_ov00_020be294
@@ -17705,7 +17705,7 @@ func_ov00_020bf1c0: ; 0x020bf1c0
mov r2, #1
str r2, [sp]
ldr r0, _020bf268 ; =data_027e0e58
ldr r3, _020bf26c ; =data_027e0d0c
ldr r3, _020bf26c ; =gVec3p_ZERO
ldr r0, [r0]
add r1, r4, #0x30
rsb r2, r2, #0x15c
@@ -17713,7 +17713,7 @@ func_ov00_020bf1c0: ; 0x020bf1c0
mov r1, #1
str r1, [sp]
ldr r0, _020bf268 ; =data_027e0e58
ldr r3, _020bf26c ; =data_027e0d0c
ldr r3, _020bf26c ; =gVec3p_ZERO
ldr r0, [r0]
add r1, r4, #0x34
mov r2, #0x15c
@@ -17742,7 +17742,7 @@ _020bf258:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020bf268: .word data_027e0e58
_020bf26c: .word data_027e0d0c
_020bf26c: .word gVec3p_ZERO
arm_func_end func_ov00_020bf1c0
.global func_ov00_020bf270
@@ -21545,7 +21545,7 @@ _020e128c: .word data_ov00_020ee178
func_ov00_020e1290: ; 0x020e1290
stmdb sp!, {r3}
sub sp, sp, #0xc
ldr r0, _020e12cc ; =data_027e0d0c
ldr r0, _020e12cc ; =gVec3p_ZERO
add ip, sp, #0
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
@@ -21559,7 +21559,7 @@ func_ov00_020e1290: ; 0x020e1290
ldmia sp!, {r3}
bx lr
.align 2, 0
_020e12cc: .word data_027e0d0c
_020e12cc: .word gVec3p_ZERO
_020e12d0: .word gPlayerPos
_020e12d4: .word gPlayerVel
arm_func_end func_ov00_020e1290
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -130,7 +130,7 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
asm/ov00/ov00_020c3e54.s
+2 -2
View File
@@ -20170,7 +20170,7 @@ func_ov00_020d3974: ; 0x020d3974
arm_func_start func_ov00_020d3988
func_ov00_020d3988: ; 0x020d3988
mov ip, #0
ldr r1, _020d3a00 ; =data_027e0d0c
ldr r1, _020d3a00 ; =gVec3p_ZERO
str ip, [r0, #0x6c]
ldr r2, [r1]
sub r3, ip, #1
@@ -20200,7 +20200,7 @@ func_ov00_020d3988: ; 0x020d3988
mov r0, #1
bx lr
.align 2, 0
_020d3a00: .word data_027e0d0c
_020d3a00: .word gVec3p_ZERO
arm_func_end func_ov00_020d3988
.global func_ov00_020d3a04
asm/ov02.inc
+1 -1
View File
@@ -29,7 +29,7 @@
.extern data_027e077c
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0f88
asm/ov02.s
+2 -2
View File
@@ -5342,7 +5342,7 @@ func_ov02_020f3228: ; 0x020f3228
add r0, r4, #4
bl func_ov00_020d5cd8
ldr r0, [r4]
ldr r2, _020f3264 ; =data_027e0d0c
ldr r2, _020f3264 ; =gVec3p_ZERO
ldr ip, [r0]
add r1, sp, #0
ldr ip, [ip, #0xc]
@@ -5351,7 +5351,7 @@ func_ov02_020f3228: ; 0x020f3228
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020f3264: .word data_027e0d0c
_020f3264: .word gVec3p_ZERO
arm_func_end func_ov02_020f3228
.global func_ov02_020f3268
asm/ov04.inc
+1 -1
View File
@@ -116,7 +116,7 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d28
.extern data_027e0d38
.extern data_027e0d3c
asm/ov04.s
+13 -13
View File
@@ -10630,7 +10630,7 @@ func_ov04_02105e50: ; 0x02105e50
str r2, [r0, #0x10]
str r2, [r0, #0x14]
str r2, [r0, #0x18]
ldr r1, _02105ebc ; =data_027e0d0c
ldr r1, _02105ebc ; =gVec3p_ZERO
str r2, [r0, #0x1c]
ldr r2, [r1]
str r2, [r0, #0x20]
@@ -10642,7 +10642,7 @@ func_ov04_02105e50: ; 0x02105e50
str r3, [r0, #0x30]
bx lr
.align 2, 0
_02105ebc: .word data_027e0d0c
_02105ebc: .word gVec3p_ZERO
arm_func_end func_ov04_02105e50
.global func_ov04_02105ec0
@@ -13998,7 +13998,7 @@ _0210775c:
ldr r0, _021077f8 ; =data_027e0fe8
ldr r1, _021077fc ; =0x4e415649
ldr r0, [r0]
ldr r2, _02107800 ; =data_027e0d0c
ldr r2, _02107800 ; =gVec3p_ZERO
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
@@ -14011,7 +14011,7 @@ _0210775c:
ldr r0, _021077f8 ; =data_027e0fe8
ldr r1, _02107808 ; =0x46434e56
ldr r0, [r0]
ldr r2, _02107800 ; =data_027e0d0c
ldr r2, _02107800 ; =gVec3p_ZERO
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
@@ -14024,7 +14024,7 @@ _0210775c:
ldr r0, _021077f8 ; =data_027e0fe8
ldr r1, _0210780c ; =0x57534e56
ldr r0, [r0]
ldr r2, _02107800 ; =data_027e0d0c
ldr r2, _02107800 ; =gVec3p_ZERO
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
@@ -14039,7 +14039,7 @@ _021077ee:
_021077f4: .word data_027e0d38
_021077f8: .word data_027e0fe8
_021077fc: .word 0x4e415649
_02107800: .word data_027e0d0c
_02107800: .word gVec3p_ZERO
_02107804: .word gActorManager
_02107808: .word 0x46434e56
_0210780c: .word 0x57534e56
@@ -14275,7 +14275,7 @@ func_ov04_021079dc: ; 0x021079dc
push {r4, lr}
add r4, r0, #0
mov r2, #0
ldr r0, _02107a74 ; =data_027e0d0c
ldr r0, _02107a74 ; =gVec3p_ZERO
str r2, [r4, #0x6c]
ldr r1, [r0]
str r1, [r4, #0x7c]
@@ -14348,7 +14348,7 @@ _02107a4a:
mov r0, #1
pop {r4, pc}
.align 2, 0
_02107a74: .word data_027e0d0c
_02107a74: .word gVec3p_ZERO
_02107a78: .word 0x00000666
_02107a7c: .word data_027e0d38
thumb_func_end func_ov04_021079dc
@@ -15448,7 +15448,7 @@ func_ov04_021082bc: ; 0x021082bc
bl func_ov04_0210add4
ldr r0, _021083d0 ; =_ZTV15LinkStateDamage
add r2, r5, #0
ldr r3, _021083d4 ; =data_027e0d0c
ldr r3, _021083d4 ; =gVec3p_ZERO
str r0, [r5]
ldmia r3!, {r0, r1}
add r2, #0xc
@@ -15575,7 +15575,7 @@ _021083c8:
pop {r3, r4, r5, r6, pc}
nop
_021083d0: .word _ZTV15LinkStateDamage
_021083d4: .word data_027e0d0c
_021083d4: .word gVec3p_ZERO
_021083d8: .word func_ov00_020b7d74
_021083dc: .word func_ov04_021079d4
_021083e0: .word data_027e0d38
@@ -21305,13 +21305,13 @@ func_ov04_0210afdc: ; 0x0210afdc
add r0, r4, #0
add r0, #0xac
add r5, r4, #0
ldr r6, _0210b0f0 ; =data_027e0d0c
ldr r6, _0210b0f0 ; =gVec3p_ZERO
strh r3, [r0]
ldmia r6!, {r0, r1}
add r5, #0xb0
stmia r5!, {r0, r1}
ldr r0, [r6]
ldr r6, _0210b0f0 ; =data_027e0d0c
ldr r6, _0210b0f0 ; =gVec3p_ZERO
str r0, [r5]
add r5, r4, #0
ldmia r6!, {r0, r1}
@@ -21357,7 +21357,7 @@ _0210b0da:
add r0, r4, #0
pop {r4, r5, r6, pc}
.align 2, 0
_0210b0f0: .word data_027e0d0c
_0210b0f0: .word gVec3p_ZERO
_0210b0f4: .word data_027e0ce0
thumb_func_end func_ov04_0210afdc
asm/ov05.inc
+1 -1
View File
@@ -179,7 +179,7 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
asm/ov05.s
+7 -7
View File
@@ -8438,7 +8438,7 @@ _02107b1c:
strh r1, [r0, #0xa4]
mov r0, r4
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r1, _02107b70 ; =data_027e0d0c
ldr r1, _02107b70 ; =gVec3p_ZERO
ldr r2, [r1]
str r2, [r0]
ldr r2, [r1, #4]
@@ -8453,7 +8453,7 @@ _02107b60: .word data_ov05_021126b4
_02107b64: .word gPlayerControl
_02107b68: .word gMapManager
_02107b6c: .word data_ov05_021122e0
_02107b70: .word data_027e0d0c
_02107b70: .word gVec3p_ZERO
arm_func_end func_ov05_02107954
.global func_ov05_02107b74
@@ -10779,7 +10779,7 @@ _02109a68:
bl _ZN13LinkStateBase6TurnToEsii
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r2, _02109cbc ; =data_027e0d0c
ldr r2, _02109cbc ; =gVec3p_ZERO
mov r1, #0
ldr r3, [r2]
str r3, [r0]
@@ -10930,7 +10930,7 @@ _02109cac:
.align 2, 0
_02109cb4: .word gItemManager
_02109cb8: .word 0x00000e39
_02109cbc: .word data_027e0d0c
_02109cbc: .word gVec3p_ZERO
_02109cc0: .word 0x00780335
_02109cc4: .word data_027e0c68
_02109cc8: .word 0x00780003
@@ -11841,7 +11841,7 @@ _0210a830:
blt _0210a904
mov r0, r4
ldr r2, [r0]
ldr r1, _0210aae8 ; =data_027e0d0c
ldr r1, _0210aae8 ; =gVec3p_ZERO
ldr r2, [r2, #0x5c]
blx r2
cmp r0, #0
@@ -11949,7 +11949,7 @@ _0210aa64:
str r0, [r4, #0x50]
mov r0, r4
ldr r2, [r0]
ldr r1, _0210aae8 ; =data_027e0d0c
ldr r1, _0210aae8 ; =gVec3p_ZERO
ldr r2, [r2, #0x5c]
blx r2
cmp r0, #0
@@ -11982,7 +11982,7 @@ _0210aad8: .word gMapManager
_0210aadc: .word 0x424f4d42
_0210aae0: .word gItemManager
_0210aae4: .word 0x43525953
_0210aae8: .word data_027e0d0c
_0210aae8: .word gVec3p_ZERO
_0210aaec: .word 0x424d5459
_0210aaf0: .word 0x0000ffff
_0210aaf4: .word data_ov05_0211291c
asm/ov09.inc
+1 -1
View File
@@ -39,7 +39,7 @@
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d54
asm/ov09.s
+5 -5
View File
@@ -4550,7 +4550,7 @@ _0211505c:
ldr r0, _021150a0 ; =data_027e0e58
str r1, [sp]
ldr r0, [r0]
ldr r3, _021150a4 ; =data_027e0d0c
ldr r3, _021150a4 ; =gVec3p_ZERO
add r1, r4, #0x10
bl func_ov00_0207c1f8
ldr r1, [r4, #0x10]
@@ -4566,7 +4566,7 @@ _0211505c:
_02115098: .word data_027e0d38
_0211509c: .word 0x00000219
_021150a0: .word data_027e0e58
_021150a4: .word data_027e0d0c
_021150a4: .word gVec3p_ZERO
arm_func_end func_ov09_0211500c
.global func_ov09_021150a8
@@ -18744,7 +18744,7 @@ _0211d69c:
moveq r5, #1
str r0, [sp]
ldr r2, [r4, #0xc]
ldr r1, _0211d78c ; =data_027e0d0c
ldr r1, _0211d78c ; =gVec3p_ZERO
str r2, [sp, #4]
str r1, [sp, #8]
movne r5, #2
@@ -18755,7 +18755,7 @@ _0211d69c:
ldmia r4, {r2, r3}
bl func_ov00_0207c358
ldr r0, [r4, #0x18]
ldr r1, _0211d78c ; =data_027e0d0c
ldr r1, _0211d78c ; =gVec3p_ZERO
str r0, [sp]
ldr r2, [r4, #0x1c]
ldr r0, _0211d790 ; =data_027e0e58
@@ -18773,7 +18773,7 @@ _0211d69c:
_0211d780: .word data_027e0d38
_0211d784: .word data_ov09_0211e3d8
_0211d788: .word data_ov09_0211e444
_0211d78c: .word data_027e0d0c
_0211d78c: .word gVec3p_ZERO
_0211d790: .word data_027e0e58
arm_func_end func_ov09_0211d668
asm/ov12.inc
+1 -1
View File
@@ -139,7 +139,7 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
asm/ov12.s
+12 -12
View File
@@ -3922,7 +3922,7 @@ _02116014:
mov r1, r1, lsl #0x1
ldrsh lr, [r2, r3]
ldrsh r4, [r2, r1]
ldr r0, _0211618c ; =data_027e0d0c
ldr r0, _0211618c ; =gVec3p_ZERO
mov r1, lr, asr #0x1f
mov r5, r1, lsl #0xf
mov r1, r4, asr #0x1f
@@ -3984,7 +3984,7 @@ _0211617c: .word data_ov12_02137c68
_02116180: .word data_ov00_020ee698
_02116184: .word data_ov12_02137d20
_02116188: .word gSinCosTable
_0211618c: .word data_027e0d0c
_0211618c: .word gVec3p_ZERO
_02116190: .word data_027e0c38
arm_func_end func_ov12_02115ed0
@@ -8500,7 +8500,7 @@ func_ov12_02119a28: ; 0x02119a28
cmp r0, #0
beq _02119aa0
ldr r2, _02119dbc ; =gPlayerPos
ldr r1, _02119dc0 ; =data_027e0d0c
ldr r1, _02119dc0 ; =gVec3p_ZERO
ldr r3, [r2]
str r3, [r0, #0x48]
ldr r3, [r2, #4]
@@ -8729,7 +8729,7 @@ _02119d9c:
_02119db4: .word data_ov12_02137c64
_02119db8: .word gActorManager
_02119dbc: .word gPlayerPos
_02119dc0: .word data_027e0d0c
_02119dc0: .word gVec3p_ZERO
_02119dc4: .word gItemManager
_02119dc8: .word data_027e0fd4
_02119dcc: .word data_ov00_020eec9c
@@ -28664,12 +28664,12 @@ _0212a28c:
ldmneia sp!, {r3, r4, r5, pc}
mov r0, r5
ldr r2, [r0]
ldr r1, _0212a2b8 ; =data_027e0d0c
ldr r1, _0212a2b8 ; =gVec3p_ZERO
ldr r2, [r2, #0x5c]
blx r2
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0212a2b8: .word data_027e0d0c
_0212a2b8: .word gVec3p_ZERO
arm_func_end func_ov12_0212a258
.global func_ov12_0212a2bc
@@ -28715,7 +28715,7 @@ func_ov12_0212a2cc: ; 0x0212a2cc
str r1, [sp]
str r1, [sp, #8]
ldr r5, _0212a464 ; =0x00000666
ldr r2, _0212a468 ; =data_027e0d0c
ldr r2, _0212a468 ; =gVec3p_ZERO
str r5, [sp, #4]
ldr r3, [r2]
mov r0, #0x800
@@ -28791,7 +28791,7 @@ _0212a458: .word gItemManager
_0212a45c: .word data_ov12_02134914
_0212a460: .word data_027e0fc4
_0212a464: .word 0x00000666
_0212a468: .word data_027e0d0c
_0212a468: .word gVec3p_ZERO
_0212a46c: .word data_ov12_0213dd0c
arm_func_end func_ov12_0212a2cc
@@ -28812,7 +28812,7 @@ func_ov12_0212a484: ; 0x0212a484
str r1, [r0, #0x130]
cmp r1, #1
bxne lr
ldr r1, _0212a4b0 ; =data_027e0d0c
ldr r1, _0212a4b0 ; =gVec3p_ZERO
ldr r2, [r1]
str r2, [r0, #0x60]
ldr r2, [r1, #4]
@@ -28821,7 +28821,7 @@ func_ov12_0212a484: ; 0x0212a484
str r1, [r0, #0x68]
bx lr
.align 2, 0
_0212a4b0: .word data_027e0d0c
_0212a4b0: .word gVec3p_ZERO
arm_func_end func_ov12_0212a484
.global func_ov12_0212a4b4
@@ -37659,7 +37659,7 @@ func_ov12_02131608: ; 0x02131608
bl func_ov12_0211cfe0
cmp r0, #0
movne r0, #1
ldr r3, _021316c4 ; =data_027e0d0c
ldr r3, _021316c4 ; =gVec3p_ZERO
strneb r0, [r4, #0x754]
ldr r0, [r3]
ldr r2, _021316c8 ; =data_027e0764
@@ -37700,7 +37700,7 @@ func_ov12_02131608: ; 0x02131608
str r0, [r4, #0x220]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_021316c4: .word data_027e0d0c
_021316c4: .word gVec3p_ZERO
_021316c8: .word data_027e0764
_021316cc: .word data_ov12_02137680
arm_func_end func_ov12_02131608
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -152,7 +152,7 @@
.extern data_027e080c
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d18
.extern data_027e0d38
.extern data_027e0d3c
asm/ov14/ov14_0211f640.s
+20 -20
View File
@@ -700,7 +700,7 @@ func_ov14_0211fda4: ; 0x0211fda4
add r0, r4, #0x100
strh ip, [r0, #0xac]
strh ip, [r0, #0xb2]
ldr r1, _0211fea4 ; =data_027e0d0c
ldr r1, _0211fea4 ; =gVec3p_ZERO
ldr r3, _0211fea8 ; =0x00000266
ldr r2, [r1]
mov r0, r4
@@ -726,7 +726,7 @@ func_ov14_0211fda4: ; 0x0211fda4
.align 2, 0
_0211fe9c: .word data_ov14_021559e8
_0211fea0: .word gItemManager
_0211fea4: .word data_027e0d0c
_0211fea4: .word gVec3p_ZERO
_0211fea8: .word 0x00000266
arm_func_end func_ov14_0211fda4
@@ -1516,7 +1516,7 @@ _0212094c:
strh r2, [r1, #0xb2]
bl func_ov14_02120da8
add r1, r5, #0x178
ldr r0, _02120994 ; =data_027e0d0c
ldr r0, _02120994 ; =gVec3p_ZERO
str r1, [r5, #0x184]
ldr r1, [r0]
str r1, [r5, #0x60]
@@ -1529,7 +1529,7 @@ _0212094c:
.align 2, 0
_0212098c: .word gActorManager
_02120990: .word 0x00001555
_02120994: .word data_027e0d0c
_02120994: .word gVec3p_ZERO
arm_func_end func_ov14_021207b8
.global func_ov14_02120998
@@ -1580,7 +1580,7 @@ _02120a30:
strh r2, [r1, #0xb2]
bl func_ov14_02120da8
add r1, r6, #0x178
ldr r0, _02120a7c ; =data_027e0d0c
ldr r0, _02120a7c ; =gVec3p_ZERO
str r1, [r6, #0x184]
ldr r1, [r0]
str r1, [r6, #0x60]
@@ -1594,7 +1594,7 @@ _02120a30:
.align 2, 0
_02120a74: .word gActorManager
_02120a78: .word 0x00001555
_02120a7c: .word data_027e0d0c
_02120a7c: .word gVec3p_ZERO
arm_func_end func_ov14_02120998
.global func_ov14_02120a80
@@ -1827,7 +1827,7 @@ _02120da4: .word data_027e0f64
.global func_ov14_02120da8
arm_func_start func_ov14_02120da8
func_ov14_02120da8: ; 0x02120da8
ldr r2, _02120de8 ; =data_027e0d0c
ldr r2, _02120de8 ; =gVec3p_ZERO
add r1, r0, #0x100
ldr ip, [r2]
mov r3, #0
@@ -1844,7 +1844,7 @@ func_ov14_02120da8: ; 0x02120da8
strb r3, [r0, #0x1b4]
bx lr
.align 2, 0
_02120de8: .word data_027e0d0c
_02120de8: .word gVec3p_ZERO
arm_func_end func_ov14_02120da8
.global func_ov14_02120dec
@@ -2344,7 +2344,7 @@ func_ov14_021214b0: ; 0x021214b0
ldr r0, _02121534 ; =data_ov14_02155ac8
mov ip, #0xa00
str r0, [r4]
ldr r1, _02121538 ; =data_027e0d0c
ldr r1, _02121538 ; =gVec3p_ZERO
str ip, [r4, #0x15c]
ldr r0, [r1]
mov r2, #0x2000
@@ -2373,7 +2373,7 @@ func_ov14_021214b0: ; 0x021214b0
ldmia sp!, {r4, pc}
.align 2, 0
_02121534: .word data_ov14_02155ac8
_02121538: .word data_027e0d0c
_02121538: .word gVec3p_ZERO
arm_func_end func_ov14_021214b0
.global func_ov14_0212153c
@@ -2901,7 +2901,7 @@ func_ov14_02121be4: ; 0x02121be4
mov r3, #0
ldr r7, _02121cd0 ; =0x0000059a
str r3, [r4, #0x244]
ldr r0, _02121cd4 ; =data_027e0d0c
ldr r0, _02121cd4 ; =gVec3p_ZERO
add r9, r4, #0x254
mov r8, #0x1000
add r6, r7, #0x1000
@@ -2940,7 +2940,7 @@ _02121cc4: .word data_ov14_02155cac
_02121cc8: .word func_ov14_02121cd8 - 1
_02121ccc: .word func_ov14_02121d6c - 1
_02121cd0: .word 0x0000059a
_02121cd4: .word data_027e0d0c
_02121cd4: .word gVec3p_ZERO
arm_func_end func_ov14_02121be4
.global func_ov14_02121cd8
@@ -3534,7 +3534,7 @@ _02122510:
add r1, r5, #0x254
mov r2, r0
bl Vec3p_Add
ldr r2, _02122ae8 ; =data_027e0d0c
ldr r2, _02122ae8 ; =gVec3p_ZERO
mov r0, r5
ldr r3, [r2]
mov r1, #0x1a
@@ -3919,7 +3919,7 @@ _02122ad8: .word data_027e0764
_02122adc: .word 0x0000019a
_02122ae0: .word data_ov14_02155b9c
_02122ae4: .word data_027e0f78
_02122ae8: .word data_027e0d0c
_02122ae8: .word gVec3p_ZERO
_02122aec: .word data_ov14_02153bdc
_02122af0: .word data_ov14_02153be8
_02122af4: .word 0xffffd555
@@ -30595,7 +30595,7 @@ _021384a4:
cmp r3, #2
blo _021384a4
str r5, [r6, #0x158]
ldr r1, _021384f4 ; =data_027e0d0c
ldr r1, _021384f4 ; =gVec3p_ZERO
str r4, [r6, #0x15c]
ldr r0, [r1]
mvn r2, #0
@@ -30609,7 +30609,7 @@ _021384a4:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021384f0: .word data_ov14_021581f0
_021384f4: .word data_027e0d0c
_021384f4: .word gVec3p_ZERO
arm_func_end func_ov14_0213844c
.global func_ov14_021384f8
@@ -32267,7 +32267,7 @@ _021399c4:
mov r0, #1
mov r1, #0
strb r0, [r4, #0x128]
ldr r2, _02139a4c ; =data_027e0d0c
ldr r2, _02139a4c ; =gVec3p_ZERO
str r1, [r4, #0x6c]
ldr r0, [r2]
sub ip, r1, #1
@@ -32299,7 +32299,7 @@ _021399c4:
ldmia sp!, {r4, pc}
.align 2, 0
_02139a48: .word gAdventureFlags
_02139a4c: .word data_027e0d0c
_02139a4c: .word gVec3p_ZERO
arm_func_end func_ov14_0213996c
.global func_ov14_02139a50
@@ -32660,7 +32660,7 @@ func_ov14_02139eac: ; 0x02139eac
mov r2, #0
mov r4, r0
strb r2, [r4, #0x119]
ldr r3, _02139f78 ; =data_027e0d0c
ldr r3, _02139f78 ; =gVec3p_ZERO
str r2, [r4, #0x6c]
ldr r1, [r3]
sub lr, r2, #1
@@ -32710,7 +32710,7 @@ _02139f6c:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02139f78: .word data_027e0d0c
_02139f78: .word gVec3p_ZERO
arm_func_end func_ov14_02139eac
.global func_ov14_02139f7c
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -155,7 +155,7 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d28
.extern data_027e0d38
.extern data_027e0d3c
asm/ov14/ov14_0213b778.s
+12 -12
View File
@@ -2941,7 +2941,7 @@ _0213d8a0:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, pc}
_0213d8ec:
ldr r0, _0213d918 ; =data_027e0d0c
ldr r0, _0213d918 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4]
ldr r1, [r0, #4]
@@ -2954,7 +2954,7 @@ _0213d908:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0213d914: .word 0x00000e66
_0213d918: .word data_027e0d0c
_0213d918: .word gVec3p_ZERO
arm_func_end func_ov14_0213d81c
.global func_ov14_0213d91c
@@ -3950,7 +3950,7 @@ _0213e670:
ldmia r4, {r0, r1, r2}
add r4, sp, #0x8c
stmia r4, {r0, r1, r2}
ldr r5, _0213eaa4 ; =data_027e0d0c
ldr r5, _0213eaa4 ; =gVec3p_ZERO
ldr r3, _0213eaa8 ; =data_027e0d44
add r4, sp, #0x80
ldmia r5, {r0, r1, r2}
@@ -4214,7 +4214,7 @@ _0213ea6c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0213eaa0: .word data_027e0f64
_0213eaa4: .word data_027e0d0c
_0213eaa4: .word gVec3p_ZERO
_0213eaa8: .word data_027e0d44
_0213eaac: .word 0x0000ffff
_0213eab0: .word 0x001f20c0
@@ -4393,7 +4393,7 @@ _0213ebe4:
ldr r0, _0213ec38 ; =data_027e0f64
str r1, [sp, #4]
ldr r0, [r0]
ldr r3, _0213ec3c ; =data_027e0d0c
ldr r3, _0213ec3c ; =gVec3p_ZERO
ldr r0, [r0, #4]
add r2, r4, #0x20
mov r1, #7
@@ -4403,7 +4403,7 @@ _0213ebe4:
.align 2, 0
_0213ec34: .word gPlayerVel
_0213ec38: .word data_027e0f64
_0213ec3c: .word data_027e0d0c
_0213ec3c: .word gVec3p_ZERO
arm_func_end func_ov14_0213eba4
.global func_ov14_0213ec40
@@ -19432,7 +19432,7 @@ func_ov14_0214a560: ; 0x0214a560
strh r0, [r4, #0x6e]
sub ip, lr, #1
str ip, [r4, #0x70]
ldr r0, _0214a600 ; =data_027e0d0c
ldr r0, _0214a600 ; =gVec3p_ZERO
str ip, [r4, #0x74]
add r3, r4, #0x78
ldmia r0, {r0, r1, r2}
@@ -19451,7 +19451,7 @@ func_ov14_0214a560: ; 0x0214a560
_0214a5f4: .word data_ov14_02159ca4
_0214a5f8: .word 0x00002aab
_0214a5fc: .word 0x000078e4
_0214a600: .word data_027e0d0c
_0214a600: .word gVec3p_ZERO
arm_func_end func_ov14_0214a560
.global func_ov14_0214a604
@@ -19925,7 +19925,7 @@ func_ov14_0214abd8: ; 0x0214abd8
arm_func_start func_ov14_0214abf4
func_ov14_0214abf4: ; 0x0214abf4
mov r1, #0
ldr r2, _0214adbc ; =data_027e0d0c
ldr r2, _0214adbc ; =gVec3p_ZERO
str r1, [r0, #0x6c]
ldr r3, [r2]
sub ip, r1, #1
@@ -20059,7 +20059,7 @@ _0214adb4:
mov r0, #1
bx lr
.align 2, 0
_0214adbc: .word data_027e0d0c
_0214adbc: .word gVec3p_ZERO
_0214adc0: .word 0x4e434d32
_0214adc4: .word 0x4c4e424b
_0214adc8: .word 0x43574946
@@ -21436,7 +21436,7 @@ _0214bf98: .word data_ov00_020eed2c
arm_func_start func_ov14_0214bf9c
func_ov14_0214bf9c: ; 0x0214bf9c
mov ip, #0
ldr r1, _0214c014 ; =data_027e0d0c
ldr r1, _0214c014 ; =gVec3p_ZERO
str ip, [r0, #0x6c]
ldr r2, [r1]
sub r3, ip, #1
@@ -21466,7 +21466,7 @@ func_ov14_0214bf9c: ; 0x0214bf9c
mov r0, #1
bx lr
.align 2, 0
_0214c014: .word data_027e0d0c
_0214c014: .word gVec3p_ZERO
arm_func_end func_ov14_0214bf9c
.global func_ov14_0214c018
asm/ov15.inc
+1 -1
View File
@@ -200,7 +200,7 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
asm/ov15.s
+113 -113
View File
@@ -2766,7 +2766,7 @@ func_ov15_02121af8: ; 0x02121af8
func_ov15_02121b14: ; 0x02121b14
stmdb sp!, {r3, r4, r5, r6, r7, lr}
mov r1, #0
ldr ip, _02121be0 ; =data_027e0d0c
ldr ip, _02121be0 ; =gVec3p_ZERO
str r1, [r0, #0x6c]
ldr r2, [ip]
sub r5, r1, #1
@@ -2816,7 +2816,7 @@ func_ov15_02121b14: ; 0x02121b14
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02121be0: .word data_027e0d0c
_02121be0: .word gVec3p_ZERO
_02121be4: .word data_027e0764
_02121be8: .word 0x00000259
arm_func_end func_ov15_02121b14
@@ -3232,7 +3232,7 @@ func_ov15_02122140: ; 0x02122140
_02122170:
mov r0, #0
str r0, [r4, #0x15c]
ldr r1, _021222a0 ; =data_027e0d0c
ldr r1, _021222a0 ; =gVec3p_ZERO
str r0, [r4, #0x6c]
ldr r2, [r1]
sub r3, r0, #1
@@ -3314,7 +3314,7 @@ _02122240:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0212229c: .word gAdventureFlags
_021222a0: .word data_027e0d0c
_021222a0: .word gVec3p_ZERO
_021222a4: .word 0x53454f43
_021222a8: .word 0x53454b45
_021222ac: .word 0x53504b4e
@@ -5369,7 +5369,7 @@ func_ov15_02123e38: ; 0x02123e38
mov r1, #0
str r2, [r4, #0x54]
ldr r2, [r4, #0x4c]
ldr r3, _02124054 ; =data_027e0d0c
ldr r3, _02124054 ; =gVec3p_ZERO
str r2, [r4, #0x58]
ldr r5, [r4, #0x50]
rsb r2, r0, #0x910
@@ -5445,7 +5445,7 @@ _02124044: .word data_ov15_02185b80
_02124048: .word gPlayerPos
_0212404c: .word 0xfffffe66
_02124050: .word gSinCosTable
_02124054: .word data_027e0d0c
_02124054: .word gVec3p_ZERO
_02124058: .word 0x00001554
_0212405c: .word 0x00001aaa
_02124060: .word 0x00000666
@@ -5599,7 +5599,7 @@ _02124234:
_02124260:
mvn r0, #0x80000000
str r0, [sp]
ldr r1, _02124384 ; =data_027e0d0c
ldr r1, _02124384 ; =gVec3p_ZERO
add r0, r4, #0x60
mov r2, #0x400
mov r3, #0x40
@@ -5643,7 +5643,7 @@ _021242f8:
str r2, [r4, #0x6c]
str r2, [r4, #0x64]
ldr r0, [r4, #0x2a8]
ldr r1, _02124384 ; =data_027e0d0c
ldr r1, _02124384 ; =gVec3p_ZERO
str r0, [r4, #0x4c]
sub ip, r2, #0x80000001
add r0, r4, #0x60
@@ -5678,7 +5678,7 @@ _02124364:
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_02124384: .word data_027e0d0c
_02124384: .word gVec3p_ZERO
arm_func_end func_ov15_021240ac
.global func_ov15_02124388
@@ -6926,7 +6926,7 @@ func_ov15_02125474: ; 0x02125474
mov r3, #0
str r1, [r4, #0x58]
ldr r1, [r4, #0x50]
ldr lr, _021255cc ; =data_027e0d0c
ldr lr, _021255cc ; =gVec3p_ZERO
str r1, [r4, #0x5c]
str r3, [r4, #0x6c]
ldr r1, [lr]
@@ -7001,7 +7001,7 @@ _021255b4:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_021255c8: .word 0x00000333
_021255cc: .word data_027e0d0c
_021255cc: .word gVec3p_ZERO
_021255d0: .word gPlayerPos
_021255d4: .word data_027e0c68
arm_func_end func_ov15_02125474
@@ -7055,7 +7055,7 @@ _02125658:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
_0212567c:
ldr r1, _021257bc ; =data_027e0d0c
ldr r1, _021257bc ; =gVec3p_ZERO
mvn ip, #0x80000000
ldr r2, _021257c0 ; =0x00000266
add r0, r4, #0x60
@@ -7140,7 +7140,7 @@ _021257a4:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021257bc: .word data_027e0d0c
_021257bc: .word gVec3p_ZERO
_021257c0: .word 0x00000266
_021257c4: .word data_ov15_02189898
_021257c8: .word gSinCosTable
@@ -19811,7 +19811,7 @@ _0212fdf8:
_0212fe54:
mov r3, #0
str r3, [r5, #0x4ac]
ldr r0, _0213052c ; =data_027e0d0c
ldr r0, _0213052c ; =gVec3p_ZERO
str r3, [r5, #0x4b0]
ldr r2, [r0]
ldr r1, _02130530 ; =0x0000ffff
@@ -20254,7 +20254,7 @@ _02130510:
.align 2, 0
_02130524: .word data_027e0764
_02130528: .word data_ov15_02185dc8
_0213052c: .word data_027e0d0c
_0213052c: .word gVec3p_ZERO
_02130530: .word 0x0000ffff
_02130534: .word gPlayerPos
_02130538: .word data_027e0f64
@@ -21738,7 +21738,7 @@ _021319e4:
strb r3, [r4, #0x490]
add r0, r3, #0x170
str r0, [r4, #0x4ac]
ldr r1, _02131ee0 ; =data_027e0d0c
ldr r1, _02131ee0 ; =gVec3p_ZERO
add r0, sp, #0xd8
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -22055,7 +22055,7 @@ _02131ed0:
.align 2, 0
_02131ed8: .word gPlayerPos
_02131edc: .word 0x00000171
_02131ee0: .word data_027e0d0c
_02131ee0: .word gVec3p_ZERO
_02131ee4: .word gAdventureFlags
_02131ee8: .word 0x0000ffff
_02131eec: .word data_027e0c68
@@ -23064,7 +23064,7 @@ _02132c80:
mov r2, #0
str r2, [r4, #0x4c]
ldr r0, [r4, #0x48]
ldr r3, _02132de8 ; =data_027e0d0c
ldr r3, _02132de8 ; =gVec3p_ZERO
str r0, [r4, #0x54]
ldr r1, [r4, #0x4c]
mov r0, #0x1000
@@ -23154,7 +23154,7 @@ _02132db8:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02132de4: .word gAdventureFlags
_02132de8: .word data_027e0d0c
_02132de8: .word gVec3p_ZERO
arm_func_end func_ov15_02132c48
.global func_ov15_02132dec
@@ -23910,7 +23910,7 @@ _021338b4:
cmp r1, #4
beq _021338f4
ldr r4, [r0]
ldr r2, _02133cd0 ; =data_027e0d0c
ldr r2, _02133cd0 ; =gVec3p_ZERO
ldr r4, [r4, #0x30]
mov r1, #4
mov r3, #1
@@ -24085,7 +24085,7 @@ _02133b38:
cmp r1, #4
beq _02133b78
ldr r4, [r0]
ldr r2, _02133cd0 ; =data_027e0d0c
ldr r2, _02133cd0 ; =gVec3p_ZERO
ldr r4, [r4, #0x30]
mov r1, #4
mov r3, #1
@@ -24184,7 +24184,7 @@ _02133cc0: .word 0x00000aab
_02133cc4: .word data_027e10a4
_02133cc8: .word data_027e0ffc
_02133ccc: .word gAdventureFlags
_02133cd0: .word data_027e0d0c
_02133cd0: .word gVec3p_ZERO
_02133cd4: .word 0x0000ffff
_02133cd8: .word data_027e0764
_02133cdc: .word data_027e0fe8
@@ -24656,7 +24656,7 @@ _02134270:
str r0, [r5, #0x12c]
mov r4, #0x400
_02134284:
ldr r0, _0213449c ; =data_027e0d0c
ldr r0, _0213449c ; =gVec3p_ZERO
mov r3, r4, lsl #0x1
ldr r1, [r0]
add r2, r4, #0x1000
@@ -24797,7 +24797,7 @@ _0213448c:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02134498: .word 0x0000019a
_0213449c: .word data_027e0d0c
_0213449c: .word gVec3p_ZERO
_021344a0: .word data_ov09_0211f530
_021344a4: .word data_027e0e58
_021344a8: .word 0x000004cd
@@ -28323,7 +28323,7 @@ _02137408:
mov r1, #1
str r1, [sp]
ldr r0, _021374dc ; =data_027e0e58
ldr r3, _021374e0 ; =data_027e0d0c
ldr r3, _021374e0 ; =gVec3p_ZERO
ldr r0, [r0]
add r1, r5, #0x180
mov r2, #0x58
@@ -28361,7 +28361,7 @@ _021374d0: .word 0x0000028f
_021374d4: .word data_027e0ffc
_021374d8: .word gPlayerPos
_021374dc: .word data_027e0e58
_021374e0: .word data_027e0d0c
_021374e0: .word gVec3p_ZERO
_021374e4: .word gPlayerAngle
arm_func_end func_ov15_02137278
@@ -30211,7 +30211,7 @@ _02138ed0:
ldr r4, [r0]
ldrb r1, [r1, #0x12]
ldr r4, [r4, #0x30]
ldr r2, _02138fc8 ; =data_027e0d0c
ldr r2, _02138fc8 ; =gVec3p_ZERO
blx r4
add sp, sp, #0xe8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -30227,7 +30227,7 @@ _02138fb8: .word gSinCosTable
_02138fbc: .word data_027e0f6c
_02138fc0: .word gPlayerControl
_02138fc4: .word data_ov15_0218eeb4
_02138fc8: .word data_027e0d0c
_02138fc8: .word gVec3p_ZERO
arm_func_end func_ov15_02138bc8
.global func_ov15_02138fcc
@@ -31341,7 +31341,7 @@ func_ov15_02139f84: ; 0x02139f84
ldr r0, _0213a138 ; =data_027e0e58
str r1, [sp]
ldr r0, [r0]
ldr r3, _0213a13c ; =data_027e0d0c
ldr r3, _0213a13c ; =gVec3p_ZERO
add r1, r4, #0xb0
mov r2, #0xaa
bl func_ov00_0207c1f8
@@ -31351,7 +31351,7 @@ func_ov15_02139f84: ; 0x02139f84
add r1, r4, #0xb4
ldr r0, [r0]
mov r2, #0xab
ldr r3, _0213a13c ; =data_027e0d0c
ldr r3, _0213a13c ; =gVec3p_ZERO
bl func_ov00_0207c1f8
mov r0, #1
str r0, [sp]
@@ -31359,7 +31359,7 @@ func_ov15_02139f84: ; 0x02139f84
add r1, r4, #0xb8
ldr r0, [r0]
mov r2, #0xac
ldr r3, _0213a13c ; =data_027e0d0c
ldr r3, _0213a13c ; =gVec3p_ZERO
bl func_ov00_0207c1f8
mov r0, #1
str r0, [sp]
@@ -31367,7 +31367,7 @@ func_ov15_02139f84: ; 0x02139f84
add r1, r4, #0xbc
ldr r0, [r0]
mov r2, #0xad
ldr r3, _0213a13c ; =data_027e0d0c
ldr r3, _0213a13c ; =gVec3p_ZERO
bl func_ov00_0207c1f8
ldr r0, [r4, #0x20]
bl func_ov09_0211500c
@@ -31445,7 +31445,7 @@ _0213a124:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0213a138: .word data_027e0e58
_0213a13c: .word data_027e0d0c
_0213a13c: .word gVec3p_ZERO
_0213a140: .word data_027e0d38
_0213a144: .word data_027e1094
_0213a148: .word gPlayerAngle
@@ -32975,7 +32975,7 @@ _0213b49c:
str r0, [r4, #0x4c]
str r0, [r4, #0x26c]
ldr r1, [r4, #0x48]
ldr r0, _0213b64c ; =data_027e0d0c
ldr r0, _0213b64c ; =gVec3p_ZERO
str r1, [r4, #0x54]
ldr r1, [r4, #0x4c]
mov r6, #0x80
@@ -33061,7 +33061,7 @@ _0213b63c: .word gActorManager
_0213b640: .word 0x4b4d4741
_0213b644: .word data_027e0764
_0213b648: .word gPlayerPos
_0213b64c: .word data_027e0d0c
_0213b64c: .word gVec3p_ZERO
_0213b650: .word 0x0000ffff
arm_func_end func_ov15_0213b458
@@ -36791,7 +36791,7 @@ _0213e89c:
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
ldr r0, _0213ea3c ; =data_027e0d0c
ldr r0, _0213ea3c ; =gVec3p_ZERO
ldr r2, _0213ea40 ; =0x000010cd
ldr r3, [r0]
mov r1, #0
@@ -36893,7 +36893,7 @@ _0213e998:
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0213ea3c: .word data_027e0d0c
_0213ea3c: .word gVec3p_ZERO
_0213ea40: .word 0x000010cd
_0213ea44: .word 0xfffff99a
_0213ea48: .word gAdventureFlags
@@ -39359,7 +39359,7 @@ func_ov15_02140d0c: ; 0x02140d0c
ldr ip, _02140e50 ; =0x00000e66
str r1, [r4, #0x2e4]
ldr r2, [sp, #8]
ldr r1, _02140e54 ; =data_027e0d0c
ldr r1, _02140e54 ; =gVec3p_ZERO
str r2, [r4, #0x2e8]
ldr lr, [r1]
ldr r3, [r1, #4]
@@ -39405,7 +39405,7 @@ _02140e44: .word data_027e0fe8
_02140e48: .word 0x4c4f4e44
_02140e4c: .word gActorManager
_02140e50: .word 0x00000e66
_02140e54: .word data_027e0d0c
_02140e54: .word gVec3p_ZERO
_02140e58: .word 0x53504b48
arm_func_end func_ov15_02140d0c
@@ -39642,7 +39642,7 @@ func_ov15_021410e4: ; 0x021410e4
stmdb sp!, {r4, lr}
mov r4, r0
mov r0, #0
ldr r2, _021411b4 ; =data_027e0d0c
ldr r2, _021411b4 ; =gVec3p_ZERO
str r0, [r4, #0x6c]
ldr r0, [r2]
ldr r1, _021411b8 ; =0x0000099a
@@ -39693,7 +39693,7 @@ _02141188:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_021411b4: .word data_027e0d0c
_021411b4: .word gVec3p_ZERO
_021411b8: .word 0x0000099a
_021411bc: .word 0x00001dec
_021411c0: .word gActorManager
@@ -47106,7 +47106,7 @@ _021473d8:
bl func_02002c14
str r0, [r4, #0x410]
mov r6, #0
ldr r1, _02147554 ; =data_027e0d0c
ldr r1, _02147554 ; =gVec3p_ZERO
str r6, [r4, #0x3fc]
ldr r0, [r1]
mov r5, #0x1000
@@ -47159,7 +47159,7 @@ _021473d8:
mov r1, r5
str r1, [r0, #0x10]
_021474e0:
ldr r5, _02147554 ; =data_027e0d0c
ldr r5, _02147554 ; =gVec3p_ZERO
mov r2, #0x1000
ldr r1, [r5]
add r0, r4, #0x400
@@ -47189,7 +47189,7 @@ _02147544: .word data_ov15_021861c0
_02147548: .word data_ov15_021861c4
_0214754c: .word 0x66666667
_02147550: .word data_ov15_021861bc
_02147554: .word data_027e0d0c
_02147554: .word gVec3p_ZERO
_02147558: .word data_ov15_021861c8
_0214755c: .word data_ov15_02186194
_02147560: .word data_027e0e58
@@ -54117,7 +54117,7 @@ func_ov15_0214d2b0: ; 0x0214d2b0
mov r3, #0x1000
str r1, [r0, #0x158]
str lr, [r0, #0x98]
ldr r1, _0214d310 ; =data_027e0d0c
ldr r1, _0214d310 ; =gVec3p_ZERO
str lr, [r0, #0x88]
ldr r2, [r1]
str r2, [r0, #0xa8]
@@ -54136,7 +54136,7 @@ func_ov15_0214d2b0: ; 0x0214d2b0
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0214d310: .word data_027e0d0c
_0214d310: .word gVec3p_ZERO
arm_func_end func_ov15_0214d2b0
.global func_ov15_0214d314
@@ -54351,7 +54351,7 @@ func_ov15_0214d568: ; 0x0214d568
stmdb sp!, {r3, lr}
mvn lr, #0
str lr, [r0, #0x98]
ldr r1, _0214d5bc ; =data_027e0d0c
ldr r1, _0214d5bc ; =gVec3p_ZERO
str lr, [r0, #0x88]
ldr r2, [r1]
mov r3, #0
@@ -54370,7 +54370,7 @@ func_ov15_0214d568: ; 0x0214d568
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0214d5bc: .word data_027e0d0c
_0214d5bc: .word gVec3p_ZERO
arm_func_end func_ov15_0214d568
.global func_ov15_0214d5c0
@@ -54537,7 +54537,7 @@ func_ov15_0214d784: ; 0x0214d784
ldr r0, _0214d808 ; =data_ov15_0218bca4
mov ip, #0x400
str r0, [r4]
ldr r1, _0214d80c ; =data_027e0d0c
ldr r1, _0214d80c ; =gVec3p_ZERO
str ip, [r4, #0x15c]
ldr r0, [r1]
mov r2, #0x2000
@@ -54566,7 +54566,7 @@ func_ov15_0214d784: ; 0x0214d784
ldmia sp!, {r4, pc}
.align 2, 0
_0214d808: .word data_ov15_0218bca4
_0214d80c: .word data_027e0d0c
_0214d80c: .word gVec3p_ZERO
arm_func_end func_ov15_0214d784
.global func_ov15_0214d810
@@ -55917,7 +55917,7 @@ func_ov15_0214eb18: ; 0x0214eb18
mov r7, r1
mov r5, r3
bne _0214eb74
ldr r1, _0214ed4c ; =data_027e0d0c
ldr r1, _0214ed4c ; =gVec3p_ZERO
add sp, sp, #0x24
ldr r2, [r1]
mov r0, #1
@@ -56057,7 +56057,7 @@ _0214ecf8:
add sp, sp, #0x24
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_0214ed4c: .word data_027e0d0c
_0214ed4c: .word gVec3p_ZERO
_0214ed50: .word gSinCosTable
_0214ed54: .word 0x0000019a
arm_func_end func_ov15_0214eb18
@@ -59327,7 +59327,7 @@ _02151a2c:
func_ov15_02151a48: ; 0x02151a48
stmdb sp!, {r3, r4, r5, r6, r7, lr}
mov r2, #0
ldr lr, _02151b38 ; =data_027e0d0c
ldr lr, _02151b38 ; =gVec3p_ZERO
str r2, [r0, #0x6c]
ldr r3, [lr]
sub r1, r2, #1
@@ -59387,7 +59387,7 @@ _02151b18:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02151b38: .word data_027e0d0c
_02151b38: .word gVec3p_ZERO
_02151b3c: .word data_027e0764
arm_func_end func_ov15_02151a48
@@ -63794,7 +63794,7 @@ func_ov15_0215583c: ; 0x0215583c
str r0, [r1, #0x14]
ldrsh r2, [r5, #0x78]
add r0, r5, #0x200
ldr r1, _02155b60 ; =data_027e0d0c
ldr r1, _02155b60 ; =gVec3p_ZERO
strh r2, [r0, #0xee]
ldr r2, [r1]
mov r0, #0x800
@@ -63971,7 +63971,7 @@ _02155b4c:
.align 2, 0
_02155b58: .word data_027e0764
_02155b5c: .word 0x7ffff000
_02155b60: .word data_027e0d0c
_02155b60: .word gVec3p_ZERO
_02155b64: .word data_027e0d38
_02155b68: .word gActorManager
_02155b6c: .word data_027e0ff0
@@ -65987,7 +65987,7 @@ func_ov15_021576b4: ; 0x021576b4
ldr r2, [r0]
ldr r2, [r2, #0xc]
blx r2
ldr r0, _021577e0 ; =data_027e0d0c
ldr r0, _021577e0 ; =gVec3p_ZERO
ldr r3, _021577e4 ; =0x000004cd
ldr r1, [r0]
mvn r2, #0
@@ -66029,7 +66029,7 @@ func_ov15_021576b4: ; 0x021576b4
mov r0, #0x1000
str r0, [r4, #0x1f4]
str r0, [r4, #0x1f8]
ldr r0, _021577e0 ; =data_027e0d0c
ldr r0, _021577e0 ; =gVec3p_ZERO
ldr r2, [r4, #0x208]
ldr r1, [r0]
mov r2, r2, asr #0x1
@@ -66054,7 +66054,7 @@ _021577c0:
ldmia sp!, {r4, pc}
.align 2, 0
_021577dc: .word data_027e0fec
_021577e0: .word data_027e0d0c
_021577e0: .word gVec3p_ZERO
_021577e4: .word 0x000004cd
_021577e8: .word gActorManager
arm_func_end func_ov15_021576b4
@@ -66511,7 +66511,7 @@ _02157df8:
mvn r4, #0
str r4, [r0, #0x88]
ldr r1, [r0, #0x7c]
ldr r2, _02157e64 ; =data_027e0d0c
ldr r2, _02157e64 ; =gVec3p_ZERO
str r1, [r0, #0x8c]
ldr r1, [r0, #0x80]
mov ip, #0
@@ -66536,7 +66536,7 @@ _02157df8:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02157e64: .word data_027e0d0c
_02157e64: .word gVec3p_ZERO
arm_func_end func_ov15_02157dd8
.global func_ov15_02157e68
@@ -67215,7 +67215,7 @@ _02158790: .word func_ov15_02123d44
arm_func_start func_ov15_02158794
func_ov15_02158794: ; 0x02158794
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r3, _021588d8 ; =data_027e0d0c
ldr r3, _021588d8 ; =gVec3p_ZERO
mov r4, r0
ldr r0, [r3]
mov r6, #0x1800
@@ -67299,7 +67299,7 @@ _021588d0:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_021588d8: .word data_027e0d0c
_021588d8: .word gVec3p_ZERO
_021588dc: .word data_ov15_02186504
_021588e0: .word data_ov15_0218650c
arm_func_end func_ov15_02158794
@@ -67334,7 +67334,7 @@ _02158938:
strb r0, [r5, #0x181]
rsb r2, r1, #0x10000
strh r2, [r5, #0x7a]
ldr r3, _02158cb0 ; =data_027e0d0c
ldr r3, _02158cb0 ; =gVec3p_ZERO
ldr r2, _02158cb4 ; =data_027e0764
ldr r6, [r3]
str r6, [r5, #0x60]
@@ -67564,7 +67564,7 @@ _02158c9c:
add sp, sp, #0x24
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_02158cb0: .word data_027e0d0c
_02158cb0: .word gVec3p_ZERO
_02158cb4: .word data_027e0764
_02158cb8: .word gSinCosTable
_02158cbc: .word gPlayerPos
@@ -67600,7 +67600,7 @@ _02158cfc: ; jump table
b _02159228 ; case 8
b _02159234 ; case 9
_02158d24:
ldr r0, _02159270 ; =data_027e0d0c
ldr r0, _02159270 ; =gVec3p_ZERO
add sp, sp, #0x4c
ldr r1, [r0]
str r1, [r4, #0x60]
@@ -67954,7 +67954,7 @@ _02159268:
add sp, sp, #0x4c
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02159270: .word data_027e0d0c
_02159270: .word gVec3p_ZERO
_02159274: .word gSinCosTable
_02159278: .word gPlayerPos
_0215927c: .word 0x0000019a
@@ -73638,7 +73638,7 @@ _0215deb8:
mov r2, #0x10
str r0, [r4, #0x1f4]
str r2, [r4, #0x1fc]
ldr r1, _0215dfe4 ; =data_027e0d0c
ldr r1, _0215dfe4 ; =gVec3p_ZERO
str r0, [r4, #0x200]
ldr r3, [r1]
sub r2, r2, #0x11
@@ -73711,7 +73711,7 @@ _0215dfd0:
_0215dfd8: .word data_027e0dbc
_0215dfdc: .word data_027e0764
_0215dfe0: .word 0x55555556
_0215dfe4: .word data_027e0d0c
_0215dfe4: .word gVec3p_ZERO
_0215dfe8: .word 0x00001666
_0215dfec: .word gAdventureFlags
_0215dff0: .word data_ov15_02186700
@@ -73731,7 +73731,7 @@ func_ov15_0215dff8: ; 0x0215dff8
str r3, [r6, #0x3b8]
str r3, [r6, #0x3c4]
str r3, [r6, #0x3c8]
ldr r0, _0215e568 ; =data_027e0d0c
ldr r0, _0215e568 ; =gVec3p_ZERO
str r3, [r6, #0x6c]
ldr r1, [r0]
cmp r5, #7
@@ -74084,7 +74084,7 @@ _0215e558:
str r5, [r6, #0x130]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0215e568: .word data_027e0d0c
_0215e568: .word gVec3p_ZERO
_0215e56c: .word data_027e0764
_0215e570: .word gMapManager
_0215e574: .word data_027e0dbc
@@ -74842,7 +74842,7 @@ _0215f048:
ldrlt r0, [r9, #0x64]
cmplt r0, #0
bge _0215f478
ldr r1, _0215f7f0 ; =data_027e0d0c
ldr r1, _0215f7f0 ; =gVec3p_ZERO
mov r0, #0
str r0, [r9, #0x6c]
ldr r0, [r1]
@@ -75349,7 +75349,7 @@ _0215f7e0: .word 0x00000266
_0215f7e4: .word data_ov15_0218c8b0
_0215f7e8: .word 0x000009f5
_0215f7ec: .word data_027e0dbc
_0215f7f0: .word data_027e0d0c
_0215f7f0: .word gVec3p_ZERO
_0215f7f4: .word data_ov15_0218664c
_0215f7f8: .word 0xfffffccd
_0215f7fc: .word 0xfffff99a
@@ -79590,7 +79590,7 @@ _02163238:
add r0, r4, #0x78
mov r2, #0x16c
bl func_0202b154
ldr r0, _02163c50 ; =data_027e0d0c
ldr r0, _02163c50 ; =gVec3p_ZERO
add r3, sp, #0xc4
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -80248,7 +80248,7 @@ _02163c40: .word data_ov00_020eec68
_02163c44: .word data_027e10a4
_02163c48: .word gMapManager
_02163c4c: .word gPlayerPos
_02163c50: .word data_027e0d0c
_02163c50: .word gVec3p_ZERO
_02163c54: .word data_027e0764
_02163c58: .word data_027e0fe8
_02163c5c: .word 0x544f5044
@@ -82890,7 +82890,7 @@ func_ov15_021660a4: ; 0x021660a4
arm_func_start func_ov15_021660e4
func_ov15_021660e4: ; 0x021660e4
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _021661a0 ; =data_027e0d0c
ldr r2, _021661a0 ; =gVec3p_ZERO
mov r4, r0
ldr r0, [r2]
ldr r6, _021661a4 ; =0x00000266
@@ -82937,7 +82937,7 @@ func_ov15_021660e4: ; 0x021660e4
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021661a0: .word data_027e0d0c
_021661a0: .word gVec3p_ZERO
_021661a4: .word 0x00000266
_021661a8: .word data_027e0ffc
arm_func_end func_ov15_021660e4
@@ -83949,7 +83949,7 @@ _02166d48:
b _02166ecc
_02166e58:
mvn r3, #0
ldr r0, _02166f00 ; =data_027e0d0c
ldr r0, _02166f00 ; =gVec3p_ZERO
str r3, [r5, #0x88]
ldr r2, [r0]
mov r1, #0
@@ -83993,7 +83993,7 @@ _02166ef0: .word data_027e0ffc
_02166ef4: .word 0x00000666
_02166ef8: .word data_027e0e58
_02166efc: .word 0x00000133
_02166f00: .word data_027e0d0c
_02166f00: .word gVec3p_ZERO
_02166f04: .word gActorManager
arm_func_end func_ov15_02166d08
@@ -84006,7 +84006,7 @@ func_ov15_02166f08: ; 0x02166f08
ldr r1, [r4, #0x130]
cmp r1, #1
beq _02166f44
ldr r0, _021670cc ; =data_027e0d0c
ldr r0, _021670cc ; =gVec3p_ZERO
add sp, sp, #0x34
ldr r1, [r0]
str r1, [r4, #0x60]
@@ -84115,7 +84115,7 @@ _02166f44:
add sp, sp, #0x34
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_021670cc: .word data_027e0d0c
_021670cc: .word gVec3p_ZERO
_021670d0: .word gPlayerPos
_021670d4: .word gSinCosTable
_021670d8: .word data_027e0ff4
@@ -84781,7 +84781,7 @@ func_ov15_02167928: ; 0x02167928
func_ov15_02167960: ; 0x02167960
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0x14
ldr r1, _02167d0c ; =data_027e0d0c
ldr r1, _02167d0c ; =gVec3p_ZERO
ldr r3, _02167d10 ; =0x00000266
ldr r2, [r1]
mov r4, r0
@@ -85021,7 +85021,7 @@ _02167cdc:
add sp, sp, #0x14
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02167d0c: .word data_027e0d0c
_02167d0c: .word gVec3p_ZERO
_02167d10: .word 0x00000266
_02167d14: .word data_ov15_0218689c
_02167d18: .word gActorManager
@@ -85416,7 +85416,7 @@ _02168288:
strge r0, [r4, #0x64]
ldmia sp!, {r3, r4, r5, pc}
_021682b8:
ldr r0, _02168354 ; =data_027e0d0c
ldr r0, _02168354 ; =gVec3p_ZERO
add sp, sp, #0x40
ldr r1, [r0]
str r1, [r4, #0x60]
@@ -85458,7 +85458,7 @@ _02168344: .word gPlayerPos
_02168348: .word gSinCosTable
_0216834c: .word gMapManager
_02168350: .word 0x00000666
_02168354: .word data_027e0d0c
_02168354: .word gVec3p_ZERO
arm_func_end func_ov15_02167f14
.global func_ov15_02168358
@@ -86702,7 +86702,7 @@ func_ov15_02169358: ; 0x02169358
blx r2
add r0, r4, #0x1e0
bl func_ov15_02169144
ldr r0, _021694ec ; =data_027e0d0c
ldr r0, _021694ec ; =gVec3p_ZERO
mov r3, #0x15000
ldr r1, [r0]
mvn r2, #0
@@ -86778,7 +86778,7 @@ func_ov15_02169358: ; 0x02169358
.align 2, 0
_021694e4: .word gAdventureFlags
_021694e8: .word data_027e0fec
_021694ec: .word data_027e0d0c
_021694ec: .word gVec3p_ZERO
_021694f0: .word data_027e0f6c
arm_func_end func_ov15_02169358
@@ -94969,7 +94969,7 @@ _021703e8:
ldr r0, _0217063c ; =data_027e10a4
mov r6, #0
ldr r0, [r0]
ldr r1, _02170654 ; =data_027e0d0c
ldr r1, _02170654 ; =gVec3p_ZERO
strb r6, [r0, #0x194]
ldr r2, [r1]
add r0, sp, #0xc0
@@ -95123,7 +95123,7 @@ _02170644: .word gSinCosTable
_02170648: .word 0xffffd738
_0217064c: .word data_027e0d3c
_02170650: .word 0x00000aab
_02170654: .word data_027e0d0c
_02170654: .word gVec3p_ZERO
_02170658: .word 0x000005dc
_0217065c: .word data_ov00_020eec68
arm_func_end func_ov15_0216fe00
@@ -98655,7 +98655,7 @@ _02173834: .word func_ov00_020b7d74
func_ov15_02173838: ; 0x02173838
stmdb sp!, {r4, lr}
sub sp, sp, #0x38
ldr r2, _02173974 ; =data_027e0d0c
ldr r2, _02173974 ; =gVec3p_ZERO
mov r4, r0
ldr r1, [r2]
mov r0, #0x35c
@@ -98734,7 +98734,7 @@ _0217395c:
add sp, sp, #0x38
ldmia sp!, {r4, pc}
.align 2, 0
_02173974: .word data_027e0d0c
_02173974: .word gVec3p_ZERO
_02173978: .word gActorManager
_0217397c: .word data_027e0fe8
_02173980: .word 0x53424559
@@ -103958,7 +103958,7 @@ _02178020:
blt _02178020
_0217804c:
mov r4, #0
ldr r0, _02178130 ; =data_027e0d0c
ldr r0, _02178130 ; =gVec3p_ZERO
str r4, [r7, #0x44c]
ldr r1, [r0]
ldr r2, _02178134 ; =0x00000ccd
@@ -104019,7 +104019,7 @@ _02178114:
.align 2, 0
_02178128: .word data_027e10a4
_0217812c: .word gActorManager
_02178130: .word data_027e0d0c
_02178130: .word gVec3p_ZERO
_02178134: .word 0x00000ccd
_02178138: .word data_027e103c
_0217813c: .word gAdventureFlags
@@ -105156,7 +105156,7 @@ _0217916c:
add r9, r9, #1
cmp r9, #0xf
blt _02179104
ldr r0, _02179340 ; =data_027e0d0c
ldr r0, _02179340 ; =gVec3p_ZERO
add r4, sp, #0x38
ldmia r0, {r0, r1, r2}
stmia r4, {r0, r1, r2}
@@ -105271,7 +105271,7 @@ _02179330: .word data_027e103c
_02179334: .word data_02063e4c
_02179338: .word data_ov15_02186e60
_0217933c: .word data_ov15_02186e9c
_02179340: .word data_027e0d0c
_02179340: .word gVec3p_ZERO
_02179344: .word gSinCosTable
_02179348: .word data_02051f54
arm_func_end func_ov15_02178ff8
@@ -107353,7 +107353,7 @@ _0217afc0:
sub ip, r1, #1
str r0, [r4, #0x2ac]
ldr r2, [r4, #0x4c]
ldr r0, _0217b10c ; =data_027e0d0c
ldr r0, _0217b10c ; =gVec3p_ZERO
str r2, [r4, #0x2b0]
ldr r3, [r4, #0x50]
mov r2, #2
@@ -107375,7 +107375,7 @@ _0217afc0:
mov r0, r4
mov r1, #1
bl func_ov15_0217b11c
ldr r0, _0217b10c ; =data_027e0d0c
ldr r0, _0217b10c ; =gVec3p_ZERO
ldr r1, _0217b110 ; =0x00000666
b _0217b0b4
_0217b098:
@@ -107384,7 +107384,7 @@ _0217b098:
add r0, r4, #0x158
mov r1, #0
bl func_ov00_020c5d74
ldr r0, _0217b10c ; =data_027e0d0c
ldr r0, _0217b10c ; =gVec3p_ZERO
ldr r1, _0217b114 ; =0x000004cd
_0217b0b4:
ldr r2, [r0]
@@ -107410,7 +107410,7 @@ _0217b0fc: .word 0x474f3245
_0217b100: .word gActorManager
_0217b104: .word data_027e0764
_0217b108: .word 0x7ffff000
_0217b10c: .word data_027e0d0c
_0217b10c: .word gVec3p_ZERO
_0217b110: .word 0x00000666
_0217b114: .word 0x000004cd
_0217b118: .word data_027e0d38
@@ -108275,7 +108275,7 @@ _0217bc8c:
movs r4, r0
addeq sp, sp, #0x68
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldr r0, _0217be2c ; =data_027e0d0c
ldr r0, _0217be2c ; =gVec3p_ZERO
add r3, sp, #0x18
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -108359,7 +108359,7 @@ _0217be1c: .word 0x0000099a
_0217be20: .word data_027e0fe8
_0217be24: .word 0x474f3242
_0217be28: .word gActorManager
_0217be2c: .word data_027e0d0c
_0217be2c: .word gVec3p_ZERO
_0217be30: .word gSinCosTable
arm_func_end func_ov15_0217bc00
@@ -108705,7 +108705,7 @@ func_ov15_0217c228: ; 0x0217c228
bl func_ov00_020c5d74
mvn r0, #0
str r0, [r8, #0x98]
ldr r1, _0217c660 ; =data_027e0d0c
ldr r1, _0217c660 ; =gVec3p_ZERO
ldrh r2, [r8, #0x20]
ldr r0, [r1]
ldr r5, _0217c664 ; =data_ov15_02187038
@@ -108978,7 +108978,7 @@ _0217c63c:
add sp, sp, #0x28
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217c660: .word data_027e0d0c
_0217c660: .word gVec3p_ZERO
_0217c664: .word data_ov15_02187038
_0217c668: .word gSinCosTable
_0217c66c: .word data_ov15_02187050
@@ -109503,7 +109503,7 @@ _0217cc78:
str r1, [r4, #0x2d8]
b _0217ce00
_0217cde4:
ldr r0, _0217ced8 ; =data_027e0d0c
ldr r0, _0217ced8 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x2d0]
ldr r1, [r0, #4]
@@ -109566,7 +109566,7 @@ _0217cec8: .word gMapManager
_0217cecc: .word data_027e0ffc
_0217ced0: .word 0x00000666
_0217ced4: .word data_027e0764
_0217ced8: .word data_027e0d0c
_0217ced8: .word gVec3p_ZERO
arm_func_end func_ov15_0217ca04
.global func_ov15_0217cedc
@@ -113207,7 +113207,7 @@ func_ov15_0217fe90: ; 0x0217fe90
mov r10, #0
str r10, [r4, #0x4c]
ldr r1, [r4, #0x48]
ldr r0, _02180330 ; =data_027e0d0c
ldr r0, _02180330 ; =gVec3p_ZERO
str r1, [r4, #0x54]
ldr r1, [r4, #0x4c]
mov r9, #0x6000
@@ -113523,7 +113523,7 @@ _02180324:
add sp, sp, #0x50
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02180330: .word data_027e0d0c
_02180330: .word gVec3p_ZERO
_02180334: .word gAdventureFlags
_02180338: .word data_027e0dcc
_0218033c: .word 0xcccccccd
@@ -113589,7 +113589,7 @@ _021803d0: ; jump table
b _02180a1c ; case 11
b _02180a3c ; case 12
_02180404:
ldr r0, _02180acc ; =data_027e0d0c
ldr r0, _02180acc ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r5, #0x60]
ldr r1, [r0, #4]
@@ -114034,7 +114034,7 @@ _02180ab8:
add sp, sp, #0x31c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02180acc: .word data_027e0d0c
_02180acc: .word gVec3p_ZERO
_02180ad0: .word data_027e10a4
_02180ad4: .word gPlayerPos
_02180ad8: .word data_027e0f64
@@ -126107,7 +126107,7 @@ func_ov15_02188148: ; 0x02188148
ldr r1, _021881bc ; =_ZN9ActorTypeD1Ev
ldr r2, _021881c0 ; =data_ov15_0218f6d4
bl __register_global_object
ldr r0, _021881c4 ; =data_027e0d0c
ldr r0, _021881c4 ; =gVec3p_ZERO
ldr r3, _021881c8 ; =data_ov15_0218c0e4
ldr r2, [r0]
ldr r1, [r0, #4]
@@ -126129,7 +126129,7 @@ _021881b4: .word 0x42554949
_021881b8: .word func_ov15_02155680
_021881bc: .word _ZN9ActorTypeD1Ev
_021881c0: .word data_ov15_0218f6d4
_021881c4: .word data_027e0d0c
_021881c4: .word gVec3p_ZERO
_021881c8: .word data_ov15_0218c0e4
_021881cc: .word data_ov15_0218c0f4
_021881d0: .word func_ov15_021262d4
@@ -126149,7 +126149,7 @@ func_ov15_021881d8: ; 0x021881d8
ldr r1, _02188250 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188254 ; =data_ov15_0218f700
bl __register_global_object
ldr r0, _02188258 ; =data_027e0d0c
ldr r0, _02188258 ; =gVec3p_ZERO
ldr r3, _0218825c ; =data_ov15_0218c1d8
ldr r2, [r0]
ldr r1, [r0, #4]
@@ -126172,7 +126172,7 @@ _02188248: .word 0x53524f50
_0218824c: .word func_ov15_02157610
_02188250: .word _ZN9ActorTypeD1Ev
_02188254: .word data_ov15_0218f700
_02188258: .word data_027e0d0c
_02188258: .word gVec3p_ZERO
_0218825c: .word data_ov15_0218c1d8
_02188260: .word 0x0000019a
_02188264: .word data_ov15_0218c1e8
asm/ov17.inc
+1 -1
View File
@@ -86,7 +86,7 @@
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0e58
asm/ov17.s
+17 -17
View File
@@ -2278,7 +2278,7 @@ func_ov17_0215cf24: ; 0x0215cf24
mov r1, r0
add r0, r4, #0x188
blx func_ov00_020a9588
ldr r0, _0215cf98 ; =data_027e0d0c
ldr r0, _0215cf98 ; =gVec3p_ZERO
add r3, r4, #0x208
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -2296,7 +2296,7 @@ func_ov17_0215cf24: ; 0x0215cf24
.align 2, 0
_0215cf90: .word data_ov17_0216bcc4
_0215cf94: .word gItemManager
_0215cf98: .word data_027e0d0c
_0215cf98: .word gVec3p_ZERO
arm_func_end func_ov17_0215cf24
.global func_ov17_0215cf9c
@@ -2487,7 +2487,7 @@ _0215d1ec:
add r1, r4, #0x208
mov r2, r0
bl Vec3p_Add
ldr r3, _0215d478 ; =data_027e0d0c
ldr r3, _0215d478 ; =gVec3p_ZERO
ldr r1, _0215d47c ; =gMapManager
ldr r2, [r3]
add r0, sp, #0
@@ -2576,7 +2576,7 @@ _0215d2ec:
_0215d360:
mov r5, #1
_0215d364:
ldr r1, _0215d478 ; =data_027e0d0c
ldr r1, _0215d478 ; =gVec3p_ZERO
add r0, r4, #0x60
mov r2, #0x3d
bl func_0202b2e8
@@ -2651,7 +2651,7 @@ _0215d468: .word 0x000008cd
_0215d46c: .word 0x0000019a
_0215d470: .word 0xfffffe3d
_0215d474: .word 0x000001c3
_0215d478: .word data_027e0d0c
_0215d478: .word gVec3p_ZERO
_0215d47c: .word gMapManager
_0215d480: .word data_027e0ffc
arm_func_end func_ov17_0215d114
@@ -3675,7 +3675,7 @@ func_ov17_0215e1f0: ; 0x0215e1f0
bl func_0204f614
mov lr, #0
str lr, [r4, #0x234]
ldr r0, _0215e2ac ; =data_027e0d0c
ldr r0, _0215e2ac ; =gVec3p_ZERO
add ip, r4, #0x244
add r3, r4, #0x200
ldmia r0, {r0, r1, r2}
@@ -3691,7 +3691,7 @@ _0215e29c: .word gItemManager
_0215e2a0: .word data_ov17_0216be94
_0215e2a4: .word func_ov00_020b7d74
_0215e2a8: .word func_ov17_0215bf80
_0215e2ac: .word data_027e0d0c
_0215e2ac: .word gVec3p_ZERO
arm_func_end func_ov17_0215e1f0
.global func_ov17_0215e2b0
@@ -4344,7 +4344,7 @@ _0215eb90:
add r1, r4, #0x244
mov r2, r0
bl Vec3p_Add
ldr r0, _0215ee50 ; =data_027e0d0c
ldr r0, _0215ee50 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x244]
ldr r1, [r0, #4]
@@ -4416,7 +4416,7 @@ _0215ec50:
_0215ecc0:
mov r5, #1
_0215ecc4:
ldr r1, _0215ee50 ; =data_027e0d0c
ldr r1, _0215ee50 ; =gVec3p_ZERO
add r0, r4, #0x60
mov r2, #0x3d
bl func_0202b2e8
@@ -4487,7 +4487,7 @@ _0215edb8:
bl _ZN5Actor18func_ov00_020c2de4Ev
cmp r0, #0
bne _0215ee3c
ldr r2, _0215ee50 ; =data_027e0d0c
ldr r2, _0215ee50 ; =gVec3p_ZERO
mov r0, r4
ldr r3, [r2]
mov r1, #6
@@ -4526,7 +4526,7 @@ _0215ee3c:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215ee50: .word data_027e0d0c
_0215ee50: .word gVec3p_ZERO
_0215ee54: .word gPlayerLink
_0215ee58: .word gPlayerPos
_0215ee5c: .word 0x00000733
@@ -4726,7 +4726,7 @@ func_ov17_0215f098: ; 0x0215f098
mov r2, #0
blx func_ov00_020c0c08
ldr r1, _0215f104 ; =data_ov17_0216be94
ldr r0, _0215f108 ; =data_027e0d0c
ldr r0, _0215f108 ; =gVec3p_ZERO
str r1, [r4, #0x1e4]
add r3, r4, #0x228
ldmia r0, {r0, r1, r2}
@@ -4742,7 +4742,7 @@ func_ov17_0215f098: ; 0x0215f098
.align 2, 0
_0215f100: .word data_ov17_0216bee4
_0215f104: .word data_ov17_0216be94
_0215f108: .word data_027e0d0c
_0215f108: .word gVec3p_ZERO
arm_func_end func_ov17_0215f098
.global func_ov17_0215f10c
@@ -4981,7 +4981,7 @@ _0215f3fc:
add r1, r4, #0x228
mov r2, r0
bl Vec3p_Add
ldr r1, _0215f708 ; =data_027e0d0c
ldr r1, _0215f708 ; =gVec3p_ZERO
mov r0, r4
ldr r2, [r1]
str r2, [r4, #0x228]
@@ -5074,7 +5074,7 @@ _0215f514:
_0215f57c:
mov r5, #1
_0215f580:
ldr r1, _0215f708 ; =data_027e0d0c
ldr r1, _0215f708 ; =gVec3p_ZERO
add r0, r4, #0x60
mov r2, #0x3d
bl func_0202b2e8
@@ -5142,7 +5142,7 @@ _0215f66c:
bl _ZN5Actor18func_ov00_020c2de4Ev
cmp r0, #0
bne _0215f6ec
ldr r2, _0215f708 ; =data_027e0d0c
ldr r2, _0215f708 ; =gVec3p_ZERO
mov r0, r4
ldr r3, [r2]
mov r1, #4
@@ -5182,7 +5182,7 @@ _0215f6ec:
.align 2, 0
_0215f700: .word 0xfffffe3d
_0215f704: .word 0x000001c3
_0215f708: .word data_027e0d0c
_0215f708: .word gVec3p_ZERO
_0215f70c: .word data_027e0ffc
_0215f710: .word gPlayerLink
_0215f714: .word gPlayerPos
asm/ov19.inc
+1 -1
View File
@@ -108,7 +108,7 @@
.extern data_027e0764
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d44
.extern data_027e0db0
.extern data_027e0e58
asm/ov19.s
+2 -2
View File
@@ -10125,7 +10125,7 @@ _02175be8:
strh r1, [r0, #0xa4]
mov r0, r4
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r1, _02175c3c ; =data_027e0d0c
ldr r1, _02175c3c ; =gVec3p_ZERO
ldr r2, [r1]
str r2, [r0]
ldr r2, [r1, #4]
@@ -10140,7 +10140,7 @@ _02175c2c: .word 0xb60b60b7
_02175c30: .word data_ov00_020eec9c
_02175c34: .word gMapManager
_02175c38: .word data_ov19_02175ee0
_02175c3c: .word data_027e0d0c
_02175c3c: .word gVec3p_ZERO
arm_func_end func_ov19_02175a2c
.global func_ov19_02175c40
asm/ov22.inc
+1 -1
View File
@@ -104,7 +104,7 @@
.extern gSinCosTable
.extern data_02057200
.extern data_027e0764
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0e58
.extern gMapManager
asm/ov22.s
+4 -4
View File
@@ -7738,7 +7738,7 @@ _02173c58:
str r1, [r0, #0x10]
b _02173d3c
_02173c74:
ldr r0, _02173d50 ; =data_027e0d0c
ldr r0, _02173d50 ; =gVec3p_ZERO
mov r1, #0x2000
ldr r2, [r0]
str r2, [r5, #0x60]
@@ -7801,7 +7801,7 @@ _02173d3c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02173d4c: .word 0x00000ab8
_02173d50: .word data_027e0d0c
_02173d50: .word gVec3p_ZERO
arm_func_end func_ov22_02173c18
.global func_ov22_02173d54
@@ -8735,7 +8735,7 @@ func_ov22_02174990: ; 0x02174990
ldr r3, _02174a70 ; =0x00000666
str r0, [r4, #0x54]
ldr r0, [r4, #0x4c]
ldr r1, _02174a74 ; =data_027e0d0c
ldr r1, _02174a74 ; =gVec3p_ZERO
str r0, [r4, #0x58]
ldr r0, [r4, #0x50]
add r2, r3, #0x1000
@@ -8787,7 +8787,7 @@ func_ov22_02174990: ; 0x02174990
ldmia sp!, {r4, pc}
.align 2, 0
_02174a70: .word 0x00000666
_02174a74: .word data_027e0d0c
_02174a74: .word gVec3p_ZERO
_02174a78: .word data_027e0fec
_02174a7c: .word gActorManager
arm_func_end func_ov22_02174990
asm/ov23.inc
+1 -1
View File
@@ -136,7 +136,7 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0db0
asm/ov23.s
+10 -10
View File
@@ -4002,7 +4002,7 @@ _02170a6c:
mov r1, #1
str r1, [sp]
ldr r0, _02170ae4 ; =data_027e0e58
ldr r3, _02170ae8 ; =data_027e0d0c
ldr r3, _02170ae8 ; =gVec3p_ZERO
ldr r0, [r0]
add r1, r4, #0x1bc
mov r2, #0xc8
@@ -4021,7 +4021,7 @@ _02170ad8: .word data_027e0ce0
_02170adc: .word data_ov23_0217a234
_02170ae0: .word data_027e0d38
_02170ae4: .word data_027e0e58
_02170ae8: .word data_027e0d0c
_02170ae8: .word gVec3p_ZERO
arm_func_end func_ov23_021709a0
.global func_ov23_02170aec
@@ -5442,7 +5442,7 @@ _02171d34:
beq _02171dd4
mov r0, r4
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r1, _021720b0 ; =data_027e0d0c
ldr r1, _021720b0 ; =gVec3p_ZERO
ldr r2, [r1]
str r2, [r0]
ldr r2, [r1, #4]
@@ -5643,7 +5643,7 @@ _021720a0: .word gSinCosTable
_021720a4: .word 0xffffb8e4
_021720a8: .word 0x000002e1
_021720ac: .word 0x50574253
_021720b0: .word data_027e0d0c
_021720b0: .word gVec3p_ZERO
_021720b4: .word 0x00001a44
_021720b8: .word 0x000004cd
_021720bc: .word 0x000002d5
@@ -13091,7 +13091,7 @@ _02178298:
bl func_ov23_02178344
mov r1, #0
strb r1, [r0, #0xb]
ldr r0, _02178328 ; =data_027e0d0c
ldr r0, _02178328 ; =gVec3p_ZERO
ldr r2, _0217832c ; =gPlayerVel
ldr r3, [r0]
ldr r1, [r0, #4]
@@ -13118,7 +13118,7 @@ _02178318: .word gMapManager
_0217831c: .word data_027e0f64
_02178320: .word data_027e0fcc
_02178324: .word data_027e0fd4
_02178328: .word data_027e0d0c
_02178328: .word gVec3p_ZERO
_0217832c: .word gPlayerVel
_02178330: .word data_ov00_020eec9c
arm_func_end func_ov23_02178174
@@ -13177,7 +13177,7 @@ func_ov23_02178354: ; 0x02178354
bl func_ov23_02178344
mov r1, #0
strb r1, [r0, #0xb]
ldr r3, _02178418 ; =data_027e0d0c
ldr r3, _02178418 ; =gVec3p_ZERO
ldr r2, _0217841c ; =gPlayerVel
ldr lr, [r3]
ldr ip, [r3, #4]
@@ -13196,7 +13196,7 @@ _02178408: .word gPlayerPos
_0217840c: .word gPlayerAngle
_02178410: .word data_027e0fcc
_02178414: .word data_027e0fd4
_02178418: .word data_027e0d0c
_02178418: .word gVec3p_ZERO
_0217841c: .word gPlayerVel
arm_func_end func_ov23_02178354
@@ -13387,7 +13387,7 @@ _0217867c:
ldrb r0, [r4, #0x57]
cmp r0, #0
beq _021786f8
ldr r1, _02178720 ; =data_027e0d0c
ldr r1, _02178720 ; =gVec3p_ZERO
ldr r0, _02178718 ; =gPlayerVel
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -13409,7 +13409,7 @@ _021786f8:
_02178714: .word data_027e0fd4
_02178718: .word gPlayerVel
_0217871c: .word gPlayerAngle
_02178720: .word data_027e0d0c
_02178720: .word gVec3p_ZERO
arm_func_end func_ov23_02178630
.global func_ov23_02178724
asm/ov24.inc
+1 -1
View File
@@ -102,7 +102,7 @@
.extern data_02057200
.extern data_027e0764
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0e58
.extern data_027e0f64
.extern data_027e0f68
asm/ov24.s
+6 -6
View File
@@ -3509,7 +3509,7 @@ _021703c4:
bl func_ov00_020cb60c
cmp r0, #0
beq _02170438
ldr r2, _02170454 ; =data_027e0d0c
ldr r2, _02170454 ; =gVec3p_ZERO
add r0, r5, #0x318
ldr r3, [r2]
mov r1, #6
@@ -3533,7 +3533,7 @@ _02170444: .word gPlayerPos
_02170448: .word data_027e0ffc
_0217044c: .word 0x0000019d
_02170450: .word 0x000001bd
_02170454: .word data_027e0d0c
_02170454: .word gVec3p_ZERO
arm_func_end func_ov24_021701d8
.global func_ov24_02170458
@@ -3617,7 +3617,7 @@ _02170518:
bl func_ov24_0216ffdc
b _021705fc
_02170550:
ldr r1, _021706a8 ; =data_027e0d0c
ldr r1, _021706a8 ; =gVec3p_ZERO
add r0, r5, #0x60
mov r2, r2, lsl #0xc
bl func_0202b308
@@ -3708,7 +3708,7 @@ _02170684:
add sp, sp, #0x2c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021706a8: .word data_027e0d0c
_021706a8: .word gVec3p_ZERO
_021706ac: .word gPlayerPos
_021706b0: .word data_027e0ffc
_021706b4: .word 0x000003a9
@@ -4342,7 +4342,7 @@ func_ov24_02170ef8: ; 0x02170ef8
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02170f38 ; =data_027e0d0c
ldr r0, _02170f38 ; =gVec3p_ZERO
str r2, [r1, #0x10]
ldr r1, [r0]
str r1, [r4, #0x60]
@@ -4352,7 +4352,7 @@ func_ov24_02170ef8: ; 0x02170ef8
str r0, [r4, #0x68]
ldmia sp!, {r4, pc}
.align 2, 0
_02170f38: .word data_027e0d0c
_02170f38: .word gVec3p_ZERO
arm_func_end func_ov24_02170ef8
.global func_ov24_02170f3c
asm/ov26.inc
+1 -1
View File
@@ -107,7 +107,7 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d18
.extern data_027e0d38
.extern data_027e0d3c
asm/ov26.s
+2 -2
View File
@@ -3180,7 +3180,7 @@ _0216fc2c:
ldrsh r6, [r1, r2]
mov r0, r0, lsl #0x1
ldrsh ip, [r1, r0]
ldr r2, _0216fd90 ; =data_027e0d0c
ldr r2, _0216fd90 ; =gVec3p_ZERO
add r1, sp, #0x10
add r3, sp, #0x28
mov r0, #0x400
@@ -3259,7 +3259,7 @@ _0216fd80: .word gPlayerPos
_0216fd84: .word data_027e0764
_0216fd88: .word 0x00008001
_0216fd8c: .word gSinCosTable
_0216fd90: .word data_027e0d0c
_0216fd90: .word gVec3p_ZERO
_0216fd94: .word gMapManager
arm_func_end func_ov26_0216fba8
asm/ov27.inc
+1 -1
View File
@@ -89,7 +89,7 @@
.extern data_027e0c38
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0dbc
.extern data_027e0e58
asm/ov27.s
+22 -22
View File
@@ -297,7 +297,7 @@ func_ov27_0216da38: ; 0x0216da38
mov r2, #0x1000
str r2, [r1, #0x10]
ldr r0, _0216e914 ; =0x00000ccd
ldr r1, _0216e918 ; =data_027e0d0c
ldr r1, _0216e918 ; =gVec3p_ZERO
str r0, [r5, #0x88]
ldr r2, [r1]
add r0, r5, #0x470
@@ -1260,7 +1260,7 @@ _0216e8fc:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0216e914: .word 0x00000ccd
_0216e918: .word data_027e0d0c
_0216e918: .word gVec3p_ZERO
_0216e91c: .word gMapManager
_0216e920: .word data_027e0c68
_0216e924: .word 0x00060003
@@ -2734,7 +2734,7 @@ _0216fce8:
bl func_ov00_020b7e6c
b _0216fd44
_0216fd14:
ldr r1, _0216fe38 ; =data_027e0d0c
ldr r1, _0216fe38 ; =gVec3p_ZERO
add r0, r10, #0x470
ldr r2, [r1]
str r2, [r10, #0x60]
@@ -2812,7 +2812,7 @@ _0216fe28: .word 0x00000bb8
_0216fe2c: .word data_ov27_02178ee0
_0216fe30: .word data_027e0e58
_0216fe34: .word 0x0000099a
_0216fe38: .word data_027e0d0c
_0216fe38: .word gVec3p_ZERO
_0216fe3c: .word data_027e0ffc
_0216fe40: .word data_027e0764
arm_func_end func_ov27_0216fc00
@@ -2830,7 +2830,7 @@ func_ov27_0216fe44: ; 0x0216fe44
bl func_ov27_021713d4
b _0216fe84
_0216fe68:
ldr r0, _0216ff30 ; =data_027e0d0c
ldr r0, _0216ff30 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x60]
ldr r1, [r0, #4]
@@ -2886,7 +2886,7 @@ _0216ff24:
bl func_ov27_0216da38
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0216ff30: .word data_027e0d0c
_0216ff30: .word gVec3p_ZERO
_0216ff34: .word data_027e0764
arm_func_end func_ov27_0216fe44
@@ -2969,7 +2969,7 @@ _02170020:
bl func_ov00_020b7e6c
b _02170084
_02170054:
ldr r1, _02170188 ; =data_027e0d0c
ldr r1, _02170188 ; =gVec3p_ZERO
add r0, r10, #0x470
ldr r2, [r1]
str r2, [r10, #0x60]
@@ -3052,7 +3052,7 @@ _02170178: .word 0x00000bb8
_0217017c: .word data_ov27_02178ee0
_02170180: .word data_027e0e58
_02170184: .word 0x0000099a
_02170188: .word data_027e0d0c
_02170188: .word gVec3p_ZERO
_0217018c: .word data_027e0ffc
_02170190: .word data_027e0764
arm_func_end func_ov27_0216ff38
@@ -5130,7 +5130,7 @@ func_ov27_02171e10: ; 0x02171e10
ldr r2, [r0]
ldr r2, [r2, #0xc]
blx r2
ldr r1, _02171f2c ; =data_027e0d0c
ldr r1, _02171f2c ; =gVec3p_ZERO
mov r0, #0x400
ldr r2, [r1]
mov lr, #0x1400
@@ -5191,7 +5191,7 @@ _02171eec:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02171f28: .word data_027e0fec
_02171f2c: .word data_027e0d0c
_02171f2c: .word gVec3p_ZERO
_02171f30: .word 0x0000099a
_02171f34: .word 0x00002710
_02171f38: .word gActorManager
@@ -5511,7 +5511,7 @@ _021723e0:
add r2, r6, #0x48
bl Vec3p_Add
_021723f0:
ldr r0, _02172490 ; =data_027e0d0c
ldr r0, _02172490 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r6, #0x60]
ldr r1, [r0, #4]
@@ -5554,7 +5554,7 @@ _02172480: .word 0x0000019a
_02172484: .word gMapManager
_02172488: .word 0x00000b33
_0217248c: .word 0xffff699a
_02172490: .word data_027e0d0c
_02172490: .word gVec3p_ZERO
_02172494: .word 0x00000333
_02172498: .word data_027e0ff8
arm_func_end func_ov27_02171f3c
@@ -8185,7 +8185,7 @@ func_ov27_02174704: ; 0x02174704
func_ov27_02174748: ; 0x02174748
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r2, _021747cc ; =data_027e0d0c
ldr r2, _021747cc ; =gVec3p_ZERO
mov r4, r0
ldr r1, [r2]
add r0, r4, #0x1d8
@@ -8217,7 +8217,7 @@ func_ov27_02174748: ; 0x02174748
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021747cc: .word data_027e0d0c
_021747cc: .word gVec3p_ZERO
_021747d0: .word gMapManager
arm_func_end func_ov27_02174748
@@ -8280,7 +8280,7 @@ _02174888:
bl func_ov14_02145508
cmp r0, #0
beq _021748c8
ldr r0, _021748e4 ; =data_027e0d0c
ldr r0, _021748e4 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r5, #0x60]
ldr r1, [r0, #4]
@@ -8296,7 +8296,7 @@ _021748d4: .word gMapManager
_021748d8: .word 0x00000222
_021748dc: .word gAdventureFlags
_021748e0: .word 0x00000266
_021748e4: .word data_027e0d0c
_021748e4: .word gVec3p_ZERO
arm_func_end func_ov27_021747d4
.global func_ov27_021748e8
@@ -9134,7 +9134,7 @@ func_ov27_021752a8: ; 0x021752a8
str r1, [r4, #0x414]
mov r1, #0
bl func_ov27_02174df0
ldr r1, _021753d0 ; =data_027e0d0c
ldr r1, _021753d0 ; =gVec3p_ZERO
mov r0, #0
ldr ip, [r1]
ldr r3, [r1, #4]
@@ -9175,7 +9175,7 @@ _021753c0: .word data_ov27_0217902c
_021753c4: .word func_ov27_02174f08
_021753c8: .word data_ov27_0217903c
_021753cc: .word func_ov27_02175048
_021753d0: .word data_027e0d0c
_021753d0: .word gVec3p_ZERO
_021753d4: .word gMapManager
arm_func_end func_ov27_021752a8
@@ -9965,7 +9965,7 @@ _02175e38:
bl func_ov14_02145e48
_02175e40:
mov r1, #0
ldr r0, _02175e70 ; =data_027e0d0c
ldr r0, _02175e70 ; =gVec3p_ZERO
str r1, [r4, #0x138]
ldr r1, [r0]
str r1, [r4, #0x60]
@@ -9977,7 +9977,7 @@ _02175e40:
.align 2, 0
_02175e68: .word data_027e0ffc
_02175e6c: .word 0x0000040a
_02175e70: .word data_027e0d0c
_02175e70: .word gVec3p_ZERO
arm_func_end func_ov27_02175e00
.global func_ov27_02175e74
@@ -10217,7 +10217,7 @@ func_ov27_02176164: ; 0x02176164
mov r1, #0
str r1, [r0, #0x20]
mov r1, #1
ldr r0, _021761d8 ; =data_027e0d0c
ldr r0, _021761d8 ; =gVec3p_ZERO
str r1, [r4, #0x4d4]
ldr r1, [r0]
str r1, [r4, #0x60]
@@ -10229,7 +10229,7 @@ func_ov27_02176164: ; 0x02176164
.align 2, 0
_021761d0: .word data_027e0c68
_021761d4: .word 0x00060027
_021761d8: .word data_027e0d0c
_021761d8: .word gVec3p_ZERO
arm_func_end func_ov27_02176164
.global func_ov27_021761dc
asm/ov29.inc
+1 -1
View File
@@ -86,7 +86,7 @@
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0e58
asm/ov29.s
+24 -24
View File
@@ -3272,7 +3272,7 @@ func_ov29_02170180: ; 0x02170180
mov r0, #2
str r1, [r4, #0x1d4]
str r0, [r4, #0x25c]
ldr r1, _0217022c ; =data_027e0d0c
ldr r1, _0217022c ; =gVec3p_ZERO
mov r0, r4
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -3288,7 +3288,7 @@ func_ov29_02170180: ; 0x02170180
_02170220: .word data_ov29_02179b20
_02170224: .word data_027e0fec
_02170228: .word data_ov29_02179aa0
_0217022c: .word data_027e0d0c
_0217022c: .word gVec3p_ZERO
arm_func_end func_ov29_02170180
.global func_ov29_02170230
@@ -6073,7 +6073,7 @@ func_ov29_02172738: ; 0x02172738
str r0, [r4, #0x28c]
strb r0, [r4, #0x29d]
strb r0, [r4, #0x29e]
ldr r1, _02172814 ; =data_027e0d0c
ldr r1, _02172814 ; =gVec3p_ZERO
mov r0, r4
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -6090,7 +6090,7 @@ _02172804: .word data_ov29_02179e14
_02172808: .word data_02057200
_0217280c: .word data_027e0fec
_02172810: .word data_ov29_02179ed0
_02172814: .word data_027e0d0c
_02172814: .word gVec3p_ZERO
arm_func_end func_ov29_02172738
.global func_ov29_02172818
@@ -6547,7 +6547,7 @@ _02172e10:
_02172e14:
mov ip, #0
str ip, [r4, #0x130]
ldr r0, _02172e78 ; =data_027e0d0c
ldr r0, _02172e78 ; =gVec3p_ZERO
strb ip, [r4, #0x11a]
ldr r1, [r0]
mov r2, #1
@@ -6571,7 +6571,7 @@ _02172e14:
str r0, [r4, #0x164]
ldmia sp!, {r4, pc}
.align 2, 0
_02172e78: .word data_027e0d0c
_02172e78: .word gVec3p_ZERO
_02172e7c: .word data_ov29_02179db0
_02172e80: .word data_02057200
arm_func_end func_ov29_02172ddc
@@ -6709,7 +6709,7 @@ _0217300c:
str r5, [r8, #4]
add r0, r3, #0x1e
_02173034:
ldr r2, _0217308c ; =data_027e0d0c
ldr r2, _0217308c ; =gVec3p_ZERO
str r0, [r4, #0x284]
ldr r0, [r2]
mov r3, #0x800
@@ -6732,7 +6732,7 @@ _02173034:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02173088: .word data_027e0764
_0217308c: .word data_027e0d0c
_0217308c: .word gVec3p_ZERO
_02173090: .word data_ov29_02179db0
_02173094: .word data_02057200
arm_func_end func_ov29_02172f10
@@ -7091,7 +7091,7 @@ _02173570:
strh r1, [r0, #0x94]
str r1, [r4, #0x278]
mov r1, #0x1000
ldr r0, _021735f4 ; =data_027e0d0c
ldr r0, _021735f4 ; =gVec3p_ZERO
str r1, [r4, #0x274]
ldr r1, [r0]
mov r2, #0x800
@@ -7118,7 +7118,7 @@ _021735e4: .word data_027e0764
_021735e8: .word data_ov38_02189238
_021735ec: .word 0x00000fa5
_021735f0: .word 0xfffff05b
_021735f4: .word data_027e0d0c
_021735f4: .word gVec3p_ZERO
_021735f8: .word data_ov29_02179db0
_021735fc: .word data_02057200
arm_func_end func_ov29_021733f4
@@ -7294,7 +7294,7 @@ func_ov29_02173834: ; 0x02173834
_0217386c:
blx r1
_02173870:
ldr r1, _021739c4 ; =data_027e0d0c
ldr r1, _021739c4 ; =gVec3p_ZERO
mov r0, #4
str r0, [r4, #0x130]
ldr r0, [r1]
@@ -7384,7 +7384,7 @@ _02173998:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021739c4: .word data_027e0d0c
_021739c4: .word gVec3p_ZERO
_021739c8: .word data_ov38_02189238
_021739cc: .word data_027e0764
_021739d0: .word data_ov29_02179db0
@@ -7855,7 +7855,7 @@ func_ov29_02174054: ; 0x02174054
_0217408c:
blx r1
_02174090:
ldr r0, _021742c0 ; =data_027e0d0c
ldr r0, _021742c0 ; =gVec3p_ZERO
mov r1, #5
str r1, [r4, #0x130]
ldr r1, [r0]
@@ -8002,7 +8002,7 @@ _02174284:
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021742c0: .word data_027e0d0c
_021742c0: .word gVec3p_ZERO
_021742c4: .word func_ov29_021726fc
_021742c8: .word data_ov29_02179db0
_021742cc: .word gPlayerPos
@@ -9251,7 +9251,7 @@ _021753a8: .word data_ov29_02179f4c
func_ov29_021753ac: ; 0x021753ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x68
ldr r3, _0217558c ; =data_027e0d0c
ldr r3, _0217558c ; =gVec3p_ZERO
mov r4, r0
ldr r1, [r3]
mov r0, #0x800
@@ -9370,7 +9370,7 @@ func_ov29_021753ac: ; 0x021753ac
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217558c: .word data_027e0d0c
_0217558c: .word gVec3p_ZERO
_02175590: .word data_ov29_02179eec
_02175594: .word data_ov29_02179ef4
_02175598: .word data_ov29_02179408
@@ -9495,7 +9495,7 @@ func_ov29_02175724: ; 0x02175724
mov r1, #0x1000
str r1, [r4, #0x278]
str r1, [r4, #0x27c]
ldr r3, _0217578c ; =data_027e0d0c
ldr r3, _0217578c ; =gVec3p_ZERO
str r1, [r4, #0x280]
ldr r2, [r3]
mov r1, #1
@@ -9517,7 +9517,7 @@ func_ov29_02175724: ; 0x02175724
str r0, [r4, #0x15c]
ldmia sp!, {r4, pc}
.align 2, 0
_0217578c: .word data_027e0d0c
_0217578c: .word gVec3p_ZERO
_02175790: .word data_ov29_02179f20
arm_func_end func_ov29_02175724
@@ -9759,7 +9759,7 @@ _02175ab0:
addeq sp, sp, #0x18
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
ldr r2, _02175b10 ; =data_027e0d0c
ldr r2, _02175b10 ; =gVec3p_ZERO
ldr r1, _02175b14 ; =data_ov29_0217bc78
ldr r0, [r2]
mov r3, #0
@@ -9779,7 +9779,7 @@ _02175ab0:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02175b10: .word data_027e0d0c
_02175b10: .word gVec3p_ZERO
_02175b14: .word data_ov29_0217bc78
arm_func_end func_ov29_02175900
@@ -10824,7 +10824,7 @@ func_ov29_021768a4: ; 0x021768a4
func_ov29_021768dc: ; 0x021768dc
stmdb sp!, {r4, lr}
sub sp, sp, #0x10
ldr r3, _021769ac ; =data_027e0d0c
ldr r3, _021769ac ; =gVec3p_ZERO
mov r4, r0
ldr r2, [r3]
mov ip, #0x800
@@ -10875,7 +10875,7 @@ func_ov29_021768dc: ; 0x021768dc
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_021769ac: .word data_027e0d0c
_021769ac: .word gVec3p_ZERO
_021769b0: .word data_ov29_0217a0a4
_021769b4: .word data_ov29_02179418
arm_func_end func_ov29_021768dc
@@ -13730,7 +13730,7 @@ func_ov29_02178f60: ; 0x02178f60
add r0, r3, #1
str r0, [sp, #4]
add r1, r3, #2
ldr r0, _02178fc4 ; =data_027e0d0c
ldr r0, _02178fc4 ; =gVec3p_ZERO
str r1, [sp, #8]
str r0, [sp, #0xc]
mov r1, #0x41
@@ -13745,7 +13745,7 @@ func_ov29_02178f60: ; 0x02178f60
ldmia sp!, {pc}
.align 2, 0
_02178fc0: .word 0x00001025
_02178fc4: .word data_027e0d0c
_02178fc4: .word gVec3p_ZERO
_02178fc8: .word data_027e0e58
_02178fcc: .word data_ov29_0217bd5c
arm_func_end func_ov29_02178f60
asm/ov30.inc
+1 -1
View File
@@ -80,7 +80,7 @@
.extern data_027e0c38
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0e58
asm/ov30.s
+2 -2
View File
@@ -8003,7 +8003,7 @@ _0218219c:
mov r1, #3
strb r1, [sp, #0x3c]
mov r1, #1
ldr r0, _0218231c ; =data_027e0d0c
ldr r0, _0218231c ; =gVec3p_ZERO
mov r3, #0x800
add r6, sp, #0x18
str r2, [sp, #0x34]
@@ -8060,7 +8060,7 @@ _0218230c: .word 0x0000ffff
_02182310: .word data_027e0d3c
_02182314: .word data_02063e4c
_02182318: .word gSinCosTable
_0218231c: .word data_027e0d0c
_0218231c: .word gVec3p_ZERO
_02182320: .word data_027e0d38
_02182324: .word data_027e0c38
arm_func_end func_ov30_02181ef8
asm/ov32.inc
+1 -1
View File
@@ -86,7 +86,7 @@
.extern data_027e077c
.extern data_027e080c
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d78
.extern data_027e0e58
.extern data_027e0e5c
asm/ov32.s
+3 -3
View File
@@ -10552,7 +10552,7 @@ func_ov32_0218477c: ; 0x0218477c
ldr r3, _02184878 ; =0x00000666
str r0, [r4, #0x54]
ldr r0, [r4, #0x4c]
ldr r1, _0218487c ; =data_027e0d0c
ldr r1, _0218487c ; =gVec3p_ZERO
str r0, [r4, #0x58]
ldr r0, [r4, #0x50]
add r2, r3, #0x1000
@@ -10590,7 +10590,7 @@ func_ov32_0218477c: ; 0x0218477c
ldr r2, [r2, #0xc]
blx r2
mov r0, #0
ldr r2, _0218487c ; =data_027e0d0c
ldr r2, _0218487c ; =gVec3p_ZERO
str r0, [r4, #0x164]
ldr r1, [r2]
ldr r0, _02184884 ; =gActorManager
@@ -10611,7 +10611,7 @@ func_ov32_0218477c: ; 0x0218477c
ldmia sp!, {r4, pc}
.align 2, 0
_02184878: .word 0x00000666
_0218487c: .word data_027e0d0c
_0218487c: .word gVec3p_ZERO
_02184880: .word data_027e0fec
_02184884: .word gActorManager
arm_func_end func_ov32_0218477c
asm/ov34.inc
+1 -1
View File
@@ -69,7 +69,7 @@
.extern data_027e0194
.extern data_027e03c8
.extern data_027e0764
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
asm/ov34.s
+14 -14
View File
@@ -937,7 +937,7 @@ _0217c998:
add r2, r2, #0x5800
str r1, [r5, #0x90]
ldr r1, [r5, #0x84]
ldr r3, _0217cdf0 ; =data_027e0d0c
ldr r3, _0217cdf0 ; =gVec3p_ZERO
str r1, [r5, #0x94]
ldr r6, [r5, #0x88]
ldr r1, _0217cdf4 ; =data_ov34_021861a0
@@ -1206,7 +1206,7 @@ _0217cd8c:
.align 2, 0
_0217cde8: .word gAdventureFlags
_0217cdec: .word 0x00001e66
_0217cdf0: .word data_027e0d0c
_0217cdf0: .word gVec3p_ZERO
_0217cdf4: .word data_ov34_021861a0
_0217cdf8: .word data_ov34_021861e8
_0217cdfc: .word data_027e0fec
@@ -1604,7 +1604,7 @@ func_ov34_0217d318: ; 0x0217d318
mov r0, #7
str r0, [r1, #0x190]
mov r2, #0x32
ldr r0, _0217d350 ; =data_027e0d0c
ldr r0, _0217d350 ; =gVec3p_ZERO
str r2, [r1, #0x194]
ldr r2, [r0]
str r2, [r1, #0x180]
@@ -1615,7 +1615,7 @@ func_ov34_0217d318: ; 0x0217d318
bx lr
.align 2, 0
_0217d34c: .word data_ov34_021861a0
_0217d350: .word data_027e0d0c
_0217d350: .word gVec3p_ZERO
arm_func_end func_ov34_0217d318
.global func_ov34_0217d354
@@ -1697,7 +1697,7 @@ _0217d470:
ldr r0, _0217d4ac ; =data_ov34_02186314
mov r4, #0xc00
ldr r1, _0217d4b0 ; =data_ov34_02186320
ldr r2, _0217d4b4 ; =data_027e0d0c
ldr r2, _0217d4b4 ; =gVec3p_ZERO
ldr r3, _0217d4b8 ; =0x0000099a
str r4, [sp]
bl func_ov34_0217ceb0
@@ -1712,7 +1712,7 @@ _0217d4a4: .word data_ov00_020eec9c
_0217d4a8: .word 0x000002ee
_0217d4ac: .word data_ov34_02186314
_0217d4b0: .word data_ov34_02186320
_0217d4b4: .word data_027e0d0c
_0217d4b4: .word gVec3p_ZERO
_0217d4b8: .word 0x0000099a
arm_func_end func_ov34_0217d354
@@ -9786,7 +9786,7 @@ _02184774: .word data_ov34_02185fbc
func_ov34_02184778: ; 0x02184778
stmdb sp!, {r4, r5, r6, lr}
ldrh r1, [r0, #0x20]
ldr r2, _02184878 ; =data_027e0d0c
ldr r2, _02184878 ; =gVec3p_ZERO
mov r4, #0x800
str r1, [r0, #0x18c]
ldr r1, [r2]
@@ -9849,7 +9849,7 @@ func_ov34_02184778: ; 0x02184778
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02184878: .word data_027e0d0c
_02184878: .word gVec3p_ZERO
_0218487c: .word data_ov34_02186394
_02184880: .word gSinCosTable
_02184884: .word data_ov34_021861fd
@@ -9991,7 +9991,7 @@ _02184a30:
strle ip, [r4, #0x16c]
ldrle ip, [r0, #4]
_02184a54:
ldr r1, _02184aa0 ; =data_027e0d0c
ldr r1, _02184aa0 ; =gVec3p_ZERO
add r0, ip, #0x21c
ldr r3, [r1, #8]
ldmia r1, {r2, ip}
@@ -10011,7 +10011,7 @@ _02184a54:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02184a9c: .word data_ov34_021861e0
_02184aa0: .word data_027e0d0c
_02184aa0: .word gVec3p_ZERO
arm_func_end func_ov34_02184950
.global func_ov34_02184aa4
@@ -10226,7 +10226,7 @@ func_ov34_02184cec: ; 0x02184cec
b _02184df8
_02184d84:
ldr r2, [r4, #0x188]
ldr r1, _02184f30 ; =data_027e0d0c
ldr r1, _02184f30 ; =gVec3p_ZERO
add r0, r4, #0x60
bl func_0202b308
add r1, sp, #8
@@ -10337,7 +10337,7 @@ _02184efc:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02184f2c: .word gSinCosTable
_02184f30: .word data_027e0d0c
_02184f30: .word gVec3p_ZERO
arm_func_end func_ov34_02184cec
.global func_ov34_02184f34
@@ -11213,7 +11213,7 @@ func_ov34_02185818: ; 0x02185818
str r3, [r0, #0x264]
str r2, [r0, #0x268]
str r3, [r0, #0x27c]
ldr r1, _02185964 ; =data_027e0d0c
ldr r1, _02185964 ; =gVec3p_ZERO
str r2, [r0, #0x280]
ldr r3, _02185968 ; =data_ov34_021861e8
ldmia r1, {r0, r1, r2}
@@ -11240,7 +11240,7 @@ _02185954: .word func_ov34_0217c570
_02185958: .word data_ov34_021861c0
_0218595c: .word data_02057200
_02185960: .word data_ov34_02185aa0
_02185964: .word data_027e0d0c
_02185964: .word gVec3p_ZERO
_02185968: .word data_ov34_021861e8
_0218596c: .word data_027e0194
_02185970: .word data_ov34_02186344
asm/ov35.inc
+1 -1
View File
@@ -88,7 +88,7 @@
.extern data_027e0764
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
asm/ov35.s
+37 -37
View File
@@ -360,7 +360,7 @@ func_ov35_0217c1d4: ; 0x0217c1d4
rsb r0, r0, #0x2000
str r0, [r10, #0x88]
mov r3, r1, asr #0xc
ldr r1, _0217c4a4 ; =data_027e0d0c
ldr r1, _0217c4a4 ; =gVec3p_ZERO
str r3, [r10, #0x98]
ldr r2, [r1]
ldr r0, _0217c4a8 ; =data_027e0fec
@@ -522,7 +522,7 @@ _0217c44c:
_0217c498: .word gActorManager
_0217c49c: .word 0xfffffe66
_0217c4a0: .word 0x000004cd
_0217c4a4: .word data_027e0d0c
_0217c4a4: .word gVec3p_ZERO
_0217c4a8: .word data_027e0fec
_0217c4ac: .word data_ov35_0218512c
_0217c4b0: .word data_ov35_0218595c
@@ -2390,7 +2390,7 @@ _0217dd70:
beq _0217ddd8
mov r0, r5
bl func_ov00_020cc214
ldr r1, _0217e2c4 ; =data_027e0d0c
ldr r1, _0217e2c4 ; =gVec3p_ZERO
mov r0, r5
ldr r2, [r1]
str r2, [r5, #0x60]
@@ -2690,7 +2690,7 @@ _0217e174:
str r1, [r0, #0x10]
b _0217e220
_0217e1f8:
ldr r0, _0217e2c4 ; =data_027e0d0c
ldr r0, _0217e2c4 ; =gVec3p_ZERO
mov r1, #0
ldr r2, [r0]
str r2, [r5, #0x60]
@@ -2746,7 +2746,7 @@ _0217e2ac:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0217e2c0: .word gActorManager
_0217e2c4: .word data_027e0d0c
_0217e2c4: .word gVec3p_ZERO
_0217e2c8: .word gPlayerLink
_0217e2cc: .word gPlayerPos
_0217e2d0: .word data_027e0764
@@ -2864,7 +2864,7 @@ func_ov35_0217e3dc: ; 0x0217e3dc
mov r1, r4
bl func_ov00_020cb60c
mov r2, #0
ldr r1, _0217e520 ; =data_027e0d0c
ldr r1, _0217e520 ; =gVec3p_ZERO
strb r2, [r5, #0x303]
add r0, r5, #0x100
strh r2, [r0, #0x20]
@@ -2916,7 +2916,7 @@ _0217e510:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0217e51c: .word 0x52594453
_0217e520: .word data_027e0d0c
_0217e520: .word gVec3p_ZERO
arm_func_end func_ov35_0217e3dc
.global func_ov35_0217e524
@@ -4157,7 +4157,7 @@ _0217f5ec:
b _02180974
_0217f5f8:
ldr r1, _021800b4 ; =0x00000333
ldr r0, _021800b8 ; =data_027e0d0c
ldr r0, _021800b8 ; =gVec3p_ZERO
str r1, [r4, #0x53c]
ldr r1, [r0]
ldr r5, _021800bc ; =gSinCosTable
@@ -4197,7 +4197,7 @@ _0217f688:
mvn r1, #0
ldr r0, [r0]
bl func_ov00_020bd070
ldr r1, _021800b8 ; =data_027e0d0c
ldr r1, _021800b8 ; =gVec3p_ZERO
ldr r0, _021800c0 ; =data_027e0c54
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -4262,7 +4262,7 @@ _0217f740:
bl func_ov00_020ceacc
b _02180974
_0217f790:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #4
@@ -4307,7 +4307,7 @@ _0217f7bc:
bl func_ov00_020c5d74
b _02180974
_0217f83c:
ldr r1, _021800b8 ; =data_027e0d0c
ldr r1, _021800b8 ; =gVec3p_ZERO
ldr r2, [r1]
str r2, [r4, #0x60]
ldr r2, [r1, #4]
@@ -4336,7 +4336,7 @@ _0217f894:
bl func_ov00_020c5d74
b _02180974
_0217f8a4:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #0
@@ -4442,7 +4442,7 @@ _0217fa0c:
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #6
@@ -4521,7 +4521,7 @@ _0217fa0c:
strh r0, [r4, #0x9c]
b _02180974
_0217fb7c:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #7
@@ -4533,7 +4533,7 @@ _0217fb7c:
bl func_ov00_020c5d74
b _02180974
_0217fba8:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #4
@@ -4706,7 +4706,7 @@ _0217fd30:
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217fe50:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #1
@@ -4822,7 +4822,7 @@ _0217fff0:
str r2, [r4, #0x50]
bl func_ov00_020c5d74
mov r1, #0x32
ldr r0, _021800b8 ; =data_027e0d0c
ldr r0, _021800b8 ; =gVec3p_ZERO
str r1, [r4, #0x548]
ldr r1, [r0]
str r1, [r4, #0x60]
@@ -4841,7 +4841,7 @@ _0217fff0:
_02180058:
ldr r1, [r4, #0x4e4]
mov r2, #1
ldr r0, _021800b8 ; =data_027e0d0c
ldr r0, _021800b8 ; =gVec3p_ZERO
strb r2, [r1, #0x22f]
ldr r1, [r0]
str r1, [r4, #0x60]
@@ -4865,7 +4865,7 @@ _021800a8: .word data_027e0c68
_021800ac: .word gPlayerLink
_021800b0: .word data_027e071c
_021800b4: .word 0x00000333
_021800b8: .word data_027e0d0c
_021800b8: .word gVec3p_ZERO
_021800bc: .word gSinCosTable
_021800c0: .word data_027e0c54
_021800c4: .word func_ov35_0217e9ec
@@ -5031,7 +5031,7 @@ _0218033c:
add r0, r4, #0x158
mov r1, #5
bl func_ov00_020c5d74
ldr r1, _021800b8 ; =data_027e0d0c
ldr r1, _021800b8 ; =gVec3p_ZERO
add r0, sp, #0x190
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -5071,7 +5071,7 @@ _02180370:
str r3, [r4, #0x540]
b _02180974
_021803e0:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #9
@@ -5127,7 +5127,7 @@ _021804a0:
bl func_ov00_020c5d74
b _02180974
_021804b0:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #0xc
@@ -5139,7 +5139,7 @@ _021804b0:
bl func_ov00_020c5d74
b _02180974
_021804dc:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #0xd
@@ -5154,7 +5154,7 @@ _021804dc:
b _02180974
_02180510:
ldrb r1, [r4, #0x564]
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
add r1, r1, #1
strb r1, [r4, #0x564]
@@ -5179,7 +5179,7 @@ _02180510:
bl func_ov00_020c71fc
b _02180974
_02180574:
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #8
@@ -5206,7 +5206,7 @@ _021805ac:
ldr r0, _021800d8 ; =data_ov00_020eec68
mov r1, #5
bl func_ov00_020d716c
ldr r2, _021800b8 ; =data_027e0d0c
ldr r2, _021800b8 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r1, [r2]
mvn r3, #0
@@ -5857,7 +5857,7 @@ func_ov35_02180ec4: ; 0x02180ec4
stmdb sp!, {r3, r4, r5, lr}
mov r4, r0
mvn r5, #0x80000000
ldr r1, _02180fc4 ; =data_027e0d0c
ldr r1, _02180fc4 ; =gVec3p_ZERO
ldr r2, _02180fc8 ; =0x00000666
add r0, r4, #0x60
mov r3, #0x29
@@ -5875,7 +5875,7 @@ func_ov35_02180ec4: ; 0x02180ec4
orr r0, r0, r2, lsr #21
mov r1, r1, lsr #0xc
orr r1, r1, r0, lsl #20
ldr r0, _02180fc4 ; =data_027e0d0c
ldr r0, _02180fc4 ; =gVec3p_ZERO
str r1, [r4, #0x53c]
ldr r1, [r0]
ldr ip, _02180fcc ; =gSinCosTable
@@ -5919,7 +5919,7 @@ func_ov35_02180ec4: ; 0x02180ec4
bl func_ov35_0217f234
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02180fc4: .word data_027e0d0c
_02180fc4: .word gVec3p_ZERO
_02180fc8: .word 0x00000666
_02180fcc: .word gSinCosTable
arm_func_end func_ov35_02180ec4
@@ -7387,7 +7387,7 @@ _021823ac:
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, pc}
_0218243c:
ldr r0, _02182470 ; =data_027e0d0c
ldr r0, _02182470 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x60]
ldr r1, [r0, #4]
@@ -7401,7 +7401,7 @@ _02182460: .word 0x00000171
_02182464: .word data_027e0764
_02182468: .word gSinCosTable
_0218246c: .word data_027e0ffc
_02182470: .word data_027e0d0c
_02182470: .word gVec3p_ZERO
arm_func_end func_ov35_0218221c
.global func_ov35_02182474
@@ -8810,7 +8810,7 @@ func_ov35_02183764: ; 0x02183764
mov r4, r0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, pc}
ldr r3, _02183838 ; =data_027e0d0c
ldr r3, _02183838 ; =gVec3p_ZERO
add r2, r4, #0x100
ldr ip, [r3]
mov r1, #0
@@ -8858,7 +8858,7 @@ func_ov35_02183764: ; 0x02183764
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_02183838: .word data_027e0d0c
_02183838: .word gVec3p_ZERO
_0218383c: .word 0x00001333
_02183840: .word data_ov35_02185cb0
_02183844: .word data_ov35_02185c70
@@ -10155,7 +10155,7 @@ func_ov35_021849dc: ; 0x021849dc
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r1, _02184a98 ; =data_027e0d0c
ldr r1, _02184a98 ; =gVec3p_ZERO
ldr ip, _02184a9c ; =0x00000666
ldr r0, [r1]
mvn r3, #0
@@ -10193,7 +10193,7 @@ func_ov35_021849dc: ; 0x021849dc
ldmia sp!, {r4, pc}
.align 2, 0
_02184a94: .word gActorManager
_02184a98: .word data_027e0d0c
_02184a98: .word gVec3p_ZERO
_02184a9c: .word 0x00000666
_02184aa0: .word data_027e0fec
arm_func_end func_ov35_021849dc
@@ -11922,7 +11922,7 @@ func_ov35_02185730: ; 0x02185730
ldr r1, _02185878 ; =func_ov35_0217cd98
ldr r2, _021858ac ; =data_ov35_02186fd4
bl __register_global_object
ldr r1, _021858b0 ; =data_027e0d0c
ldr r1, _021858b0 ; =gVec3p_ZERO
ldr r0, _02185870 ; =data_ov35_02185c70
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -11960,7 +11960,7 @@ _021858a0: .word 0x00000d07
_021858a4: .word 0xfffff184
_021858a8: .word data_ov35_02185cc0
_021858ac: .word data_ov35_02186fd4
_021858b0: .word data_027e0d0c
_021858b0: .word gVec3p_ZERO
_021858b4: .word 0x000004cd
_021858b8: .word data_ov35_02185cd0
_021858bc: .word data_ov35_02186fe0
asm/ov36.inc
+1 -1
View File
@@ -73,7 +73,7 @@
.extern data_027e077c
.extern data_027e0c38
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d3c
.extern data_027e0e58
.extern gMapManager
asm/ov36.s
+31 -31
View File
@@ -1663,7 +1663,7 @@ _0217d368:
addeq sp, sp, #0x70
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _0217d690 ; =data_027e0d0c
ldr r0, _0217d690 ; =gVec3p_ZERO
mvn r3, #0
ldmia r0, {r4, lr}
ldr ip, [r0, #8]
@@ -1862,7 +1862,7 @@ _0217d680: .word gAdventureFlags
_0217d684: .word data_027e0fe8
_0217d688: .word 0x4c4f4e44
_0217d68c: .word gActorManager
_0217d690: .word data_027e0d0c
_0217d690: .word gVec3p_ZERO
_0217d694: .word 0x00000b33
_0217d698: .word 0x0000199a
_0217d69c: .word func_ov36_0217c24c
@@ -3027,7 +3027,7 @@ _0217e6e0:
ldr r1, _0217e744 ; =data_ov36_02186c8c
add r0, r4, #0x158
bl func_ov36_0217c7e8
ldr r1, _0217e748 ; =data_027e0d0c
ldr r1, _0217e748 ; =gVec3p_ZERO
mov r0, #1
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -3040,7 +3040,7 @@ _0217e6e0:
_0217e73c: .word data_027e0ffc
_0217e740: .word 0x000002c2
_0217e744: .word data_ov36_02186c8c
_0217e748: .word data_027e0d0c
_0217e748: .word gVec3p_ZERO
arm_func_end func_ov36_0217e6b8
.global func_ov36_0217e74c
@@ -3085,7 +3085,7 @@ func_ov36_0217e7a4: ; 0x0217e7a4
ldr r1, _0217e80c ; =data_ov36_02186c90
add r0, r4, #0x158
bl func_ov36_0217c7e8
ldr r1, _0217e810 ; =data_027e0d0c
ldr r1, _0217e810 ; =gVec3p_ZERO
ldr r2, _0217e814 ; =0x00000b33
ldr r3, [r1]
mov r0, #1
@@ -3102,7 +3102,7 @@ func_ov36_0217e7a4: ; 0x0217e7a4
ldmia sp!, {r4, pc}
.align 2, 0
_0217e80c: .word data_ov36_02186c90
_0217e810: .word data_027e0d0c
_0217e810: .word gVec3p_ZERO
_0217e814: .word 0x00000b33
arm_func_end func_ov36_0217e7a4
@@ -3391,7 +3391,7 @@ func_ov36_0217eb58: ; 0x0217eb58
ldr r1, _0217ecd0 ; =data_ov36_02186c94
add r0, r4, #0x158
bl func_ov36_0217c7e8
ldr r2, _0217ecd4 ; =data_027e0d0c
ldr r2, _0217ecd4 ; =gVec3p_ZERO
ldr r0, _0217ecd8 ; =data_027e0f64
ldr r3, [r2]
mov r1, #5
@@ -3426,7 +3426,7 @@ _0217ecc4: .word data_027e0e58
_0217ecc8: .word 0x00001009
_0217eccc: .word 0x0000100a
_0217ecd0: .word data_ov36_02186c94
_0217ecd4: .word data_027e0d0c
_0217ecd4: .word gVec3p_ZERO
_0217ecd8: .word data_027e0f64
_0217ecdc: .word data_027e0ffc
_0217ece0: .word 0x000002ce
@@ -3485,7 +3485,7 @@ func_ov36_0217ed50: ; 0x0217ed50
add r0, r4, #0x158
str r3, [r2, #0x10]
bl func_ov36_0217c7e8
ldr r0, _0217ef08 ; =data_027e0d0c
ldr r0, _0217ef08 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x60]
ldr r1, [r0, #4]
@@ -3587,7 +3587,7 @@ _0217eef8:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0217ef04: .word data_ov36_02186c9c
_0217ef08: .word data_027e0d0c
_0217ef08: .word gVec3p_ZERO
_0217ef0c: .word gMapManager
arm_func_end func_ov36_0217ed50
@@ -3736,7 +3736,7 @@ func_ov36_0217f0c0: ; 0x0217f0c0
ldr r1, _0217f104 ; =data_ov36_02186ca4
add r0, r4, #0x158
bl func_ov36_0217c7e8
ldr r1, _0217f108 ; =data_027e0d0c
ldr r1, _0217f108 ; =gVec3p_ZERO
mov r0, #1
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -3747,7 +3747,7 @@ func_ov36_0217f0c0: ; 0x0217f0c0
ldmia sp!, {r4, pc}
.align 2, 0
_0217f104: .word data_ov36_02186ca4
_0217f108: .word data_027e0d0c
_0217f108: .word gVec3p_ZERO
arm_func_end func_ov36_0217f0c0
.global func_ov36_0217f10c
@@ -3804,7 +3804,7 @@ _0217f1a0:
mov r1, #0x13
str r2, [r4, #0x878]
bl func_ov36_0217ca34
ldr r1, _0217f20c ; =data_027e0d0c
ldr r1, _0217f20c ; =gVec3p_ZERO
mov r0, r4
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -3826,7 +3826,7 @@ _0217f1a0:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0217f20c: .word data_027e0d0c
_0217f20c: .word gVec3p_ZERO
_0217f210: .word data_ov36_02186ca8
_0217f214: .word data_027e0ffc
_0217f218: .word 0x000002c3
@@ -4024,7 +4024,7 @@ _0217f498: .word 0x00001770
arm_func_start func_ov36_0217f49c
func_ov36_0217f49c: ; 0x0217f49c
stmdb sp!, {r4, lr}
ldr r2, _0217f4f0 ; =data_027e0d0c
ldr r2, _0217f4f0 ; =gVec3p_ZERO
mov r4, r0
ldr r1, [r2]
add r0, r4, #0x158
@@ -4045,7 +4045,7 @@ func_ov36_0217f49c: ; 0x0217f49c
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0217f4f0: .word data_027e0d0c
_0217f4f0: .word gVec3p_ZERO
arm_func_end func_ov36_0217f49c
.global func_ov36_0217f4f4
@@ -4366,7 +4366,7 @@ _0217f994: .word 0x50424652
arm_func_start func_ov36_0217f998
func_ov36_0217f998: ; 0x0217f998
stmdb sp!, {r4, lr}
ldr r2, _0217f9e8 ; =data_027e0d0c
ldr r2, _0217f9e8 ; =gVec3p_ZERO
mov r4, r0
ldr r1, [r2]
add r0, r4, #0x158
@@ -4386,7 +4386,7 @@ func_ov36_0217f998: ; 0x0217f998
str r1, [r4, #0x878]
ldmia sp!, {r4, pc}
.align 2, 0
_0217f9e8: .word data_027e0d0c
_0217f9e8: .word gVec3p_ZERO
_0217f9ec: .word data_ov36_02186cac
arm_func_end func_ov36_0217f998
@@ -4667,7 +4667,7 @@ _0217fdec: .word 0x000002c7
arm_func_start func_ov36_0217fdf0
func_ov36_0217fdf0: ; 0x0217fdf0
stmdb sp!, {r4, lr}
ldr r2, _0217fe34 ; =data_027e0d0c
ldr r2, _0217fe34 ; =gVec3p_ZERO
mov r4, r0
ldr r1, [r2]
add r0, r4, #0x158
@@ -4684,7 +4684,7 @@ func_ov36_0217fdf0: ; 0x0217fdf0
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0217fe34: .word data_027e0d0c
_0217fe34: .word gVec3p_ZERO
_0217fe38: .word data_ov36_02186cb4
arm_func_end func_ov36_0217fdf0
@@ -4899,7 +4899,7 @@ _021800fc:
arm_func_start func_ov36_0218011c
func_ov36_0218011c: ; 0x0218011c
stmdb sp!, {r4, lr}
ldr r2, _02180160 ; =data_027e0d0c
ldr r2, _02180160 ; =gVec3p_ZERO
mov r4, r0
ldr r1, [r2]
add r0, r4, #0x158
@@ -4916,7 +4916,7 @@ func_ov36_0218011c: ; 0x0218011c
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02180160: .word data_027e0d0c
_02180160: .word gVec3p_ZERO
_02180164: .word data_ov36_02186cbc
arm_func_end func_ov36_0218011c
@@ -5313,7 +5313,7 @@ func_ov36_02180664: ; 0x02180664
mov r2, #0
orr r0, r0, #0x400
str r0, [r7, #0x878]
ldr r1, _02180980 ; =data_027e0d0c
ldr r1, _02180980 ; =gVec3p_ZERO
str r2, [r7, #0x12c]
add r0, r7, #0x800
strh r2, [r0, #0x92]
@@ -5512,7 +5512,7 @@ _0218091c:
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02180980: .word data_027e0d0c
_02180980: .word gVec3p_ZERO
_02180984: .word data_ov36_02186cd4
_02180988: .word data_ov36_02186838
_0218098c: .word gSinCosTable
@@ -6591,7 +6591,7 @@ _021818e8:
bne _021818e8
_021818fc:
mov r2, #0
ldr r1, _02181b84 ; =data_027e0d0c
ldr r1, _02181b84 ; =gVec3p_ZERO
str r2, [r4, #0x12c]
add r0, r4, #0x800
strh r2, [r0, #0x92]
@@ -6754,7 +6754,7 @@ _02181b40:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02181b80: .word data_027e103c
_02181b84: .word data_027e0d0c
_02181b84: .word gVec3p_ZERO
_02181b88: .word gAdventureFlags
_02181b8c: .word data_ov00_020eec68
_02181b90: .word data_027e0f64
@@ -7744,7 +7744,7 @@ _021829ec:
ldr r0, _02182c74 ; =data_ov00_020eec68
mov r1, #5
bl func_ov00_020d716c
ldr r2, _02182c78 ; =data_027e0d0c
ldr r2, _02182c78 ; =gVec3p_ZERO
add r0, r4, #0x158
ldr r3, [r2]
mov r1, #0x1c
@@ -7896,7 +7896,7 @@ _02182c68: .word data_027e0f64
_02182c6c: .word data_027e0ffc
_02182c70: .word gPlayerLink
_02182c74: .word data_ov00_020eec68
_02182c78: .word data_027e0d0c
_02182c78: .word gVec3p_ZERO
_02182c7c: .word gAdventureFlags
_02182c80: .word 0x0000038e
_02182c84: .word 0x00000dac
@@ -11698,7 +11698,7 @@ func_ov36_02186110: ; 0x02186110
str r3, [r0, #0x16c]
add r1, r2, #2
str r1, [r0, #0x174]
ldr r1, _021862ac ; =data_027e0d0c
ldr r1, _021862ac ; =gVec3p_ZERO
str r3, [r0, #0x178]
ldr r3, [r1]
mov r2, #0x800
@@ -11736,7 +11736,7 @@ _021861c8:
mov r3, #0
str r1, [r0, #0x90]
ldr r4, [r0, #0x84]
ldr r1, _021862ac ; =data_027e0d0c
ldr r1, _021862ac ; =gVec3p_ZERO
str r4, [r0, #0x94]
ldr r4, [r0, #0x88]
mov r5, #7
@@ -11787,7 +11787,7 @@ _021861c8:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_021862a8: .word 0x00001004
_021862ac: .word data_027e0d0c
_021862ac: .word gVec3p_ZERO
_021862b0: .word 0x00001007
_021862b4: .word gSinCosTable
arm_func_end func_ov36_02186110
asm/ov37.inc
+1 -1
View File
@@ -77,7 +77,7 @@
.extern gSinCosTable
.extern data_027e0764
.extern data_027e0c54
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0e58
.extern data_027e0f64
.extern data_027e0f6c
asm/ov37.s
+7 -7
View File
@@ -907,7 +907,7 @@ func_ov37_0217c924: ; 0x0217c924
add r6, r0, #0x2c00
ldr r0, _0217cbdc ; =0x00007fff
add r1, r8, #0xdf0
ldr r9, _0217cbe0 ; =data_027e0d0c
ldr r9, _0217cbe0 ; =gVec3p_ZERO
add r7, r1, #0x2000
mov r4, #0
rsb r11, r0, #0
@@ -1000,7 +1000,7 @@ _0217caac:
add r7, r0, #0x2c00
ldr r0, _0217cbdc ; =0x00007fff
add r1, r8, #0x2f4
ldr r5, _0217cbe0 ; =data_027e0d0c
ldr r5, _0217cbe0 ; =gVec3p_ZERO
add r9, r1, #0x2c00
mov r10, #0
rsb r4, r0, #0
@@ -1075,7 +1075,7 @@ _0217cbc0:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217cbdc: .word 0x00007fff
_0217cbe0: .word data_027e0d0c
_0217cbe0: .word gVec3p_ZERO
_0217cbe4: .word gActorManager
_0217cbe8: .word data_ov37_02187dcc
_0217cbec: .word gPlayerPos
@@ -10717,7 +10717,7 @@ _0218530c: .word _ZN11ItemManager21GetEquipItemUncheckedEi
.global func_ov37_02185310
arm_func_start func_ov37_02185310
func_ov37_02185310: ; 0x02185310
ldr r1, _02185360 ; =data_027e0d0c
ldr r1, _02185360 ; =gVec3p_ZERO
mov ip, #0x1000
ldr r3, [r1]
mov r2, #0x2000
@@ -10738,7 +10738,7 @@ func_ov37_02185310: ; 0x02185310
mov r0, #1
bx lr
.align 2, 0
_02185360: .word data_027e0d0c
_02185360: .word gVec3p_ZERO
arm_func_end func_ov37_02185310
.global func_ov37_02185364
@@ -10831,7 +10831,7 @@ func_ov37_02185410: ; 0x02185410
arm_func_start func_ov37_0218544c
func_ov37_0218544c: ; 0x0218544c
stmdb sp!, {r3, lr}
ldr r1, _021854a4 ; =data_027e0d0c
ldr r1, _021854a4 ; =gVec3p_ZERO
ldr ip, _021854a8 ; =0x0000099a
ldr r2, [r1]
mov r3, #0
@@ -10853,7 +10853,7 @@ func_ov37_0218544c: ; 0x0218544c
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_021854a4: .word data_027e0d0c
_021854a4: .word gVec3p_ZERO
_021854a8: .word 0x0000099a
arm_func_end func_ov37_0218544c
asm/ov38.inc
+1 -1
View File
@@ -77,7 +77,7 @@
.extern data_027e0764
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0f64
asm/ov38.s
+22 -22
View File
@@ -1494,7 +1494,7 @@ _0217cff0:
add r0, r0, #0x40
bl func_0201e388
ldr r2, _0217d518 ; =data_ov38_021891e0
ldr r3, _0217d53c ; =data_027e0d0c
ldr r3, _0217d53c ; =gVec3p_ZERO
str r0, [r2, #0x40]
ldrsh r0, [r10, #0x78]
add r1, r10, #0x1000
@@ -1709,7 +1709,7 @@ _0217d52c: .word data_ov38_02188a88
_0217d530: .word data_ov38_02188a9c
_0217d534: .word data_ov38_02188ab0
_0217d538: .word data_ov38_02188ac4
_0217d53c: .word data_027e0d0c
_0217d53c: .word gVec3p_ZERO
_0217d540: .word gSinCosTable
_0217d544: .word data_027e01b8
_0217d548: .word data_ov38_02189224
@@ -2248,7 +2248,7 @@ _0217dcd8: .word gSinCosTable
func_ov38_0217dcdc: ; 0x0217dcdc
stmdb sp!, {r4, lr}
sub sp, sp, #0x10
ldr r1, _0217ddb8 ; =data_027e0d0c
ldr r1, _0217ddb8 ; =gVec3p_ZERO
mov r4, r0
ldr r0, [r1]
mov r3, #0x10
@@ -2302,7 +2302,7 @@ func_ov38_0217dcdc: ; 0x0217dcdc
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_0217ddb8: .word data_027e0d0c
_0217ddb8: .word gVec3p_ZERO
_0217ddbc: .word 0x0000019a
_0217ddc0: .word 0x00000266
_0217ddc4: .word gSinCosTable
@@ -5021,7 +5021,7 @@ _021803c0: .word 0x0000043b
arm_func_start func_ov38_021803c4
func_ov38_021803c4: ; 0x021803c4
stmdb sp!, {r4, r5, r6, lr}
ldr r3, _02180444 ; =data_027e0d0c
ldr r3, _02180444 ; =gVec3p_ZERO
mov ip, #0
ldr r1, [r3]
mov r2, ip
@@ -5053,7 +5053,7 @@ func_ov38_021803c4: ; 0x021803c4
bl func_ov38_0217d570
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02180444: .word data_027e0d0c
_02180444: .word gVec3p_ZERO
_02180448: .word data_027e0764
arm_func_end func_ov38_021803c4
@@ -5117,7 +5117,7 @@ _02180508: .word 0x00000b33
arm_func_start func_ov38_0218050c
func_ov38_0218050c: ; 0x0218050c
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldr r3, _021805d4 ; =data_027e0d0c
ldr r3, _021805d4 ; =gVec3p_ZERO
mov r1, #0
ldr r4, [r3]
mov r2, r1
@@ -5167,7 +5167,7 @@ func_ov38_0218050c: ; 0x0218050c
bl func_ov38_0217d570
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_021805d4: .word data_027e0d0c
_021805d4: .word gVec3p_ZERO
_021805d8: .word data_027e0764
arm_func_end func_ov38_0218050c
@@ -5483,7 +5483,7 @@ _02180a60: .word 0x00000b33
func_ov38_02180a64: ; 0x02180a64
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x24
ldr r1, _02180bb4 ; =data_027e0d0c
ldr r1, _02180bb4 ; =gVec3p_ZERO
mov r4, r0
ldr r2, [r1]
add r0, r4, #0x1000
@@ -5571,7 +5571,7 @@ _02180b74:
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02180bb4: .word data_027e0d0c
_02180bb4: .word gVec3p_ZERO
_02180bb8: .word 0x00000171
_02180bbc: .word data_027e0ffc
arm_func_end func_ov38_02180a64
@@ -5746,7 +5746,7 @@ _02180dfc: .word data_027e0f6c
func_ov38_02180e00: ; 0x02180e00
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x24
ldr r1, _02180f20 ; =data_027e0d0c
ldr r1, _02180f20 ; =gVec3p_ZERO
mov r4, r0
ldr r2, [r1]
add r0, r4, #0x1000
@@ -5821,7 +5821,7 @@ _02180ee4:
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02180f20: .word data_027e0d0c
_02180f20: .word gVec3p_ZERO
_02180f24: .word 0x00000171
_02180f28: .word data_ov00_020eec68
arm_func_end func_ov38_02180e00
@@ -6058,7 +6058,7 @@ func_ov38_02181254: ; 0x02181254
mov r4, r0
mov r2, #1
add lr, r4, #0x1000
ldr r1, _02181320 ; =data_027e0d0c
ldr r1, _02181320 ; =gVec3p_ZERO
str r2, [lr, #0x70]
ldr r3, [r1]
mov r5, #0x1e
@@ -6105,7 +6105,7 @@ func_ov38_02181254: ; 0x02181254
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02181320: .word data_027e0d0c
_02181320: .word gVec3p_ZERO
arm_func_end func_ov38_02181254
.global func_ov38_02181324
@@ -6906,7 +6906,7 @@ func_ov38_02181e30: ; 0x02181e30
mov r3, #0x200
str lr, [ip, #0x70]
bl func_ov38_0217d570
ldr r0, _02181f14 ; =data_027e0d0c
ldr r0, _02181f14 ; =gVec3p_ZERO
add r1, r4, #0x1000
ldr r2, [r0]
mov r3, #0
@@ -6953,7 +6953,7 @@ func_ov38_02181e30: ; 0x02181e30
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_02181f14: .word data_027e0d0c
_02181f14: .word gVec3p_ZERO
_02181f18: .word 0x00000133
_02181f1c: .word func_ov38_0217cd70
arm_func_end func_ov38_02181e30
@@ -10037,7 +10037,7 @@ func_ov38_02184a18: ; 0x02184a18
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r4, #0xff0]
ldr r2, _02184ba4 ; =data_027e0d0c
ldr r2, _02184ba4 ; =gVec3p_ZERO
ldr lr, _02184ba8 ; =0x0000119a
ldr r5, [r2]
ldr r3, [r2, #4]
@@ -10096,7 +10096,7 @@ func_ov38_02184a18: ; 0x02184a18
_02184b98: .word data_027e0fe8
_02184b9c: .word 0x4c4f4e44
_02184ba0: .word gActorManager
_02184ba4: .word data_027e0d0c
_02184ba4: .word gVec3p_ZERO
_02184ba8: .word 0x0000119a
arm_func_end func_ov38_02184a18
@@ -10110,7 +10110,7 @@ func_ov38_02184bac: ; 0x02184bac
strb r5, [r2, #0xa1]
ldrsh r1, [r2, #0x8e]
mov ip, #2
ldr r3, _02184c88 ; =data_027e0d0c
ldr r3, _02184c88 ; =gVec3p_ZERO
strh r1, [r2, #0x8a]
ldrsh lr, [r2, #0x90]
mov r1, #6
@@ -10160,7 +10160,7 @@ _02184c74:
bl func_ov38_0217be60
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02184c88: .word data_027e0d0c
_02184c88: .word gVec3p_ZERO
_02184c8c: .word data_027e0ffc
_02184c90: .word 0x00000445
arm_func_end func_ov38_02184bac
@@ -10280,7 +10280,7 @@ func_ov38_02184d9c: ; 0x02184d9c
mov r1, #3
mov r4, #0
bl func_01ff9b4c
ldr r11, _02184ed8 ; =data_027e0d0c
ldr r11, _02184ed8 ; =gVec3p_ZERO
mov r5, r0
mov r7, r10
add r8, r10, #0x38
@@ -10348,7 +10348,7 @@ _02184de4:
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02184ed8: .word data_027e0d0c
_02184ed8: .word gVec3p_ZERO
_02184edc: .word 0x00000133
_02184ee0: .word gSinCosTable
_02184ee4: .word data_ov38_02189224
asm/ov43.inc
+1 -1
View File
@@ -60,7 +60,7 @@
.extern gSinCosTable
.extern data_027e0764
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
asm/ov43.s
+7 -7
View File
@@ -2707,7 +2707,7 @@ _0218b910:
str r0, [r5, #0x3c0]
b _0218b9fc
_0218b91c:
ldr r3, _0218ba20 ; =data_027e0d0c
ldr r3, _0218ba20 ; =gVec3p_ZERO
ldr r2, _0218ba24 ; =0x00000333
ldr r1, [r3]
add r0, r5, #0x28c
@@ -2779,7 +2779,7 @@ _0218ba10: .word 0x0000ffff
_0218ba14: .word gActorManager
_0218ba18: .word 0x50574253
_0218ba1c: .word 0x504c444d
_0218ba20: .word data_027e0d0c
_0218ba20: .word gVec3p_ZERO
_0218ba24: .word 0x00000333
_0218ba28: .word data_027e0c68
_0218ba2c: .word 0x00690331
@@ -3109,7 +3109,7 @@ _0218bed4:
beq _0218bf54
mov r0, r4
bl func_ov00_020cc214
ldr r1, _0218c990 ; =data_027e0d0c
ldr r1, _0218c990 ; =gVec3p_ZERO
mov r0, r4
ldr r2, [r1]
str r2, [r4, #0x60]
@@ -3428,7 +3428,7 @@ _0218c32c:
cmp r2, #0x2000
ble _0218c3bc
_0218c39c:
ldr r0, _0218c990 ; =data_027e0d0c
ldr r0, _0218c990 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x60]
ldr r1, [r0, #4]
@@ -3491,7 +3491,7 @@ _0218c474:
add r0, r4, #0x28c
mov r1, #2
bl func_ov43_0218b1a0
ldr r0, _0218c990 ; =data_027e0d0c
ldr r0, _0218c990 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x60]
ldr r1, [r0, #4]
@@ -3715,7 +3715,7 @@ _0218c76c:
str r1, [r4, #0x68]
b _0218c7e8
_0218c7cc:
ldr r0, _0218c990 ; =data_027e0d0c
ldr r0, _0218c990 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x60]
ldr r1, [r0, #4]
@@ -3839,7 +3839,7 @@ _0218c980: .word 0x0000ffff
_0218c984: .word data_027e0fe8
_0218c988: .word 0x50425a4b
_0218c98c: .word gMapManager
_0218c990: .word data_027e0d0c
_0218c990: .word gVec3p_ZERO
_0218c994: .word data_027e0c68
_0218c998: .word 0x00690330
_0218c99c: .word data_ov00_020eec9c
asm/ov46.inc
+1 -1
View File
@@ -70,7 +70,7 @@
.extern data_027e0764
.extern data_027e077c
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0dbc
.extern data_027e0e58
asm/ov46.s
+2 -2
View File
@@ -3443,7 +3443,7 @@ func_ov46_02192c90: ; 0x02192c90
mov r5, #0x1000
str r0, [r4, #0x8c]
ldr r0, [r4, #0x80]
ldr r3, _02192fb0 ; =data_027e0d0c
ldr r3, _02192fb0 ; =gVec3p_ZERO
str r0, [r4, #0x90]
ldr r0, [r4, #0x84]
ldr r6, _02192fb4 ; =data_ov46_021944a8
@@ -3628,7 +3628,7 @@ func_ov46_02192c90: ; 0x02192c90
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02192fac: .word data_ov46_0219448c
_02192fb0: .word data_027e0d0c
_02192fb0: .word gVec3p_ZERO
_02192fb4: .word data_ov46_021944a8
_02192fb8: .word data_027e0764
_02192fbc: .word gSinCosTable
asm/ov53.inc
+1 -1
View File
@@ -18,7 +18,7 @@
.extern _ZN9SysObjectdlEPv
.extern __register_global_object
.extern gSinCosTable
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0de4
.extern gMapManager
.extern data_027e0f64
asm/ov53.s
+5 -5
View File
@@ -824,7 +824,7 @@ func_ov53_02199730: ; 0x02199730
mov r2, #1
mov r4, r0
bl _ZN13LinkStateBase18func_ov00_020a89bcEii
ldr r1, _02199774 ; =data_027e0d0c
ldr r1, _02199774 ; =gVec3p_ZERO
ldr r0, _02199778 ; =gPlayerControl
ldr r2, [r1]
str r2, [r4, #0x44]
@@ -837,7 +837,7 @@ func_ov53_02199730: ; 0x02199730
ldmia sp!, {r4, pc}
.align 2, 0
_02199770: .word data_ov53_0219a0f4
_02199774: .word data_027e0d0c
_02199774: .word gVec3p_ZERO
_02199778: .word gPlayerControl
arm_func_end func_ov53_02199730
@@ -916,7 +916,7 @@ _02199850:
str r1, [sp]
str r1, [sp, #4]
ldr r0, _02199a04 ; =data_027e0f64
ldr r3, _02199a0c ; =data_027e0d0c
ldr r3, _02199a0c ; =gVec3p_ZERO
ldr r0, [r0]
add r2, sp, #0x2c
ldr r0, [r0, #4]
@@ -1001,7 +1001,7 @@ _02199938:
str r0, [sp]
str r0, [sp, #4]
ldr r0, _02199a04 ; =data_027e0f64
ldr r3, _02199a0c ; =data_027e0d0c
ldr r3, _02199a0c ; =gVec3p_ZERO
ldr r0, [r0]
mov r1, #2
ldr r0, [r0, #4]
@@ -1015,7 +1015,7 @@ _021999fc: .word gPlayerControl
_02199a00: .word data_ov53_0219a104
_02199a04: .word data_027e0f64
_02199a08: .word gPlayerPos
_02199a0c: .word data_027e0d0c
_02199a0c: .word gVec3p_ZERO
arm_func_end func_ov53_0219977c
.global func_ov53_02199a10
asm/ov56.inc
+1 -1
View File
@@ -11,7 +11,7 @@
.extern _ZN13PlayerControl18func_ov00_020b0e54EP5Vec3pS1_
.extern _ZN13PlayerControl6SetAimEv
.extern data_027e0764
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0f64
.extern gPlayerPos
.extern gPlayerControl
asm/ov56.s
+4 -4
View File
@@ -306,7 +306,7 @@ func_ov56_021990c0: ; 0x021990c0
mov r4, r0
bl _ZN13LinkStateBase18func_ov00_020a89bcEii
mov r0, #0
ldr r1, _02199114 ; =data_027e0d0c
ldr r1, _02199114 ; =gVec3p_ZERO
strh r0, [r4, #0x2c]
ldr r2, [r1]
ldr r0, _02199118 ; =gPlayerControl
@@ -322,7 +322,7 @@ func_ov56_021990c0: ; 0x021990c0
ldmia sp!, {r4, pc}
.align 2, 0
_02199110: .word data_ov56_021993e0
_02199114: .word data_027e0d0c
_02199114: .word gVec3p_ZERO
_02199118: .word gPlayerControl
arm_func_end func_ov56_021990c0
@@ -433,7 +433,7 @@ _0219925c:
str r1, [sp]
str r1, [sp, #4]
ldr r0, _021992dc ; =data_027e0f64
ldr r3, _021992e4 ; =data_027e0d0c
ldr r3, _021992e4 ; =gVec3p_ZERO
ldr r0, [r0]
add r2, sp, #8
ldr r0, [r0, #4]
@@ -448,7 +448,7 @@ _021992d4: .word data_ov56_021993f0
_021992d8: .word data_ov56_021993e0
_021992dc: .word data_027e0f64
_021992e0: .word gPlayerPos
_021992e4: .word data_027e0d0c
_021992e4: .word gVec3p_ZERO
arm_func_end func_ov56_0219911c
.global func_ov56_021992e8
asm/ov57.inc
+1 -1
View File
@@ -27,7 +27,7 @@
.extern __register_global_object
.extern gSinCosTable
.extern data_027e03c8
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0de4
.extern data_027e0e58
.extern gMapManager
asm/ov57.s
+6 -6
View File
@@ -1345,7 +1345,7 @@ func_ov57_02199e64: ; 0x02199e64
mov r2, #1
mov r4, r0
bl _ZN13LinkStateBase18func_ov00_020a89bcEii
ldr r0, _02199ec0 ; =data_027e0d0c
ldr r0, _02199ec0 ; =gVec3p_ZERO
ldr r1, [r0]
str r1, [r4, #0x44]
ldr r1, [r0, #4]
@@ -1364,7 +1364,7 @@ func_ov57_02199e64: ; 0x02199e64
ldmia sp!, {r4, pc}
.align 2, 0
_02199ebc: .word data_ov57_0219aa60
_02199ec0: .word data_027e0d0c
_02199ec0: .word gVec3p_ZERO
_02199ec4: .word gPlayerControl
_02199ec8: .word data_ov57_0219ab14
arm_func_end func_ov57_02199e64
@@ -1579,7 +1579,7 @@ _0219a180:
str r1, [sp]
str r1, [sp, #4]
ldr r0, _0219a1fc ; =data_027e0f64
ldr r3, _0219a204 ; =data_027e0d0c
ldr r3, _0219a204 ; =gVec3p_ZERO
ldr r0, [r0]
add r2, sp, #8
ldr r0, [r0, #4]
@@ -1597,7 +1597,7 @@ _0219a1f4: .word data_ov57_0219aa70
_0219a1f8: .word data_ov57_0219aa50
_0219a1fc: .word data_027e0f64
_0219a200: .word gPlayerPos
_0219a204: .word data_027e0d0c
_0219a204: .word gVec3p_ZERO
arm_func_end func_ov57_02199edc
.global func_ov57_0219a208
@@ -1815,7 +1815,7 @@ func_ov57_0219a460: ; 0x0219a460
add r0, r4, #0x8c
bl func_ov14_0212382c
bl func_ov14_0212384c
ldr r2, _0219a564 ; =data_027e0d0c
ldr r2, _0219a564 ; =gVec3p_ZERO
mvn ip, #0
ldr r3, [r2]
add r1, r4, #0x100
@@ -1853,7 +1853,7 @@ func_ov57_0219a460: ; 0x0219a460
.align 2, 0
_0219a55c: .word data_ov14_02155df8
_0219a560: .word gItemManager
_0219a564: .word data_027e0d0c
_0219a564: .word gVec3p_ZERO
arm_func_end func_ov57_0219a460
.global func_ov57_0219a568
include/lib/math.h
+2
View File
@@ -39,6 +39,8 @@ typedef struct {
/* c */
} Vec3p;
extern const Vec3p gVec3p_ZERO;
extern "C" void Vec3p_Add(Vec3p *a, Vec3p *b, Vec3p *out);
extern "C" void Vec3p_Sub(Vec3p *a, Vec3p *b, Vec3p *out);
extern "C" q20 Vec3p_Dot(Vec3p *a, Vec3p *b);