mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-01 01:39:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name gPlayerPos

Browse Source
This commit is contained in:
Aetias
2024-05-19 10:56:05 +02:00
parent c1384df63c
commit a573a263ba
116 changed files with 1283 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dtcm.s
+3 -9
View File
@@ -3971,15 +3971,9 @@ data_027e0f8c:
.global gPlayer
gPlayer:
.space 0x4
.global data_027e0f94
data_027e0f94:
.space 0x4
.global data_027e0f98
data_027e0f98:
.space 0x4
.global data_027e0f9c
data_027e0f9c:
.space 0x4
.global gPlayerPos
gPlayerPos:
.space 0xc
.global data_027e0fa0
data_027e0fa0:
.space 0x4
asm/main/main_02000000.inc
+1 -1
View File
@@ -120,7 +120,7 @@
.extern data_027e0f80
.extern data_027e0f84
.extern data_027e0f8c
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/main/main_02000000.s
+2 -2
View File
@@ -75932,7 +75932,7 @@ func_02037628: ; 0x02037628
streq r2, [r0, #4]
streq r2, [r0, #8]
beq _0203767c
ldr r1, _020376b4 ; =data_027e0f94
ldr r1, _020376b4 ; =gPlayerPos
ldr r2, [r1]
str r2, [r0]
ldr r2, [r1, #4]
@@ -75956,7 +75956,7 @@ _020376a8:
bx lr
.align 2, 0
_020376b0: .word data_027e0d38
_020376b4: .word data_027e0f94
_020376b4: .word gPlayerPos
_020376b8: .word data_027e077c
_020376bc: .word data_02056be4
arm_func_end func_02037628
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -27,7 +27,7 @@
.extern data_027e0d3c
.extern gMapManager
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
asm/ov00/Actor/Actor.s
+24 -24
View File
@@ -742,7 +742,7 @@ _020c1c88:
_ZN5Actor10IsNearLinkEv: ; 0x020c1c94
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _020c1cf4 ; =data_027e0f94
ldr r1, _020c1cf4 ; =gPlayerPos
mov r4, r0
add r3, sp, #0
ldmia r1, {r0, r1, r2}
@@ -765,7 +765,7 @@ _ZN5Actor10IsNearLinkEv: ; 0x020c1c94
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020c1cf4: .word data_027e0f94
_020c1cf4: .word gPlayerPos
arm_func_end _ZN5Actor10IsNearLinkEv
.global _ZN5Actor18func_ov00_020c1cf8Ev
@@ -846,7 +846,7 @@ _ZN5Actor18func_ov00_020c1da0EiP5Vec3p: ; 0x020c1da0
str r0, [sp, #8]
b _020c1dfc
_020c1dec:
ldr r0, _020c1e24 ; =data_027e0f94
ldr r0, _020c1e24 ; =gPlayerPos
add r2, sp, #0
add r1, r6, #0x54
bl func_01ff9bf8
@@ -862,7 +862,7 @@ _020c1dfc:
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020c1e24: .word data_027e0f94
_020c1e24: .word gPlayerPos
_020c1e28: .word gPlayer
arm_func_end _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
@@ -894,7 +894,7 @@ _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p: ; 0x020c1e2c
str r0, [sp, #0x18]
b _020c1e9c
_020c1e8c:
ldr r0, _020c1ef0 ; =data_027e0f94
ldr r0, _020c1ef0 ; =gPlayerPos
add r2, sp, #0x10
add r1, r5, #0x54
bl func_01ff9bf8
@@ -921,7 +921,7 @@ _020c1e9c:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020c1ef0: .word data_027e0f94
_020c1ef0: .word gPlayerPos
_020c1ef4: .word gPlayer
arm_func_end _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
@@ -1007,7 +1007,7 @@ _ZN5Actor18func_ov00_020c1fc8Ej: ; 0x020c1fc8
mov r5, #0
cmp r0, #0
blt _020c2218
ldr r1, _020c2228 ; =data_027e0f94
ldr r1, _020c2228 ; =gPlayerPos
add r2, sp, #0x60
add r0, r4, #0x48
bl func_01ff9bf8
@@ -1149,7 +1149,7 @@ _020c2218:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020c2224: .word gAdventureFlags
_020c2228: .word data_027e0f94
_020c2228: .word gPlayerPos
_020c222c: .word gPlayer
_020c2230: .word gItemManager
_020c2234: .word gPlayerLink
@@ -1161,7 +1161,7 @@ _ZN5Actor18CollidesWithShieldEP8Cylinder: ; 0x020c2238
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
mov r5, r1
ldr r1, _020c22ac ; =data_027e0f94
ldr r1, _020c22ac ; =gPlayerPos
add r2, sp, #0
add r0, r0, #0x48
bl func_01ff9bf8
@@ -1189,7 +1189,7 @@ _020c22a0:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020c22ac: .word data_027e0f94
_020c22ac: .word gPlayerPos
_020c22b0: .word data_027e0fac
_020c22b4: .word gPlayer
arm_func_end _ZN5Actor18CollidesWithShieldEP8Cylinder
@@ -1680,12 +1680,12 @@ _ZN5Actor12XzDistanceToEP5Vec3p: ; 0x020c288c
arm_func_start _ZN5Actor14DistanceToLinkEv
_ZN5Actor14DistanceToLinkEv: ; 0x020c28d4
ldr ip, _020c28e4 ; =func_01ff9ec0
ldr r1, _020c28e8 ; =data_027e0f94
ldr r1, _020c28e8 ; =gPlayerPos
add r0, r0, #0x48
bx ip
.align 2, 0
_020c28e4: .word func_01ff9ec0
_020c28e8: .word data_027e0f94
_020c28e8: .word gPlayerPos
arm_func_end _ZN5Actor14DistanceToLinkEv
.global _ZN5Actor16XzDistanceToLinkEv
@@ -1695,7 +1695,7 @@ _ZN5Actor16XzDistanceToLinkEv: ; 0x020c28ec
sub sp, sp, #0x18
ldr lr, [r0, #0x50]
ldr ip, [r0, #0x48]
ldr r0, _020c2934 ; =data_027e0f94
ldr r0, _020c2934 ; =gPlayerPos
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -1710,7 +1710,7 @@ _ZN5Actor16XzDistanceToLinkEv: ; 0x020c28ec
add sp, sp, #0x18
ldmia sp!, {r3, pc}
.align 2, 0
_020c2934: .word data_027e0f94
_020c2934: .word gPlayerPos
arm_func_end _ZN5Actor16XzDistanceToLinkEv
.global _ZN5Actor10GetAngleToEP5Vec3p
@@ -1738,11 +1738,11 @@ _020c296c:
arm_func_start _ZN5Actor14GetAngleToLinkEv
_ZN5Actor14GetAngleToLinkEv: ; 0x020c2974
ldr ip, _020c2980 ; =_ZN5Actor10GetAngleToEP5Vec3p
ldr r1, _020c2984 ; =data_027e0f94
ldr r1, _020c2984 ; =gPlayerPos
bx ip
.align 2, 0
_020c2980: .word _ZN5Actor10GetAngleToEP5Vec3p
_020c2984: .word data_027e0f94
_020c2984: .word gPlayerPos
arm_func_end _ZN5Actor14GetAngleToLinkEv
.global _ZN5Actor18func_ov00_020c2988EP5Vec3piS1_
@@ -2007,7 +2007,7 @@ _020c2cbc:
bl func_01ff9bf8
b _020c2d00
_020c2cf0:
ldr r0, _020c2d40 ; =data_027e0f94
ldr r0, _020c2d40 ; =gPlayerPos
add r2, sp, #0xc
add r1, r5, #0x48
bl func_01ff9bf8
@@ -2029,7 +2029,7 @@ _020c2d00:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020c2d3c: .word gPlayerLink
_020c2d40: .word data_027e0f94
_020c2d40: .word gPlayerPos
arm_func_end _ZN5Actor18func_ov00_020c2c70Ev
.global _ZN5Actor17GetEquipBoomerangEv
@@ -2108,7 +2108,7 @@ _ZN5Actor18func_ov00_020c2de4Ev: ; 0x020c2de4
bl func_0202d95c
b _020c2e3c
_020c2e30:
ldr r0, _020c2e78 ; =data_027e0f94
ldr r0, _020c2e78 ; =gPlayerPos
add r1, r5, #0x48
bl func_01ff9bf8
_020c2e3c:
@@ -2128,7 +2128,7 @@ _020c2e3c:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020c2e78: .word data_027e0f94
_020c2e78: .word gPlayerPos
arm_func_end _ZN5Actor18func_ov00_020c2de4Ev
.global _ZN5Actor18func_ov00_020c2e7cEv
@@ -2490,7 +2490,7 @@ _ZN5Actor10GetLinkPosEP5Vec3p: ; 0x020c3230
bl _ZN5Actor15GetLinkDummyPosEP5Vec3p
ldmia sp!, {r3, r4, r5, pc}
_020c3268:
ldr r0, _020c328c ; =data_027e0f94
ldr r0, _020c328c ; =gPlayerPos
ldr r1, [r0]
str r1, [r4]
ldr r1, [r0, #4]
@@ -2500,7 +2500,7 @@ _020c3268:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020c3288: .word gPlayerLink
_020c328c: .word data_027e0f94
_020c328c: .word gPlayerPos
arm_func_end _ZN5Actor10GetLinkPosEP5Vec3p
.global _ZN5Actor15GetLinkDummyPosEP5Vec3p
@@ -2533,7 +2533,7 @@ _ZN5Actor15GetLinkDummyPosEP5Vec3p: ; 0x020c3290
str r0, [r4, #8]
ldmia sp!, {r4, pc}
_020c32f8:
ldr r0, _020c3324 ; =data_027e0f94
ldr r0, _020c3324 ; =gPlayerPos
ldr r1, [r0]
str r1, [r4]
ldr r1, [r0, #4]
@@ -2545,7 +2545,7 @@ _020c32f8:
.align 2, 0
_020c331c: .word gActorManager
_020c3320: .word 0x504c444d
_020c3324: .word data_027e0f94
_020c3324: .word gPlayerPos
arm_func_end _ZN5Actor15GetLinkDummyPosEP5Vec3p
.global _ZN19Actor_UnkStruct_09cC2Ev
asm/ov00/Map/MapManager.inc
+1 -1
View File
@@ -52,7 +52,7 @@
.extern data_027e0f78
.extern data_027e0f7c
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern gActorManager
.extern data_027e0fe8
.extern data_027e103c
asm/ov00/Map/MapManager.s
+12 -12
View File
@@ -388,7 +388,7 @@ _ZN10MapManager18func_ov00_02082538Ev: ; 0x02082538
addeq sp, sp, #0xc
addeq r0, r0, #0x1a0
ldmeqia sp!, {r3, r4, pc}
ldr r1, _02082590 ; =data_027e0f94
ldr r1, _02082590 ; =gPlayerPos
add r0, sp, #0
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -399,7 +399,7 @@ _ZN10MapManager18func_ov00_02082538Ev: ; 0x02082538
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02082590: .word data_027e0f94
_02082590: .word gPlayerPos
arm_func_end _ZN10MapManager18func_ov00_02082538Ev
.global _ZN10MapManager18func_ov00_02082594Ev
@@ -1324,7 +1324,7 @@ _ZN10MapManager18func_ov00_0208306cEv: ; 0x0208306c
add r0, r3, #2
cmp ip, r0
bne _02083138
ldr r1, _02083154 ; =data_027e0f94
ldr r1, _02083154 ; =gPlayerPos
add r0, sp, #4
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -1370,7 +1370,7 @@ _02083138:
add sp, sp, #0x20
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02083154: .word data_027e0f94
_02083154: .word gPlayerPos
_02083158: .word data_027e0d38
arm_func_end _ZN10MapManager18func_ov00_0208306cEv
@@ -1392,7 +1392,7 @@ _ZN10MapManager18func_ov00_0208315cEPiS0_: ; 0x0208315c
add r1, r3, #2
cmp ip, r1
bne _02083220
ldr r1, _0208323c ; =data_027e0f94
ldr r1, _0208323c ; =gPlayerPos
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp, #0x10]
@@ -1436,7 +1436,7 @@ _02083220:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0208323c: .word data_027e0f94
_0208323c: .word gPlayerPos
_02083240: .word data_027e0d38
arm_func_end _ZN10MapManager18func_ov00_0208315cEPiS0_
@@ -1962,7 +1962,7 @@ _ZN10MapManager18func_ov00_020836dcEii: ; 0x020836dc
mov r4, r1
cmpne r2, #1
bne _02083718
ldr r0, _02083768 ; =data_027e0f94
ldr r0, _02083768 ; =gPlayerPos
ldr r2, [r0]
ldr r1, [r0, #4]
str r2, [sp]
@@ -1993,7 +1993,7 @@ _02083750:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02083768: .word data_027e0f94
_02083768: .word gPlayerPos
_0208376c: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_020836dcEii
@@ -3374,7 +3374,7 @@ _ZN10MapManager18func_ov00_02084740Ev: ; 0x02084740
bl func_ov00_02078b40
cmp r0, #2
beq _020847a8
ldr r0, _020847d8 ; =data_027e0f94
ldr r0, _020847d8 ; =gPlayerPos
add r1, sp, #0
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -3405,7 +3405,7 @@ _020847b4:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020847d4: .word data_027e0d38
_020847d8: .word data_027e0f94
_020847d8: .word gPlayerPos
_020847dc: .word data_ov00_020d88f0
arm_func_end _ZN10MapManager18func_ov00_02084740Ev
@@ -4788,7 +4788,7 @@ _020858f8:
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r3, [sp, #0x18]
ldrb r2, [sp, #0x19]
ldr r1, _02085a30 ; =data_027e0f94
ldr r1, _02085a30 ; =gPlayerPos
add r0, r3, #1
sub r7, r3, #1
str r0, [sp, #4]
@@ -4858,7 +4858,7 @@ _02085a20:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02085a2c: .word data_027e0f64
_02085a30: .word data_027e0f94
_02085a30: .word gPlayerPos
arm_func_end _ZN10MapManager18func_ov00_020858b0Ev
.global _ZN10MapManager18func_ov00_02085a34Eii
asm/ov00/Player/LinkStateBase.inc
+1 -1
View File
@@ -14,7 +14,7 @@
.extern data_027e0e58
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb0
asm/ov00/Player/LinkStateBase.s
+2 -2
View File
@@ -1186,10 +1186,10 @@ _020a8c48: .word func_ov00_020b5268
.global _ZN13LinkStateBase12GetPlayerPosEv
arm_func_start _ZN13LinkStateBase12GetPlayerPosEv
_ZN13LinkStateBase12GetPlayerPosEv: ; 0x020a8c4c
ldr r0, _020a8c54 ; =data_027e0f94
ldr r0, _020a8c54 ; =gPlayerPos
bx lr
.align 2, 0
_020a8c54: .word data_027e0f94
_020a8c54: .word gPlayerPos
arm_func_end _ZN13LinkStateBase12GetPlayerPosEv
.global _ZN13LinkStateBase12GetPlayerVelEv
asm/ov00/Player/PlayerBase.inc
+1 -1
View File
@@ -9,7 +9,7 @@
.extern gMapManager
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb0
asm/ov00/Player/PlayerBase.s
+5 -5
View File
@@ -94,7 +94,7 @@ _ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac
stmdb sp!, {lr}
sub sp, sp, #0xc
mov r0, r1
ldr r1, _020a7bf8 ; =data_027e0f94
ldr r1, _020a7bf8 ; =gPlayerPos
add r2, sp, #0
bl func_01ff9bf8
ldr r0, [sp]
@@ -111,7 +111,7 @@ _ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020a7bf8: .word data_027e0f94
_020a7bf8: .word gPlayerPos
_020a7bfc: .word data_027e0fac
arm_func_end _ZN10PlayerBase6LookAtEP5Vec3p
@@ -324,7 +324,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
sub sp, sp, #0xc
mov r5, r1
ldr r0, [r5]
ldr r3, _020a7f64 ; =data_027e0f94
ldr r3, _020a7f64 ; =gPlayerPos
mov r4, r2
str r0, [r3]
ldr r1, [r5, #4]
@@ -346,7 +346,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
ldr r2, _020a7f6c ; =data_027e0fac
cmp ip, r0
movle ip, r0
ldr r3, _020a7f64 ; =data_027e0f94
ldr r3, _020a7f64 ; =gPlayerPos
ldr r1, _020a7f70 ; =data_027e0fa0
mov r5, #0
ldr r0, _020a7f74 ; =data_027e0fb0
@@ -384,7 +384,7 @@ _020a7f58:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020a7f64: .word data_027e0f94
_020a7f64: .word gPlayerPos
_020a7f68: .word gMapManager
_020a7f6c: .word data_027e0fac
_020a7f70: .word data_027e0fa0
asm/ov00/Player/PlayerControl.inc
+1 -1
View File
@@ -29,7 +29,7 @@
.extern gMapManager
.extern data_027e0f64
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fcc
asm/ov00/Player/PlayerControl.s
+22 -22
View File
@@ -332,7 +332,7 @@ _020af1f8:
bl _ZNK11ItemManager8GetFairyEi
cmp r0, #0
beq _020af268
ldr r1, _020af294 ; =data_027e0f94
ldr r1, _020af294 ; =gPlayerPos
ldr r2, [r0, #0x50]
ldr r1, [r1, #4]
ldr r0, [r0, #0x48]
@@ -353,7 +353,7 @@ _020af284: .word data_027e0d38
_020af288: .word gItemManager
_020af28c: .word data_027e05f8
_020af290: .word data_027e103c
_020af294: .word data_027e0f94
_020af294: .word gPlayerPos
arm_func_end _ZN13PlayerControl18func_ov00_020af06cEv
.global _ZN13PlayerControl20UpdateUsingEquipItemEv
@@ -712,7 +712,7 @@ _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii: ; 0x020af6e4
ldmeqia sp!, {r3, r4, r5, r6, pc}
cmp r5, #0
ble _020af72c
ldr r0, _020af770 ; =data_027e0f94
ldr r0, _020af770 ; =gPlayerPos
bl func_01ff9ec0
cmp r0, r5
addge sp, sp, #4
@@ -739,7 +739,7 @@ _020af72c:
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020af770: .word data_027e0f94
_020af770: .word gPlayerPos
_020af774: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
@@ -887,7 +887,7 @@ _020af97c:
add r1, sp, #8
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02085108EPi
ldr r2, _020afad4 ; =data_027e0f94
ldr r2, _020afad4 ; =gPlayerPos
mov r1, r0
ldr r0, [r2, #4]
cmp r5, #0
@@ -974,7 +974,7 @@ _020afac4: .word gItemManager
_020afac8: .word gPlayerLink
_020afacc: .word gActorManager
_020afad0: .word gMapManager
_020afad4: .word data_027e0f94
_020afad4: .word gPlayerPos
arm_func_end _ZN13PlayerControl18func_ov00_020af778Ev
.global _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
@@ -982,7 +982,7 @@ _020afad4: .word data_027e0f94
_ZN13PlayerControl18func_ov00_020afad8EP5Vec3p: ; 0x020afad8
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r2, _020afb60 ; =data_027e0f94
ldr r2, _020afb60 ; =gPlayerPos
ldr r3, [r1, #4]
ldr r1, [r2, #4]
cmp r3, r1
@@ -1017,7 +1017,7 @@ _020afb54:
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020afb60: .word data_027e0f94
_020afb60: .word gPlayerPos
_020afb64: .word gPlayer
_020afb68: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
@@ -1053,7 +1053,7 @@ _020afbcc:
cmp r5, #0
ldr r6, [r9, #0xa4]
beq _020afce8
ldr r0, _020afe78 ; =data_027e0f94
ldr r0, _020afe78 ; =gPlayerPos
add r1, r5, #0x48
bl func_01ff9ec0
mov r6, r0
@@ -1172,7 +1172,7 @@ _020afd5c:
movne r6, r5
b _020afdc4
_020afd88:
ldr r1, _020afe78 ; =data_027e0f94
ldr r1, _020afe78 ; =gPlayerPos
ldr r0, _020afe84 ; =gMapManager
ldr r1, [r1, #4]
ldr r0, [r0]
@@ -1208,7 +1208,7 @@ _020afdc4:
add r1, sp, #4
bl func_ov00_020ced7c
_020afe10:
ldr r0, _020afe78 ; =data_027e0f94
ldr r0, _020afe78 ; =gPlayerPos
add r1, sp, #4
bl func_01ff9ec0
mov r6, r0
@@ -1238,7 +1238,7 @@ _020afe64:
.align 2, 0
_020afe70: .word gActorManager
_020afe74: .word gItemManager
_020afe78: .word data_027e0f94
_020afe78: .word gPlayerPos
_020afe7c: .word gPlayerLink
_020afe80: .word data_027e0ffc
_020afe84: .word gMapManager
@@ -1532,7 +1532,7 @@ _ZN13PlayerControl14UpdateAimWorldEP5Vec3p: ; 0x020b0240
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x10
ldr r2, _020b031c ; =data_027e0d38
ldr lr, _020b0320 ; =data_027e0f94
ldr lr, _020b0320 ; =gPlayerPos
ldr r3, [r2]
add ip, sp, #4
mov r5, r0
@@ -1588,7 +1588,7 @@ _020b02f8:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020b031c: .word data_027e0d38
_020b0320: .word data_027e0f94
_020b0320: .word gPlayerPos
_020b0324: .word data_027e0f64
arm_func_end _ZN13PlayerControl14UpdateAimWorldEP5Vec3p
@@ -1726,7 +1726,7 @@ _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb: ; 0x020b049c
mov r1, r4
mov r2, #0x400
bl func_ov00_020b7d4c
ldr r1, _020b05d8 ; =data_027e0f94
ldr r1, _020b05d8 ; =gPlayerPos
mov r0, r4
mov r2, r4
bl func_01ff9bf8
@@ -1792,7 +1792,7 @@ _020b05d0:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020b05d8: .word data_027e0f94
_020b05d8: .word gPlayerPos
_020b05dc: .word data_027e0d0c
_020b05e0: .word data_027e0fac
_020b05e4: .word data_02050f54
@@ -1816,7 +1816,7 @@ _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p: ; 0x020b05e8
bge _020b0758
mov r0, r4
ldr r2, _020b0764 ; =0x00000333
ldr r4, _020b0768 ; =data_027e0f94
ldr r4, _020b0768 ; =gPlayerPos
add r1, sp, #4
bl func_ov00_020b7d4c
mov r1, r4
@@ -1900,7 +1900,7 @@ _020b0758:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020b0764: .word 0x00000333
_020b0768: .word data_027e0f94
_020b0768: .word gPlayerPos
_020b076c: .word data_027e0fac
_020b0770: .word data_02050f54
_020b0774: .word gMapManager
@@ -2468,7 +2468,7 @@ _020b0f0c:
bl func_ov00_020b7d4c
b _020b0f6c
_020b0f50:
ldr r0, _020b0f84 ; =data_027e0f94
ldr r0, _020b0f84 ; =gPlayerPos
ldr r1, [r0]
str r1, [r5]
ldr r1, [r0, #4]
@@ -2484,7 +2484,7 @@ _020b0f78:
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020b0f84: .word data_027e0f94
_020b0f84: .word gPlayerPos
arm_func_end _ZN13PlayerControl18func_ov00_020b0e54EP5Vec3pS1_
.global _ZN13PlayerControl18func_ov00_020b0f88EP5Vec3piS1_
@@ -2566,7 +2566,7 @@ _ZN13PlayerControl18func_ov00_020b1058EP5Vec3piS1_S1_: ; 0x020b1058
ldr r0, [sp, #0x30]
cmp r0, #0
beq _020b1140
ldr r1, _020b11d8 ; =data_027e0f94
ldr r1, _020b11d8 ; =gPlayerPos
add r2, sp, #0
bl func_01ff9bf8
ldr ip, [sp]
@@ -2649,7 +2649,7 @@ _020b11cc:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020b11d8: .word data_027e0f94
_020b11d8: .word gPlayerPos
arm_func_end _ZN13PlayerControl18func_ov00_020b1058EP5Vec3piS1_S1_
.global _ZN13PlayerControl14IsUntouchedNowEv
asm/ov00/ov00_0207afa0.inc
+1 -1
View File
@@ -36,7 +36,7 @@
.extern data_027e0e5c
.extern data_027e0f64
.extern data_027e0f7c
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fcc
.extern gActorManager
asm/ov00/ov00_0207afa0.s
+5 -5
View File
@@ -807,7 +807,7 @@ _0207b62c:
add r1, r5, #0
add r1, #0x56
strb r0, [r1]
ldr r0, _0207b80c ; =data_027e0f94
ldr r0, _0207b80c ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x5c]
ldr r1, [r0, #4]
@@ -997,7 +997,7 @@ _0207b740:
add r0, r5, #0
add r0, #0x9d
strb r1, [r0]
ldr r1, _0207b80c ; =data_027e0f94
ldr r1, _0207b80c ; =gPlayerPos
add r0, r5, #0
ldr r2, [r1]
add r0, #0xa0
@@ -1021,7 +1021,7 @@ _0207b7f0:
_0207b800: .word gActorManager
_0207b804: .word 0x414e4353
_0207b808: .word gMapManager
_0207b80c: .word data_027e0f94
_0207b80c: .word gPlayerPos
_0207b810: .word data_027e0fac
_0207b814: .word data_027e0f7c
_0207b818: .word gItemManager
@@ -2679,7 +2679,7 @@ _0207c800: .word data_ov00_020d88cc
func_ov00_0207c804: ; 0x0207c804
push {r3, r4, r5, r6, lr}
sub sp, #0x24
ldr r3, _0207c8d0 ; =data_027e0f94
ldr r3, _0207c8d0 ; =gPlayerPos
add r6, r2, #0
add r5, r0, #0
add r4, r1, #0
@@ -2781,7 +2781,7 @@ _0207c8c8:
add sp, #0x24
pop {r3, r4, r5, r6, pc}
nop
_0207c8d0: .word data_027e0f94
_0207c8d0: .word gPlayerPos
_0207c8d4: .word data_027e0d38
_0207c8d8: .word 0x0000019a
_0207c8dc: .word data_027e0fcc
asm/ov00/ov00_02086cd0.inc
+1 -1
View File
@@ -125,7 +125,7 @@
.extern data_027e0f80
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerLink
asm/ov00/ov00_02086cd0.s
+29 -29
View File
@@ -19,7 +19,7 @@ func_ov00_02086cd4: ; 0x02086cd4
bl func_ov00_0209da68
ldr r0, [r4, #0x150]
bl func_ov00_020a1774
ldr r1, _02086da4 ; =data_027e0f94
ldr r1, _02086da4 ; =gPlayerPos
mov r0, r4
ldr r3, [r1, #4]
ldr r2, [r1, #8]
@@ -67,7 +67,7 @@ _02086d58:
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02086da4: .word data_027e0f94
_02086da4: .word gPlayerPos
arm_func_end func_ov00_02086cd4
.global func_ov00_02086da8
@@ -1635,7 +1635,7 @@ _020881ec:
func_ov00_020881f4: ; 0x020881f4
stmdb sp!, {r3}
sub sp, sp, #0x24
ldr r1, _02088240 ; =data_027e0f94
ldr r1, _02088240 ; =gPlayerPos
add r3, sp, #0x18
mov ip, r0
ldmia r1, {r0, r1, r2}
@@ -1653,7 +1653,7 @@ func_ov00_020881f4: ; 0x020881f4
ldmia sp!, {r3}
bx lr
.align 2, 0
_02088240: .word data_027e0f94
_02088240: .word gPlayerPos
arm_func_end func_ov00_020881f4
.global func_ov00_02088244
@@ -4219,7 +4219,7 @@ _0208a4d0:
add r1, sp, #0x20
add r0, r6, #0x308
bl func_ov00_0208ed74
ldr r0, _0208a848 ; =data_027e0f94
ldr r0, _0208a848 ; =gPlayerPos
ldrsh r2, [r6, #4]
ldr r4, [sp, #0x1c]
ldr r0, [r0, #4]
@@ -4357,7 +4357,7 @@ _0208a77c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0208a844: .word gMapManager
_0208a848: .word data_027e0f94
_0208a848: .word gPlayerPos
arm_func_end func_ov00_0208a464
.global func_ov00_0208a84c
@@ -5789,7 +5789,7 @@ _0208b92c: .word data_ov00_020e9370
func_ov00_0208b930: ; 0x0208b930
stmdb sp!, {r3, lr}
sub sp, sp, #0x18
ldr r1, _0208b984 ; =data_027e0f94
ldr r1, _0208b984 ; =gPlayerPos
mov ip, r0
ldr r2, [r1]
ldr r0, [r1, #4]
@@ -5809,7 +5809,7 @@ func_ov00_0208b930: ; 0x0208b930
add sp, sp, #0x18
ldmia sp!, {r3, pc}
.align 2, 0
_0208b984: .word data_027e0f94
_0208b984: .word gPlayerPos
arm_func_end func_ov00_0208b930
.global func_ov00_0208b988
@@ -5817,7 +5817,7 @@ _0208b984: .word data_027e0f94
func_ov00_0208b988: ; 0x0208b988
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r2, _0208b9c8 ; =data_027e0f94
ldr r2, _0208b9c8 ; =gPlayerPos
mov ip, r0
ldr r0, [r2, #4]
ldr r3, [r2]
@@ -5832,7 +5832,7 @@ func_ov00_0208b988: ; 0x0208b988
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_0208b9c8: .word data_027e0f94
_0208b9c8: .word gPlayerPos
arm_func_end func_ov00_0208b988
.global func_ov00_0208b9cc
@@ -11157,7 +11157,7 @@ _0208ff48:
ldr r0, _0209030c ; =data_ov00_020eec9c
mov r1, #0xb
bl func_ov00_020d77e4
ldr r1, _02090310 ; =data_027e0f94
ldr r1, _02090310 ; =gPlayerPos
add r0, sp, #0x30
ldr r3, [r1, #4]
ldr r4, [r1]
@@ -11413,7 +11413,7 @@ _020902f8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0209030c: .word data_ov00_020eec9c
_02090310: .word data_027e0f94
_02090310: .word gPlayerPos
_02090314: .word gActorManager
_02090318: .word 0x534e414b
_0209031c: .word data_027e0764
@@ -11734,7 +11734,7 @@ _02090688:
beq _020906cc
b _020906fc
_020906a8:
ldr r1, _0209076c ; =data_027e0f94
ldr r1, _0209076c ; =gPlayerPos
add r0, r4, #0x48
bl func_01ff9ec0
cmp r0, #0x1000
@@ -11747,7 +11747,7 @@ _020906cc:
ldr r0, [r4, #0x1c4]
cmp r0, #0x5a000
blt _020906fc
ldr r1, _0209076c ; =data_027e0f94
ldr r1, _0209076c ; =gPlayerPos
add r0, r4, #0x48
bl func_01ff9ec0
cmp r0, #0x1000
@@ -11788,7 +11788,7 @@ _02090760:
bl func_0203516c
ldmia sp!, {r4, pc}
.align 2, 0
_0209076c: .word data_027e0f94
_0209076c: .word gPlayerPos
_02090770: .word gAdventureFlags
arm_func_end func_ov00_02090648
@@ -11924,7 +11924,7 @@ func_ov00_020908d0: ; 0x020908d0
func_ov00_020908f8: ; 0x020908f8
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr r2, _02090974 ; =data_027e0f94
ldr r2, _02090974 ; =gPlayerPos
mov r4, r1
ldr r3, [r2]
ldr r1, [r2, #4]
@@ -11955,7 +11955,7 @@ _0209094c:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02090974: .word data_027e0f94
_02090974: .word gPlayerPos
arm_func_end func_ov00_020908f8
.global func_ov00_02090978
@@ -12900,7 +12900,7 @@ _02091168: .word func_ov00_020908f8
func_ov00_0209116c: ; 0x0209116c
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r2, _020911c8 ; =data_027e0f94
ldr r2, _020911c8 ; =gPlayerPos
add r1, sp, #0
ldr ip, [r2]
ldr r3, [r2, #4]
@@ -12922,7 +12922,7 @@ func_ov00_0209116c: ; 0x0209116c
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020911c8: .word data_027e0f94
_020911c8: .word gPlayerPos
arm_func_end func_ov00_0209116c
.global func_ov00_020911cc
@@ -13370,7 +13370,7 @@ _020917b4: .word 0x0000ffff
func_ov00_020917b8: ; 0x020917b8
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0x18c
ldr r1, _02091d3c ; =data_027e0f94
ldr r1, _02091d3c ; =gPlayerPos
ldr r2, _02091d40 ; =data_027e0fac
ldr r4, [r1]
ldr r3, [r1, #4]
@@ -13446,7 +13446,7 @@ _02091890:
mov r1, r1, lsl #0x10
mov r1, r1, asr #0x10
bl func_ov00_02090ac8
ldr r0, _02091d3c ; =data_027e0f94
ldr r0, _02091d3c ; =gPlayerPos
strh r4, [r5, #0x14]
ldr r1, [r0, #4]
ldr r2, [r0]
@@ -13478,7 +13478,7 @@ _0209190c:
mov r1, r1, lsl #0x10
mov r1, r1, asr #0x10
bl func_ov00_02090ac8
ldr r0, _02091d3c ; =data_027e0f94
ldr r0, _02091d3c ; =gPlayerPos
strh r4, [r5, #0x14]
ldr r1, [r0, #4]
ldr r2, [r0]
@@ -13746,7 +13746,7 @@ _02091d34:
add sp, sp, #0x18c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02091d3c: .word data_027e0f94
_02091d3c: .word gPlayerPos
_02091d40: .word data_027e0fac
_02091d44: .word data_027e10a4
_02091d48: .word data_027e0d38
@@ -14739,7 +14739,7 @@ _02092b4c:
b _02092c74
_02092b68:
bl func_ov00_02087d84
ldr r1, _020931f8 ; =data_027e0f94
ldr r1, _020931f8 ; =gPlayerPos
ldr r0, [r0, #0x10]
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -15183,7 +15183,7 @@ _020931e8: .word data_ov00_020e2fa8
_020931ec: .word 0x0000019a
_020931f0: .word 0x00000ccd
_020931f4: .word 0x00001388
_020931f8: .word data_027e0f94
_020931f8: .word gPlayerPos
_020931fc: .word 0x00001ccd
_02093200: .word 0xffffe333
_02093204: .word 0x000004cd
@@ -15325,7 +15325,7 @@ func_ov00_020933b8: ; 0x020933b8
func_ov00_020933d4: ; 0x020933d4
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r2, _02093500 ; =data_027e0f94
ldr r2, _02093500 ; =gPlayerPos
mov r4, r1
ldr r1, [r2]
str r1, [r4]
@@ -15406,7 +15406,7 @@ _020934c8:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02093500: .word data_027e0f94
_02093500: .word gPlayerPos
_02093504: .word gMapManager
arm_func_end func_ov00_020933d4
@@ -15590,7 +15590,7 @@ func_ov00_020936d8: ; 0x020936d8
ldr r1, [r0, #0x18]
mov r0, r4
bl func_ov00_02090ad8
ldr r1, _020937d4 ; =data_027e0f94
ldr r1, _020937d4 ; =gPlayerPos
mov r0, r4
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -15625,7 +15625,7 @@ func_ov00_020936d8: ; 0x020936d8
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020937d4: .word data_027e0f94
_020937d4: .word gPlayerPos
arm_func_end func_ov00_020936d8
.global func_ov00_020937d8
asm/ov00/ov00_020980f4.inc
+1 -1
View File
@@ -104,7 +104,7 @@
.extern data_027e0f88
.extern data_027e0f8c
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerLink
asm/ov00/ov00_020980f4.s
+21 -21
View File
@@ -4812,7 +4812,7 @@ _0209be9c: .word data_027e0fac
func_ov00_0209bea0: ; 0x0209bea0
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x18
ldr r2, _0209bf44 ; =data_027e0f94
ldr r2, _0209bf44 ; =gPlayerPos
ldr r1, _0209bf48 ; =data_027e0fa0
ldr r4, [r2]
ldr r3, [r2, #4]
@@ -4852,7 +4852,7 @@ func_ov00_0209bea0: ; 0x0209bea0
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0209bf44: .word data_027e0f94
_0209bf44: .word gPlayerPos
_0209bf48: .word data_027e0fa0
_0209bf4c: .word data_027e0fac
arm_func_end func_ov00_0209bea0
@@ -5621,7 +5621,7 @@ func_ov00_0209c8f4: ; 0x0209c8f4
blx r1
cmp r0, #2
bne _0209c93c
ldr r0, _0209c950 ; =data_027e0f94
ldr r0, _0209c950 ; =gPlayerPos
mov r1, #0
ldr r2, [r0]
str r2, [r4, #0xf8]
@@ -5638,7 +5638,7 @@ _0209c93c:
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldmia sp!, {r4, pc}
.align 2, 0
_0209c950: .word data_027e0f94
_0209c950: .word gPlayerPos
_0209c954: .word gMapManager
arm_func_end func_ov00_0209c8f4
@@ -6085,7 +6085,7 @@ func_ov00_0209ce78: ; 0x0209ce78
mov r5, r1
addne sp, sp, #0x1c
ldmneia sp!, {r4, r5, pc}
ldr r2, _0209cf5c ; =data_027e0f94
ldr r2, _0209cf5c ; =gPlayerPos
add r1, sp, #0x10
ldr ip, [r2]
ldr r3, [r2, #4]
@@ -6137,7 +6137,7 @@ _0209cee4:
add sp, sp, #0x1c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0209cf5c: .word data_027e0f94
_0209cf5c: .word gPlayerPos
_0209cf60: .word data_027e0fac
arm_func_end func_ov00_0209ce78
@@ -6146,7 +6146,7 @@ _0209cf60: .word data_027e0fac
func_ov00_0209cf64: ; 0x0209cf64
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x48
ldr r2, _0209d098 ; =data_027e0f94
ldr r2, _0209d098 ; =gPlayerPos
ldr r1, _0209d09c ; =data_027e0fa0
ldr r4, [r2]
ldr r3, [r2, #4]
@@ -6222,7 +6222,7 @@ func_ov00_0209cf64: ; 0x0209cf64
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0209d098: .word data_027e0f94
_0209d098: .word gPlayerPos
_0209d09c: .word data_027e0fa0
_0209d0a0: .word data_ov00_020e2fa8
arm_func_end func_ov00_0209cf64
@@ -6407,7 +6407,7 @@ _0209d2d0: .word data_027e0d38
func_ov00_0209d2d4: ; 0x0209d2d4
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _0209d404 ; =data_027e0f94
ldr r1, _0209d404 ; =gPlayerPos
mov r4, r0
ldr r2, [r1]
ldr r0, [r1, #4]
@@ -6485,7 +6485,7 @@ _0209d3dc:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_0209d404: .word data_027e0f94
_0209d404: .word gPlayerPos
_0209d408: .word data_027e10a4
arm_func_end func_ov00_0209d2d4
@@ -7949,7 +7949,7 @@ func_ov00_0209e594: ; 0x0209e594
ldr r4, [r0, #0x5c]
cmp r4, #0
ble _0209e664
ldr r0, _0209e6f0 ; =data_027e0f94
ldr r0, _0209e6f0 ; =gPlayerPos
ldr r1, [r7, #0x18]
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -8028,7 +8028,7 @@ _0209e690:
add sp, sp, #0x28
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0209e6f0: .word data_027e0f94
_0209e6f0: .word gPlayerPos
_0209e6f4: .word data_027e0d38
arm_func_end func_ov00_0209e594
@@ -8061,7 +8061,7 @@ func_ov00_0209e6f8: ; 0x0209e6f8
ldr r4, [r0, #0x5c]
cmp r4, #0
ble _0209e7fc
ldr r0, _0209e858 ; =data_027e0f94
ldr r0, _0209e858 ; =gPlayerPos
ldr r1, [r6, #0x18]
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -8127,7 +8127,7 @@ _0209e7fc:
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0209e858: .word data_027e0f94
_0209e858: .word gPlayerPos
_0209e85c: .word data_027e0d38
arm_func_end func_ov00_0209e6f8
@@ -12631,7 +12631,7 @@ func_ov00_020a1f24: ; 0x020a1f24
str r0, [r4, #0x2c]
ldmia sp!, {r4, pc}
_020a1f90:
ldr r0, _020a1fcc ; =data_027e0f94
ldr r0, _020a1fcc ; =gPlayerPos
ldr r1, [r0]
str r1, [r4, #0x18]
ldr r1, [r0, #4]
@@ -12647,7 +12647,7 @@ _020a1f90:
ldmia sp!, {r4, pc}
.align 2, 0
_020a1fc8: .word gMapManager
_020a1fcc: .word data_027e0f94
_020a1fcc: .word gPlayerPos
arm_func_end func_ov00_020a1f24
.global func_ov00_020a1fd0
@@ -12883,7 +12883,7 @@ func_ov00_020a22d0: ; 0x020a22d0
mvn r1, #0
bl func_ov00_02090efc
mvn r0, #0
ldr r1, _020a239c ; =data_027e0f94
ldr r1, _020a239c ; =gPlayerPos
str r0, [r5, #0x1c]
ldr r0, [r1]
ldr r3, _020a23a0 ; =data_027e0fac
@@ -12930,7 +12930,7 @@ _020a238c:
bl func_ov00_02090f08
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020a239c: .word data_027e0f94
_020a239c: .word gPlayerPos
_020a23a0: .word data_027e0fac
arm_func_end func_ov00_020a22d0
@@ -18440,7 +18440,7 @@ func_ov00_020a6908: ; 0x020a6908
func_ov00_020a6924: ; 0x020a6924
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xf0
ldr r2, _020a6de4 ; =data_027e0f94
ldr r2, _020a6de4 ; =gPlayerPos
mov r10, r0
ldr r3, [r2]
ldr r0, [r2, #4]
@@ -18615,7 +18615,7 @@ _020a6b9c:
ldr r0, [sp, #0x40]
ldr r1, [sp, #0x48]
bl func_01ffa0f4
ldr r1, _020a6de4 ; =data_027e0f94
ldr r1, _020a6de4 ; =gPlayerPos
mov r0, r0, lsl #0x10
ldr r2, [r1]
mov r4, r0, asr #0x10
@@ -18756,7 +18756,7 @@ _020a6d70:
add sp, sp, #0xf0
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_020a6de4: .word data_027e0f94
_020a6de4: .word gPlayerPos
_020a6de8: .word data_027e10a4
_020a6dec: .word 0x00001ccd
_020a6df0: .word 0x00000333
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -189,7 +189,7 @@
.extern data_027e0f6c
.extern data_027e0f78
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb8
asm/ov00/ov00_020b1498.s
+38 -38
View File
@@ -7857,7 +7857,7 @@ _020b7ab0:
str r0, [sp, #0x10]
add r1, r4, #0x44
str r1, [sp, #0x14]
ldr r0, _020b7d44 ; =data_027e0f94
ldr r0, _020b7d44 ; =gPlayerPos
mov r1, r7
ldr r2, [r0, #4]
mov r0, r8
@@ -8021,7 +8021,7 @@ _020b7d24:
_020b7d38: .word data_027e0d84
_020b7d3c: .word data_027e0f64
_020b7d40: .word gPlayer
_020b7d44: .word data_027e0f94
_020b7d44: .word gPlayerPos
_020b7d48: .word data_027e077c
arm_func_end func_ov00_020b7924
@@ -10087,7 +10087,7 @@ _020b9444:
mov r2, #0
cmp r0, #0
beq _020b94e8
ldr r0, _020b974c ; =data_027e0f94
ldr r0, _020b974c ; =gPlayerPos
str r2, [sp]
ldr r1, [r0]
str r1, [r7, #0x158]
@@ -10264,7 +10264,7 @@ _020b9738:
_020b9740: .word gAdventureFlags
_020b9744: .word data_027e0c68
_020b9748: .word gPlayerLink
_020b974c: .word data_027e0f94
_020b974c: .word gPlayerPos
_020b9750: .word gActorManager
_020b9754: .word data_ov00_020e67d8
_020b9758: .word gMapManager
@@ -11607,7 +11607,7 @@ _020ba914:
ldr r0, _020bac5c ; =data_ov00_020eec9c
bl func_ov00_020d77e4
_020ba958:
ldr r0, _020bac60 ; =data_027e0f94
ldr r0, _020bac60 ; =gPlayerPos
add r3, sp, #0x18
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -11806,7 +11806,7 @@ _020bac50: .word gPlayerLink
_020bac54: .word gAdventureFlags
_020bac58: .word data_027e0c68
_020bac5c: .word data_ov00_020eec9c
_020bac60: .word data_027e0f94
_020bac60: .word gPlayerPos
_020bac64: .word data_027e0d38
_020bac68: .word data_027e0f64
_020bac6c: .word gMapManager
@@ -12610,7 +12610,7 @@ func_ov00_020bb46c: ; 0x020bb46c
mov r5, r0
ldr r3, [r2]
mov r4, r1
ldr r0, _020bb4d4 ; =data_027e0f94
ldr r0, _020bb4d4 ; =gPlayerPos
mov r2, r4
add r1, r3, #0x34
bl func_01ff9bc4
@@ -12632,7 +12632,7 @@ func_ov00_020bb46c: ; 0x020bb46c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020bb4d0: .word data_027e0fcc
_020bb4d4: .word data_027e0f94
_020bb4d4: .word gPlayerPos
_020bb4d8: .word data_027e0fd0
arm_func_end func_ov00_020bb46c
@@ -12988,7 +12988,7 @@ func_ov00_020bb948: ; 0x020bb948
sub sp, sp, #0xc
mov r4, r1
mov r5, r0
ldr r1, _020bb9a0 ; =data_027e0f94
ldr r1, _020bb9a0 ; =gPlayerPos
add r2, sp, #0
mov r0, r4
bl func_01ff9bf8
@@ -13007,7 +13007,7 @@ func_ov00_020bb948: ; 0x020bb948
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020bb9a0: .word data_027e0f94
_020bb9a0: .word gPlayerPos
_020bb9a4: .word data_027e0fac
_020bb9a8: .word 0x0000071c
_020bb9ac: .word 0x000004cd
@@ -13553,7 +13553,7 @@ _020bbf48:
cmp r0, #0
bne _020bbff4
ldr r0, _020bc078 ; =data_027e0fcc
ldr r2, _020bc07c ; =data_027e0f94
ldr r2, _020bc07c ; =gPlayerPos
ldr r0, [r0]
mov r1, #1
ldr r3, [r0]
@@ -13609,7 +13609,7 @@ _020bc060:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_020bc078: .word data_027e0fcc
_020bc07c: .word data_027e0f94
_020bc07c: .word gPlayerPos
_020bc080: .word data_027e0fa0
_020bc084: .word data_027e0fb8
arm_func_end func_ov00_020bbed4
@@ -13844,7 +13844,7 @@ func_ov00_020bc320: ; 0x020bc320
mov r7, r0
mov r0, r1
mov r6, r2
ldr r1, _020bc394 ; =data_027e0f94
ldr r1, _020bc394 ; =gPlayerPos
mov r2, #0
mov r5, r3
bl func_ov00_020b1d70
@@ -13872,7 +13872,7 @@ _020bc384:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020bc394: .word data_027e0f94
_020bc394: .word gPlayerPos
arm_func_end func_ov00_020bc320
.global func_ov00_020bc398
@@ -13883,7 +13883,7 @@ func_ov00_020bc398: ; 0x020bc398
mov r4, r0
mov r0, r1
mov r5, r2
ldr r1, _020bc460 ; =data_027e0f94
ldr r1, _020bc460 ; =gPlayerPos
mov r2, #0
bl func_ov00_020b1d70
cmp r5, #0
@@ -13931,7 +13931,7 @@ _020bc40c:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020bc460: .word data_027e0f94
_020bc460: .word gPlayerPos
_020bc464: .word gMapManager
_020bc468: .word data_027e0fac
arm_func_end func_ov00_020bc398
@@ -14019,7 +14019,7 @@ func_ov00_020bc520: ; 0x020bc520
bl func_ov00_020bb9c8
cmp r0, #0
beq _020bc6b4
ldr r1, _020bc6c0 ; =data_027e0f94
ldr r1, _020bc6c0 ; =gPlayerPos
mov r0, r7
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -14119,7 +14119,7 @@ _020bc6b4:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020bc6c0: .word data_027e0f94
_020bc6c0: .word gPlayerPos
_020bc6c4: .word data_027e0fac
_020bc6c8: .word 0x66666667
_020bc6cc: .word 0x0b60b60b
@@ -14269,7 +14269,7 @@ _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p: ; 0x020bc854
ldr r0, _020bc8ac ; =data_027e0fcc
mov r4, r1
ldr r1, [r0]
ldr r0, _020bc8b0 ; =data_027e0f94
ldr r0, _020bc8b0 ; =gPlayerPos
mov r2, r4
add r1, r1, #0x34
bl func_01ff9bc4
@@ -14289,7 +14289,7 @@ _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p: ; 0x020bc854
ldmia sp!, {r4, pc}
.align 2, 0
_020bc8ac: .word data_027e0fcc
_020bc8b0: .word data_027e0f94
_020bc8b0: .word gPlayerPos
_020bc8b4: .word data_027e0fd0
arm_func_end _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
@@ -14533,20 +14533,20 @@ _020bcb98:
ldr r2, [r0]
ldr r0, [r1]
ldr r2, [r2, #0xc]
ldr r1, _020bcc20 ; =data_027e0f94
ldr r1, _020bcc20 ; =gPlayerPos
blx func_ov00_020b4c4c
ldr r0, _020bcc1c ; =data_027e0fd4
ldr r0, [r0]
blx func_ov00_020b4d00
ldr r0, _020bcc18 ; =data_027e0fcc
ldr r1, _020bcc20 ; =data_027e0f94
ldr r1, _020bcc20 ; =gPlayerPos
ldr r0, [r0]
ldr r2, [r0]
ldr r2, [r2, #0x5c]
blx r2
cmp r4, #0xfd
beq _020bcbfc
ldr r0, _020bcc20 ; =data_027e0f94
ldr r0, _020bcc20 ; =gPlayerPos
ldr r1, [r0]
str r1, [r7, #0x14]
ldr r1, [r0, #4]
@@ -14565,7 +14565,7 @@ _020bcc08:
_020bcc14: .word data_027e0d38
_020bcc18: .word data_027e0fcc
_020bcc1c: .word data_027e0fd4
_020bcc20: .word data_027e0f94
_020bcc20: .word gPlayerPos
arm_func_end func_ov00_020bcad8
.global func_ov00_020bcc24
@@ -14728,7 +14728,7 @@ _020bcde8: .word gAdventureFlags
func_ov00_020bcdec: ; 0x020bcdec
stmdb sp!, {r4, lr}
ldr r3, [r1]
ldr ip, _020bce38 ; =data_027e0f94
ldr ip, _020bce38 ; =gPlayerPos
ldr r0, _020bce3c ; =data_027e0fcc
str r3, [ip]
ldr lr, [r1, #4]
@@ -14746,7 +14746,7 @@ func_ov00_020bcdec: ; 0x020bcdec
strh r4, [r0]
ldmia sp!, {r4, pc}
.align 2, 0
_020bce38: .word data_027e0f94
_020bce38: .word gPlayerPos
_020bce3c: .word data_027e0fcc
_020bce40: .word data_027e0fd4
_020bce44: .word data_027e0fac
@@ -14974,7 +14974,7 @@ func_ov00_020bd0bc: ; 0x020bd0bc
sub sp, sp, #0xc
mov r0, r1
mov r4, r2
ldr r1, _020bd250 ; =data_027e0f94
ldr r1, _020bd250 ; =gPlayerPos
add r2, sp, #0
bl func_01ff9bf8
cmp r4, #0
@@ -15075,7 +15075,7 @@ _020bd234:
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_020bd250: .word data_027e0f94
_020bd250: .word gPlayerPos
_020bd254: .word 0x0000099a
_020bd258: .word data_027e0fcc
_020bd25c: .word data_027e0fa0
@@ -15190,7 +15190,7 @@ func_ov00_020bd364: ; 0x020bd364
ldr r0, [r0]
str r1, [r2]
ldr r2, [r1, #0xc]
ldr r1, _020bd3ac ; =data_027e0f94
ldr r1, _020bd3ac ; =gPlayerPos
blx func_ov00_020b4c4c
bl _ZN10PlayerBase14GetEquipShieldEv
mov r1, #0
@@ -15200,7 +15200,7 @@ func_ov00_020bd364: ; 0x020bd364
_020bd3a0: .word data_027e0fd8
_020bd3a4: .word data_027e0fd4
_020bd3a8: .word data_027e0fcc
_020bd3ac: .word data_027e0f94
_020bd3ac: .word gPlayerPos
arm_func_end func_ov00_020bd364
.global func_ov00_020bd3b0
@@ -15291,7 +15291,7 @@ _020bd4d4: .word data_027e0fa0
arm_func_start func_ov00_020bd4d8
func_ov00_020bd4d8: ; 0x020bd4d8
ldr r2, [r1]
ldr r0, _020bd4f8 ; =data_027e0f94
ldr r0, _020bd4f8 ; =gPlayerPos
str r2, [r0]
ldr r2, [r1, #4]
str r2, [r0, #4]
@@ -15299,7 +15299,7 @@ func_ov00_020bd4d8: ; 0x020bd4d8
str r1, [r0, #8]
bx lr
.align 2, 0
_020bd4f8: .word data_027e0f94
_020bd4f8: .word gPlayerPos
arm_func_end func_ov00_020bd4d8
.global func_ov00_020bd4fc
@@ -15336,7 +15336,7 @@ func_ov00_020bd510: ; 0x020bd510
mvn lr, #0
mov r3, #0
str r3, [sp, #0xc]
ldr r0, _020bd5e8 ; =data_027e0f94
ldr r0, _020bd5e8 ; =gPlayerPos
add ip, sp, #4
add r2, sp, #0xc
mov r1, r5
@@ -15371,7 +15371,7 @@ func_ov00_020bd510: ; 0x020bd510
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020bd5e4: .word gItemManager
_020bd5e8: .word data_027e0f94
_020bd5e8: .word gPlayerPos
_020bd5ec: .word gActorManager
arm_func_end func_ov00_020bd510
@@ -17001,10 +17001,10 @@ func_ov00_020be988: ; 0x020be988
.global func_ov00_020be990
arm_func_start func_ov00_020be990
func_ov00_020be990: ; 0x020be990
ldr r0, _020be998 ; =data_027e0f94
ldr r0, _020be998 ; =gPlayerPos
bx lr
.align 2, 0
_020be998: .word data_027e0f94
_020be998: .word gPlayerPos
arm_func_end func_ov00_020be990
.global func_ov00_020be99c
@@ -21549,7 +21549,7 @@ func_ov00_020e1290: ; 0x020e1290
add ip, sp, #0
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
ldr r3, _020e12d0 ; =data_027e0f94
ldr r3, _020e12d0 ; =gPlayerPos
ldmia ip, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r3, _020e12d4 ; =data_027e0fa0
@@ -21560,7 +21560,7 @@ func_ov00_020e1290: ; 0x020e1290
bx lr
.align 2, 0
_020e12cc: .word data_027e0d0c
_020e12d0: .word data_027e0f94
_020e12d0: .word gPlayerPos
_020e12d4: .word data_027e0fa0
arm_func_end func_ov00_020e1290
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -145,7 +145,7 @@
.extern data_027e0f78
.extern data_027e0f88
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
asm/ov00/ov00_020c3e54.s
+29 -29
View File
@@ -1728,7 +1728,7 @@ func_ov00_020c53b0: ; 0x020c53b0
stmdb sp!, {lr}
sub sp, sp, #0xc
mov r1, r0
ldr r0, _020c53e4 ; =data_027e0f94
ldr r0, _020c53e4 ; =gPlayerPos
add r2, sp, #0
bl func_01ff9bf8
ldr r0, [sp]
@@ -1739,7 +1739,7 @@ func_ov00_020c53b0: ; 0x020c53b0
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020c53e4: .word data_027e0f94
_020c53e4: .word gPlayerPos
arm_func_end func_ov00_020c53b0
.global func_ov00_020c53e8
@@ -1750,7 +1750,7 @@ func_ov00_020c53e8: ; 0x020c53e8
mov r4, r1
cmp r2, #0
bne _020c5420
ldr r1, _020c545c ; =data_027e0f94
ldr r1, _020c545c ; =gPlayerPos
mov r0, #1
ldr r2, [r1]
str r2, [r4]
@@ -1776,7 +1776,7 @@ _020c5420:
str r1, [r4, #8]
ldmia sp!, {r4, pc}
.align 2, 0
_020c545c: .word data_027e0f94
_020c545c: .word gPlayerPos
_020c5460: .word gActorManager
arm_func_end func_ov00_020c53e8
@@ -1985,7 +1985,7 @@ func_ov00_020c56d8: ; 0x020c56d8
addeq sp, sp, #0x10
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _020c5770 ; =data_027e0f94
ldr r0, _020c5770 ; =gPlayerPos
add ip, sp, #4
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
@@ -2009,7 +2009,7 @@ func_ov00_020c56d8: ; 0x020c56d8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020c576c: .word gPlayer
_020c5770: .word data_027e0f94
_020c5770: .word gPlayerPos
arm_func_end func_ov00_020c56d8
.global func_ov00_020c5774
@@ -2028,7 +2028,7 @@ func_ov00_020c5774: ; 0x020c5774
addeq sp, sp, #0xc
moveq r0, #0
ldmeqia sp!, {r4, r5, pc}
ldr r0, _020c57f8 ; =data_027e0f94
ldr r0, _020c57f8 ; =gPlayerPos
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -2049,7 +2049,7 @@ func_ov00_020c5774: ; 0x020c5774
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020c57f4: .word gPlayer
_020c57f8: .word data_027e0f94
_020c57f8: .word gPlayerPos
arm_func_end func_ov00_020c5774
.global func_ov00_020c57fc
@@ -11099,12 +11099,12 @@ _020cca4c: .word func_ov00_020c56d8
arm_func_start func_ov00_020cca50
func_ov00_020cca50: ; 0x020cca50
ldr ip, _020cca60 ; =func_ov00_020c5464
ldr r1, _020cca64 ; =data_027e0f94
ldr r1, _020cca64 ; =gPlayerPos
add r0, r0, #0x48
bx ip
.align 2, 0
_020cca60: .word func_ov00_020c5464
_020cca64: .word data_027e0f94
_020cca64: .word gPlayerPos
arm_func_end func_ov00_020cca50
.global func_ov00_020cca68
@@ -11156,11 +11156,11 @@ _020ccb00: .word gMapManager
arm_func_start func_ov00_020ccb04
func_ov00_020ccb04: ; 0x020ccb04
ldr ip, _020ccb10 ; =func_ov00_020cca68
ldr r1, _020ccb14 ; =data_027e0f94
ldr r1, _020ccb14 ; =gPlayerPos
bx ip
.align 2, 0
_020ccb10: .word func_ov00_020cca68
_020ccb14: .word data_027e0f94
_020ccb14: .word gPlayerPos
arm_func_end func_ov00_020ccb04
.global func_ov00_020ccb18
@@ -11709,7 +11709,7 @@ func_ov00_020cd174: ; 0x020cd174
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x18
mov r6, r0
ldr r0, _020cd274 ; =data_027e0f94
ldr r0, _020cd274 ; =gPlayerPos
add r4, sp, #0xc
str r1, [r6]
mov r5, r2
@@ -11774,7 +11774,7 @@ _020cd204:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020cd274: .word data_027e0f94
_020cd274: .word gPlayerPos
_020cd278: .word data_02050f54
arm_func_end func_ov00_020cd174
@@ -11876,7 +11876,7 @@ func_ov00_020cd37c: ; 0x020cd37c
func_ov00_020cd384: ; 0x020cd384
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x18
ldr ip, _020cd4e0 ; =data_027e0f94
ldr ip, _020cd4e0 ; =gPlayerPos
add r6, sp, #0xc
mov r5, r0
mov r4, r1
@@ -11965,7 +11965,7 @@ _020cd430:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020cd4e0: .word data_027e0f94
_020cd4e0: .word gPlayerPos
_020cd4e4: .word data_02050f54
arm_func_end func_ov00_020cd384
@@ -13412,7 +13412,7 @@ _020ce818:
mov r4, #0
bgt _020ce84c
ldr r1, _020ce8d0 ; =0x00000468
ldr r2, _020ce8d4 ; =data_027e0f94
ldr r2, _020ce8d4 ; =gPlayerPos
mov r0, r7
sub r3, r4, #2
str r4, [sp]
@@ -13422,7 +13422,7 @@ _020ce84c:
cmp r0, #6
bgt _020ce870
ldr r1, _020ce8d8 ; =0x00000469
ldr r2, _020ce8d4 ; =data_027e0f94
ldr r2, _020ce8d4 ; =gPlayerPos
mov r0, r7
sub r3, r4, #2
str r4, [sp]
@@ -13430,7 +13430,7 @@ _020ce84c:
b _020ce888
_020ce870:
ldr r1, _020ce8dc ; =0x0000046a
ldr r2, _020ce8d4 ; =data_027e0f94
ldr r2, _020ce8d4 ; =gPlayerPos
mov r0, r7
sub r3, r4, #2
str r4, [sp]
@@ -13457,7 +13457,7 @@ _020ce8c4: .word data_027e0618
_020ce8c8: .word data_ov00_020eec9c
_020ce8cc: .word data_ov00_020eec68
_020ce8d0: .word 0x00000468
_020ce8d4: .word data_027e0f94
_020ce8d4: .word gPlayerPos
_020ce8d8: .word 0x00000469
_020ce8dc: .word 0x0000046a
_020ce8e0: .word 0x00000391
@@ -19943,7 +19943,7 @@ _020d372c:
cmp r1, #0
movne r0, #0
ldmneia sp!, {r4, r5, r6, pc}
ldr r1, _020d37cc ; =data_027e0f94
ldr r1, _020d37cc ; =gPlayerPos
add r0, r0, #0x48
bl func_01ff9ec0
ldr r1, [r5]
@@ -19979,7 +19979,7 @@ _020d37c0:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020d37c8: .word gActorManager
_020d37cc: .word data_027e0f94
_020d37cc: .word gPlayerPos
_020d37d0: .word data_ov00_020df2e0
_020d37d4: .word data_ov00_020df2ec
arm_func_end func_ov00_020d36d8
@@ -21504,7 +21504,7 @@ _020d4998:
cmp r0, #0
beq _020d4a84
ldr r0, _020d4aa4 ; =data_027e0fac
ldr r1, _020d4aa8 ; =data_027e0f94
ldr r1, _020d4aa8 ; =gPlayerPos
ldrsh r2, [r0]
mov r0, r5
strh r2, [r5, #0x78]
@@ -21569,7 +21569,7 @@ _020d4a8c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020d4aa4: .word data_027e0fac
_020d4aa8: .word data_027e0f94
_020d4aa8: .word gPlayerPos
_020d4aac: .word gPlayerLink
_020d4ab0: .word data_027e0fd4
_020d4ab4: .word 0x0000019a
@@ -21899,7 +21899,7 @@ func_ov00_020d4ee0: ; 0x020d4ee0
bl func_01ff9cec
cmp r0, #0x29
ble _020d4f3c
ldr r0, _020d4f7c ; =data_027e0f94
ldr r0, _020d4f7c ; =gPlayerPos
ldr r2, [r5, #0x4c]
ldr r1, [r0]
str r1, [r5, #0x48]
@@ -21916,7 +21916,7 @@ func_ov00_020d4ee0: ; 0x020d4ee0
str r0, [r5, #0x5c]
b _020d4f60
_020d4f3c:
ldr r0, _020d4f7c ; =data_027e0f94
ldr r0, _020d4f7c ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x54]
ldr r1, [r0, #4]
@@ -21934,7 +21934,7 @@ _020d4f60:
moveq r0, #0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020d4f7c: .word data_027e0f94
_020d4f7c: .word gPlayerPos
arm_func_end func_ov00_020d4ee0
.global func_ov00_020d4f80
@@ -22021,7 +22021,7 @@ func_ov00_020d507c: ; 0x020d507c
bl _ZN5Actor16IsFollowedByLinkEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _020d50f0 ; =data_027e0f94
ldr r0, _020d50f0 ; =gPlayerPos
ldr r1, [r4, #0x4c]
ldr r0, [r0, #4]
sub ip, r1, r0
@@ -22045,7 +22045,7 @@ func_ov00_020d507c: ; 0x020d507c
str r0, [r4, #0x88]
ldmia sp!, {r4, pc}
.align 2, 0
_020d50f0: .word data_027e0f94
_020d50f0: .word gPlayerPos
_020d50f4: .word 0x000004cd
arm_func_end func_ov00_020d507c
asm/ov03.inc
+1 -1
View File
@@ -99,7 +99,7 @@
.extern data_027e0f84
.extern data_027e0f88
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
asm/ov03.s
+4 -4
View File
@@ -3876,7 +3876,7 @@ _020f0c38:
mov r1, #1
str r1, [sp]
ldr r0, _020f0e30 ; =data_027e0d3c
ldr r1, _020f0e34 ; =data_027e0f94
ldr r1, _020f0e34 ; =gPlayerPos
ldr r0, [r0]
add r2, sp, #0x20
add r3, sp, #0x1c
@@ -4008,7 +4008,7 @@ _020f0e20:
.align 2, 0
_020f0e2c: .word data_027e0c54
_020f0e30: .word data_027e0d3c
_020f0e34: .word data_027e0f94
_020f0e34: .word gPlayerPos
_020f0e38: .word 0x00001ccd
_020f0e3c: .word gMapManager
_020f0e40: .word 0x00002ccd
@@ -17348,7 +17348,7 @@ func_ov03_020f9e50: ; 0x020f9e50
ldr r0, _020f9ec8 ; =data_027e0d3c
str r2, [sp, #0xc]
ldr r0, [r0]
ldr r1, _020f9ecc ; =data_027e0f94
ldr r1, _020f9ecc ; =gPlayerPos
add r3, r2, #0
blx func_ov00_02079470
mov r3, #0
@@ -17399,7 +17399,7 @@ _020f9ebc:
pop {r3, r4, r5, r6, r7, pc}
nop
_020f9ec8: .word data_027e0d3c
_020f9ecc: .word data_027e0f94
_020f9ecc: .word gPlayerPos
_020f9ed0: .word data_ov03_021007cc
_020f9ed4: .word 0x0000024d
thumb_func_end func_ov03_020f9e50
asm/ov04.inc
+1 -1
View File
@@ -134,7 +134,7 @@
.extern data_027e0f78
.extern data_027e0f7c
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gHealthManager
asm/ov04.s
+4 -4
View File
@@ -878,7 +878,7 @@ func_ov04_02101188: ; 0x02101188
mov r0, #0
ldrsh r0, [r1, r0]
strh r0, [r5, #0x36]
ldr r0, _02101380 ; =data_027e0f94
ldr r0, _02101380 ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x38]
ldr r1, [r0, #4]
@@ -1085,7 +1085,7 @@ _02101370:
_02101374: .word 0x027ffc3c
_02101378: .word data_027e0d38
_0210137c: .word data_027e0fac
_02101380: .word data_027e0f94
_02101380: .word gPlayerPos
_02101384: .word data_027e0618
_02101388: .word gMapManager
_0210138c: .word data_027e077c
@@ -20545,7 +20545,7 @@ _0210aad6:
mov r1, #0
add r0, #0x5d
strb r1, [r0]
ldr r0, _0210ab1c ; =data_027e0f94
ldr r0, _0210ab1c ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x14]
ldr r1, [r0, #4]
@@ -20559,7 +20559,7 @@ _0210ab0c: .word data_027e0fdc
_0210ab10: .word data_027e0fd4
_0210ab14: .word data_027e0fd8
_0210ab18: .word data_027e0fcc
_0210ab1c: .word data_027e0f94
_0210ab1c: .word gPlayerPos
thumb_func_end func_ov04_0210a9ac
.global func_ov04_0210ab20
asm/ov05.inc
+1 -1
View File
@@ -199,7 +199,7 @@
.extern data_027e0f7c
.extern data_027e0f88
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb0
asm/ov05.s
+30 -30
View File
@@ -1351,7 +1351,7 @@ _02101c04:
cmp r0, #3
bne _02101c90
_02101c44:
ldr r0, _021021e0 ; =data_027e0f94
ldr r0, _021021e0 ; =gPlayerPos
mov r1, #1
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -1371,7 +1371,7 @@ _02101c44:
bl func_ov00_02089318
b _02101cd4
_02101c90:
ldr r0, _021021e0 ; =data_027e0f94
ldr r0, _021021e0 ; =gPlayerPos
mov r1, #1
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -1461,7 +1461,7 @@ _02101db0: ; jump table
b _02101dd4 ; case 7
b _02101e24 ; case 8
_02101dd4:
ldr r0, _021021e0 ; =data_027e0f94
ldr r0, _021021e0 ; =gPlayerPos
add r1, sp, #0x34
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -1730,7 +1730,7 @@ _02102140:
_021021d4: .word data_027e0f64
_021021d8: .word data_027e0d38
_021021dc: .word gMapManager
_021021e0: .word data_027e0f94
_021021e0: .word gPlayerPos
_021021e4: .word data_027e0ffc
_021021e8: .word data_ov00_020eec9c
_021021ec: .word data_ov00_020eec68
@@ -5017,7 +5017,7 @@ func_ov05_02104bc8: ; 0x02104bc8
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r2, _02104c9c ; =data_027e0f64
ldr r1, _02104ca0 ; =data_027e0f94
ldr r1, _02104ca0 ; =gPlayerPos
ldr r2, [r2]
mov r4, r0
ldr r0, [r2, #4]
@@ -5076,7 +5076,7 @@ _02104c8c:
ldmia sp!, {r4, pc}
.align 2, 0
_02104c9c: .word data_027e0f64
_02104ca0: .word data_027e0f94
_02104ca0: .word gPlayerPos
arm_func_end func_ov05_02104bc8
.global func_ov05_02104ca4
@@ -5085,7 +5085,7 @@ func_ov05_02104ca4: ; 0x02104ca4
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r2, _02104d68 ; =data_027e0f64
ldr r1, _02104d6c ; =data_027e0f94
ldr r1, _02104d6c ; =gPlayerPos
ldr r2, [r2]
mov r4, r0
ldr r0, [r2, #4]
@@ -5135,7 +5135,7 @@ _02104d48:
ldmia sp!, {r4, pc}
.align 2, 0
_02104d68: .word data_027e0f64
_02104d6c: .word data_027e0f94
_02104d6c: .word gPlayerPos
_02104d70: .word gPlayerLink
arm_func_end func_ov05_02104ca4
@@ -5157,7 +5157,7 @@ func_ov05_02104d74: ; 0x02104d74
addne sp, sp, #0x18
ldmneia sp!, {r4, pc}
ldr r0, _02104e44 ; =data_027e0f64
ldr r1, _02104e48 ; =data_027e0f94
ldr r1, _02104e48 ; =gPlayerPos
ldr r0, [r0]
ldr r3, [r1]
ldr r0, [r0, #4]
@@ -5197,7 +5197,7 @@ _02104e0c:
_02104e3c: .word gPlayerLink
_02104e40: .word gAdventureFlags
_02104e44: .word data_027e0f64
_02104e48: .word data_027e0f94
_02104e48: .word gPlayerPos
_02104e4c: .word data_027e0de4
_02104e50: .word func_ov05_02104e58
_02104e54: .word func_ov05_02104f28
@@ -5209,7 +5209,7 @@ func_ov05_02104e58: ; 0x02104e58
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x38
ldr r2, _02104f20 ; =data_027e0f64
ldr r1, _02104f24 ; =data_027e0f94
ldr r1, _02104f24 ; =gPlayerPos
ldr r2, [r2]
mov r4, r0
ldr r0, [r2, #4]
@@ -5258,7 +5258,7 @@ func_ov05_02104e58: ; 0x02104e58
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02104f20: .word data_027e0f64
_02104f24: .word data_027e0f94
_02104f24: .word gPlayerPos
arm_func_end func_ov05_02104e58
.global func_ov05_02104f28
@@ -5267,7 +5267,7 @@ func_ov05_02104f28: ; 0x02104f28
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x68
ldr r2, _02105130 ; =data_027e0f64
ldr r1, _02105134 ; =data_027e0f94
ldr r1, _02105134 ; =gPlayerPos
ldr r2, [r2]
mov r8, r0
ldr r0, [r2, #4]
@@ -5397,7 +5397,7 @@ _021050cc:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_02105130: .word data_027e0f64
_02105134: .word data_027e0f94
_02105134: .word gPlayerPos
_02105138: .word data_ov00_020e9360
_0210513c: .word data_02050f54
arm_func_end func_ov05_02104f28
@@ -16331,7 +16331,7 @@ _0210e644:
ldr r4, _0210e884 ; =data_027e0fd4
ldr r2, _0210e87c ; =data_027e0fcc
ldr r3, [r4]
ldr r1, _0210e890 ; =data_027e0f94
ldr r1, _0210e890 ; =gPlayerPos
strb r0, [r3, #0xb8]
ldr r3, [r6, #0x20]
ldr r0, [r2]
@@ -16425,7 +16425,7 @@ _0210e7b8:
ldr r3, _0210e884 ; =data_027e0fd4
strb r0, [r1, #0x149]
ldr r0, [ip]
ldr r1, _0210e890 ; =data_027e0f94
ldr r1, _0210e890 ; =gPlayerPos
strb r4, [r0, #0x14a]
ldr r0, [ip]
ldrsh r2, [r2]
@@ -16450,7 +16450,7 @@ _0210e7b8:
bl func_ov29_02178fd0
_0210e838:
ldr r0, _0210e87c ; =data_027e0fcc
ldr r2, _0210e890 ; =data_027e0f94
ldr r2, _0210e890 ; =gPlayerPos
ldr r0, [r0]
mov r1, r5
ldr r3, [r0]
@@ -16472,7 +16472,7 @@ _0210e880: .word data_027e0d38
_0210e884: .word data_027e0fd4
_0210e888: .word data_027e0fa0
_0210e88c: .word data_027e0fd0
_0210e890: .word data_027e0f94
_0210e890: .word gPlayerPos
_0210e894: .word gMapManager
_0210e898: .word gAdventureFlags
_0210e89c: .word 0x66666667
@@ -16536,7 +16536,7 @@ _0210e94c: ; jump table
b _0210e9bc ; case 2
b _0210e9ec ; case 3
_0210e95c:
ldr r0, _0210ea94 ; =data_027e0f94
ldr r0, _0210ea94 ; =gPlayerPos
ldr r1, [r5, #0x14]
ldr r2, [r0]
cmp r2, r1
@@ -16549,7 +16549,7 @@ _0210e95c:
str r0, [r5, #0x1c]
b _0210ea38
_0210e98c:
ldr r0, _0210ea94 ; =data_027e0f94
ldr r0, _0210ea94 ; =gPlayerPos
ldr r1, [r5, #0x14]
ldr r2, [r0]
cmp r2, r1
@@ -16562,7 +16562,7 @@ _0210e98c:
str r0, [r5, #0x1c]
b _0210ea38
_0210e9bc:
ldr r0, _0210ea94 ; =data_027e0f94
ldr r0, _0210ea94 ; =gPlayerPos
ldr r1, [r5, #0x1c]
ldr r2, [r0, #8]
cmp r2, r1
@@ -16575,7 +16575,7 @@ _0210e9bc:
str r0, [r5, #0x1c]
b _0210ea38
_0210e9ec:
ldr r0, _0210ea94 ; =data_027e0f94
ldr r0, _0210ea94 ; =gPlayerPos
ldr r1, [r5, #0x1c]
ldr r2, [r0, #8]
cmp r2, r1
@@ -16588,7 +16588,7 @@ _0210e9ec:
str r0, [r5, #0x1c]
b _0210ea38
_0210ea1c:
ldr r0, _0210ea94 ; =data_027e0f94
ldr r0, _0210ea94 ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x14]
ldr r1, [r0, #4]
@@ -16620,7 +16620,7 @@ _0210ea38:
_0210ea88: .word data_027e0d38
_0210ea8c: .word gMapManager
_0210ea90: .word data_027e0fac
_0210ea94: .word data_027e0f94
_0210ea94: .word gPlayerPos
_0210ea98: .word data_027e0fcc
_0210ea9c: .word data_027e0fd0
arm_func_end func_ov05_0210e8b4
@@ -16657,7 +16657,7 @@ func_ov05_0210eaa0: ; 0x0210eaa0
ldr r1, _0210eb98 ; =data_027e0fb0
ldr r3, _0210eb94 ; =data_027e0fac
ldrsh ip, [r1]
ldr r2, _0210eb9c ; =data_027e0f94
ldr r2, _0210eb9c ; =gPlayerPos
mov r1, r4
str ip, [sp]
ldr ip, [r0]
@@ -16693,7 +16693,7 @@ _0210eb64:
_0210eb90: .word data_027e0fcc
_0210eb94: .word data_027e0fac
_0210eb98: .word data_027e0fb0
_0210eb9c: .word data_027e0f94
_0210eb9c: .word gPlayerPos
_0210eba0: .word data_027e0fd0
arm_func_end func_ov05_0210eaa0
@@ -17557,7 +17557,7 @@ _0210f754: .word data_027e077c
func_ov05_0210f758: ; 0x0210f758
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r2, _0210f7b0 ; =data_027e0f94
ldr r2, _0210f7b0 ; =gPlayerPos
ldr r1, _0210f7b4 ; =data_027e0fd4
mov r4, r0
ldr r2, [r2, #4]
@@ -17578,7 +17578,7 @@ func_ov05_0210f758: ; 0x0210f758
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0210f7b0: .word data_027e0f94
_0210f7b0: .word gPlayerPos
_0210f7b4: .word data_027e0fd4
arm_func_end func_ov05_0210f758
@@ -17599,13 +17599,13 @@ func_ov05_0210f7b8: ; 0x0210f7b8
mov r0, r4
bl func_ov00_020bc46c
mov r2, r0
ldr r1, _0210f804 ; =data_027e0f94
ldr r1, _0210f804 ; =gPlayerPos
mov r0, r4
bl func_ov00_020bc8b8
ldmia sp!, {r4, pc}
.align 2, 0
_0210f800: .word func_ov00_020b1940
_0210f804: .word data_027e0f94
_0210f804: .word gPlayerPos
arm_func_end func_ov05_0210f7b8
.global func_ov05_0210f808
asm/ov12.inc
+1 -1
View File
@@ -153,7 +153,7 @@
.extern data_027e0f68
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc0
asm/ov12.s
+43 -43
View File
@@ -2208,7 +2208,7 @@ func_ov12_021148a8: ; 0x021148a8
mov r10, r0
ldr r0, _02114a90 ; =0x00005555
mov r6, #0
ldr r11, _02114a94 ; =data_027e0f94
ldr r11, _02114a94 ; =gPlayerPos
mov r7, r6
add r5, sp, #4
rsb r4, r0, #0x8000
@@ -2336,7 +2336,7 @@ _02114a78:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02114a90: .word 0x00005555
_02114a94: .word data_027e0f94
_02114a94: .word gPlayerPos
_02114a98: .word data_ov12_02137c64
_02114a9c: .word gPlayer
_02114aa0: .word 0x0000019a
@@ -4027,10 +4027,10 @@ _02116208: .word data_ov00_020e9370
.global func_ov12_0211620c
arm_func_start func_ov12_0211620c
func_ov12_0211620c: ; 0x0211620c
ldr r0, _02116214 ; =data_027e0f94
ldr r0, _02116214 ; =gPlayerPos
bx lr
.align 2, 0
_02116214: .word data_027e0f94
_02116214: .word gPlayerPos
arm_func_end func_ov12_0211620c
.global func_ov12_02116218
@@ -8499,7 +8499,7 @@ func_ov12_02119a28: ; 0x02119a28
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
beq _02119aa0
ldr r2, _02119dbc ; =data_027e0f94
ldr r2, _02119dbc ; =gPlayerPos
ldr r1, _02119dc0 ; =data_027e0d0c
ldr r3, [r2]
str r3, [r0, #0x48]
@@ -8577,7 +8577,7 @@ _02119b7c:
ldrb r0, [r0, #0x716]
cmp r0, #0
beq _02119c24
ldr r1, _02119dbc ; =data_027e0f94
ldr r1, _02119dbc ; =gPlayerPos
mov r0, r6
bl func_ov12_0211986c
ldr r0, _02119dd0 ; =data_027e0fac
@@ -8661,7 +8661,7 @@ _02119c78:
ldr r0, [r0]
bl func_ov00_020b8610
ldr r0, _02119dd4 ; =data_027e0fcc
ldr r2, _02119dbc ; =data_027e0f94
ldr r2, _02119dbc ; =gPlayerPos
ldr r0, [r0]
mov r1, #1
bl func_ov00_020b4460
@@ -8689,7 +8689,7 @@ _02119d0c:
ldr r0, _02119de0 ; =data_027e0e58
add r7, r6, #0x7c
ldr r5, [r0]
ldr r4, _02119dbc ; =data_027e0f94
ldr r4, _02119dbc ; =gPlayerPos
mov r6, #0
_02119d3c:
mov r0, r5
@@ -8720,7 +8720,7 @@ _02119d80:
blo _02119d80
_02119d9c:
ldr r0, _02119dd4 ; =data_027e0fcc
ldr r2, _02119dbc ; =data_027e0f94
ldr r2, _02119dbc ; =gPlayerPos
ldr r0, [r0]
mov r1, #0
bl func_ov00_020b4460
@@ -8728,7 +8728,7 @@ _02119d9c:
.align 2, 0
_02119db4: .word data_ov12_02137c64
_02119db8: .word gActorManager
_02119dbc: .word data_027e0f94
_02119dbc: .word gPlayerPos
_02119dc0: .word data_027e0d0c
_02119dc4: .word gItemManager
_02119dc8: .word data_027e0fd4
@@ -8756,7 +8756,7 @@ func_ov12_02119de4: ; 0x02119de4
bl func_ov05_0210e4e4
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02119e14:
ldr r1, _0211a3c8 ; =data_027e0f94
ldr r1, _0211a3c8 ; =gPlayerPos
mov r0, r6
bl func_ov12_02119968
ldrb r2, [r6, #0x11c]
@@ -8910,7 +8910,7 @@ _0211a028:
cmp r0, #0x21
bne _0211a068
ldr r0, _0211a3e4 ; =data_ov00_020eec9c
ldr r2, _0211a3c8 ; =data_027e0f94
ldr r2, _0211a3c8 ; =gPlayerPos
mov r1, #0xd0
bl func_ov00_020d7a84
_0211a068:
@@ -9056,13 +9056,13 @@ _0211a274:
ldrb r0, [r6, #0x74]
cmp r0, #0
beq _0211a2cc
ldr r1, _0211a3c8 ; =data_027e0f94
ldr r1, _0211a3c8 ; =gPlayerPos
mov r0, r6
bl func_ov12_021196d4
cmp r0, #0
beq _0211a2cc
ldr r0, _0211a3f4 ; =data_027e0e58
ldr r4, _0211a3c8 ; =data_027e0f94
ldr r4, _0211a3c8 ; =gPlayerPos
ldr r7, [r0]
add r9, r6, #0x7c
mov r8, #0
@@ -9094,13 +9094,13 @@ _0211a2f8:
bl func_ov12_021197f0
cmp r0, #0
beq _0211a354
ldr r1, _0211a3c8 ; =data_027e0f94
ldr r1, _0211a3c8 ; =gPlayerPos
mov r0, r6
bl func_ov12_021196d4
cmp r0, #0
beq _0211a354
ldr r0, _0211a3f4 ; =data_027e0e58
ldr r4, _0211a3c8 ; =data_027e0f94
ldr r4, _0211a3c8 ; =gPlayerPos
ldr r7, [r0]
add r9, r6, #0xdc
mov r8, #0
@@ -9127,7 +9127,7 @@ _0211a364:
bne _0211a364
_0211a378:
ldr r0, _0211a3dc ; =data_027e0fcc
ldr r2, _0211a3c8 ; =data_027e0f94
ldr r2, _0211a3c8 ; =gPlayerPos
ldr r0, [r0]
mov r1, r5
ldr r3, [r0]
@@ -9147,7 +9147,7 @@ _0211a378:
str r0, [r6, #0x124]
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0211a3c8: .word data_027e0f94
_0211a3c8: .word gPlayerPos
_0211a3cc: .word data_027e0fac
_0211a3d0: .word data_ov12_02137c64
_0211a3d4: .word gAdventureFlags
@@ -9194,12 +9194,12 @@ _0211a450:
cmp r0, #0
beq _0211a48c
bl func_ov12_0211934c
ldr r1, _0211a4a0 ; =data_027e0f94
ldr r1, _0211a4a0 ; =gPlayerPos
bl func_ov12_021196d4
cmp r0, #0
beq _0211a48c
ldr r0, _0211a4a4 ; =data_027e0e58
ldr r2, _0211a4a0 ; =data_027e0f94
ldr r2, _0211a4a0 ; =gPlayerPos
ldr r0, [r0]
add r1, r6, #0xd0
bl func_ov00_0207c474
@@ -9212,7 +9212,7 @@ _0211a494:
str r0, [r6, #0x78]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0211a4a0: .word data_027e0f94
_0211a4a0: .word gPlayerPos
_0211a4a4: .word data_027e0e58
arm_func_end func_ov12_0211a3f8
@@ -9264,7 +9264,7 @@ _0211a528:
cmp r0, #0
ble _0211a638
bl func_ov12_0211934c
ldr r1, _0211a68c ; =data_027e0f94
ldr r1, _0211a68c ; =gPlayerPos
bl func_ov12_021196d4
cmp r0, #0
beq _0211a638
@@ -9356,7 +9356,7 @@ _0211a670:
add sp, sp, #0x24
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_0211a68c: .word data_027e0f94
_0211a68c: .word gPlayerPos
_0211a690: .word data_027e0fcc
_0211a694: .word data_027e0e58
arm_func_end func_ov12_0211a4e4
@@ -9505,7 +9505,7 @@ _0211a834:
ldr r4, [r4, #0x34]
mov r3, r2
blx r4
ldr r1, _0211a94c ; =data_027e0f94
ldr r1, _0211a94c ; =gPlayerPos
mov r0, r5
bl func_ov12_0211986c
_0211a884:
@@ -9527,7 +9527,7 @@ _0211a884:
ldr r0, _0211a950 ; =data_027e0fcc
mov r1, #0
ldr r3, [r0]
ldr r2, _0211a94c ; =data_027e0f94
ldr r2, _0211a94c ; =gPlayerPos
strb r1, [r3, #0x14e]
ldr r0, [r0]
bl func_ov00_020b4460
@@ -9560,7 +9560,7 @@ _0211a884:
.align 2, 0
_0211a944: .word data_ov12_02137c64
_0211a948: .word gMapManager
_0211a94c: .word data_027e0f94
_0211a94c: .word gPlayerPos
_0211a950: .word data_027e0fcc
_0211a954: .word data_027e0fd4
_0211a958: .word data_027e071c
@@ -9669,13 +9669,13 @@ func_ov12_0211aa40: ; 0x0211aa40
func_ov12_0211aa4c: ; 0x0211aa4c
ldr r1, _0211aa60 ; =data_027e0fac
ldr ip, _0211aa64 ; =func_ov12_0212e324
ldr r0, _0211aa68 ; =data_027e0f94
ldr r0, _0211aa68 ; =gPlayerPos
ldrsh r1, [r1]
bx ip
.align 2, 0
_0211aa60: .word data_027e0fac
_0211aa64: .word func_ov12_0212e324
_0211aa68: .word data_027e0f94
_0211aa68: .word gPlayerPos
arm_func_end func_ov12_0211aa4c
.global func_ov12_0211aa6c
@@ -10502,7 +10502,7 @@ func_ov12_0211b4ec: ; 0x0211b4ec
ldmeqia sp!, {r3, r4, r5, pc}
_0211b528:
bl func_ov12_0211934c
ldr r1, _0211b68c ; =data_027e0f94
ldr r1, _0211b68c ; =gPlayerPos
bl func_ov12_021196d4
cmp r0, #0
addeq sp, sp, #0x78
@@ -10596,7 +10596,7 @@ _0211b640:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0211b688: .word data_027e0618
_0211b68c: .word data_027e0f94
_0211b68c: .word gPlayerPos
_0211b690: .word data_027e0d3c
_0211b694: .word data_ov12_02137c64
arm_func_end func_ov12_0211b4ec
@@ -10898,7 +10898,7 @@ func_ov12_0211ba94: ; 0x0211ba94
sub sp, sp, #0x24
mov r4, r2
bl func_ov12_0211934c
ldr r1, _0211bafc ; =data_027e0f94
ldr r1, _0211bafc ; =gPlayerPos
bl func_ov12_021196d4
cmp r0, #0
addeq sp, sp, #0x24
@@ -10921,7 +10921,7 @@ func_ov12_0211ba94: ; 0x0211ba94
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0211bafc: .word data_027e0f94
_0211bafc: .word gPlayerPos
_0211bb00: .word 0x0000059a
_0211bb04: .word data_ov00_020e9370
arm_func_end func_ov12_0211ba94
@@ -29604,7 +29604,7 @@ _0212af10:
cmp r0, #0
beq _0212af94
bl func_ov12_0211934c
ldr r1, _0212b074 ; =data_027e0f94
ldr r1, _0212b074 ; =gPlayerPos
bl func_ov12_021196d4
cmp r0, #0
addeq sp, sp, #0x38
@@ -29686,7 +29686,7 @@ _0212b04c:
.align 2, 0
_0212b06c: .word data_027e0618
_0212b070: .word data_027e0d3c
_0212b074: .word data_027e0f94
_0212b074: .word gPlayerPos
arm_func_end func_ov12_0212aec8
.global func_ov12_0212b078
@@ -30919,7 +30919,7 @@ func_ov12_0212bff0: ; 0x0212bff0
mov r4, r3
cmp r1, #0
bne _0212c058
ldr r2, _0212c1a8 ; =data_027e0f94
ldr r2, _0212c1a8 ; =gPlayerPos
ldr r1, _0212c1ac ; =data_027e0fa0
ldr r3, [r2]
ldr r0, _0212c1b0 ; =data_027e0fac
@@ -30943,7 +30943,7 @@ _0212c058:
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
bne _0212c0b4
ldr r2, _0212c1a8 ; =data_027e0f94
ldr r2, _0212c1a8 ; =gPlayerPos
ldr r1, _0212c1ac ; =data_027e0fa0
ldr r3, [r2]
ldr r0, _0212c1b0 ; =data_027e0fac
@@ -31026,7 +31026,7 @@ _0212c10c:
str r0, [r6, #8]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0212c1a8: .word data_027e0f94
_0212c1a8: .word gPlayerPos
_0212c1ac: .word data_027e0fa0
_0212c1b0: .word data_027e0fac
_0212c1b4: .word gActorManager
@@ -32244,7 +32244,7 @@ _0212cf94:
ldr r1, [r5, #0x224]
cmp r1, #3
bne _0212cffc
ldr r0, _0212d07c ; =data_027e0f94
ldr r0, _0212d07c ; =gPlayerPos
mov r4, #0
ldr r1, [r0]
str r1, [r5, #0x48]
@@ -32291,7 +32291,7 @@ _0212d06c: .word data_ov00_020eec9c
_0212d070: .word data_ov12_02137c64
_0212d074: .word data_ov12_02137d28
_0212d078: .word data_ov12_0213dd0c
_0212d07c: .word data_027e0f94
_0212d07c: .word gPlayerPos
_0212d080: .word data_ov12_02137d20
_0212d084: .word data_ov12_021370e0
arm_func_end func_ov12_0212cf0c
@@ -32304,7 +32304,7 @@ func_ov12_0212d088: ; 0x0212d088
ldr r1, [r4, #0x224]
cmp r1, #3
bne _0212d0c8
ldr r0, _0212d11c ; =data_027e0f94
ldr r0, _0212d11c ; =gPlayerPos
ldr r1, [r0]
str r1, [r4, #0x48]
ldr r1, [r0, #4]
@@ -32339,7 +32339,7 @@ _0212d0f8:
bl func_ov12_0212cc64
ldmia sp!, {r4, pc}
.align 2, 0
_0212d11c: .word data_027e0f94
_0212d11c: .word gPlayerPos
_0212d120: .word data_ov12_02137d20
arm_func_end func_ov12_0212d088
@@ -33798,7 +33798,7 @@ func_ov12_0212e274: ; 0x0212e274
ldr r0, _0212e2f4 ; =data_027e0fe8
ldr r1, _0212e2f8 ; =0x4254444c
ldr r0, [r0]
ldr r2, _0212e2fc ; =data_027e0f94
ldr r2, _0212e2fc ; =gPlayerPos
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _0212e300 ; =gActorManager
@@ -33814,7 +33814,7 @@ func_ov12_0212e274: ; 0x0212e274
.align 2, 0
_0212e2f4: .word data_027e0fe8
_0212e2f8: .word 0x4254444c
_0212e2fc: .word data_027e0f94
_0212e2fc: .word gPlayerPos
_0212e300: .word gActorManager
_0212e304: .word data_ov12_0213dd10
arm_func_end func_ov12_0212e274
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -166,7 +166,7 @@
.extern data_027e0f78
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
asm/ov14/ov14_0211f640.s
+11 -11
View File
@@ -1905,7 +1905,7 @@ _02120e80:
mov r3, #0
bl func_ov00_020c070c
_02120e94:
ldr r1, _02120ed0 ; =data_027e0f94
ldr r1, _02120ed0 ; =gPlayerPos
add r2, sp, #0
add r0, r4, #0x54
bl func_01ff9bf8
@@ -1922,7 +1922,7 @@ _02120ec4:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02120ed0: .word data_027e0f94
_02120ed0: .word gPlayerPos
arm_func_end func_ov14_02120e54
.global func_ov14_02120ed4
@@ -3785,7 +3785,7 @@ _021228d4:
bl func_ov14_02122bb8
b _021229e0
_021228f0:
ldr r0, _02122afc ; =data_027e0f94
ldr r0, _02122afc ; =gPlayerPos
ldr r2, [r5, #0x4c]
ldr r1, [r0, #4]
mov r0, r5
@@ -3924,7 +3924,7 @@ _02122aec: .word data_ov14_02153bdc
_02122af0: .word data_ov14_02153be8
_02122af4: .word 0xffffd555
_02122af8: .word 0xffffd99a
_02122afc: .word data_027e0f94
_02122afc: .word gPlayerPos
_02122b00: .word 0x00000666
_02122b04: .word 0x0000099a
_02122b08: .word data_027e0e58
@@ -4129,7 +4129,7 @@ func_ov14_02122d6c: ; 0x02122d6c
bl func_01ff9cec
cmp r0, #0x29
ble _02122db4
ldr r0, _02122e40 ; =data_027e0f94
ldr r0, _02122e40 ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x48]
ldr r0, [r0, #8]
@@ -4141,7 +4141,7 @@ func_ov14_02122d6c: ; 0x02122d6c
ldr r0, [r5, #0x50]
b _02122dcc
_02122db4:
ldr r0, _02122e40 ; =data_027e0f94
ldr r0, _02122e40 ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x54]
ldr r1, [r5, #0x4c]
@@ -4178,7 +4178,7 @@ _02122dcc:
str r2, [r5, #0x68]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02122e40: .word data_027e0f94
_02122e40: .word gPlayerPos
_02122e44: .word 0x00000ccd
arm_func_end func_ov14_02122d6c
@@ -17961,7 +17961,7 @@ func_ov14_0212df64: ; 0x0212df64
beq _0212e0e4
b _0212dff0
_0212df8c:
ldr r1, _0212e0f0 ; =data_027e0f94
ldr r1, _0212e0f0 ; =gPlayerPos
add r0, r4, #0x38
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -18060,7 +18060,7 @@ _0212e0e4:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0212e0f0: .word data_027e0f94
_0212e0f0: .word gPlayerPos
_0212e0f4: .word gActorManager
_0212e0f8: .word 0x50534241
_0212e0fc: .word 0x424c5354
@@ -20854,7 +20854,7 @@ func_ov14_021305c4: ; 0x021305c4
mov r4, r0
cmp r1, #0
beq _02130610
ldr r1, _02130644 ; =data_027e0f94
ldr r1, _02130644 ; =gPlayerPos
add r0, r4, #0x38
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -20883,7 +20883,7 @@ _02130610:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02130644: .word data_027e0f94
_02130644: .word gPlayerPos
_02130648: .word gPlayer
arm_func_end func_ov14_021305c4
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -167,7 +167,7 @@
.extern data_027e0f6c
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fb8
.extern data_027e0fc0
asm/ov14/ov14_0213b778.s
+23 -23
View File
@@ -5007,7 +5007,7 @@ _0213f1bc:
ldr r0, [r0]
bl func_ov00_020b8610
ldr r0, _0213f320 ; =data_027e0fcc
ldr r2, _0213f32c ; =data_027e0f94
ldr r2, _0213f32c ; =gPlayerPos
ldr r0, [r0]
mov r1, #1
bl func_ov00_020b4460
@@ -5018,7 +5018,7 @@ _0213f218:
ldr r0, [r0]
bl func_ov00_020b8610
ldr r0, _0213f320 ; =data_027e0fcc
ldr r2, _0213f32c ; =data_027e0f94
ldr r2, _0213f32c ; =gPlayerPos
ldr r0, [r0]
mov r1, #0
bl func_ov00_020b4460
@@ -5047,7 +5047,7 @@ _0213f26c:
b _0213f2a4
_0213f290:
ldr r0, _0213f320 ; =data_027e0fcc
ldr r2, _0213f32c ; =data_027e0f94
ldr r2, _0213f32c ; =gPlayerPos
ldr r0, [r0]
mov r1, #0
bl func_ov14_02141af0
@@ -5092,7 +5092,7 @@ _0213f31c: .word data_027e0fd4
_0213f320: .word data_027e0fcc
_0213f324: .word gAdventureFlags
_0213f328: .word data_027e0fc0
_0213f32c: .word data_027e0f94
_0213f32c: .word gPlayerPos
_0213f330: .word data_027e0d38
arm_func_end func_ov14_0213f104
@@ -5429,7 +5429,7 @@ _0213f644:
str r1, [sp]
str r1, [sp, #4]
ldr r0, _0213f718 ; =data_027e0e58
ldr r2, _0213f71c ; =data_027e0f94
ldr r2, _0213f71c ; =gPlayerPos
ldr r0, [r0]
mov r1, #0x1a8
bl func_ov00_0207c1b0
@@ -5441,7 +5441,7 @@ _0213f6e4:
ldr r0, _0213f718 ; =data_027e0e58
ldr r1, _0213f720 ; =0x000001a7
ldr r0, [r0]
ldr r2, _0213f71c ; =data_027e0f94
ldr r2, _0213f71c ; =gPlayerPos
bl func_ov00_0207c1b0
add sp, sp, #0xc
ldmia sp!, {pc}
@@ -5451,7 +5451,7 @@ _0213f70c: .word 0x000003ae
_0213f710: .word data_027e0fa0
_0213f714: .word data_027e0fb8
_0213f718: .word data_027e0e58
_0213f71c: .word data_027e0f94
_0213f71c: .word gPlayerPos
_0213f720: .word 0x000001a7
arm_func_end func_ov14_0213f600
@@ -5606,7 +5606,7 @@ _0213f8f0:
bl func_ov00_020bc4ac
ldr r0, _0213f95c ; =data_ov00_020eec9c
ldr r1, _0213f970 ; =0x0000011e
ldr r2, _0213f974 ; =data_027e0f94
ldr r2, _0213f974 ; =gPlayerPos
bl func_ov00_020d7b20
_0213f930:
mov r4, #1
@@ -5616,7 +5616,7 @@ _0213f938:
str r0, [r5, #0x70]
_0213f940:
ldr r0, _0213f978 ; =data_027e0fcc
ldr r2, _0213f974 ; =data_027e0f94
ldr r2, _0213f974 ; =gPlayerPos
ldr r0, [r0]
mov r1, r4
bl func_ov14_02141af0
@@ -5629,7 +5629,7 @@ _0213f964: .word gItemManager
_0213f968: .word 0x88888889
_0213f96c: .word data_027e077c
_0213f970: .word 0x0000011e
_0213f974: .word data_027e0f94
_0213f974: .word gPlayerPos
_0213f978: .word data_027e0fcc
arm_func_end func_ov14_0213f740
@@ -5674,7 +5674,7 @@ _0213f9c4:
bl func_ov00_020d77e4
_0213fa04:
ldr r0, _0213fa24 ; =data_027e0fcc
ldr r2, _0213fa28 ; =data_027e0f94
ldr r2, _0213fa28 ; =gPlayerPos
ldr r0, [r0]
mov r1, #0
bl func_ov14_02141af0
@@ -5683,7 +5683,7 @@ _0213fa04:
_0213fa1c: .word data_027e0fd4
_0213fa20: .word data_ov00_020eec9c
_0213fa24: .word data_027e0fcc
_0213fa28: .word data_027e0f94
_0213fa28: .word gPlayerPos
arm_func_end func_ov14_0213f97c
.global func_ov14_0213fa2c
@@ -15737,7 +15737,7 @@ func_ov14_02147584: ; 0x02147584
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
ldr r2, _02147678 ; =data_027e0fa0
ldr ip, _0214767c ; =data_027e0f94
ldr ip, _0214767c ; =gPlayerPos
ldr r5, [r2, #8]
ldmia ip, {r3, r9}
ldr r8, [ip, #8]
@@ -15798,7 +15798,7 @@ _02147624:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02147678: .word data_027e0fa0
_0214767c: .word data_027e0f94
_0214767c: .word gPlayerPos
_02147680: .word gPlayerLink
_02147684: .word data_027e0fd0
_02147688: .word 0xfffffe66
@@ -19692,7 +19692,7 @@ _0214a928: .word 0x000004fa
func_ov14_0214a92c: ; 0x0214a92c
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x10
ldr r4, _0214aa08 ; =data_027e0f94
ldr r4, _0214aa08 ; =gPlayerPos
add ip, sp, #4
mov r7, r0
mov r6, r1
@@ -19749,7 +19749,7 @@ _0214a9f4:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0214aa08: .word data_027e0f94
_0214aa08: .word gPlayerPos
arm_func_end func_ov14_0214a92c
.global func_ov14_0214aa0c
@@ -19787,7 +19787,7 @@ _0214aa64:
mvn r0, #0
cmp r1, r0
bne _0214aaa8
ldr r1, _0214ab0c ; =data_027e0f94
ldr r1, _0214ab0c ; =gPlayerPos
mov r0, #1
ldr r2, [r1]
str r2, [r4]
@@ -19814,7 +19814,7 @@ _0214aaa8:
mov r0, #1
ldmia sp!, {r4, pc}
_0214aad8:
ldr r1, _0214ab0c ; =data_027e0f94
ldr r1, _0214ab0c ; =gPlayerPos
mov r0, #0
ldr r2, [r1]
str r2, [r4]
@@ -19828,7 +19828,7 @@ _0214aad8:
str r1, [r4, #4]
ldmia sp!, {r4, pc}
.align 2, 0
_0214ab0c: .word data_027e0f94
_0214ab0c: .word gPlayerPos
_0214ab10: .word gActorManager
arm_func_end func_ov14_0214aa2c
@@ -20359,7 +20359,7 @@ _0214b188:
ldr r2, [r0]
ldr r2, [r2, #0x34]
blx r2
ldr r1, _0214b29c ; =data_027e0f94
ldr r1, _0214b29c ; =gPlayerPos
add r0, sp, #0x18
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -20430,7 +20430,7 @@ _0214b28c: .word data_ov14_02159cec
_0214b290: .word 0x47524d47
_0214b294: .word gAdventureFlags
_0214b298: .word data_027e0c68
_0214b29c: .word data_027e0f94
_0214b29c: .word gPlayerPos
arm_func_end func_ov14_0214b018
.global func_ov14_0214b2a0
@@ -30386,7 +30386,7 @@ func_ov14_02152e44: ; 0x02152e44
beq _02152fc4
b _02152ed0
_02152e6c:
ldr r1, _02152fd0 ; =data_027e0f94
ldr r1, _02152fd0 ; =gPlayerPos
add r0, r4, #0x38
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -30485,7 +30485,7 @@ _02152fc4:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02152fd0: .word data_027e0f94
_02152fd0: .word gPlayerPos
_02152fd4: .word gActorManager
_02152fd8: .word 0x50534241
_02152fdc: .word 0x424c5354
asm/ov15.inc
+1 -1
View File
@@ -218,7 +218,7 @@
.extern data_027e0f7c
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb0
asm/ov15.s
+466 -466
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+1 -1
View File
@@ -98,7 +98,7 @@
.extern data_027e0f78
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc4
asm/ov17.s
+14 -14
View File
@@ -4511,7 +4511,7 @@ _0215edf4:
bl func_ov17_0215e9ec
b _0215ee3c
_0215ee1c:
ldr r0, _0215ee58 ; =data_027e0f94
ldr r0, _0215ee58 ; =gPlayerPos
add r1, r4, #0x48
bl func_01ff9ec0
cmp r0, #0x1000
@@ -4528,7 +4528,7 @@ _0215ee3c:
.align 2, 0
_0215ee50: .word data_027e0d0c
_0215ee54: .word gPlayerLink
_0215ee58: .word data_027e0f94
_0215ee58: .word gPlayerPos
_0215ee5c: .word 0x00000733
arm_func_end func_ov17_0215ea94
@@ -5165,7 +5165,7 @@ _0215f6a4:
bl func_ov17_0215f2e4
b _0215f6ec
_0215f6cc:
ldr r0, _0215f714 ; =data_027e0f94
ldr r0, _0215f714 ; =gPlayerPos
add r1, r4, #0x48
bl func_01ff9ec0
cmp r0, #0x1000
@@ -5185,7 +5185,7 @@ _0215f704: .word 0x000001c3
_0215f708: .word data_027e0d0c
_0215f70c: .word data_027e0ffc
_0215f710: .word gPlayerLink
_0215f714: .word data_027e0f94
_0215f714: .word gPlayerPos
_0215f718: .word 0x00000733
arm_func_end func_ov17_0215f300
@@ -12487,7 +12487,7 @@ _02165280: .word gMapManager
func_ov17_02165284: ; 0x02165284
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x14
ldr r1, _02165304 ; =data_027e0f94
ldr r1, _02165304 ; =gPlayerPos
mov r4, r0
ldr r2, [r1]
ldr r0, [r1, #4]
@@ -12518,7 +12518,7 @@ func_ov17_02165284: ; 0x02165284
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02165304: .word data_027e0f94
_02165304: .word gPlayerPos
_02165308: .word gActorManager
_0216530c: .word data_ov17_0216c794
arm_func_end func_ov17_02165284
@@ -13832,7 +13832,7 @@ _021661e4: .word gAdventureFlags
func_ov17_021661e8: ; 0x021661e8
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r1, _02166228 ; =data_027e0f94
ldr r1, _02166228 ; =gPlayerPos
add r0, r0, #0x170
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -13847,7 +13847,7 @@ func_ov17_021661e8: ; 0x021661e8
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_02166228: .word data_027e0f94
_02166228: .word gPlayerPos
arm_func_end func_ov17_021661e8
.global func_ov17_0216622c
@@ -13860,7 +13860,7 @@ func_ov17_0216622c: ; 0x0216622c
add r1, sp, #0xc
ldr r2, [r2, #0x3c]
blx r2
ldr r0, _0216628c ; =data_027e0f94
ldr r0, _0216628c ; =gPlayerPos
ldr r2, [sp, #0x10]
ldr r1, [r0, #4]
ldr r3, [r0]
@@ -13878,7 +13878,7 @@ func_ov17_0216622c: ; 0x0216622c
add sp, sp, #0x18
ldmia sp!, {r3, pc}
.align 2, 0
_0216628c: .word data_027e0f94
_0216628c: .word gPlayerPos
arm_func_end func_ov17_0216622c
.global func_ov17_02166290
@@ -15503,7 +15503,7 @@ _02167874: .word func_ov00_0208b9e4
func_ov17_02167878: ; 0x02167878
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r2, _021678bc ; =data_027e0f94
ldr r2, _021678bc ; =gPlayerPos
add r1, sp, #0
ldr ip, [r2]
ldr r3, [r2, #4]
@@ -15519,7 +15519,7 @@ func_ov17_02167878: ; 0x02167878
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_021678bc: .word data_027e0f94
_021678bc: .word gPlayerPos
arm_func_end func_ov17_02167878
.global func_ov17_021678c0
@@ -18440,7 +18440,7 @@ func_ov17_02169d4c: ; 0x02169d4c
mov r0, #2
ldmia sp!, {r3, r4, r5, r6, pc}
_02169e50:
ldr r1, _02169ec4 ; =data_027e0f94
ldr r1, _02169ec4 ; =gPlayerPos
add r0, r6, #0x38
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -18471,7 +18471,7 @@ _02169eac:
_02169eb8: .word 0x00001333
_02169ebc: .word gActorManager
_02169ec0: .word 0x42494752
_02169ec4: .word data_027e0f94
_02169ec4: .word gPlayerPos
_02169ec8: .word gPlayerLink
arm_func_end func_ov17_02169d4c
asm/ov18.inc
+1 -1
View File
@@ -95,7 +95,7 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
asm/ov18.s
+13 -13
View File
@@ -812,7 +812,7 @@ _0215bfc4: .word data_027e0f64
func_ov18_0215bfc8: ; 0x0215bfc8
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x10
ldr r2, _0215c12c ; =data_027e0f94
ldr r2, _0215c12c ; =gPlayerPos
ldr r1, _0215c130 ; =gMapManager
ldr r4, [r2]
ldr r3, [r2, #4]
@@ -907,7 +907,7 @@ _0215c108:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215c12c: .word data_027e0f94
_0215c12c: .word gPlayerPos
_0215c130: .word gMapManager
_0215c134: .word 0x0000019a
_0215c138: .word data_ov18_0216b43c
@@ -8907,7 +8907,7 @@ _02162658:
ldr r0, [r0, #4]
cmp r0, #0
bne _02162708
ldr r1, _0216271c ; =data_027e0f94
ldr r1, _0216271c ; =gPlayerPos
add r0, sp, #0
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -8944,7 +8944,7 @@ _02162708:
.align 2, 0
_02162714: .word gPlayerLink
_02162718: .word data_027e0fd0
_0216271c: .word data_027e0f94
_0216271c: .word gPlayerPos
_02162720: .word 0xfffffaec
_02162724: .word 0x00000514
_02162728: .word data_027e0f64
@@ -13557,7 +13557,7 @@ _021662f4:
mov r4, r0
cmp r4, #0x7e
beq _02166354
ldr r1, _0216666c ; =data_027e0f94
ldr r1, _0216666c ; =gPlayerPos
ldr r0, _02166670 ; =data_027e0f64
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -13789,7 +13789,7 @@ _0216665c: .word data_027e103c
_02166660: .word data_ov18_0216d604
_02166664: .word data_027e0ffc
_02166668: .word 0x00000466
_0216666c: .word data_027e0f94
_0216666c: .word gPlayerPos
_02166670: .word data_027e0f64
_02166674: .word gPlayerLink
_02166678: .word 0x00000467
@@ -14950,7 +14950,7 @@ func_ov18_02167644: ; 0x02167644
add r0, r4, #0x1f8
add r2, r2, #0x48
bl func_ov14_0214a92c
ldr r0, _021676f0 ; =data_027e0f94
ldr r0, _021676f0 ; =gPlayerPos
add r3, sp, #0xc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -14980,7 +14980,7 @@ func_ov18_02167644: ; 0x02167644
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_021676f0: .word data_027e0f94
_021676f0: .word gPlayerPos
arm_func_end func_ov18_02167644
.global func_ov18_021676f4
@@ -15658,7 +15658,7 @@ _02168018:
str r3, [sp, #8]
ldmia r5, {r1, r2, r3}
bl func_ov18_02166810
ldr r0, _021681ec ; =data_027e0f94
ldr r0, _021681ec ; =gPlayerPos
add r1, sp, #0x1c
ldmib r0, {r2, r3}
ldr r5, [r0]
@@ -15674,7 +15674,7 @@ _02168018:
strb r0, [r4, #0x475]
b _021681ac
_021680ac:
ldr r0, _021681ec ; =data_027e0f94
ldr r0, _021681ec ; =gPlayerPos
mov r2, #0x800
ldmib r0, {r1, r5}
ldr r6, [r0]
@@ -15759,7 +15759,7 @@ _021681dc: .word gPlayerLink
_021681e0: .word 0xffffe38e
_021681e4: .word data_02050f54
_021681e8: .word data_ov18_0216d604
_021681ec: .word data_027e0f94
_021681ec: .word gPlayerPos
_021681f0: .word 0x00000333
arm_func_end func_ov18_02167ec8
@@ -16494,7 +16494,7 @@ func_ov18_02168c10: ; 0x02168c10
ldrne r1, [r2, #8]
cmpne r1, #0
bne _02168c74
ldr r0, _02168d6c ; =data_027e0f94
ldr r0, _02168d6c ; =gPlayerPos
ldr r2, [r4, #0x18]
ldr r1, [r0]
ldr ip, [r4, #0x20]
@@ -16573,7 +16573,7 @@ _02168d60:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_02168d6c: .word data_027e0f94
_02168d6c: .word gPlayerPos
_02168d70: .word gActorManager
_02168d74: .word 0x424c5354
arm_func_end func_ov18_02168c10
asm/ov19.inc
+1 -1
View File
@@ -119,7 +119,7 @@
.extern data_027e0f78
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fb8
.extern gPlayerLink
asm/ov19.s
+19 -19
View File
@@ -326,7 +326,7 @@ func_ov19_0216dac8: ; 0x0216dac8
sub sp, sp, #0x24
movs r4, r1
mov r5, r0
ldr r6, _0216dd94 ; =data_027e0f94
ldr r6, _0216dd94 ; =gPlayerPos
bne _0216db70
bl func_ov19_0216e98c
cmp r0, #2
@@ -508,7 +508,7 @@ _0216dc18:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0216dd94: .word data_027e0f94
_0216dd94: .word gPlayerPos
_0216dd98: .word 0x00000266
_0216dd9c: .word 0x00000b33
_0216dda0: .word 0x000004cd
@@ -521,14 +521,14 @@ _0216dda8: .word 0x0000038e
func_ov19_0216ddac: ; 0x0216ddac
stmdb sp!, {r4, lr}
mov r4, r0
ldr r1, _0216de00 ; =data_027e0f94
ldr r1, _0216de00 ; =gPlayerPos
add r0, r4, #0x1000
ldr r1, [r1]
ldr r0, [r0, #0x640]
sub r0, r1, r0
bl func_02042f74
add r1, r4, #0x1000
ldr r2, _0216de00 ; =data_027e0f94
ldr r2, _0216de00 ; =gPlayerPos
ldr r1, [r1, #0x648]
ldr r2, [r2, #8]
mov r4, r0
@@ -541,7 +541,7 @@ func_ov19_0216ddac: ; 0x0216ddac
movge r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_0216de00: .word data_027e0f94
_0216de00: .word gPlayerPos
arm_func_end func_ov19_0216ddac
.global func_ov19_0216de04
@@ -635,7 +635,7 @@ func_ov19_0216df00: ; 0x0216df00
func_ov19_0216df14: ; 0x0216df14
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _0216df8c ; =data_027e0f94
ldr r0, _0216df8c ; =gPlayerPos
add r1, r4, #0x48
add r2, r4, #0x60
bl func_01ff9bf8
@@ -664,7 +664,7 @@ func_ov19_0216df14: ; 0x0216df14
bl func_0202da8c
ldmia sp!, {r4, pc}
.align 2, 0
_0216df8c: .word data_027e0f94
_0216df8c: .word gPlayerPos
_0216df90: .word data_02050f54
_0216df94: .word 0x0000019a
arm_func_end func_ov19_0216df14
@@ -830,7 +830,7 @@ _0216e17c: .word 0x00000f33
.global func_ov19_0216e180
arm_func_start func_ov19_0216e180
func_ov19_0216e180: ; 0x0216e180
ldr r1, _0216e1c8 ; =data_027e0f94
ldr r1, _0216e1c8 ; =gPlayerPos
ldr r2, [r0, #0x4c]
ldr r1, [r1, #4]
add r1, r1, #0x4000
@@ -849,7 +849,7 @@ func_ov19_0216e180: ; 0x0216e180
str r2, [r1, #0x644]
bx lr
.align 2, 0
_0216e1c8: .word data_027e0f94
_0216e1c8: .word gPlayerPos
arm_func_end func_ov19_0216e180
.global func_ov19_0216e1cc
@@ -1080,7 +1080,7 @@ _0216e46c:
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [sp, #0x10]
ldr r0, _0216e6a0 ; =data_027e0f94
ldr r0, _0216e6a0 ; =gPlayerPos
add r6, sp, #0x2c
ldmia r0, {r0, r1, r2}
stmia r6, {r0, r1, r2}
@@ -1205,7 +1205,7 @@ _0216e690: .word data_027e0764
_0216e694: .word 0x57425341
_0216e698: .word data_027e0fe8
_0216e69c: .word gActorManager
_0216e6a0: .word data_027e0f94
_0216e6a0: .word gPlayerPos
arm_func_end func_ov19_0216e334
.global func_ov19_0216e6a4
@@ -2720,7 +2720,7 @@ _0216fa4c:
mov r0, r4
mov r1, #0
bl func_ov19_0216dac8
ldr r0, _0216fc50 ; =data_027e0f94
ldr r0, _0216fc50 ; =gPlayerPos
ldr r1, [r4, #0x50]
ldr r0, [r0, #8]
sub r0, r0, #0x2000
@@ -2857,7 +2857,7 @@ _0216fc14:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0216fc4c: .word 0xb60b60b7
_0216fc50: .word data_027e0f94
_0216fc50: .word gPlayerPos
_0216fc54: .word data_027e0764
arm_func_end func_ov19_0216f9e8
@@ -7009,7 +7009,7 @@ _02173254:
addeq sp, sp, #0x18
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r1, _021732f8 ; =data_027e0f94
ldr r1, _021732f8 ; =gPlayerPos
ldr r2, [r4, #0x1c]
ldr r3, [r1, #4]
ldr ip, [r1]
@@ -7047,7 +7047,7 @@ _021732b8:
.align 2, 0
_021732f0: .word data_027e0f78
_021732f4: .word data_027e0f64
_021732f8: .word data_027e0f94
_021732f8: .word gPlayerPos
_021732fc: .word 0xfffff19a
_02173300: .word gPlayerLink
arm_func_end func_ov19_021731e8
@@ -8540,7 +8540,7 @@ _02174604:
str r1, [r7, #0x350]
ldmia sp!, {r4, r5, r6, r7, pc}
_0217467c:
ldr r4, _0217478c ; =data_027e0f94
ldr r4, _0217478c ; =gPlayerPos
add r0, r7, #0x48
mov r1, r4
ldr r5, _02174790 ; =data_027e0fa0
@@ -8612,7 +8612,7 @@ _0217475c:
.align 2, 0
_02174784: .word gActorManager
_02174788: .word 0x424f4d42
_0217478c: .word data_027e0f94
_0217478c: .word gPlayerPos
_02174790: .word data_027e0fa0
_02174794: .word 0x0000019a
_02174798: .word gMapManager
@@ -8631,7 +8631,7 @@ func_ov19_0217479c: ; 0x0217479c
ldr r0, [r4, #0x34c]
cmp r0, #0
bne _021747e4
ldr r0, _02174870 ; =data_027e0f94
ldr r0, _02174870 ; =gPlayerPos
ldr r2, [r0]
ldr r1, [r0, #4]
str r2, [sp, #0xc]
@@ -8677,7 +8677,7 @@ _02174824:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_02174870: .word data_027e0f94
_02174870: .word gPlayerPos
_02174874: .word gActorManager
_02174878: .word 0x0000071c
_0217487c: .word 0x00000333
asm/ov20.inc
+1 -1
View File
@@ -111,7 +111,7 @@
.extern data_027e0f68
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
asm/ov20.s
+17 -17
View File
@@ -752,7 +752,7 @@ _0216e0e0:
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e120:
ldr r0, _0216e544 ; =data_027e0f94
ldr r0, _0216e544 ; =gPlayerPos
add r3, sp, #0x68
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -1026,7 +1026,7 @@ _0216e534: .word data_02050f54
_0216e538: .word 0x55555556
_0216e53c: .word data_ov20_02177878
_0216e540: .word data_027e0ffc
_0216e544: .word data_027e0f94
_0216e544: .word gPlayerPos
_0216e548: .word data_027e0764
_0216e54c: .word 0x00008001
_0216e550: .word gMapManager
@@ -2382,7 +2382,7 @@ func_ov20_0216f82c: ; 0x0216f82c
mov r4, r0
add r0, r4, #0xa00
ldrsh r0, [r0, #0x70]
ldr r1, _0216f894 ; =data_027e0f94
ldr r1, _0216f894 ; =gPlayerPos
add r2, sp, #0
add r0, r4, r0, lsl #2
ldr r0, [r0, #0xa40]
@@ -2405,7 +2405,7 @@ _0216f870:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216f894: .word data_027e0f94
_0216f894: .word gPlayerPos
arm_func_end func_ov20_0216f82c
.global func_ov20_0216f898
@@ -2588,7 +2588,7 @@ func_ov20_0216fa6c: ; 0x0216fa6c
str r1, [sp, #0x30]
bl func_ov00_020c3348
ldr r1, [r4, #8]
ldr r0, _0216fb84 ; =data_027e0f94
ldr r0, _0216fb84 ; =gPlayerPos
str r1, [sp, #0x2c]
ldr r4, [r4, #0xc]
add r3, sp, #4
@@ -2648,7 +2648,7 @@ func_ov20_0216fa6c: ; 0x0216fa6c
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0216fb84: .word data_027e0f94
_0216fb84: .word gPlayerPos
_0216fb88: .word data_027e0764
_0216fb8c: .word 0x00004001
_0216fb90: .word data_027e0fe8
@@ -3567,7 +3567,7 @@ _021706a0:
ldrsh r5, [r1, r2]
mov r0, r0, lsl #0x1
ldrsh ip, [r1, r0]
ldr r2, _0217073c ; =data_027e0f94
ldr r2, _0217073c ; =gPlayerPos
add r1, sp, #0
add r3, sp, #0xc
mov r0, #0x3800
@@ -3591,7 +3591,7 @@ _0217072c: .word 0xffffce39
_02170730: .word 0x0000071c
_02170734: .word 0xfffff8e4
_02170738: .word data_02050f54
_0217073c: .word data_027e0f94
_0217073c: .word gPlayerPos
arm_func_end func_ov20_021705ec
.global func_ov20_02170740
@@ -4909,7 +4909,7 @@ func_ov20_021718bc: ; 0x021718bc
beq _021719b8
b _021719c0
_021718dc:
ldr r0, _021719d4 ; =data_027e0f94
ldr r0, _021719d4 ; =gPlayerPos
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -4975,7 +4975,7 @@ _021719c0:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021719d4: .word data_027e0f94
_021719d4: .word gPlayerPos
_021719d8: .word 0x00000333
arm_func_end func_ov20_021718bc
@@ -7661,7 +7661,7 @@ func_ov20_02173ce4: ; 0x02173ce4
ldr r1, [sp, #0x44]
add r0, sp, #0x3c
add r2, r1, #0x1000
ldr r1, _02173e34 ; =data_027e0f94
ldr r1, _02173e34 ; =gPlayerPos
str r2, [sp, #0x44]
bl func_01ff9ec0
mov r4, r0
@@ -7683,7 +7683,7 @@ _02173e20:
.align 2, 0
_02173e2c: .word 0x0000ffff
_02173e30: .word gMapManager
_02173e34: .word data_027e0f94
_02173e34: .word gPlayerPos
arm_func_end func_ov20_02173ce4
.global func_ov20_02173e38
@@ -8680,7 +8680,7 @@ _02174a20:
ldr r0, [r6, #0x15c]
cmp r0, #0
bne _02174b28
ldr r1, _02174ba4 ; =data_027e0f94
ldr r1, _02174ba4 ; =gPlayerPos
add r2, sp, #0x34
add r0, r6, #0x48
bl func_01ff9bf8
@@ -8730,7 +8730,7 @@ _02174b28:
_02174b4c:
cmp r2, #0
bne _02174b88
ldr r0, _02174ba4 ; =data_027e0f94
ldr r0, _02174ba4 ; =gPlayerPos
add r2, sp, #0x10
add r1, r6, #0x54
bl func_01ff9bf8
@@ -8752,7 +8752,7 @@ _02174b94: .word gItemManager
_02174b98: .word 0x000008a4
_02174b9c: .word 0x00000733
_02174ba0: .word gMapManager
_02174ba4: .word data_027e0f94
_02174ba4: .word gPlayerPos
arm_func_end func_ov20_021749dc
.global func_ov20_02174ba8
@@ -9867,7 +9867,7 @@ _021759c4:
add sp, sp, #0x19c
ldmia sp!, {r4, r5, pc}
_021759e8:
ldr r0, _02175f10 ; =data_027e0f94
ldr r0, _02175f10 ; =gPlayerPos
add r3, sp, #0xe0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -10216,7 +10216,7 @@ _02175ec8:
add sp, sp, #0x19c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02175f10: .word data_027e0f94
_02175f10: .word gPlayerPos
_02175f14: .word gMapManager
_02175f18: .word data_027e077c
_02175f1c: .word gAdventureFlags
asm/ov21.inc
+1 -1
View File
@@ -77,7 +77,7 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
asm/ov21.s
+6 -6
View File
@@ -487,7 +487,7 @@ _0216dc54: .word func_ov00_020b7d74
func_ov21_0216dc58: ; 0x0216dc58
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r1, _0216dcb0 ; =data_027e0f94
ldr r1, _0216dcb0 ; =gPlayerPos
mov ip, r0
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -508,7 +508,7 @@ func_ov21_0216dc58: ; 0x0216dc58
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_0216dcb0: .word data_027e0f94
_0216dcb0: .word gPlayerPos
arm_func_end func_ov21_0216dc58
.global func_ov21_0216dcb4
@@ -1077,7 +1077,7 @@ _0216e3d8: .word data_ov21_021710a0
func_ov21_0216e3dc: ; 0x0216e3dc
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _0216e460 ; =data_027e0f94
ldr r1, _0216e460 ; =gPlayerPos
mov r4, r0
add r3, sp, #0
ldmia r1, {r0, r1, r2}
@@ -1112,7 +1112,7 @@ _0216e44c:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216e460: .word data_027e0f94
_0216e460: .word gPlayerPos
arm_func_end func_ov21_0216e3dc
.global func_ov21_0216e464
@@ -1417,7 +1417,7 @@ _0216e830:
ldr r0, [r0, #0x14]
cmp r0, #0x15000
bge _0216e868
ldr r1, _0216e8d4 ; =data_027e0f94
ldr r1, _0216e8d4 ; =gPlayerPos
mov r0, r4
bl _ZN5Actor10GetAngleToEP5Vec3p
mov r1, r0
@@ -1456,7 +1456,7 @@ _0216e8c4: .word data_02050f54
_0216e8c8: .word 0x000009be
_0216e8cc: .word data_027e0ffc
_0216e8d0: .word 0x0000024f
_0216e8d4: .word data_027e0f94
_0216e8d4: .word gPlayerPos
_0216e8d8: .word 0x00000aab
_0216e8dc: .word 0x00000c51
arm_func_end func_ov21_0216e74c
asm/ov22.inc
+1 -1
View File
@@ -114,7 +114,7 @@
.extern data_027e0f78
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
asm/ov22.s
+16 -16
View File
@@ -3474,7 +3474,7 @@ _02170474:
cmpeq r0, #0
addne sp, sp, #0xc
ldmneia sp!, {r3, r4, pc}
ldr r0, _021704f8 ; =data_027e0f94
ldr r0, _021704f8 ; =gPlayerPos
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -3502,7 +3502,7 @@ _02170474:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021704f8: .word data_027e0f94
_021704f8: .word gPlayerPos
_021704fc: .word data_027e0fd4
arm_func_end func_ov22_02170434
@@ -3614,7 +3614,7 @@ func_ov22_02170628: ; 0x02170628
add r0, r4, #0x14
ldmia r0, {r0, r1, r2}
add lr, sp, #0x38
ldr ip, _0217080c ; =data_027e0f94
ldr ip, _0217080c ; =gPlayerPos
stmia lr, {r0, r1, r2}
add r3, sp, #0x2c
ldmia ip, {r0, r1, r2}
@@ -3737,7 +3737,7 @@ _021707fc:
add sp, sp, #0x44
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0217080c: .word data_027e0f94
_0217080c: .word gPlayerPos
_02170810: .word data_02050f54
_02170814: .word 0x0000019a
_02170818: .word 0x0000038e
@@ -3772,7 +3772,7 @@ func_ov22_02170854: ; 0x02170854
add r0, r4, #0x14
ldmia r0, {r0, r1, r2}
add lr, sp, #0x30
ldr ip, _02170934 ; =data_027e0f94
ldr ip, _02170934 ; =gPlayerPos
stmia lr, {r0, r1, r2}
add r3, sp, #0x24
ldmia ip, {r0, r1, r2}
@@ -3823,7 +3823,7 @@ func_ov22_02170854: ; 0x02170854
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02170934: .word data_027e0f94
_02170934: .word gPlayerPos
_02170938: .word data_02050f54
arm_func_end func_ov22_02170854
@@ -4934,7 +4934,7 @@ func_ov22_02171770: ; 0x02171770
ldr r0, [r4, #0x50]
str r0, [r4, #0x738]
_021717d8:
ldr r0, _02171934 ; =data_027e0f94
ldr r0, _02171934 ; =gPlayerPos
add r3, sp, #0x18
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -5026,7 +5026,7 @@ _0217190c:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02171930: .word gMapManager
_02171934: .word data_027e0f94
_02171934: .word gPlayerPos
_02171938: .word 0x0000071c
_0217193c: .word data_02050f54
_02171940: .word 0x00000333
@@ -5037,7 +5037,7 @@ _02171940: .word 0x00000333
func_ov22_02171944: ; 0x02171944
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _02171998 ; =data_027e0f94
ldr r1, _02171998 ; =gPlayerPos
ldr r3, _0217199c ; =gPlayer
mov r4, r0
add ip, sp, #0
@@ -5057,7 +5057,7 @@ func_ov22_02171944: ; 0x02171944
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02171998: .word data_027e0f94
_02171998: .word gPlayerPos
_0217199c: .word gPlayer
arm_func_end func_ov22_02171944
@@ -6879,7 +6879,7 @@ func_ov22_021730f0: ; 0x021730f0
beq _02173160
ldmia sp!, {r4, pc}
_02173114:
ldr r1, _02173180 ; =data_027e0f94
ldr r1, _02173180 ; =gPlayerPos
mov r0, r4
bl func_ov22_021719a0
cmp r0, #0
@@ -6909,7 +6909,7 @@ _02173160:
bl func_ov22_0217283c
ldmia sp!, {r4, pc}
.align 2, 0
_02173180: .word data_027e0f94
_02173180: .word gPlayerPos
arm_func_end func_ov22_021730f0
.global func_ov22_02173184
@@ -8103,7 +8103,7 @@ _02174134:
mov r1, r1, asr #0xc
str r1, [r5, #0x68]
bl _ZN5Actor16XzDistanceToLinkEv
ldr r1, _02174618 ; =data_027e0f94
ldr r1, _02174618 ; =gPlayerPos
ldr r2, [r5, #0x4c]
ldr r1, [r1, #4]
mov r4, r0
@@ -8423,7 +8423,7 @@ _02174604:
_0217460c: .word gMapManager
_02174610: .word data_027e0764
_02174614: .word data_02050f54
_02174618: .word data_027e0f94
_02174618: .word gPlayerPos
_0217461c: .word 0x00001555
_02174620: .word 0x000005dc
_02174624: .word 0xffffeaab
@@ -12154,7 +12154,7 @@ _02177548:
ldr r1, [r4, #0x328]
ldr r7, _021776f4 ; =data_027e0764
ldrb r1, [r5, r1]
ldr r0, _021776f8 ; =data_027e0f94
ldr r0, _021776f8 ; =gPlayerPos
ldr r6, [r7]
ldr r5, [r0]
strh r1, [sp, #0x1c]
@@ -12253,7 +12253,7 @@ _021776e8: .word data_ov22_02178890
_021776ec: .word data_ov22_0217889c
_021776f0: .word data_ov22_021788a8
_021776f4: .word data_027e0764
_021776f8: .word data_027e0f94
_021776f8: .word gPlayerPos
_021776fc: .word 0x00001001
_02177700: .word data_027e0fe8
_02177704: .word 0x54534e49
asm/ov23.inc
+1 -1
View File
@@ -149,7 +149,7 @@
.extern data_027e0f70
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb8
asm/ov23.s
+22 -22
View File
@@ -866,7 +866,7 @@ func_ov23_0216e180: ; 0x0216e180
add r0, r4, #0x14
ldmia r0, {r0, r1, r2}
add lr, sp, #0x38
ldr ip, _0216e360 ; =data_027e0f94
ldr ip, _0216e360 ; =gPlayerPos
stmia lr, {r0, r1, r2}
add r3, sp, #0x2c
ldmia ip, {r0, r1, r2}
@@ -988,7 +988,7 @@ _0216e350:
add sp, sp, #0x44
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0216e360: .word data_027e0f94
_0216e360: .word gPlayerPos
_0216e364: .word data_02050f54
_0216e368: .word 0x0000019a
_0216e36c: .word 0x0000038e
@@ -1026,7 +1026,7 @@ func_ov23_0216e3b4: ; 0x0216e3b4
add r0, r4, #0x14
ldmia r0, {r0, r1, r2}
add lr, sp, #0x30
ldr ip, _0216e4a4 ; =data_027e0f94
ldr ip, _0216e4a4 ; =gPlayerPos
stmia lr, {r0, r1, r2}
add r3, sp, #0x24
ldmia ip, {r0, r1, r2}
@@ -1081,7 +1081,7 @@ func_ov23_0216e3b4: ; 0x0216e3b4
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216e4a4: .word data_027e0f94
_0216e4a4: .word gPlayerPos
_0216e4a8: .word data_02050f54
_0216e4ac: .word data_ov14_02153e98
_0216e4b0: .word func_ov23_0216d7f8
@@ -1818,7 +1818,7 @@ _0216ed80: ; jump table
b _0216eea4 ; case 7
b _0216eebc ; case 8
_0216eda4:
ldr r2, _0216eee0 ; =data_027e0f94
ldr r2, _0216eee0 ; =gPlayerPos
add r1, r0, #0x88
str r2, [sp]
mov r2, #2
@@ -1908,7 +1908,7 @@ _0216eed4:
add sp, sp, #8
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0216eee0: .word data_027e0f94
_0216eee0: .word gPlayerPos
_0216eee4: .word data_027e0e58
_0216eee8: .word gItemManager
_0216eeec: .word data_ov00_020eec68
@@ -3392,7 +3392,7 @@ func_ov23_021701c0: ; 0x021701c0
bl _ZN5Actor16XzDistanceToLinkEv
cmp r0, #0xa000
ble _02170374
ldr r1, _02170664 ; =data_027e0f94
ldr r1, _02170664 ; =gPlayerPos
add r0, r5, #0x14
bl func_ov00_020ce2f0
cmp r0, #0xa000
@@ -3686,7 +3686,7 @@ _02170658:
add sp, sp, #0x2c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02170664: .word data_027e0f94
_02170664: .word gPlayerPos
_02170668: .word gActorManager
_0217066c: .word 0x50534241
_02170670: .word gMapManager
@@ -6253,12 +6253,12 @@ func_ov23_0217282c: ; 0x0217282c
mov r1, r0
add r0, r1, #0x1a4
ldr ip, _02172844 ; =func_ov00_020cd0a8
ldr r2, _02172848 ; =data_027e0f94
ldr r2, _02172848 ; =gPlayerPos
add r0, r0, #0x400
bx ip
.align 2, 0
_02172844: .word func_ov00_020cd0a8
_02172848: .word data_027e0f94
_02172848: .word gPlayerPos
arm_func_end func_ov23_0217282c
.global func_ov23_0217284c
@@ -6266,14 +6266,14 @@ _02172848: .word data_027e0f94
func_ov23_0217284c: ; 0x0217284c
ldr ip, _02172868 ; =func_ov00_020cd120
add r0, r0, #0x1a4
ldr r1, _0217286c ; =data_027e0f94
ldr r1, _0217286c ; =gPlayerPos
add r0, r0, #0x400
mov r2, #0x77
mov r3, #0x2bc
bx ip
.align 2, 0
_02172868: .word func_ov00_020cd120
_0217286c: .word data_027e0f94
_0217286c: .word gPlayerPos
arm_func_end func_ov23_0217284c
.global func_ov23_02172870
@@ -12798,14 +12798,14 @@ func_ov23_02177e90: ; 0x02177e90
mov r6, r0
bl func_ov23_02177e84
ldr r2, _02178040 ; =gMapManager
ldr r1, _02178044 ; =data_027e0f94
ldr r1, _02178044 ; =gPlayerPos
ldr r8, [r2]
mov r5, r0
ldr r1, [r1]
mov r0, r8
mov r7, #1
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _02178044 ; =data_027e0f94
ldr r1, _02178044 ; =gPlayerPos
mov r4, r0
ldr r1, [r1, #8]
mov r0, r8
@@ -12879,7 +12879,7 @@ _02177fcc:
bne _02178018
mov r4, #1
ldr r0, _0217804c ; =data_027e0ffc
ldr r2, _02178044 ; =data_027e0f94
ldr r2, _02178044 ; =gPlayerPos
rsb r1, r4, #0x400
mov r3, #0
strb r4, [r9, #0x80]
@@ -12906,7 +12906,7 @@ _02178030:
.align 2, 0
_0217803c: .word data_027e0d38
_02178040: .word gMapManager
_02178044: .word data_027e0f94
_02178044: .word gPlayerPos
_02178048: .word data_027e0fa0
_0217804c: .word data_027e0ffc
_02178050: .word data_027e0fd4
@@ -13029,7 +13029,7 @@ func_ov23_02178174: ; 0x02178174
bl func_ov00_020bc46c
str r0, [sp]
mov r0, r4
ldr r1, _02178310 ; =data_027e0f94
ldr r1, _02178310 ; =gPlayerPos
ldr r2, _02178314 ; =data_027e0fac
add r3, r5, #8
bl func_ov23_02175a64
@@ -13086,7 +13086,7 @@ _02178298:
ldr r2, [r0]
ldr r0, [r1]
ldr r2, [r2, #0xc]
ldr r1, _02178310 ; =data_027e0f94
ldr r1, _02178310 ; =gPlayerPos
blx func_ov00_020b4c4c
bl func_ov23_02178344
mov r1, #0
@@ -13112,7 +13112,7 @@ _02178298:
.align 2, 0
_02178308: .word gActorManager
_0217830c: .word 0x504c444d
_02178310: .word data_027e0f94
_02178310: .word gPlayerPos
_02178314: .word data_027e0fac
_02178318: .word gMapManager
_0217831c: .word data_027e0f64
@@ -13162,7 +13162,7 @@ func_ov23_02178354: ; 0x02178354
mov r0, r5
bl func_ov00_020bc46c
str r0, [sp]
ldr r1, _02178408 ; =data_027e0f94
ldr r1, _02178408 ; =gPlayerPos
ldr r2, _0217840c ; =data_027e0fac
mov r0, r4
add r3, r5, #8
@@ -13170,7 +13170,7 @@ func_ov23_02178354: ; 0x02178354
ldr r2, _02178410 ; =data_027e0fcc
ldr r0, _02178414 ; =data_027e0fd4
ldr r2, [r2]
ldr r1, _02178408 ; =data_027e0f94
ldr r1, _02178408 ; =gPlayerPos
ldr r0, [r0]
ldr r2, [r2, #0xc]
blx func_ov00_020b4c4c
@@ -13192,7 +13192,7 @@ func_ov23_02178354: ; 0x02178354
.align 2, 0
_02178400: .word gActorManager
_02178404: .word 0x504c444d
_02178408: .word data_027e0f94
_02178408: .word gPlayerPos
_0217840c: .word data_027e0fac
_02178410: .word data_027e0fcc
_02178414: .word data_027e0fd4
asm/ov24.inc
+1 -1
View File
@@ -109,7 +109,7 @@
.extern data_027e0f6c
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov24.s
+8 -8
View File
@@ -3373,7 +3373,7 @@ func_ov24_021701d8: ; 0x021701d8
cmp r0, #1
bhi _0217023c
bl func_ov24_02170458
ldr r2, _02170444 ; =data_027e0f94
ldr r2, _02170444 ; =gPlayerPos
mov r1, #0x18c
mov r3, #0
bl func_ov00_020c070c
@@ -3529,7 +3529,7 @@ _02170438:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02170444: .word data_027e0f94
_02170444: .word gPlayerPos
_02170448: .word data_027e0ffc
_0217044c: .word 0x0000019d
_02170450: .word 0x000001bd
@@ -3638,7 +3638,7 @@ _02170564:
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
cmp r0, #0
beq _021705f8
ldr r0, _021706ac ; =data_027e0f94
ldr r0, _021706ac ; =gPlayerPos
add lr, sp, #0x20
ldmia r0, {r0, r1, r2}
stmia lr, {r0, r1, r2}
@@ -3709,7 +3709,7 @@ _02170684:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021706a8: .word data_027e0d0c
_021706ac: .word data_027e0f94
_021706ac: .word gPlayerPos
_021706b0: .word data_027e0ffc
_021706b4: .word 0x000003a9
arm_func_end func_ov24_02170478
@@ -4010,7 +4010,7 @@ _021709f8:
mov r0, #0
str r0, [r4, #0x324]
_02170a80:
ldr r0, _02170ca0 ; =data_027e0f94
ldr r0, _02170ca0 ; =gPlayerPos
mov r5, #0
mov r3, #0x1000
add r2, sp, #0
@@ -4152,7 +4152,7 @@ _02170b24:
_02170c94: .word data_027e0ffc
_02170c98: .word 0x000003a7
_02170c9c: .word data_027e0764
_02170ca0: .word data_027e0f94
_02170ca0: .word gPlayerPos
_02170ca4: .word data_ov24_021792ac
_02170ca8: .word data_02050f54
_02170cac: .word 0x0000059a
@@ -7704,7 +7704,7 @@ func_ov24_02173b18: ; 0x02173b18
str r1, [sp, #0x50]
bl func_ov00_020c3348
ldr r1, [r4, #8]
ldr r0, _02173ce4 ; =data_027e0f94
ldr r0, _02173ce4 ; =gPlayerPos
str r1, [sp, #0x4c]
ldr r1, [r4, #0xc]
add r2, sp, #0x24
@@ -7811,7 +7811,7 @@ _02173bd8:
add sp, sp, #0x5c
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02173ce4: .word data_027e0f94
_02173ce4: .word gPlayerPos
_02173ce8: .word 0xffff8001
_02173cec: .word data_ov24_021792d0
_02173cf0: .word data_02050f54
asm/ov25.inc
+1 -1
View File
@@ -114,7 +114,7 @@
.extern data_027e0f6c
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
asm/ov25.s
+13 -13
View File
@@ -394,7 +394,7 @@ _0216db80:
bl func_ov00_020c3348
ldrh r2, [r4, #0x24]
ldrh r1, [r4, #0x26]
ldr r3, _0216dccc ; =data_027e0f94
ldr r3, _0216dccc ; =gPlayerPos
ldr r0, _0216dcd0 ; =gMapManager
strh r1, [sp, #0x22]
strh r2, [sp, #0x20]
@@ -454,7 +454,7 @@ _0216db80:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0216dcc8: .word data_027e0fe8
_0216dccc: .word data_027e0f94
_0216dccc: .word gPlayerPos
_0216dcd0: .word gMapManager
_0216dcd4: .word data_027e0fac
arm_func_end func_ov25_0216daa4
@@ -1342,7 +1342,7 @@ _0216e880: .word func_ov25_0216e750
arm_func_start func_ov25_0216e884
func_ov25_0216e884: ; 0x0216e884
stmdb sp!, {r4, lr}
ldr r1, _0216e91c ; =data_027e0f94
ldr r1, _0216e91c ; =gPlayerPos
mov r2, #0
ldr r1, [r1]
str r1, [r0, #0x6cc]
@@ -1380,7 +1380,7 @@ func_ov25_0216e884: ; 0x0216e884
strh r1, [r0, #0xda]
ldmia sp!, {r4, pc}
.align 2, 0
_0216e91c: .word data_027e0f94
_0216e91c: .word gPlayerPos
_0216e920: .word data_027e0764
arm_func_end func_ov25_0216e884
@@ -8238,7 +8238,7 @@ _021745a8:
add r2, r2, #0x7b
bl func_ov25_021732fc
_021745e0:
ldr r1, _02175088 ; =data_027e0f94
ldr r1, _02175088 ; =gPlayerPos
ldr r0, _0217507c ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -8301,11 +8301,11 @@ _021746a8:
ldrsh r2, [r0, #0x78]
add r0, r4, #0x1f8
bl func_ov14_0214aa0c
ldr r1, _02175088 ; =data_027e0f94
ldr r1, _02175088 ; =gPlayerPos
mov r0, r4
mov r2, #0x7b
bl func_ov25_021732fc
ldr r1, _02175088 ; =data_027e0f94
ldr r1, _02175088 ; =gPlayerPos
ldr r0, _0217507c ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -8397,7 +8397,7 @@ _0217480c:
bl func_ov14_0214aa0c
mov r0, r4
bl func_ov25_02173250
ldr r1, _02175088 ; =data_027e0f94
ldr r1, _02175088 ; =gPlayerPos
ldr r0, _0217507c ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -8955,7 +8955,7 @@ _02175078: .word 0x00000152
_0217507c: .word gMapManager
_02175080: .word 0xb60b60b7
_02175084: .word 0x00000171
_02175088: .word data_027e0f94
_02175088: .word gPlayerPos
_0217508c: .word 0x00000555
_02175090: .word 0x00001333
_02175094: .word 0x000002aa
@@ -12480,7 +12480,7 @@ _02177dc0: .word data_ov25_0217a434
func_ov25_02177dc4: ; 0x02177dc4
stmdb sp!, {r4, r5, r6, r7, r8, lr}
mov r4, r0
ldr r0, _02177efc ; =data_027e0f94
ldr r0, _02177efc ; =gPlayerPos
add r1, r4, #0x48
add r2, r4, #0x60
bl func_01ff9bf8
@@ -12557,7 +12557,7 @@ func_ov25_02177dc4: ; 0x02177dc4
strh r1, [r0, #0x6c]
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02177efc: .word data_027e0f94
_02177efc: .word gPlayerPos
_02177f00: .word data_02050f54
_02177f04: .word data_027e0764
arm_func_end func_ov25_02177dc4
@@ -13679,7 +13679,7 @@ func_ov25_02178d0c: ; 0x02178d0c
addeq sp, sp, #0xc
moveq r0, #0
ldmeqia sp!, {r3, r4, pc}
ldr r0, _02178d84 ; =data_027e0f94
ldr r0, _02178d84 ; =gPlayerPos
add r2, sp, #0
add r1, r4, #0x34c
bl func_01ff9bf8
@@ -13702,7 +13702,7 @@ func_ov25_02178d0c: ; 0x02178d0c
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02178d84: .word data_027e0f94
_02178d84: .word gPlayerPos
_02178d88: .word gPlayer
arm_func_end func_ov25_02178d0c
asm/ov26.inc
+1 -1
View File
@@ -119,7 +119,7 @@
.extern data_027e0f7c
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerLink
asm/ov26.s
+21 -21
View File
@@ -741,7 +741,7 @@ func_ov26_0216dde4: ; 0x0216dde4
ldmia r0, {r0, r1, r2}
stmia r5, {r0, r1, r2}
ldr r0, [sp, #0x24]
ldr r1, _0216de88 ; =data_027e0f94
ldr r1, _0216de88 ; =gPlayerPos
add r3, r0, #0x1000
add r2, sp, #0x10
mov r0, r5
@@ -772,7 +772,7 @@ _0216de54:
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0216de88: .word data_027e0f94
_0216de88: .word gPlayerPos
arm_func_end func_ov26_0216dde4
.global func_ov26_0216de8c
@@ -1528,7 +1528,7 @@ _0216e6f8:
mov r4, r0, asr #0xc
_0216e728:
ldr r0, _0216e8b0 ; =data_027e0f64
ldr r1, _0216e8b4 ; =data_027e0f94
ldr r1, _0216e8b4 ; =gPlayerPos
ldr r0, [r0]
ldr r3, [r1]
ldr r0, [r0, #4]
@@ -1627,7 +1627,7 @@ _0216e728:
.align 2, 0
_0216e8ac: .word data_027e0618
_0216e8b0: .word data_027e0f64
_0216e8b4: .word data_027e0f94
_0216e8b4: .word gPlayerPos
arm_func_end func_ov26_0216e6a8
.global func_ov26_0216e8b8
@@ -3013,7 +3013,7 @@ func_ov26_0216f9f8: ; 0x0216f9f8
func_ov26_0216fa04: ; 0x0216fa04
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x1c
ldr r1, _0216fb10 ; =data_027e0f94
ldr r1, _0216fb10 ; =gPlayerPos
mov r4, r0
ldr r2, [r1]
ldr r0, [r1, #4]
@@ -3080,7 +3080,7 @@ _0216fa94:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216fb10: .word data_027e0f94
_0216fb10: .word gPlayerPos
_0216fb14: .word 0x000004cd
_0216fb18: .word gMapManager
arm_func_end func_ov26_0216fa04
@@ -3140,7 +3140,7 @@ func_ov26_0216fba8: ; 0x0216fba8
mov r5, r0
add r2, r5, #0x400
ldrsh r0, [r2, #0xb2]
ldr r4, _0216fd80 ; =data_027e0f94
ldr r4, _0216fd80 ; =gPlayerPos
cmp r0, #0
subgt r0, r0, #1
strgth r0, [r2, #0xb2]
@@ -3255,7 +3255,7 @@ _0216fc2c:
add sp, sp, #0x34
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0216fd80: .word data_027e0f94
_0216fd80: .word gPlayerPos
_0216fd84: .word data_027e0764
_0216fd88: .word 0x00008001
_0216fd8c: .word data_02050f54
@@ -3626,7 +3626,7 @@ func_ov26_02170180: ; 0x02170180
func_ov26_02170194: ; 0x02170194
stmdb sp!, {r4, lr}
sub sp, sp, #0x10
ldr r1, _02170258 ; =data_027e0f94
ldr r1, _02170258 ; =gPlayerPos
add r3, sp, #4
mov r4, r0
ldmia r1, {r0, r1, r2}
@@ -3674,7 +3674,7 @@ func_ov26_02170194: ; 0x02170194
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_02170258: .word data_027e0f94
_02170258: .word gPlayerPos
_0217025c: .word 0x000004cd
_02170260: .word gMapManager
arm_func_end func_ov26_02170194
@@ -3757,7 +3757,7 @@ func_ov26_02170320: ; 0x02170320
add r0, r0, #0x400
strh r0, [r6, #0xe8]
ldrsh lr, [r1]
ldr r0, _02170584 ; =data_027e0f94
ldr r0, _02170584 ; =gPlayerPos
add ip, sp, #8
mov r1, lr, lsl #0x10
mov r1, r1, lsr #0x10
@@ -3894,7 +3894,7 @@ _02170574: .word 0x0000071c
_02170578: .word data_027e0fac
_0217057c: .word data_02050f54
_02170580: .word 0x0000019a
_02170584: .word data_027e0f94
_02170584: .word gPlayerPos
_02170588: .word data_027e0fa0
_0217058c: .word gMapManager
arm_func_end func_ov26_02170320
@@ -3956,10 +3956,10 @@ _0217064c: .word 0x000004cd
.global func_ov26_02170650
arm_func_start func_ov26_02170650
func_ov26_02170650: ; 0x02170650
ldr r0, _02170658 ; =data_027e0f94
ldr r0, _02170658 ; =gPlayerPos
bx lr
.align 2, 0
_02170658: .word data_027e0f94
_02170658: .word gPlayerPos
arm_func_end func_ov26_02170650
.global func_ov26_0217065c
@@ -4032,7 +4032,7 @@ func_ov26_02170704: ; 0x02170704
str r3, [sp, #8]
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x10]
ldr r1, _02170790 ; =data_027e0f94
ldr r1, _02170790 ; =gPlayerPos
add r0, r4, #0x14
bl func_ov00_020c5464
cmp r0, #0
@@ -4050,7 +4050,7 @@ _02170780:
ldmia sp!, {r4, pc}
.align 2, 0
_0217078c: .word gMapManager
_02170790: .word data_027e0f94
_02170790: .word gPlayerPos
arm_func_end func_ov26_02170704
.global func_ov26_02170794
@@ -4929,7 +4929,7 @@ _021713b4:
bl func_ov26_0216fa04
mov r0, r5
bl func_ov26_02170794
ldr r0, _0217174c ; =data_027e0f94
ldr r0, _0217174c ; =gPlayerPos
bl func_ov00_020c5288
cmp r0, #0
mov r0, r5
@@ -4958,7 +4958,7 @@ _0217141c:
bl func_ov26_0216fba8
mov r0, r5
bl func_ov26_02170794
ldr r0, _0217174c ; =data_027e0f94
ldr r0, _0217174c ; =gPlayerPos
bl func_ov00_020c5288
cmp r0, #0
mov r0, r5
@@ -4988,7 +4988,7 @@ _02171488:
bl func_ov26_02170194
mov r0, r5
bl func_ov26_02170794
ldr r0, _0217174c ; =data_027e0f94
ldr r0, _0217174c ; =gPlayerPos
bl func_ov00_020c5288
cmp r0, #0
mov r0, r5
@@ -5022,7 +5022,7 @@ _02171504:
bl func_ov26_02170320
mov r0, r5
bl func_ov26_02170794
ldr r0, _0217174c ; =data_027e0f94
ldr r0, _0217174c ; =gPlayerPos
bl func_ov00_020c5288
cmp r0, #0
beq _02171718
@@ -5176,7 +5176,7 @@ _0217173c: .word 0x000001c1
_02171740: .word gAdventureFlags
_02171744: .word data_ov00_020e8398
_02171748: .word data_027e0ff0
_0217174c: .word data_027e0f94
_0217174c: .word gPlayerPos
_02171750: .word gPlayerLink
arm_func_end func_ov26_02170d60
asm/ov27.inc
+1 -1
View File
@@ -98,7 +98,7 @@
.extern data_027e0f6c
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb8
asm/ov27.s
+19 -19
View File
@@ -697,7 +697,7 @@ _0216e05c:
bl func_ov27_0217164c
b _0216e8fc
_0216e084:
ldr r0, _0216e950 ; =data_027e0f94
ldr r0, _0216e950 ; =gPlayerPos
ldr r1, [r5, #0x48]
ldr r0, [r0]
add r2, r5, #8
@@ -1024,7 +1024,7 @@ _0216e4f4:
str r0, [sp, #0x8c]
mov r0, #0x1000
str r0, [sp, #0x94]
ldr r0, _0216e950 ; =data_027e0f94
ldr r0, _0216e950 ; =gPlayerPos
add r1, r5, #0x48
add r2, sp, #0x38
bl func_01ff9bf8
@@ -1105,7 +1105,7 @@ _0216e4f4:
ldr r2, _0216e974 ; =0x00060009
add r1, r5, #0x158
bl func_02036ce4
ldr r0, _0216e950 ; =data_027e0f94
ldr r0, _0216e950 ; =gPlayerPos
add r3, sp, #0x2c
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -1274,7 +1274,7 @@ _0216e940: .word 0x00000233
_0216e944: .word data_ov27_02178dfc
_0216e948: .word 0x00000232
_0216e94c: .word 0x00000235
_0216e950: .word data_027e0f94
_0216e950: .word gPlayerPos
_0216e954: .word gPlayerLink
_0216e958: .word data_027e0f64
_0216e95c: .word data_02050f54
@@ -1678,7 +1678,7 @@ _0216eea4:
ldr r1, [r5, #0x14]
cmp r1, #0
bne _0216eed0
ldr r0, _0216f328 ; =data_027e0f94
ldr r0, _0216f328 ; =gPlayerPos
ldr r2, [r0]
ldr r1, [r0, #4]
str r2, [sp, #0x48]
@@ -1938,7 +1938,7 @@ _0216f248:
ldr r1, [r5, #0x14]
cmp r1, #0
bne _0216f288
ldr r0, _0216f328 ; =data_027e0f94
ldr r0, _0216f328 ; =gPlayerPos
ldr r2, [r0]
ldr r1, [r0, #4]
str r2, [sp, #0x18]
@@ -1991,7 +1991,7 @@ _0216f31c:
add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0216f328: .word data_027e0f94
_0216f328: .word gPlayerPos
_0216f32c: .word data_027e0ffc
_0216f330: .word 0x0000019d
_0216f334: .word 0x5342454d
@@ -3296,7 +3296,7 @@ func_ov27_02170480: ; 0x02170480
adds r3, r3, #0x800
mov ip, r8, lsr #0xc
orr ip, ip, r5, lsl #20
ldr r1, _021708b0 ; =data_027e0f94
ldr r1, _021708b0 ; =gPlayerPos
mov r4, r0
add lr, sp, #0x2c
ldmia r1, {r0, r1, r2}
@@ -3541,7 +3541,7 @@ _021707f8:
_021708a4: .word data_027e0fac
_021708a8: .word data_02050f54
_021708ac: .word 0x00001b85
_021708b0: .word data_027e0f94
_021708b0: .word gPlayerPos
_021708b4: .word 0x00000333
_021708b8: .word gPlayerLink
_021708bc: .word data_027e0ffc
@@ -4042,7 +4042,7 @@ func_ov27_02170f88: ; 0x02170f88
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r10, r0
ldr r0, _02171374 ; =data_027e0f94
ldr r0, _02171374 ; =gPlayerPos
mov r9, r1
add r5, sp, #0x38
ldmia r0, {r0, r1, r2}
@@ -4304,7 +4304,7 @@ _02171324:
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02171374: .word data_027e0f94
_02171374: .word gPlayerPos
_02171378: .word 0x00000bb8
_0217137c: .word data_ov27_021794c0
_02171380: .word 0x00001133
@@ -7985,7 +7985,7 @@ _02174450: .word gMapManager
func_ov27_02174454: ; 0x02174454
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x124
ldr r1, _021746e4 ; =data_027e0f94
ldr r1, _021746e4 ; =gPlayerPos
mov r4, r0
ldr r2, [r1]
ldr r0, _021746e8 ; =data_027e0fac
@@ -8148,7 +8148,7 @@ func_ov27_02174454: ; 0x02174454
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021746e4: .word data_027e0f94
_021746e4: .word gPlayerPos
_021746e8: .word data_027e0fac
_021746ec: .word data_02050f54
_021746f0: .word data_027e0c68
@@ -10082,7 +10082,7 @@ _02175fb0:
_02175fd8:
ldr r0, _02176058 ; =data_027e0ffc
ldr r1, _02176074 ; =0x0000040c
ldr r2, _02176078 ; =data_027e0f94
ldr r2, _02176078 ; =gPlayerPos
mov r3, #0
bl func_ov00_020ceacc
_02175fec:
@@ -10123,7 +10123,7 @@ _02176068: .word 0x0000040d
_0217606c: .word 0x0000040e
_02176070: .word 0x0000040f
_02176074: .word 0x0000040c
_02176078: .word data_027e0f94
_02176078: .word gPlayerPos
arm_func_end func_ov27_02175e74
.global func_ov27_0217607c
@@ -10855,7 +10855,7 @@ func_ov27_02176aac: ; 0x02176aac
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r10, r0
ldr r0, _02176e74 ; =data_027e0f94
ldr r0, _02176e74 ; =gPlayerPos
mov r9, r1
add r5, sp, #0x38
ldmia r0, {r0, r1, r2}
@@ -11109,7 +11109,7 @@ _02176e54:
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02176e74: .word data_027e0f94
_02176e74: .word gPlayerPos
_02176e78: .word data_ov27_02179bc4
_02176e7c: .word 0x00001133
_02176e80: .word data_02050f54
@@ -11730,7 +11730,7 @@ func_ov27_021776c0: ; 0x021776c0
ldr r1, [r6, #0x14]
cmp r1, #0
bne _02177714
ldr r0, _0217790c ; =data_027e0f94
ldr r0, _0217790c ; =gPlayerPos
ldr r2, [r0]
ldr r1, [r0, #4]
str r2, [sp, #0x18]
@@ -11876,7 +11876,7 @@ _021778f4:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0217790c: .word data_027e0f94
_0217790c: .word gPlayerPos
_02177910: .word data_027e0764
_02177914: .word data_ov27_021790b4
_02177918: .word 0x000003e7
asm/ov28.inc
+1 -1
View File
@@ -107,7 +107,7 @@
.extern data_027e0f6c
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov28.s
+5 -5
View File
@@ -7184,7 +7184,7 @@ func_ov28_02173330: ; 0x02173330
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr ip, _021733b4 ; =0x00008b33
ldr r0, _021733b8 ; =data_027e0f94
ldr r0, _021733b8 ; =gPlayerPos
ldr r3, _021733bc ; =0xffff9666
sub r4, ip, #0x7800
add lr, sp, #0xc
@@ -7217,7 +7217,7 @@ _021733a8:
ldmia sp!, {r4, pc}
.align 2, 0
_021733b4: .word 0x00008b33
_021733b8: .word data_027e0f94
_021733b8: .word gPlayerPos
_021733bc: .word 0xffff9666
_021733c0: .word data_ov00_020eec68
_021733c4: .word gPlayerLink
@@ -12432,7 +12432,7 @@ func_ov28_021776f0: ; 0x021776f0
ldr r1, [r5, #0x130]
cmp r1, #1
bne _02177798
ldr r1, _021778ac ; =data_027e0f94
ldr r1, _021778ac ; =gPlayerPos
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp]
@@ -12497,7 +12497,7 @@ _02177798:
mov r1, r0
b _0217783c
_021777fc:
ldr r1, _021778ac ; =data_027e0f94
ldr r1, _021778ac ; =gPlayerPos
mov r0, r5
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -12544,7 +12544,7 @@ _02177890:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021778ac: .word data_027e0f94
_021778ac: .word gPlayerPos
_021778b0: .word 0x0000238e
_021778b4: .word gActorManager
_021778b8: .word 0x00001555
asm/ov29.inc
+1 -1
View File
@@ -95,7 +95,7 @@
.extern data_027e0f6c
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
asm/ov29.s
+26 -26
View File
@@ -2894,7 +2894,7 @@ func_ov29_0216fcd4: ; 0x0216fcd4
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0216fd6c
ldr r1, _0216fd7c ; =data_027e0f94
ldr r1, _0216fd7c ; =gPlayerPos
ldr r0, _0216fd78 ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -2930,7 +2930,7 @@ _0216fd6c:
ldmia sp!, {pc}
.align 2, 0
_0216fd78: .word gMapManager
_0216fd7c: .word data_027e0f94
_0216fd7c: .word gPlayerPos
arm_func_end func_ov29_0216fcd4
.global func_ov29_0216fd80
@@ -4222,7 +4222,7 @@ func_ov29_02170f0c: ; 0x02170f0c
addne sp, sp, #0x40
strneb r0, [r5, #0x118]
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _021710f8 ; =data_027e0f94
ldr r0, _021710f8 ; =gPlayerPos
ldr r1, [r5, #0x22c]
ldr r0, [r0, #4]
subs r0, r1, r0
@@ -4333,7 +4333,7 @@ _02171070:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021710f4: .word data_ov38_02189238
_021710f8: .word data_027e0f94
_021710f8: .word gPlayerPos
_021710fc: .word data_027e0fe8
_02171100: .word 0x474f314d
_02171104: .word data_027e0e58
@@ -4464,7 +4464,7 @@ func_ov29_02171280: ; 0x02171280
cmp r0, #2
b _02171454
_021712ac:
ldr r0, _02171534 ; =data_027e0f94
ldr r0, _02171534 ; =gPlayerPos
mov r1, #0
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -4497,7 +4497,7 @@ _02171304:
str r0, [r4, #8]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_02171328:
ldr r0, _02171534 ; =data_027e0f94
ldr r0, _02171534 ; =gPlayerPos
mov r2, #0
ldr r3, [r0]
ldr r1, [r0, #4]
@@ -4576,7 +4576,7 @@ _02171428:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_02171454:
ldr r0, _0217153c ; =data_ov38_02189238
ldr r1, _02171534 ; =data_027e0f94
ldr r1, _02171534 ; =gPlayerPos
ldr r0, [r0]
ldr r3, [r1]
add r0, r0, #0x1000
@@ -4633,7 +4633,7 @@ _02171504:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02171534: .word data_027e0f94
_02171534: .word gPlayerPos
_02171538: .word data_027e0764
_0217153c: .word data_ov38_02189238
arm_func_end func_ov29_02171280
@@ -5235,7 +5235,7 @@ _02171ca4:
movne r0, #0
strneb r0, [r4, #0x118]
ldmneia sp!, {r4, pc}
ldr r0, _02171cfc ; =data_027e0f94
ldr r0, _02171cfc ; =gPlayerPos
ldr r1, [r4, #0x4c]
ldr r0, [r0, #4]
subs r0, r1, r0
@@ -5253,7 +5253,7 @@ _02171ca4:
ldmia sp!, {r4, pc}
.align 2, 0
_02171cf8: .word 0x0000019a
_02171cfc: .word data_027e0f94
_02171cfc: .word gPlayerPos
arm_func_end func_ov29_02171c38
.global func_ov29_02171d00
@@ -5289,7 +5289,7 @@ func_ov29_02171d38: ; 0x02171d38
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
_02171d5c:
ldr r0, _02171edc ; =data_027e0f94
ldr r0, _02171edc ; =gPlayerPos
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -5394,7 +5394,7 @@ _02171eb8:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02171edc: .word data_027e0f94
_02171edc: .word gPlayerPos
_02171ee0: .word data_027e0ffc
arm_func_end func_ov29_02171d38
@@ -7467,7 +7467,7 @@ _021739f8:
cmp r2, r0
movlt r2, r0
_02173af4:
ldr r0, _02174014 ; =data_027e0f94
ldr r0, _02174014 ; =gPlayerPos
add r5, r3, r2
ldr r2, [r0]
ldr r1, [r0, #4]
@@ -7812,7 +7812,7 @@ _02174004: .word 0x00000333
_02174008: .word func_ov29_021726fc
_0217400c: .word data_ov29_02179db0
_02174010: .word 0x00000eef
_02174014: .word data_027e0f94
_02174014: .word gPlayerPos
_02174018: .word 0x000038e4
_0217401c: .word 0x00001333
_02174020: .word data_027e0e58
@@ -7901,7 +7901,7 @@ _02174090:
movne r1, #0x12800
str r1, [r0]
ldr r1, [r4, #0x208]
ldr r0, _021742cc ; =data_027e0f94
ldr r0, _021742cc ; =gPlayerPos
str r2, [r1]
ldr r1, [r0, #4]
ldr r2, [r0]
@@ -8005,7 +8005,7 @@ _02174284:
_021742c0: .word data_027e0d0c
_021742c4: .word func_ov29_021726fc
_021742c8: .word data_ov29_02179db0
_021742cc: .word data_027e0f94
_021742cc: .word gPlayerPos
_021742d0: .word data_ov38_02189238
_021742d4: .word 0xfffff111
_021742d8: .word 0xffff8001
@@ -9395,7 +9395,7 @@ func_ov29_021755b4: ; 0x021755b4
ldreq r0, [r5, #0x130]
cmpeq r0, #2
bne _0217564c
ldr r0, _02175674 ; =data_027e0f94
ldr r0, _02175674 ; =gPlayerPos
add r2, sp, #0
add r1, r5, #0x48
mov r4, #0x400
@@ -9435,7 +9435,7 @@ _0217564c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02175670: .word data_ov29_0217bc78
_02175674: .word data_027e0f94
_02175674: .word gPlayerPos
arm_func_end func_ov29_021755b4
.global func_ov29_02175678
@@ -11616,7 +11616,7 @@ func_ov29_021772f8: ; 0x021772f8
ldr r1, [r1, #8]
b _021773b4
_02177350:
ldr r1, _02177410 ; =data_027e0f94
ldr r1, _02177410 ; =gPlayerPos
mov r2, r3, asr #0x4
ldr r3, [r1]
mov r5, r2, lsl #0x1
@@ -11666,7 +11666,7 @@ _021773b4:
.align 2, 0
_02177408: .word data_ov29_0217bce0
_0217740c: .word data_027e0fac
_02177410: .word data_027e0f94
_02177410: .word gPlayerPos
_02177414: .word data_02050f54
_02177418: .word data_ov29_0217a244
arm_func_end func_ov29_021772f8
@@ -12369,7 +12369,7 @@ func_ov29_02177db4: ; 0x02177db4
ldrb r0, [r4, #0x25c]
cmp r0, #0
beq _02177e54
ldr r0, _02177e8c ; =data_027e0f94
ldr r0, _02177e8c ; =gPlayerPos
add ip, sp, #0
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
@@ -12420,7 +12420,7 @@ _02177e74:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02177e8c: .word data_027e0f94
_02177e8c: .word gPlayerPos
_02177e90: .word 0x00000333
_02177e94: .word 0x00000ccd
_02177e98: .word data_02057200
@@ -12431,7 +12431,7 @@ _02177e98: .word data_02057200
func_ov29_02177e9c: ; 0x02177e9c
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _02177f18 ; =data_027e0f94
ldr r1, _02177f18 ; =gPlayerPos
add r3, sp, #0
mov r4, r0
ldmia r1, {r0, r1, r2}
@@ -12461,7 +12461,7 @@ func_ov29_02177e9c: ; 0x02177e9c
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02177f18: .word data_027e0f94
_02177f18: .word gPlayerPos
_02177f1c: .word 0x00000333
_02177f20: .word 0x0000019a
_02177f24: .word data_ov29_0217a298
@@ -12472,7 +12472,7 @@ _02177f24: .word data_ov29_0217a298
func_ov29_02177f28: ; 0x02177f28
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _02177fe0 ; =data_027e0f94
ldr r1, _02177fe0 ; =gPlayerPos
add r3, sp, #0
mov r4, r0
ldmia r1, {r0, r1, r2}
@@ -12519,7 +12519,7 @@ _02177fc4:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02177fe0: .word data_027e0f94
_02177fe0: .word gPlayerPos
_02177fe4: .word 0xfffffccd
_02177fe8: .word 0x00000ccd
_02177fec: .word data_02057200
asm/ov30.inc
+1 -1
View File
@@ -88,7 +88,7 @@
.extern data_027e0f64
.extern data_027e0f6c
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov30.s
+29 -29
View File
@@ -1550,7 +1550,7 @@ func_ov30_0217d09c: ; 0x0217d09c
ldr r0, [r3]
mov r6, r1
ldr r1, [r0]
ldr r4, _0217d38c ; =data_027e0f94
ldr r4, _0217d38c ; =gPlayerPos
ldr r1, [r1, #4]
mov r5, r2
blx r1
@@ -1743,7 +1743,7 @@ _0217d37c:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217d388: .word gPlayer
_0217d38c: .word data_027e0f94
_0217d38c: .word gPlayerPos
_0217d390: .word gMapManager
_0217d394: .word 0xffff8001
_0217d398: .word 0x00002aaa
@@ -1769,7 +1769,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8
ldr r1, _0217d4d8 ; =gPlayer
mov r5, r0
ldr r0, [r1]
ldr r4, _0217d4dc ; =data_027e0f94
ldr r4, _0217d4dc ; =gPlayerPos
ldr r1, [r0]
ldr r1, [r1, #4]
blx r1
@@ -1838,7 +1838,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217d4d8: .word gPlayer
_0217d4dc: .word data_027e0f94
_0217d4dc: .word gPlayerPos
_0217d4e0: .word gMapManager
_0217d4e4: .word 0x0000019a
arm_func_end func_ov30_0217d3b8
@@ -1965,7 +1965,7 @@ _0217d68c: .word 0x00002aaa
func_ov30_0217d690: ; 0x0217d690
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x48
ldr r4, _0217d7cc ; =data_027e0f94
ldr r4, _0217d7cc ; =gPlayerPos
mov r5, r0
mov r0, r4
bl func_ov00_020c5288
@@ -2043,7 +2043,7 @@ func_ov30_0217d690: ; 0x0217d690
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0217d7cc: .word data_027e0f94
_0217d7cc: .word gPlayerPos
_0217d7d0: .word gMapManager
_0217d7d4: .word 0x00000333
arm_func_end func_ov30_0217d690
@@ -2053,7 +2053,7 @@ _0217d7d4: .word 0x00000333
func_ov30_0217d7d8: ; 0x0217d7d8
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x30
ldr r3, _0217d988 ; =data_027e0f94
ldr r3, _0217d988 ; =gPlayerPos
mov r11, #0
ldr r5, [r3]
ldr r4, [r3, #4]
@@ -2164,7 +2164,7 @@ _0217d97c:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217d988: .word data_027e0f94
_0217d988: .word gPlayerPos
_0217d98c: .word gMapManager
arm_func_end func_ov30_0217d7d8
@@ -2641,7 +2641,7 @@ _0217dfc0:
ldr r0, [r7, #0x10]
mov r1, #0x1000
str r1, [r0, #0x10]
ldr r2, _0217e090 ; =data_027e0f94
ldr r2, _0217e090 ; =gPlayerPos
add r1, sp, #0
ldr r0, [r2]
str r0, [r6, #0xc]
@@ -2689,7 +2689,7 @@ _0217e07c:
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0217e090: .word data_027e0f94
_0217e090: .word gPlayerPos
arm_func_end func_ov30_0217df58
.global func_ov30_0217e094
@@ -3521,7 +3521,7 @@ func_ov30_0217ebbc: ; 0x0217ebbc
cmp r0, #0x384
addle sp, sp, #0xa4
ldmleia sp!, {r3, r4, r5, r6, r7, r8, pc}
ldr r2, _0217ece4 ; =data_027e0f94
ldr r2, _0217ece4 ; =gPlayerPos
add r0, r4, #0x14
mov r1, #0x2800
bl func_ov00_020ce284
@@ -3589,7 +3589,7 @@ _0217eccc:
add sp, sp, #0xa4
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217ece4: .word data_027e0f94
_0217ece4: .word gPlayerPos
_0217ece8: .word data_ov30_02188b08
_0217ecec: .word gActorManager
arm_func_end func_ov30_0217ebbc
@@ -4077,7 +4077,7 @@ _0217f2f4:
strb r2, [sp, #0x23]
ldrsb r4, [r5, #0x2c]
ldr r0, [r0]
ldr r1, _0217f558 ; =data_027e0f94
ldr r1, _0217f558 ; =gPlayerPos
add r2, sp, #0x30
add r3, sp, #0x20
strb r4, [sp, #0x34]
@@ -4217,7 +4217,7 @@ _0217f548: .word gMapManager
_0217f54c: .word data_027e0ffc
_0217f550: .word data_ov00_020e8398
_0217f554: .word data_027e0ff0
_0217f558: .word data_027e0f94
_0217f558: .word gPlayerPos
_0217f55c: .word data_027e10b4
_0217f560: .word gActorManager
arm_func_end func_ov30_0217f1c4
@@ -4284,7 +4284,7 @@ _0217f5f8:
strb r2, [sp, #0x27]
ldrsb lr, [r4, #0x2c]
ldr r0, [r0]
ldr r1, _0217f74c ; =data_027e0f94
ldr r1, _0217f74c ; =gPlayerPos
add r2, sp, #0x34
add r3, sp, #0x24
strb lr, [sp, #0x38]
@@ -4358,7 +4358,7 @@ _0217f730:
.align 2, 0
_0217f744: .word data_ov00_020e8398
_0217f748: .word data_027e0ff0
_0217f74c: .word data_027e0f94
_0217f74c: .word gPlayerPos
_0217f750: .word gMapManager
_0217f754: .word data_027e0f64
arm_func_end func_ov30_0217f564
@@ -5208,7 +5208,7 @@ _0218027c:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
_021802c8:
ldr r1, _021803fc ; =data_027e0f94
ldr r1, _021803fc ; =gPlayerPos
mov r2, #1
bl func_ov30_02182ecc
mov r0, r4
@@ -5290,7 +5290,7 @@ _021803f4:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021803fc: .word data_027e0f94
_021803fc: .word gPlayerPos
_02180400: .word data_02050f54
_02180404: .word 0x0000019a
arm_func_end func_ov30_02180208
@@ -7539,7 +7539,7 @@ _02181b98: ; jump table
b _02181bc0 ; case 9
_02181bc0:
mov r0, r4
ldr r5, _02181d08 ; =data_027e0f94
ldr r5, _02181d08 ; =gPlayerPos
bl func_ov30_0217d690
cmp r0, #0
beq _02181c08
@@ -7629,7 +7629,7 @@ _02181cfc:
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02181d08: .word data_027e0f94
_02181d08: .word gPlayerPos
_02181d0c: .word 0x43485334
arm_func_end func_ov30_02181a70
@@ -8200,7 +8200,7 @@ func_ov30_02182474: ; 0x02182474
ldr r1, _021824bc ; =gPlayer
mov r5, r0
ldr r0, [r1]
ldr r4, _021824c0 ; =data_027e0f94
ldr r4, _021824c0 ; =gPlayerPos
ldr r1, [r0]
ldr r1, [r1, #4]
blx r1
@@ -8216,7 +8216,7 @@ func_ov30_02182474: ; 0x02182474
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021824bc: .word gPlayer
_021824c0: .word data_027e0f94
_021824c0: .word gPlayerPos
_021824c4: .word 0x00001b33
_021824c8: .word 0x00001555
arm_func_end func_ov30_02182474
@@ -12265,7 +12265,7 @@ _02185648:
bl func_ov00_020c5d74
ldr r0, [r5, #0x10]
mov r2, #0x1000
ldr r1, _021856ec ; =data_027e0f94
ldr r1, _021856ec ; =gPlayerPos
str r2, [r0, #0x10]
ldr r2, [r1]
add r0, r7, #0x10
@@ -12300,7 +12300,7 @@ _021856d0:
.align 2, 0
_021856e4: .word 0x43485334
_021856e8: .word data_027e10b4
_021856ec: .word data_027e0f94
_021856ec: .word gPlayerPos
arm_func_end func_ov30_0218529c
.global func_ov30_021856f0
@@ -12399,7 +12399,7 @@ _0218580c:
_02185824:
cmp r7, #0
beq _0218587c
ldr r0, _021863d4 ; =data_027e0f94
ldr r0, _021863d4 ; =gPlayerPos
add r3, sp, #0x5c
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -12704,7 +12704,7 @@ _02185c68:
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_02185c94:
ldr r1, _021863d4 ; =data_027e0f94
ldr r1, _021863d4 ; =gPlayerPos
mov r0, r4
mov r2, #2
bl func_ov30_02182ecc
@@ -13206,7 +13206,7 @@ _021863cc:
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_021863d4: .word data_027e0f94
_021863d4: .word gPlayerPos
_021863d8: .word 0x43485334
_021863dc: .word 0x43485336
_021863e0: .word gAdventureFlags
@@ -13626,7 +13626,7 @@ func_ov30_0218695c: ; 0x0218695c
strb r2, [sp, #3]
ldrsb ip, [r0, #0x2c]
ldr r0, _021869fc ; =data_027e0ff0
ldr r1, _02186a00 ; =data_027e0f94
ldr r1, _02186a00 ; =gPlayerPos
ldr r0, [r0]
add r2, sp, #0x10
add r3, sp, #0
@@ -13648,7 +13648,7 @@ func_ov30_0218695c: ; 0x0218695c
.align 2, 0
_021869f8: .word data_ov00_020e8398
_021869fc: .word data_027e0ff0
_02186a00: .word data_027e0f94
_02186a00: .word gPlayerPos
arm_func_end func_ov30_0218695c
.global func_ov30_02186a04
asm/ov31.inc
+1 -1
View File
@@ -75,7 +75,7 @@
.extern data_027e0e28
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov31.s
+2 -2
View File
@@ -2353,7 +2353,7 @@ func_ov31_0217dab8: ; 0x0217dab8
ldmia r0, {r0, r1, r2}
add r3, sp, #0xc
stmia r3, {r0, r1, r2}
ldr lr, _0217db44 ; =data_027e0f94
ldr lr, _0217db44 ; =gPlayerPos
ldr r3, [sp, #0x14]
add ip, sp, #0
ldmia lr, {r0, r1, r2}
@@ -2383,7 +2383,7 @@ func_ov31_0217dab8: ; 0x0217dab8
add sp, sp, #0x18
ldmia sp!, {r3, pc}
.align 2, 0
_0217db44: .word data_027e0f94
_0217db44: .word gPlayerPos
arm_func_end func_ov31_0217dab8
.global func_ov31_0217db48
asm/ov32.inc
+1 -1
View File
@@ -95,7 +95,7 @@
.extern data_027e0f6c
.extern data_027e0f84
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerLink
asm/ov32.s
+12 -12
View File
@@ -1785,7 +1785,7 @@ func_ov32_0217d354: ; 0x0217d354
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [sp, #4]
ldr r1, _0217d3b4 ; =data_027e0f94
ldr r1, _0217d3b4 ; =gPlayerPos
add r2, r0, #0x1800
mov r0, r3
str r2, [sp, #4]
@@ -1803,7 +1803,7 @@ _0217d3a8:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217d3b4: .word data_027e0f94
_0217d3b4: .word gPlayerPos
arm_func_end func_ov32_0217d354
.global func_ov32_0217d3b8
@@ -5189,7 +5189,7 @@ func_ov32_0217feac: ; 0x0217feac
blx r1
cmp r0, #0
beq _0217ff6c
ldr r1, _02180048 ; =data_027e0f94
ldr r1, _02180048 ; =gPlayerPos
ldr r0, _0218004c ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -5272,7 +5272,7 @@ _0217ffd0:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02180044: .word gPlayer
_02180048: .word data_027e0f94
_02180048: .word gPlayerPos
_0218004c: .word gMapManager
_02180050: .word data_027e0764
_02180054: .word 0x0000ffff
@@ -5607,7 +5607,7 @@ func_ov32_021804a4: ; 0x021804a4
ldr r3, _02180850 ; =data_027e0fac
smlabb r1, r1, r0, r2
strh r1, [r10, #0x78]
ldr r0, _02180854 ; =data_027e0f94
ldr r0, _02180854 ; =gPlayerPos
ldrsh r4, [r3]
add r8, sp, #0x18
ldmia r0, {r0, r1, r2}
@@ -5751,7 +5751,7 @@ _021806d4:
add r9, r10, #0xb8
ble _021807b4
ldr r6, _02180864 ; =data_027e0f6c
ldr r5, _02180854 ; =data_027e0f94
ldr r5, _02180854 ; =gPlayerPos
ldr r4, _02180868 ; =0x0000ffff
add r11, sp, #0x14
_02180710:
@@ -5814,7 +5814,7 @@ _021807b4:
str r1, [sp, #0x10]
cmp r0, #1
bne _0218081c
ldr r3, _02180854 ; =data_027e0f94
ldr r3, _02180854 ; =gPlayerPos
add r0, r10, #0x21c
ldr r2, [r3]
mov r1, #3
@@ -5842,7 +5842,7 @@ _02180840:
.align 2, 0
_0218084c: .word 0x0000071c
_02180850: .word data_027e0fac
_02180854: .word data_027e0f94
_02180854: .word gPlayerPos
_02180858: .word data_02050f54
_0218085c: .word 0x00000333
_02180860: .word data_027e0fa0
@@ -5858,7 +5858,7 @@ func_ov32_02180870: ; 0x02180870
sub sp, sp, #0x1c
mov r7, r0
mov r2, #2
ldr r1, _02180a34 ; =data_027e0f94
ldr r1, _02180a34 ; =gPlayerPos
str r2, [r7, #0x12c]
ldr r2, [r1]
str r2, [r7, #0x48]
@@ -5971,7 +5971,7 @@ _0218099c:
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02180a34: .word data_027e0f94
_02180a34: .word gPlayerPos
_02180a38: .word data_02050f54
_02180a3c: .word 0x0000099a
arm_func_end func_ov32_02180870
@@ -9379,7 +9379,7 @@ _02183814: .word 0x00000b34
func_ov32_02183818: ; 0x02183818
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x24
ldr r1, _021838c8 ; =data_027e0f94
ldr r1, _021838c8 ; =gPlayerPos
add r3, sp, #0x18
mov r4, r0
ldmia r1, {r0, r1, r2}
@@ -9422,7 +9422,7 @@ func_ov32_02183818: ; 0x02183818
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021838c8: .word data_027e0f94
_021838c8: .word gPlayerPos
_021838cc: .word gMapManager
_021838d0: .word 0x00000333
arm_func_end func_ov32_02183818
asm/ov33.inc
+1 -1
View File
@@ -72,7 +72,7 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerLink
asm/ov33.s
+10 -10
View File
@@ -424,7 +424,7 @@ _0217c27c:
bl func_ov33_0217bffc
b _0217c34c
_0217c2a4:
ldr r0, _0217c360 ; =data_027e0f94
ldr r0, _0217c360 ; =gPlayerPos
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -476,7 +476,7 @@ _0217c34c:
.align 2, 0
_0217c358: .word data_027e0ffc
_0217c35c: .word 0x00000246
_0217c360: .word data_027e0f94
_0217c360: .word gPlayerPos
_0217c364: .word 0x0000019a
arm_func_end func_ov33_0217c228
@@ -3031,7 +3031,7 @@ func_ov33_0217e430: ; 0x0217e430
func_ov33_0217e450: ; 0x0217e450
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _0217e4a8 ; =data_027e0f94
ldr r1, _0217e4a8 ; =gPlayerPos
mov r4, r0
add r3, sp, #0
ldmia r1, {r0, r1, r2}
@@ -3052,7 +3052,7 @@ func_ov33_0217e450: ; 0x0217e450
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217e4a8: .word data_027e0f94
_0217e4a8: .word gPlayerPos
_0217e4ac: .word 0x0000028f
arm_func_end func_ov33_0217e450
@@ -3066,12 +3066,12 @@ func_ov33_0217e4b0: ; 0x0217e4b0
arm_func_start func_ov33_0217e4b4
func_ov33_0217e4b4: ; 0x0217e4b4
ldr ip, _0217e4c4 ; =func_ov33_0217e174
ldr r1, _0217e4c8 ; =data_027e0f94
ldr r1, _0217e4c8 ; =gPlayerPos
mov r2, #0x214
bx ip
.align 2, 0
_0217e4c4: .word func_ov33_0217e174
_0217e4c8: .word data_027e0f94
_0217e4c8: .word gPlayerPos
arm_func_end func_ov33_0217e4b4
.global func_ov33_0217e4cc
@@ -3189,7 +3189,7 @@ func_ov33_0217e618: ; 0x0217e618
func_ov33_0217e640: ; 0x0217e640
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x1c
ldr r1, _0217e6ec ; =data_027e0f94
ldr r1, _0217e6ec ; =gPlayerPos
add r3, sp, #0x10
mov r4, r0
ldmia r1, {r0, r1, r2}
@@ -3232,7 +3232,7 @@ _0217e6c8:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217e6ec: .word data_027e0f94
_0217e6ec: .word gPlayerPos
_0217e6f0: .word data_027e0fa0
_0217e6f4: .word 0x000024cd
_0217e6f8: .word 0x000038a4
@@ -4528,7 +4528,7 @@ func_ov33_0217f744: ; 0x0217f744
add r5, r7, #1
mov r5, r5, lsl #0x1
ldrsh r5, [r11, r5]
ldr r2, _0217f898 ; =data_027e0f94
ldr r2, _0217f898 ; =gPlayerPos
mov r0, #0x7000
add r1, sp, #0
add r3, r4, #0x48
@@ -4554,7 +4554,7 @@ func_ov33_0217f744: ; 0x0217f744
_0217f88c: .word 0x00000666
_0217f890: .word data_027e0764
_0217f894: .word data_02050f54
_0217f898: .word data_027e0f94
_0217f898: .word gPlayerPos
arm_func_end func_ov33_0217f744
.global func_ov33_0217f89c
asm/ov34.inc
+1 -1
View File
@@ -74,7 +74,7 @@
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov34.s
+27 -27
View File
@@ -1893,7 +1893,7 @@ _0217d740:
add r4, sp, #0x84
ldmia r0, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldr r1, _0217deb0 ; =data_027e0f94
ldr r1, _0217deb0 ; =gPlayerPos
ldr r0, [sp, #0x8c]
ldr r2, [r1, #4]
add r3, r0, #0xf000
@@ -2159,7 +2159,7 @@ _0217db48:
bne _0217db48
ldmia r6, {r0, r1}
stmia lr, {r0, r1}
ldr r2, _0217deb0 ; =data_027e0f94
ldr r2, _0217deb0 ; =gPlayerPos
mov lr, #0xfa0
mov ip, #0x20000
add r3, sp, #0x60
@@ -2316,7 +2316,7 @@ _0217dd9c:
bl Approach_thunk
mov r4, r0
_0217ddc8:
ldr r0, _0217deb0 ; =data_027e0f94
ldr r0, _0217deb0 ; =gPlayerPos
add r3, sp, #0x48
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -2377,7 +2377,7 @@ _0217dea0: .word data_ov34_0218622c
_0217dea4: .word data_ov34_021862fc
_0217dea8: .word data_027e0f64
_0217deac: .word gPlayerLink
_0217deb0: .word data_027e0f94
_0217deb0: .word gPlayerPos
_0217deb4: .word data_ov34_0218632c
_0217deb8: .word data_ov34_02186294
_0217debc: .word 0x000010cc
@@ -3234,7 +3234,7 @@ func_ov34_0217ea88: ; 0x0217ea88
str ip, [sp]
bl func_ov34_0217ceb0
add r1, r4, #0x104
ldr r0, _0217eb18 ; =data_027e0f94
ldr r0, _0217eb18 ; =gPlayerPos
add r2, sp, #4
add r1, r1, #0x1c00
bl func_01ff9bf8
@@ -3259,7 +3259,7 @@ func_ov34_0217ea88: ; 0x0217ea88
ldmia sp!, {r4, pc}
.align 2, 0
_0217eb14: .word 0x00000e66
_0217eb18: .word data_027e0f94
_0217eb18: .word gPlayerPos
arm_func_end func_ov34_0217ea88
.global func_ov34_0217eb1c
@@ -3318,7 +3318,7 @@ func_ov34_0217eb94: ; 0x0217eb94
movne r1, #1
strneb r1, [r0, #0xd8c]
add r1, r4, #0x104
ldr r0, _0217ee3c ; =data_027e0f94
ldr r0, _0217ee3c ; =gPlayerPos
add r2, sp, #0x3c
add r1, r1, #0x1c00
bl func_01ff9bf8
@@ -3476,7 +3476,7 @@ _0217ece0:
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217ee3c: .word data_027e0f94
_0217ee3c: .word gPlayerPos
_0217ee40: .word 0x00000e66
_0217ee44: .word data_027e0764
_0217ee48: .word data_02050f54
@@ -3977,7 +3977,7 @@ func_ov34_0217f540: ; 0x0217f540
strh r3, [r1, #0x82]
mov r1, #1
strb r1, [r2, #0xd8e]
ldr r1, _0217f5c8 ; =data_027e0f94
ldr r1, _0217f5c8 ; =gPlayerPos
ldr r3, [r2, #0xab0]
ldr ip, [r1]
add r2, r3, #0x1800
@@ -4001,7 +4001,7 @@ _0217f598:
bx lr
.align 2, 0
_0217f5c4: .word data_ov34_021861a0
_0217f5c8: .word data_027e0f94
_0217f5c8: .word gPlayerPos
arm_func_end func_ov34_0217f540
.global func_ov34_0217f5cc
@@ -4012,7 +4012,7 @@ func_ov34_0217f5cc: ; 0x0217f5cc
mov r4, r0
add r0, r4, #0x1000
ldr r2, [r0, #0xab0]
ldr r0, _0217f708 ; =data_027e0f94
ldr r0, _0217f708 ; =gPlayerPos
add r1, r2, #0x1800
ldr r3, [r0]
sub r0, r2, #0x1800
@@ -4028,7 +4028,7 @@ _0217f604:
add r3, r4, #0x104
add ip, r0, #0x3c00
str ip, [r1, #0xa78]
ldr r0, _0217f708 ; =data_027e0f94
ldr r0, _0217f708 ; =gPlayerPos
add r2, sp, #0x10
add r1, r3, #0x1c00
bl func_01ff9bf8
@@ -4089,7 +4089,7 @@ _0217f6f8:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217f708: .word data_027e0f94
_0217f708: .word gPlayerPos
_0217f70c: .word 0x00000e66
_0217f710: .word data_ov34_021861a0
arm_func_end func_ov34_0217f5cc
@@ -4179,7 +4179,7 @@ func_ov34_0217f7c8: ; 0x0217f7c8
cmp r0, #0xf000
bge _0217f860
add r1, r5, #0x104
ldr r0, _02180074 ; =data_027e0f94
ldr r0, _02180074 ; =gPlayerPos
add r2, sp, #0x74
add r1, r1, #0x1c00
bl func_01ff9bf8
@@ -4726,7 +4726,7 @@ _02180038:
add sp, sp, #0x80
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02180074: .word data_027e0f94
_02180074: .word gPlayerPos
_02180078: .word data_027e0ffc
_0218007c: .word 0x000002f7
_02180080: .word data_02050f54
@@ -4806,7 +4806,7 @@ func_ov34_0218013c: ; 0x0218013c
strh r3, [r1, #0x82]
mov r1, #1
strb r1, [r2, #0xd8e]
ldr r1, _021801c4 ; =data_027e0f94
ldr r1, _021801c4 ; =gPlayerPos
ldr r3, [r2, #0xab0]
ldr ip, [r1]
add r2, r3, #0x1800
@@ -4830,7 +4830,7 @@ _02180194:
bx lr
.align 2, 0
_021801c0: .word data_ov34_021861a0
_021801c4: .word data_027e0f94
_021801c4: .word gPlayerPos
arm_func_end func_ov34_0218013c
.global func_ov34_021801c8
@@ -4841,7 +4841,7 @@ func_ov34_021801c8: ; 0x021801c8
mov r4, r0
add r0, r4, #0x1000
ldr r2, [r0, #0xab0]
ldr r0, _02180318 ; =data_027e0f94
ldr r0, _02180318 ; =gPlayerPos
add r1, r2, #0x1800
ldr r3, [r0]
sub r0, r2, #0x1800
@@ -4857,7 +4857,7 @@ _02180200:
add r3, r4, #0x104
add ip, r0, #0x3c00
str ip, [r1, #0xa78]
ldr r0, _02180318 ; =data_027e0f94
ldr r0, _02180318 ; =gPlayerPos
add r2, sp, #0x10
add r1, r3, #0x1c00
bl func_01ff9bf8
@@ -4924,7 +4924,7 @@ _02180308:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02180318: .word data_027e0f94
_02180318: .word gPlayerPos
_0218031c: .word 0x00000e66
_02180320: .word data_ov34_021861a0
arm_func_end func_ov34_021801c8
@@ -5008,7 +5008,7 @@ func_ov34_021803c0: ; 0x021803c0
cmp r0, #0xf000
bge _02180488
add r1, r5, #0x104
ldr r0, _02180818 ; =data_027e0f94
ldr r0, _02180818 ; =gPlayerPos
add r2, sp, #0x44
add r1, r1, #0x1c00
bl func_01ff9bf8
@@ -5269,7 +5269,7 @@ _021807c0:
add sp, sp, #0x50
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02180818: .word data_027e0f94
_02180818: .word gPlayerPos
_0218081c: .word data_027e0ffc
_02180820: .word 0x000002f7
_02180824: .word data_02050f54
@@ -5433,7 +5433,7 @@ func_ov34_02180a14: ; 0x02180a14
ldr r0, [r0, #0xa98]
cmp r0, #0xf
bne _02180ba8
ldr r0, _021810c4 ; =data_027e0f94
ldr r0, _021810c4 ; =gPlayerPos
ldr r1, [r2, #0xab0]
ldr r2, [r0]
add r0, r1, #0x2000
@@ -5733,7 +5733,7 @@ _02180d84:
bl func_ov00_020c4048
add r1, r4, #0x1000
ldr r0, [r1, #0xd54]
ldr r2, _021810c4 ; =data_027e0f94
ldr r2, _021810c4 ; =gPlayerPos
add r0, r0, #0x8f
add r0, r0, #0x1200
str r0, [r1, #0xd54]
@@ -5868,7 +5868,7 @@ _0218109c:
add sp, sp, #0x8c
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_021810c4: .word data_027e0f94
_021810c4: .word gPlayerPos
_021810c8: .word 0x000002f9
_021810cc: .word data_027e0ffc
_021810d0: .word data_027e0e58
@@ -10089,7 +10089,7 @@ func_ov34_02184b70: ; 0x02184b70
movne r1, #4
mov r0, r4
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
ldr r1, _02184ca4 ; =data_027e0f94
ldr r1, _02184ca4 ; =gPlayerPos
add r0, r4, #0x4c
ldr r1, [r1, #4]
mov r2, #0x148
@@ -10157,7 +10157,7 @@ _02184c8c:
bl func_ov34_02184950
ldmia sp!, {r4, pc}
.align 2, 0
_02184ca4: .word data_027e0f94
_02184ca4: .word gPlayerPos
arm_func_end func_ov34_02184b70
.global func_ov34_02184ca8
asm/ov35.inc
+1 -1
View File
@@ -93,7 +93,7 @@
.extern gMapManager
.extern data_027e0f64
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
asm/ov35.s
+23 -23
View File
@@ -2435,7 +2435,7 @@ _0217de24:
ldrb r0, [r5, #0x303]
cmp r0, #0
beq _0217de6c
ldr r0, _0217e2cc ; =data_027e0f94
ldr r0, _0217e2cc ; =gPlayerPos
add r1, r5, #0x48
bl func_ov00_020ce2f0
cmp r0, #0x7000
@@ -2748,7 +2748,7 @@ _0217e2ac:
_0217e2c0: .word gActorManager
_0217e2c4: .word data_027e0d0c
_0217e2c8: .word gPlayerLink
_0217e2cc: .word data_027e0f94
_0217e2cc: .word gPlayerPos
_0217e2d0: .word data_027e0764
_0217e2d4: .word 0x00555600
_0217e2d8: .word 0xffffd555
@@ -4353,7 +4353,7 @@ _0217f8d0:
bl func_ov00_020c5d74
ldr r1, [r4, #0x168]
mov r2, #0x2000
ldr r0, _021800e4 ; =data_027e0f94
ldr r0, _021800e4 ; =gPlayerPos
str r2, [r1, #0x10]
add r3, sp, #0x6c
ldmia r0, {r0, r1, r2}
@@ -4452,7 +4452,7 @@ _0217fa0c:
ldr r2, [r2, #8]
str r2, [r4, #0x68]
bl func_ov00_020c5d74
ldr r0, _021800e4 ; =data_027e0f94
ldr r0, _021800e4 ; =gPlayerPos
add r3, sp, #0x60
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -4876,7 +4876,7 @@ _021800d4: .word 0x00080063
_021800d8: .word data_ov00_020eec68
_021800dc: .word data_027e0fcc
_021800e0: .word 0x00000171
_021800e4: .word data_027e0f94
_021800e4: .word gPlayerPos
_021800e8: .word 0xfffff333
_021800ec: .word 0x0000019a
_021800f0: .word 0x00001ccd
@@ -5113,7 +5113,7 @@ _0218046c:
bl func_ov00_020c5d74
mov r1, #0x1e
ldr r0, _021800c8 ; =data_027e0ffc
ldr r2, _021800e4 ; =data_027e0f94
ldr r2, _021800e4 ; =gPlayerPos
str r1, [r4, #0x554]
mov r5, #0x5a
mov r1, #0x224
@@ -5670,7 +5670,7 @@ _02180c48: .word gAdventureFlags
func_ov35_02180c4c: ; 0x02180c4c
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _02180cd0 ; =data_027e0f94
ldr r1, _02180cd0 ; =gPlayerPos
mov r4, r0
ldr r2, [r1]
ldr r0, [r1, #4]
@@ -5702,7 +5702,7 @@ func_ov35_02180c4c: ; 0x02180c4c
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_02180cd0: .word data_027e0f94
_02180cd0: .word gPlayerPos
_02180cd4: .word data_027e0f64
arm_func_end func_ov35_02180c4c
@@ -6509,7 +6509,7 @@ _021817c4:
mov r2, #0
bl func_ov00_020bbbd0
ldr r0, _02181808 ; =data_ov00_020eec9c
ldr r2, _0218180c ; =data_027e0f94
ldr r2, _0218180c ; =gPlayerPos
mov r1, #0x124
bl func_ov00_020d7b20
mov r0, #0x5a
@@ -6520,7 +6520,7 @@ _021817fc: .word data_027e0fb8
_02181800: .word gPlayerLink
_02181804: .word gPlayer
_02181808: .word data_ov00_020eec9c
_0218180c: .word data_027e0f94
_0218180c: .word gPlayerPos
arm_func_end func_ov35_0218174c
.global func_ov35_02181810
@@ -7414,7 +7414,7 @@ func_ov35_02182474: ; 0x02182474
add r0, r4, #0x78
mov r2, #0x5b0
bl func_0202b154
ldr r0, _02182554 ; =data_027e0f94
ldr r0, _02182554 ; =gPlayerPos
ldr ip, _02182558 ; =data_02050f54
ldr r2, [r0]
ldr r1, _0218255c ; =0xffffe333
@@ -7464,7 +7464,7 @@ func_ov35_02182474: ; 0x02182474
bl func_ov35_0217f234
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02182554: .word data_027e0f94
_02182554: .word gPlayerPos
_02182558: .word data_02050f54
_0218255c: .word 0xffffe333
arm_func_end func_ov35_02182474
@@ -7512,7 +7512,7 @@ _021825d4:
mov r2, #0
bl func_ov00_020bbbd0
ldr r0, _02182618 ; =data_ov00_020eec9c
ldr r2, _0218261c ; =data_027e0f94
ldr r2, _0218261c ; =gPlayerPos
mov r1, #0x124
bl func_ov00_020d7b20
mov r0, #0x5a
@@ -7523,7 +7523,7 @@ _0218260c: .word data_027e0fb8
_02182610: .word gPlayerLink
_02182614: .word gPlayer
_02182618: .word data_ov00_020eec9c
_0218261c: .word data_027e0f94
_0218261c: .word gPlayerPos
arm_func_end func_ov35_02182560
.global func_ov35_02182620
@@ -7824,7 +7824,7 @@ func_ov35_021829c0: ; 0x021829c0
mov r0, r0, lsl #0x10
cmp r1, r0, lsr #16
ble _02182a94
ldr r1, _02182aa0 ; =data_027e0f94
ldr r1, _02182aa0 ; =gPlayerPos
add r0, r4, #0x48
bl func_ov00_020ce2f0
ldr r1, _02182aa4 ; =0x00001e66
@@ -7875,7 +7875,7 @@ _02182a94:
ldmia sp!, {r4, pc}
.align 2, 0
_02182a9c: .word 0x00002aab
_02182aa0: .word data_027e0f94
_02182aa0: .word gPlayerPos
_02182aa4: .word 0x00001e66
_02182aa8: .word gPlayerLink
arm_func_end func_ov35_021829c0
@@ -7895,7 +7895,7 @@ func_ov35_02182aac: ; 0x02182aac
mov r0, r0, lsl #0x10
cmp r1, r0, lsr #16
ble _02182b08
ldr r1, _02182b14 ; =data_027e0f94
ldr r1, _02182b14 ; =gPlayerPos
add r0, r4, #0x48
bl func_ov00_020ce2f0
ldr r1, _02182b18 ; =0x00001ccd
@@ -7911,7 +7911,7 @@ _02182b08:
ldmia sp!, {r4, pc}
.align 2, 0
_02182b10: .word 0x00002aab
_02182b14: .word data_027e0f94
_02182b14: .word gPlayerPos
_02182b18: .word 0x00001ccd
arm_func_end func_ov35_02182aac
@@ -7932,7 +7932,7 @@ func_ov35_02182b1c: ; 0x02182b1c
addhs sp, sp, #0x118
ldmhsia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _02182f88 ; =data_027e0f64
ldr r3, _02182f8c ; =data_027e0f94
ldr r3, _02182f8c ; =gPlayerPos
ldr r0, [r0]
add r6, sp, #0xac
ldr r0, [r0, #4]
@@ -8133,7 +8133,7 @@ _02182e40:
cmp r5, #0
addne sp, sp, #0x118
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _02182f8c ; =data_027e0f94
ldr r0, _02182f8c ; =gPlayerPos
mov r8, #0
ldr ip, _02182f98 ; =0x0000ffff
ldr r7, _02182f9c ; =0x0000099a
@@ -8214,7 +8214,7 @@ _02182e40:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_02182f88: .word data_027e0f64
_02182f8c: .word data_027e0f94
_02182f8c: .word gPlayerPos
_02182f90: .word data_027e0764
_02182f94: .word gMapManager
_02182f98: .word 0x0000ffff
@@ -8743,7 +8743,7 @@ _02183680:
ldr r0, [r6, #0x14]
cmp r0, #0
bne _021836c4
ldr r1, _02183758 ; =data_027e0f94
ldr r1, _02183758 ; =gPlayerPos
ldr r0, _0218375c ; =data_027e0fac
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -8796,7 +8796,7 @@ _0218374c:
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02183758: .word data_027e0f94
_02183758: .word gPlayerPos
_0218375c: .word data_027e0fac
_02183760: .word 0x00005554
arm_func_end func_ov35_0218361c
asm/ov36.inc
+1 -1
View File
@@ -80,7 +80,7 @@
.extern data_027e0f64
.extern data_027e0f6c
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern gPlayerLink
.extern data_027e0fcc
asm/ov36.s
+6 -6
View File
@@ -9044,7 +9044,7 @@ _02183c98:
blx r2
b _02183ce8
_02183cbc:
ldr r1, _02184094 ; =data_027e0f94
ldr r1, _02184094 ; =gPlayerPos
ldr r0, _02184098 ; =data_027e0fd4
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -9309,7 +9309,7 @@ _02184078:
.align 2, 0
_0218408c: .word 0x424d5459
_02184090: .word gItemManager
_02184094: .word data_027e0f94
_02184094: .word gPlayerPos
_02184098: .word data_027e0fd4
_0218409c: .word data_02050f54
_021840a0: .word 0x0000219a
@@ -10442,7 +10442,7 @@ func_ov36_02185050: ; 0x02185050
bl func_ov00_020bc46c
cmp r0, #1
bne _02185090
ldr r0, _021850c4 ; =data_027e0f94
ldr r0, _021850c4 ; =gPlayerPos
ldr r2, [r0]
ldr r1, [r0, #4]
str r2, [sp]
@@ -10466,7 +10466,7 @@ _021850ac:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021850c0: .word gPlayerLink
_021850c4: .word data_027e0f94
_021850c4: .word gPlayerPos
arm_func_end func_ov36_02185050
.global func_ov36_021850c8
@@ -10940,7 +10940,7 @@ func_ov36_021856cc: ; 0x021856cc
str r5, [sp, #0x10]
str r2, [sp, #0xc]
ldr r2, [r1, #8]
ldr r1, _0218585c ; =data_027e0f94
ldr r1, _0218585c ; =gPlayerPos
str r2, [sp, #0x14]
ldr r0, [r0]
ldr r1, [r1, #4]
@@ -11034,7 +11034,7 @@ _0218581c:
.align 2, 0
_02185854: .word data_027e0fa0
_02185858: .word data_027e0fcc
_0218585c: .word data_027e0f94
_0218585c: .word gPlayerPos
_02185860: .word gPlayerLink
arm_func_end func_ov36_021856cc
asm/ov37.inc
+1 -1
View File
@@ -82,7 +82,7 @@
.extern data_027e0f64
.extern data_027e0f6c
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fa0
.extern gPlayerLink
.extern data_027e0fe0
asm/ov37.s
+20 -20
View File
@@ -25,7 +25,7 @@ _0217bdac: .word data_027e0fe0
arm_func_start func_ov37_0217bdb0
func_ov37_0217bdb0: ; 0x0217bdb0
stmdb sp!, {r3, lr}
ldr r0, _0217be0c ; =data_027e0f94
ldr r0, _0217be0c ; =gPlayerPos
ldr r0, [r0, #4]
cmp r0, #0x5000
movgt r0, #1
@@ -49,7 +49,7 @@ _0217bdf4:
moveq r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_0217be0c: .word data_027e0f94
_0217be0c: .word gPlayerPos
_0217be10: .word data_027e0fa0
arm_func_end func_ov37_0217bdb0
@@ -945,7 +945,7 @@ _0217c978:
mov r0, r7
str r1, [r5, #0x48]
ldr r10, [r2, #0xdf4]
ldr r1, _0217cbec ; =data_027e0f94
ldr r1, _0217cbec ; =gPlayerPos
str r10, [r5, #0x4c]
ldr r10, [r2, #0xdf8]
add r2, sp, #0x18
@@ -1028,7 +1028,7 @@ _0217cadc:
mov r0, r9
str r1, [r6, #0x48]
ldr ip, [r2, #0xef8]
ldr r1, _0217cbec ; =data_027e0f94
ldr r1, _0217cbec ; =gPlayerPos
str ip, [r6, #0x4c]
ldr ip, [r2, #0xefc]
add r2, sp, #0xc
@@ -1078,7 +1078,7 @@ _0217cbdc: .word 0x00007fff
_0217cbe0: .word data_027e0d0c
_0217cbe4: .word gActorManager
_0217cbe8: .word data_ov37_02187dcc
_0217cbec: .word data_027e0f94
_0217cbec: .word gPlayerPos
arm_func_end func_ov37_0217c924
.global func_ov37_0217cbf0
@@ -1415,7 +1415,7 @@ func_ov37_0217cfb0: ; 0x0217cfb0
bl func_ov37_0217cf98
cmp r0, #0
beq _0217d058
ldr r1, _0217d5bc ; =data_027e0f94
ldr r1, _0217d5bc ; =gPlayerPos
ldr r0, _0217d5c0 ; =0x0000019a
ldr r1, [r1, #4]
cmp r1, r0
@@ -1819,7 +1819,7 @@ _0217d5a8:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0217d5bc: .word data_027e0f94
_0217d5bc: .word gPlayerPos
_0217d5c0: .word 0x0000019a
_0217d5c4: .word data_027e0ffc
_0217d5c8: .word 0x000002b6
@@ -2715,7 +2715,7 @@ _0217e280:
mov r0, r0, lsl #0x10
mov r7, r0, asr #0x10
_0217e290:
ldr r0, _0217e354 ; =data_027e0f94
ldr r0, _0217e354 ; =gPlayerPos
ldr lr, _0217e358 ; =data_027e0fa0
add r3, sp, #0xcc
ldmia r0, {r0, r1, r2}
@@ -2766,7 +2766,7 @@ _0217e344: .word 0x00150007
_0217e348: .word data_027e0764
_0217e34c: .word 0x00000222
_0217e350: .word data_027e0ffc
_0217e354: .word data_027e0f94
_0217e354: .word gPlayerPos
_0217e358: .word data_027e0fa0
_0217e35c: .word 0xffff8001
_0217e360: .word 0x00000e39
@@ -2798,7 +2798,7 @@ _0217e380:
str ip, [sp, #0xb8]
str r7, [sp, #0xbc]
bl func_01ff9e64
ldr r0, _0217e354 ; =data_027e0f94
ldr r0, _0217e354 ; =gPlayerPos
add r1, sp, #0xd8
ldr r6, [r0, #4]
add r2, sp, #0xcc
@@ -4077,7 +4077,7 @@ func_ov37_0217f668: ; 0x0217f668
sub r0, r0, #1
str r0, [r3, #0xf90]
ldr r1, [r3, #0xf8c]
ldr r0, _0217f6d4 ; =data_027e0f94
ldr r0, _0217f6d4 ; =gPlayerPos
add r1, r1, #0x11
add ip, r1, #0x100
add r2, sp, #4
@@ -4094,7 +4094,7 @@ func_ov37_0217f668: ; 0x0217f668
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_0217f6d4: .word data_027e0f94
_0217f6d4: .word gPlayerPos
arm_func_end func_ov37_0217f668
.global func_ov37_0217f6d8
@@ -12921,7 +12921,7 @@ _02187034:
arm_func_start func_ov37_0218703c
func_ov37_0218703c: ; 0x0218703c
stmdb sp!, {r4, lr}
ldr r2, _0218707c ; =data_027e0f94
ldr r2, _0218707c ; =gPlayerPos
mov r4, r0
ldr r2, [r2, #4]
cmp r2, #0x3000
@@ -12937,7 +12937,7 @@ func_ov37_0218703c: ; 0x0218703c
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0218707c: .word data_027e0f94
_0218707c: .word gPlayerPos
arm_func_end func_ov37_0218703c
.global func_ov37_02187080
@@ -13020,7 +13020,7 @@ _021870d0:
cmpne r0, #7
cmpne r0, #8
beq _0218738c
ldr r0, _0218774c ; =data_027e0f94
ldr r0, _0218774c ; =gPlayerPos
ldr r0, [r0, #4]
cmp r0, #0x3000
ble _0218738c
@@ -13412,7 +13412,7 @@ _02187730:
.align 2, 0
_02187744: .word gActorManager
_02187748: .word gPlayerLink
_0218774c: .word data_027e0f94
_0218774c: .word gPlayerPos
_02187750: .word 0x424d524e
_02187754: .word data_027e0ffc
_02187758: .word 0x0000019d
@@ -13784,7 +13784,7 @@ func_ov37_02187c5c: ; 0x02187c5c
stmdb sp!, {r4, lr}
sub sp, sp, #0x28
mov r4, r0
ldr r0, _02187ce4 ; =data_027e0f94
ldr r0, _02187ce4 ; =gPlayerPos
add r2, sp, #0x1c
add r1, r4, #0x54
bl func_01ff9bf8
@@ -13816,7 +13816,7 @@ func_ov37_02187c5c: ; 0x02187c5c
add sp, sp, #0x28
ldmia sp!, {r4, pc}
.align 2, 0
_02187ce4: .word data_027e0f94
_02187ce4: .word gPlayerPos
_02187ce8: .word gPlayer
arm_func_end func_ov37_02187c5c
@@ -13826,7 +13826,7 @@ func_ov37_02187cec: ; 0x02187cec
stmdb sp!, {r4, lr}
sub sp, sp, #0x28
mov r4, r0
ldr r0, _02187d84 ; =data_027e0f94
ldr r0, _02187d84 ; =gPlayerPos
add r2, sp, #0x1c
add r1, r4, #0x54
bl func_01ff9bf8
@@ -13863,7 +13863,7 @@ _02187d78:
add sp, sp, #0x28
ldmia sp!, {r4, pc}
.align 2, 0
_02187d84: .word data_027e0f94
_02187d84: .word gPlayerPos
_02187d88: .word gPlayer
_02187d8c: .word 0x000024cd
arm_func_end func_ov37_02187cec
asm/ov38.inc
+1 -1
View File
@@ -82,7 +82,7 @@
.extern data_027e0e5c
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern gActorManager
asm/ov38.s
+26 -26
View File
@@ -1861,7 +1861,7 @@ func_ov38_0217d6d8: ; 0x0217d6d8
mov r3, r2
bl func_01ff9e64
_0217d760:
ldr r1, _0217d908 ; =data_027e0f94
ldr r1, _0217d908 ; =gPlayerPos
add r2, sp, #0x10
add r0, r4, #0x48
bl func_01ff9bf8
@@ -1970,7 +1970,7 @@ _0217d874:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0217d904: .word 0xffffe99a
_0217d908: .word data_027e0f94
_0217d908: .word gPlayerPos
_0217d90c: .word 0x00000d9a
_0217d910: .word data_027e0ffc
_0217d914: .word data_02050f54
@@ -2815,7 +2815,7 @@ func_ov38_0217e4e0: ; 0x0217e4e0
sub sp, sp, #0xc
mov r7, r0
add r3, r7, #0x1000
ldr r0, _0217e678 ; =data_027e0f94
ldr r0, _0217e678 ; =gPlayerPos
add r2, sp, #0
add r1, r7, #0x14
ldr r5, [r3, #0x78]
@@ -2825,7 +2825,7 @@ func_ov38_0217e4e0: ; 0x0217e4e0
str r1, [sp, #4]
bl func_01ff9cec
add r1, r7, #0x1000
ldr r2, _0217e678 ; =data_027e0f94
ldr r2, _0217e678 ; =gPlayerPos
ldrsh r3, [r1, #0x94]
ldr r6, [r2, #4]
mov r4, r0
@@ -2920,7 +2920,7 @@ _0217e630:
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0217e678: .word data_027e0f94
_0217e678: .word gPlayerPos
_0217e67c: .word 0x00011fd7
_0217e680: .word 0x0000be66
_0217e684: .word 0x0000bccd
@@ -3002,7 +3002,7 @@ func_ov38_0217e77c: ; 0x0217e77c
sub sp, sp, #0x3c
mov r5, r0
bl func_ov38_02184120
ldr r1, _0217e8b4 ; =data_027e0f94
ldr r1, _0217e8b4 ; =gPlayerPos
mov r4, r0
ldr r2, [r1]
ldr r0, [r1, #4]
@@ -3079,7 +3079,7 @@ _0217e820:
add sp, sp, #0x3c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0217e8b4: .word data_027e0f94
_0217e8b4: .word gPlayerPos
_0217e8b8: .word 0xfffffe66
_0217e8bc: .word data_027e0ffc
_0217e8c0: .word 0x00000431
@@ -3091,7 +3091,7 @@ func_ov38_0217e8c4: ; 0x0217e8c4
stmdb sp!, {r4, r5, r6, r7, r8, lr}
sub sp, sp, #0x50
ldr r2, _0217ea44 ; =data_ov38_02188908
ldr r1, _0217ea48 ; =data_027e0f94
ldr r1, _0217ea48 ; =gPlayerPos
ldrh r5, [r2, #0xc0]
ldr r4, [r1]
ldr r3, [r1, #4]
@@ -3189,7 +3189,7 @@ _0217e9c4:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217ea44: .word data_ov38_02188908
_0217ea48: .word data_027e0f94
_0217ea48: .word gPlayerPos
_0217ea4c: .word 0xfffffccd
_0217ea50: .word data_027e0ffc
_0217ea54: .word 0x00000431
@@ -5292,7 +5292,7 @@ _02180784:
beq _02180a20
mov r0, r4
bl func_ov38_02184120
ldr r1, _02180a48 ; =data_027e0f94
ldr r1, _02180a48 ; =gPlayerPos
mov r5, r0
ldr r2, [r1]
ldr r0, [r1, #4]
@@ -5469,7 +5469,7 @@ _02180a20:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02180a44: .word data_027e0764
_02180a48: .word data_027e0f94
_02180a48: .word gPlayerPos
_02180a4c: .word data_ov38_02188908
_02180a50: .word data_ov38_02188938
_02180a54: .word 0xfffffe66
@@ -9054,7 +9054,7 @@ func_ov38_02183cb4: ; 0x02183cb4
ldrsh r0, [r0, #0x86]
cmp r0, #0x14
ble _02183d4c
ldr r1, _02183d60 ; =data_027e0f94
ldr r1, _02183d60 ; =gPlayerPos
add r2, sp, #0xc
add r0, r5, #0x48
bl func_01ff9bf8
@@ -9078,7 +9078,7 @@ _02183d4c:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02183d60: .word data_027e0f94
_02183d60: .word gPlayerPos
_02183d64: .word 0x000004cd
arm_func_end func_ov38_02183cb4
@@ -9485,7 +9485,7 @@ _021842b0:
str r0, [sp, #0x14]
mov r6, #0x11000
_021842c4:
ldr r0, _02184558 ; =data_027e0f94
ldr r0, _02184558 ; =gPlayerPos
mov r7, #0
ldr r2, [r0]
ldr r1, [r0, #4]
@@ -9654,7 +9654,7 @@ _0218446c:
_0218454c: .word 0x00005348
_02184550: .word 0x00006b6c
_02184554: .word 0xffffb364
_02184558: .word data_027e0f94
_02184558: .word gPlayerPos
_0218455c: .word data_ov38_021889cc
_02184560: .word data_ov20_021793cc ; data_ov22_021793cc, data_ov23_021793cc, data_ov24_021793cc, data_ov25_021793cc, data_ov26_021793cc, data_ov28_021793cc, data_ov29_021793cc
_02184564: .word data_027e0764
@@ -11238,7 +11238,7 @@ func_ov38_02185b14: ; 0x02185b14
mov r0, #1
strb r0, [sp, #0x21]
ldrsh r1, [r4, #0x94]
ldr r0, _02185c38 ; =data_027e0f94
ldr r0, _02185c38 ; =gPlayerPos
add r8, sp, #0xc
sub r1, r1, #0x8000
strh r1, [sp, #0x2c]
@@ -11288,7 +11288,7 @@ func_ov38_02185b14: ; 0x02185b14
add sp, sp, #0x44
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_02185c38: .word data_027e0f94
_02185c38: .word gPlayerPos
_02185c3c: .word data_02050f54
_02185c40: .word data_027e0fe8
_02185c44: .word 0x444d534f
@@ -11517,7 +11517,7 @@ _02185f3c:
_02185f5c:
cmp r3, #0x2d
bne _02186144
ldr r0, _02186a1c ; =data_027e0f94
ldr r0, _02186a1c ; =gPlayerPos
ldr r1, _02186a10 ; =data_ov38_021891e0
ldr ip, [r0]
ldr r5, [r0, #4]
@@ -11694,7 +11694,7 @@ _02186194:
mov r1, r2, lsl #0x11
mov r1, r1, asr #0x10
bl func_ov00_020a61ac
ldr r1, _02186a1c ; =data_027e0f94
ldr r1, _02186a1c ; =gPlayerPos
add r0, sp, #0x8c
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -11713,7 +11713,7 @@ _02186194:
add sp, sp, #0x154
ldmia sp!, {r4, r5, pc}
_02186268:
ldr r1, _02186a1c ; =data_027e0f94
ldr r1, _02186a1c ; =gPlayerPos
mov r5, #0x1000
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -12080,7 +12080,7 @@ _02186738:
str r0, [r1, #0x218]
str r0, [r1, #0x210]
ldr r2, [r1, #0x118]
ldr r0, _02186a1c ; =data_027e0f94
ldr r0, _02186a1c ; =gPlayerPos
str r2, [r1, #0x180]
ldr r2, [r1, #0x11c]
add sp, sp, #0x154
@@ -12221,7 +12221,7 @@ _021869dc:
_02186a10: .word data_ov38_021891e0
_02186a14: .word gMapManager
_02186a18: .word 0x00000ccd
_02186a1c: .word data_027e0f94
_02186a1c: .word gPlayerPos
_02186a20: .word gPlayerLink
_02186a24: .word 0x00000333
_02186a28: .word data_027e0f64
@@ -13707,7 +13707,7 @@ _02187fac:
cmp r1, #0x7000
addle sp, sp, #0x154
ldmleia sp!, {r4, r5, pc}
ldr r1, _0218809c ; =data_027e0f94
ldr r1, _0218809c ; =gPlayerPos
ldr r2, _021880a0 ; =0x00006ccd
ldr r1, [r1, #4]
mov r3, r4
@@ -13738,7 +13738,7 @@ _0218808c: .word 0x00001a2c
_02188090: .word data_ov38_021893d8
_02188094: .word gAdventureFlags
_02188098: .word data_02057200
_0218809c: .word data_027e0f94
_0218809c: .word gPlayerPos
_021880a0: .word 0x00006ccd
arm_func_end func_ov38_02187964
@@ -13972,7 +13972,7 @@ _02188394:
str r0, [r1]
ldmia sp!, {r3, r4, r5, pc}
_021883dc:
ldr r0, _021884d0 ; =data_027e0f94
ldr r0, _021884d0 ; =gPlayerPos
ldr r3, _021884bc ; =data_02050f54
ldr r5, [r0]
ldr r1, [r0, #4]
@@ -14036,7 +14036,7 @@ _021884c0: .word data_ov38_0218943c
_021884c4: .word data_027e0c68
_021884c8: .word data_ov38_02189484
_021884cc: .word data_ov38_02189448
_021884d0: .word data_027e0f94
_021884d0: .word gPlayerPos
_021884d4: .word 0x0000019a
_021884d8: .word data_02057200
arm_func_end func_ov38_0218819c
asm/ov39.inc
+1 -1
View File
@@ -83,7 +83,7 @@
.extern gMapManager
.extern data_027e0f64
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
asm/ov39.s
+18 -18
View File
@@ -1780,7 +1780,7 @@ func_ov39_0217d534: ; 0x0217d534
mov r2, #0
str r3, [sp, #0x10]
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, _0217d5c8 ; =data_027e0f94
ldr r1, _0217d5c8 ; =gPlayerPos
mov r3, r0
str r0, [r4, #0x4c]
add r0, r4, #0x48
@@ -1801,7 +1801,7 @@ func_ov39_0217d534: ; 0x0217d534
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217d5c4: .word gMapManager
_0217d5c8: .word data_027e0f94
_0217d5c8: .word gPlayerPos
_0217d5cc: .word gActorManager
_0217d5d0: .word 0x4e415649
arm_func_end func_ov39_0217d534
@@ -2258,7 +2258,7 @@ _0217dbec:
movne r0, #0x14000
strne r0, [r5, #0x1e8]
bne _0217dc74
ldr r1, _0217dd18 ; =data_027e0f94
ldr r1, _0217dd18 ; =gPlayerPos
add r2, sp, #0x60
add r0, r5, #0x48
bl func_01ff9bf8
@@ -2271,7 +2271,7 @@ _0217dbec:
subge r0, r0, #0x1000
strge r0, [r5, #0x1e8]
_0217dc74:
ldr r0, _0217dd18 ; =data_027e0f94
ldr r0, _0217dd18 ; =gPlayerPos
add r2, sp, #0x60
add r1, r5, #0x268
bl func_01ff9bc4
@@ -2314,7 +2314,7 @@ _0217dd08: .word 0x0000011f
_0217dd0c: .word data_027e0f64
_0217dd10: .word gPlayerLink
_0217dd14: .word 0x000004cd
_0217dd18: .word data_027e0f94
_0217dd18: .word gPlayerPos
arm_func_end func_ov39_0217d790
.global func_ov39_0217dd1c
@@ -3805,7 +3805,7 @@ func_ov39_0217f10c: ; 0x0217f10c
ldr r1, _0217f264 ; =data_027e0fac
ldr r4, [r5, #0x138]
ldrsh r3, [r1]
ldr r0, _0217f268 ; =data_027e0f94
ldr r0, _0217f268 ; =gPlayerPos
add r8, sp, #0x10
ldmia r0, {r0, r1, r2}
strh r3, [sp]
@@ -3888,7 +3888,7 @@ _0217f23c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217f264: .word data_027e0fac
_0217f268: .word data_027e0f94
_0217f268: .word gPlayerPos
_0217f26c: .word data_02050f54
_0217f270: .word 0x00002b33
_0217f274: .word gPlayerLink
@@ -4587,7 +4587,7 @@ _0217fbc4: .word data_027e0e58
func_ov39_0217fbc8: ; 0x0217fbc8
stmdb sp!, {lr}
sub sp, sp, #0x14
ldr r1, _0217fc40 ; =data_027e0f94
ldr r1, _0217fc40 ; =gPlayerPos
mov ip, r0
add r3, sp, #8
ldmia r1, {r0, r1, r2}
@@ -4616,7 +4616,7 @@ func_ov39_0217fbc8: ; 0x0217fbc8
add sp, sp, #0x14
ldmia sp!, {pc}
.align 2, 0
_0217fc40: .word data_027e0f94
_0217fc40: .word gPlayerPos
_0217fc44: .word data_027e0e58
_0217fc48: .word 0x000001c1
_0217fc4c: .word 0x000001c2
@@ -4814,7 +4814,7 @@ _0217fe9c:
bl func_ov39_0217e2e8
cmp r0, #0
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _0217ff14 ; =data_027e0f94
ldr r0, _0217ff14 ; =gPlayerPos
ldr r1, [r4, #0x4c]
ldr r0, [r0, #4]
cmp r0, r1
@@ -4829,7 +4829,7 @@ _0217fe9c:
bl func_ov39_0217d5d4
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217ff14: .word data_027e0f94
_0217ff14: .word gPlayerPos
_0217ff18: .word 0x00003333
arm_func_end func_ov39_0217fe5c
@@ -6021,7 +6021,7 @@ func_ov39_02180ff4: ; 0x02180ff4
bl func_ov39_0217e2e8
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _021810c0 ; =data_027e0f94
ldr r0, _021810c0 ; =gPlayerPos
ldr r1, [r4, #0x4c]
ldr r0, [r0, #4]
cmp r0, r1
@@ -6037,7 +6037,7 @@ func_ov39_02180ff4: ; 0x02180ff4
ldmia sp!, {r4, pc}
.align 2, 0
_021810bc: .word data_02050f54
_021810c0: .word data_027e0f94
_021810c0: .word gPlayerPos
_021810c4: .word 0x00003333
arm_func_end func_ov39_02180ff4
@@ -6695,7 +6695,7 @@ func_ov39_0218199c: ; 0x0218199c
add r0, r7, #0xab
mov r3, #0x3800
add r9, r0, #0x2a00
ldr r2, _02181cbc ; =data_027e0f94
ldr r2, _02181cbc ; =gPlayerPos
mov r1, r9, lsl #0x10
ldr r0, [r2]
str r6, [sp, #0x34]
@@ -6774,7 +6774,7 @@ _02181afc:
cmp r5, #0
cmpeq r4, #0
bne _02181bcc
ldr r0, _02181cbc ; =data_027e0f94
ldr r0, _02181cbc ; =gPlayerPos
add r3, sp, #0x28
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -6895,7 +6895,7 @@ _02181c14:
add sp, sp, #0x40
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_02181cbc: .word data_027e0f94
_02181cbc: .word gPlayerPos
_02181cc0: .word 0xffffd555
_02181cc4: .word data_027e0764
_02181cc8: .word data_027e0ffc
@@ -7335,7 +7335,7 @@ _021822c8:
bl func_ov00_020bc280
bl func_ov39_0218240c
mov r1, #0
ldr r3, _021823f0 ; =data_027e0f94
ldr r3, _021823f0 ; =gPlayerPos
mov r2, r1
bl func_ov05_02106980
bl func_ov39_0217e288
@@ -7402,7 +7402,7 @@ _0218233c:
.align 2, 0
_021823e8: .word data_027e0fb8
_021823ec: .word gPlayerLink
_021823f0: .word data_027e0f94
_021823f0: .word gPlayerPos
_021823f4: .word data_027e0ffc
_021823f8: .word 0x000001bd
_021823fc: .word data_ov29_0217a4ac
asm/ov41.inc
+1 -1
View File
@@ -84,7 +84,7 @@
.extern data_027e0f6c
.extern data_027e0f78
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fd0
asm/ov41.s
+4 -4
View File
@@ -3495,7 +3495,7 @@ func_ov41_0218c1c4: ; 0x0218c1c4
func_ov41_0218c204: ; 0x0218c204
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _0218c3bc ; =data_027e0f94
ldr r1, _0218c3bc ; =gPlayerPos
ldr r3, _0218c3c0 ; =gPlayerLink
mov r4, r0
add ip, sp, #0xc
@@ -3607,7 +3607,7 @@ _0218c3b0:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_0218c3bc: .word data_027e0f94
_0218c3bc: .word gPlayerPos
_0218c3c0: .word gPlayerLink
_0218c3c4: .word 0x0000319a
_0218c3c8: .word gAdventureFlags
@@ -4712,7 +4712,7 @@ _0218d20c: .word 0x0000071c
func_ov41_0218d210: ; 0x0218d210
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x18
ldr r1, _0218d310 ; =data_027e0f94
ldr r1, _0218d310 ; =gPlayerPos
ldr r3, _0218d314 ; =gPlayer
mov r6, r0
add r4, sp, #0xc
@@ -4777,7 +4777,7 @@ _0218d2fc:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0218d310: .word data_027e0f94
_0218d310: .word gPlayerPos
_0218d314: .word gPlayer
_0218d318: .word data_027e0fac
_0218d31c: .word gMapManager
asm/ov42.inc
+1 -1
View File
@@ -65,7 +65,7 @@
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f78
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
asm/ov42.s
+2 -2
View File
@@ -624,7 +624,7 @@ func_ov42_02189cf8: ; 0x02189cf8
strb r3, [r1, #0x79]
strb r3, [r1, #0x7b]
ldr r0, [r0]
ldr r1, _02189e54 ; =data_027e0f94
ldr r1, _02189e54 ; =gPlayerPos
rsb r2, r2, #0
bl func_ov00_020bcdec
ldmia sp!, {r4, pc}
@@ -696,7 +696,7 @@ _02189e44:
.align 2, 0
_02189e4c: .word gPlayerLink
_02189e50: .word data_027e0fb8
_02189e54: .word data_027e0f94
_02189e54: .word gPlayerPos
_02189e58: .word data_ov00_020eec9c
_02189e5c: .word 0x88888889
arm_func_end func_ov42_02189cf8
asm/ov43.inc
+1 -1
View File
@@ -66,7 +66,7 @@
.extern data_027e0f64
.extern data_027e0f6c
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
asm/ov43.s
+5 -5
View File
@@ -581,7 +581,7 @@ _02189c88: .word 0x0000071c
func_ov43_02189c8c: ; 0x02189c8c
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x18
ldr ip, _02189e78 ; =data_027e0f94
ldr ip, _02189e78 ; =gPlayerPos
add r3, sp, #0xc
mov r7, r0
mov r6, r1
@@ -709,7 +709,7 @@ _02189e58:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02189e78: .word data_027e0f94
_02189e78: .word gPlayerPos
_02189e7c: .word data_02050f54
_02189e80: .word 0xffff8001
_02189e84: .word 0x00000ccd
@@ -4146,7 +4146,7 @@ func_ov43_0218cd7c: ; 0x0218cd7c
mov r0, r10
bl _ZN5Actor14GetAngleToLinkEv
strh r0, [r6]
ldr r0, _0218cf88 ; =data_027e0f94
ldr r0, _0218cf88 ; =gPlayerPos
ldr r1, [r10, #0x3c0]
ldr r11, [r0]
cmp r1, #0
@@ -4203,7 +4203,7 @@ _0218ce8c:
str r0, [r9]
mov r0, r10
bl _ZN5Actor14GetAngleToLinkEv
ldr r2, _0218cf88 ; =data_027e0f94
ldr r2, _0218cf88 ; =gPlayerPos
strh r0, [r8]
ldmia r2, {r0, r1, r3}
_0218ceac:
@@ -4267,7 +4267,7 @@ _0218cf78:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218cf84: .word gPlayerLink
_0218cf88: .word data_027e0f94
_0218cf88: .word gPlayerPos
_0218cf8c: .word gMapManager
arm_func_end func_ov43_0218cd7c
asm/ov44.inc
+1 -1
View File
@@ -69,7 +69,7 @@
.extern data_027e0764
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fe0
.extern gActorManager
.extern data_027e0fe8
asm/ov44.s
+15 -15
View File
@@ -236,7 +236,7 @@ _021897d4: .word 0xfffffe66
func_ov44_021897d8: ; 0x021897d8
stmdb sp!, {lr}
sub sp, sp, #0x14
ldr r1, _02189818 ; =data_027e0f94
ldr r1, _02189818 ; =gPlayerPos
add r3, sp, #8
mov ip, r0
ldmia r1, {r0, r1, r2}
@@ -251,7 +251,7 @@ func_ov44_021897d8: ; 0x021897d8
add sp, sp, #0x14
ldmia sp!, {pc}
.align 2, 0
_02189818: .word data_027e0f94
_02189818: .word gPlayerPos
arm_func_end func_ov44_021897d8
.global func_ov44_0218981c
@@ -259,7 +259,7 @@ _02189818: .word data_027e0f94
func_ov44_0218981c: ; 0x0218981c
stmdb sp!, {lr}
sub sp, sp, #0x14
ldr r1, _0218985c ; =data_027e0f94
ldr r1, _0218985c ; =gPlayerPos
add r3, sp, #8
mov ip, r0
ldmia r1, {r0, r1, r2}
@@ -274,7 +274,7 @@ func_ov44_0218981c: ; 0x0218981c
add sp, sp, #0x14
ldmia sp!, {pc}
.align 2, 0
_0218985c: .word data_027e0f94
_0218985c: .word gPlayerPos
arm_func_end func_ov44_0218981c
.global func_ov44_02189860
@@ -1491,7 +1491,7 @@ _0218a79c:
ldrb r0, [r4, #0x342]
cmp r0, #0
bne _0218a7fc
ldr r0, _0218a900 ; =data_027e0f94
ldr r0, _0218a900 ; =gPlayerPos
add r3, sp, #0x14
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -1584,7 +1584,7 @@ _0218a8ec:
.align 2, 0
_0218a8f8: .word gActorManager
_0218a8fc: .word data_027e0764
_0218a900: .word data_027e0f94
_0218a900: .word gPlayerPos
_0218a904: .word 0x52415448
arm_func_end func_ov44_0218a604
@@ -2595,7 +2595,7 @@ _0218b3b4: .word 0x00000404
func_ov44_0218b3b8: ; 0x0218b3b8
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x14
ldr r1, _0218b430 ; =data_027e0f94
ldr r1, _0218b430 ; =gPlayerPos
mov r4, r0
add r3, sp, #8
ldmia r1, {r0, r1, r2}
@@ -2625,7 +2625,7 @@ _0218b408:
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218b430: .word data_027e0f94
_0218b430: .word gPlayerPos
_0218b434: .word 0x00001555
arm_func_end func_ov44_0218b3b8
@@ -2811,7 +2811,7 @@ _0218b660: ; jump table
b _0218b6a8 ; case 3
_0218b670:
ldr r1, [r4, #0x50]
ldr r0, _0218b6f8 ; =data_027e0f94
ldr r0, _0218b6f8 ; =gPlayerPos
str r1, [sp, #4]
ldr r1, [r0, #8]
ldr r2, _0218b6fc ; =0x0000019a
@@ -2825,7 +2825,7 @@ _0218b670:
str r0, [r4, #0x68]
b _0218b6dc
_0218b6a8:
ldr r0, _0218b6f8 ; =data_027e0f94
ldr r0, _0218b6f8 ; =gPlayerPos
ldr r3, [r4, #0x48]
ldr r1, [r0]
ldr r2, _0218b6fc ; =0x0000019a
@@ -2847,7 +2847,7 @@ _0218b6dc:
ldmia sp!, {r4, pc}
.align 2, 0
_0218b6f4: .word 0x00001555
_0218b6f8: .word data_027e0f94
_0218b6f8: .word gPlayerPos
_0218b6fc: .word 0x0000019a
arm_func_end func_ov44_0218b630
@@ -4701,7 +4701,7 @@ _0218cd9c: .word 0x0000019a
arm_func_start func_ov44_0218cda0
func_ov44_0218cda0: ; 0x0218cda0
stmdb sp!, {r4, lr}
ldr r1, _0218ce98 ; =data_027e0f94
ldr r1, _0218ce98 ; =gPlayerPos
mov r4, r0
ldr r2, [r4, #0x48]
ldr r0, [r1]
@@ -4765,7 +4765,7 @@ _0218ce80:
blx r1
ldmia sp!, {r4, pc}
.align 2, 0
_0218ce98: .word data_027e0f94
_0218ce98: .word gPlayerPos
_0218ce9c: .word data_02050f54
_0218cea0: .word 0x0000019a
arm_func_end func_ov44_0218cda0
@@ -6840,7 +6840,7 @@ _0218e870: .word func_ov00_020c6c78
func_ov44_0218e874: ; 0x0218e874
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr ip, _0218e8b0 ; =data_027e0f94
ldr ip, _0218e8b0 ; =gPlayerPos
add r3, sp, #0
mov r5, r0
mov r4, r1
@@ -6854,7 +6854,7 @@ func_ov44_0218e874: ; 0x0218e874
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0218e8b0: .word data_027e0f94
_0218e8b0: .word gPlayerPos
arm_func_end func_ov44_0218e874
.global func_ov44_0218e8b4
asm/ov45.inc
+1 -1
View File
@@ -60,7 +60,7 @@
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0f64
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
asm/ov45.s
+2 -2
View File
@@ -4349,7 +4349,7 @@ func_ov45_0218cb5c: ; 0x0218cb5c
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [sp, #0x18]
ldr r1, _0218cbbc ; =data_027e0f94
ldr r1, _0218cbbc ; =gPlayerPos
add r2, r0, #0x1000
mov r0, r3
str r2, [sp, #0x18]
@@ -4366,7 +4366,7 @@ func_ov45_0218cb5c: ; 0x0218cb5c
add sp, sp, #0x1c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0218cbbc: .word data_027e0f94
_0218cbbc: .word gPlayerPos
arm_func_end func_ov45_0218cb5c
.global func_ov45_0218cbc0
asm/ov46.inc
+1 -1
View File
@@ -75,7 +75,7 @@
.extern data_027e0dbc
.extern data_027e0e58
.extern data_027e0f6c
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fe0
asm/ov46.s
+2 -2
View File
@@ -2241,7 +2241,7 @@ _02191b68:
str r1, [sp, #0x40]
mla r5, r4, ip, r5
ldr r4, [sp, #0x40]
ldr r0, _02191e54 ; =data_027e0f94
ldr r0, _02191e54 ; =gPlayerPos
mla r5, r4, r3, r5
adds r4, r6, #0x800
adc r3, r5, #0
@@ -2285,7 +2285,7 @@ _02191e44: .word data_ov46_02194c2c
_02191e48: .word data_ov46_02194c14
_02191e4c: .word data_ov46_02194c20
_02191e50: .word 0x0000059a
_02191e54: .word data_027e0f94
_02191e54: .word gPlayerPos
_02191e58: .word data_ov46_02194c38
arm_func_end func_ov46_0219194c
asm/ov47.inc
+1 -1
View File
@@ -68,7 +68,7 @@
.extern gMapManager
.extern data_027e0f6c
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fe0
.extern data_027e0fe8
.extern data_027e0fec
asm/ov47.s
+2 -2
View File
@@ -4788,7 +4788,7 @@ func_ov47_02193f78: ; 0x02193f78
add r1, sp, #0
mov r0, r5
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r1, _02194104 ; =data_027e0f94
ldr r1, _02194104 ; =gPlayerPos
ldr r0, _02194108 ; =gItemManager
ldr r2, [r1, #4]
ldr r0, [r0]
@@ -4872,7 +4872,7 @@ _021940ec:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02194104: .word data_027e0f94
_02194104: .word gPlayerPos
_02194108: .word gItemManager
_0219410c: .word gPlayer
arm_func_end func_ov47_02193f78
asm/ov48.inc
+1 -1
View File
@@ -135,7 +135,7 @@
.extern data_027e0e5c
.extern gMapManager
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern data_027e0fac
.extern data_027e0fe0
.extern gActorManager
asm/ov48.s
+8 -8
View File
@@ -770,7 +770,7 @@ func_ov48_021908ac: ; 0x021908ac
addeq sp, sp, #0x1c
moveq r0, #0
ldmeqia sp!, {r4, r5, pc}
ldr r0, _0219093c ; =data_027e0f94
ldr r0, _0219093c ; =gPlayerPos
add r2, sp, #0x10
add r1, r5, #0x54
bl func_01ff9bf8
@@ -798,7 +798,7 @@ func_ov48_021908ac: ; 0x021908ac
add sp, sp, #0x1c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0219093c: .word data_027e0f94
_0219093c: .word gPlayerPos
_02190940: .word gPlayer
_02190944: .word 0x000004cd
arm_func_end func_ov48_021908ac
@@ -1929,7 +1929,7 @@ _02191694:
ldrnesh r1, [r0, #0xf8]
subne r1, r1, #0xb6
strh r1, [r0, #0xf8]
ldr r0, _02191c0c ; =data_027e0f94
ldr r0, _02191c0c ; =gPlayerPos
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, r4
@@ -2286,7 +2286,7 @@ _02191be4:
_02191c00: .word 0x41525257
_02191c04: .word data_02050f54
_02191c08: .word 0xfffffccd
_02191c0c: .word data_027e0f94
_02191c0c: .word gPlayerPos
_02191c10: .word 0x00000666
_02191c14: .word data_ov48_0219542c
_02191c18: .word data_ov00_020e892c
@@ -2972,14 +2972,14 @@ _02192324: .word func_ov00_020cd0a8
func_ov48_02192328: ; 0x02192328
ldr ip, _02192344 ; =func_ov00_020cd120
add r0, r0, #0x138
ldr r1, _02192348 ; =data_027e0f94
ldr r1, _02192348 ; =gPlayerPos
ldr r2, _0219234c ; =0x0000013f
ldr r3, _02192350 ; =0x0000071c
add r0, r0, #0x400
bx ip
.align 2, 0
_02192344: .word func_ov00_020cd120
_02192348: .word data_027e0f94
_02192348: .word gPlayerPos
_0219234c: .word 0x0000013f
_02192350: .word 0x0000071c
arm_func_end func_ov48_02192328
@@ -3277,7 +3277,7 @@ _02192714:
ldr r1, _02193168 ; =0x00000247
add r2, r9, #0x48
bl func_ov00_020cec60
ldr r0, _0219316c ; =data_027e0f94
ldr r0, _0219316c ; =gPlayerPos
add r3, sp, #0x6c
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -3984,7 +3984,7 @@ _02193154:
_02193160: .word gItemManager
_02193164: .word data_027e0ffc
_02193168: .word 0x00000247
_0219316c: .word data_027e0f94
_0219316c: .word gPlayerPos
_02193170: .word gPlayer
_02193174: .word 0x00000191
_02193178: .word 0x5342454d
asm/ov49.inc
+1 -1
View File
@@ -79,7 +79,7 @@
.extern gMapManager
.extern data_027e0f64
.extern gPlayer
.extern data_027e0f94
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe8

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