Name gPlayerLink singleton

This commit is contained in:
Aetias
2024-05-18 17:05:59 +02:00
parent c5430ca4ac
commit 9bf232a4fd
99 changed files with 688 additions and 683 deletions
+2 -2
View File
@@ -4010,8 +4010,8 @@ data_027e0fc0:
.global data_027e0fc4
data_027e0fc4:
.space 0x4
.global data_027e0fc8
data_027e0fc8:
.global gPlayerLink
gPlayerLink:
.space 0x4
.global data_027e0fcc
data_027e0fcc:
+1 -1
View File
@@ -121,7 +121,7 @@
.extern data_027e0f84
.extern data_027e0f8c
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0ffc
+3 -3
View File
@@ -76771,7 +76771,7 @@ _0203816c:
ldrsh r0, [r5, #0x1e]
cmp r0, #0
bne _020381b0
ldr r0, _0203857c ; =data_027e0fc8
ldr r0, _0203857c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bce48
cmp r0, #0
@@ -76781,7 +76781,7 @@ _0203816c:
mov r0, #0
ldmia sp!, {r3, r4, r5, pc}
_020381b0:
ldr r0, _0203857c ; =data_027e0fc8
ldr r0, _0203857c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcec8
cmp r0, #0
@@ -77053,7 +77053,7 @@ _02038568:
.align 2, 0
_02038574: .word data_027e103c
_02038578: .word gAdventureFlags
_0203857c: .word data_027e0fc8
_0203857c: .word gPlayerLink
_02038580: .word 0x00007fff
_02038584: .word data_027e0cb4
_02038588: .word data_ov12_02137c64
+1 -1
View File
@@ -30,7 +30,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe4
.extern data_027e103c
.extern data_ov00_020e9c88
+14 -14
View File
@@ -465,14 +465,14 @@ _ZN5Actor18func_ov00_020c195cEv: ; 0x020c195c
cmp r1, #0
moveq r0, #0
ldmeqia sp!, {r3, pc}
ldr r2, _020c1988 ; =data_027e0fc8
ldr r2, _020c1988 ; =gPlayerLink
add r1, r0, #0x48
ldr r0, [r2]
bl func_ov00_020bc854
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_020c1988: .word data_027e0fc8
_020c1988: .word gPlayerLink
arm_func_end _ZN5Actor18func_ov00_020c195cEv
.global _ZN5Actor18func_ov00_020c198cEv
@@ -506,7 +506,7 @@ _020c19ec:
mov r0, #0
ldmia sp!, {r3, pc}
_020c19f4:
ldr r0, _020c1a2c ; =data_027e0fc8
ldr r0, _020c1a2c ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020c1a14
@@ -522,7 +522,7 @@ _020c1a1c: .word data_027e077c
_020c1a20: .word data_02056be4
_020c1a24: .word data_027e103c
_020c1a28: .word data_027e0f90
_020c1a2c: .word data_027e0fc8
_020c1a2c: .word gPlayerLink
arm_func_end _ZN5Actor18func_ov00_020c198cEv
.global _ZN20KillPickupItemActors6FilterEP5Actor
@@ -1113,7 +1113,7 @@ _020c218c:
bl _ZN5Actor18CollidesWithPlayerEj
cmp r0, #0
beq _020c2218
ldr r0, _020c2234 ; =data_027e0fc8
ldr r0, _020c2234 ; =gPlayerLink
mov r2, r5
ldr r0, [r0]
mov r1, #0xb
@@ -1152,7 +1152,7 @@ _020c2224: .word gAdventureFlags
_020c2228: .word data_027e0f94
_020c222c: .word data_027e0f90
_020c2230: .word gItemManager
_020c2234: .word data_027e0fc8
_020c2234: .word gPlayerLink
arm_func_end _ZN5Actor18func_ov00_020c1fc8Ej
.global _ZN5Actor18CollidesWithShieldEP8Cylinder
@@ -1241,7 +1241,7 @@ _020c2334:
ldmneia sp!, {r3, r4, r5, pc}
_020c2358:
tst r4, #8
ldrne r0, _020c23c0 ; =data_027e0fc8
ldrne r0, _020c23c0 ; =gPlayerLink
ldrne r0, [r0]
cmpne r0, #0
beq _020c2384
@@ -1269,7 +1269,7 @@ _020c23b0:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020c23bc: .word data_027e0f90
_020c23c0: .word data_027e0fc8
_020c23c0: .word gPlayerLink
arm_func_end _ZN5Actor18CollidesWithPlayerEj
.global _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
@@ -1641,7 +1641,7 @@ _020c2860: .word data_027e0fb8
arm_func_start _ZN5Actor9IsGrabbedEv
_ZN5Actor9IsGrabbedEv: ; 0x020c2864
stmdb sp!, {r4, lr}
ldr r1, _020c2888 ; =data_027e0fc8
ldr r1, _020c2888 ; =gPlayerLink
ldr r4, [r0, #8]
ldr r0, [r1]
bl func_ov00_020bc7f8
@@ -1650,7 +1650,7 @@ _ZN5Actor9IsGrabbedEv: ; 0x020c2864
movne r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_020c2888: .word data_027e0fc8
_020c2888: .word gPlayerLink
arm_func_end _ZN5Actor9IsGrabbedEv
.global _ZN5Actor12XzDistanceToEP5Vec3p
@@ -1993,7 +1993,7 @@ _ZN5Actor18func_ov00_020c2c70Ev: ; 0x020c2c70
bl func_0202d95c
b _020c2d00
_020c2cbc:
ldr r0, _020c2d3c ; =data_027e0fc8
ldr r0, _020c2d3c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -2028,7 +2028,7 @@ _020c2d00:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020c2d3c: .word data_027e0fc8
_020c2d3c: .word gPlayerLink
_020c2d40: .word data_027e0f94
arm_func_end _ZN5Actor18func_ov00_020c2c70Ev
@@ -2476,7 +2476,7 @@ _ZN5Actor8vfunc_b0Ev: ; 0x020c322c
arm_func_start _ZN5Actor10GetLinkPosEP5Vec3p
_ZN5Actor10GetLinkPosEP5Vec3p: ; 0x020c3230
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _020c3288 ; =data_027e0fc8
ldr r2, _020c3288 ; =gPlayerLink
mov r5, r0
ldr r0, [r2]
mov r4, r1
@@ -2499,7 +2499,7 @@ _020c3268:
str r0, [r4, #8]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020c3288: .word data_027e0fc8
_020c3288: .word gPlayerLink
_020c328c: .word data_027e0f94
arm_func_end _ZN5Actor10GetLinkPosEP5Vec3p
@@ -46,7 +46,7 @@ _020ad800:
cmp r0, #1
bhi _020ad874
_020ad840:
lda r0, data_027e0fc8
lda r0, gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020ad860
+1 -1
View File
@@ -31,7 +31,7 @@
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fe4
.extern data_027e0ffc
+5 -5
View File
@@ -829,7 +829,7 @@ _020af810:
bl _ZN11ItemManager12GetEquipItemEi
mov r5, r0
_020af8b0:
ldr r0, _020afac8 ; =data_027e0fc8
ldr r0, _020afac8 ; =gPlayerLink
mov r8, #0
ldr r1, [r0]
cmp r1, #0
@@ -971,7 +971,7 @@ _020afaa8:
_020afabc: .word gAdventureFlags
_020afac0: .word data_027e0f90
_020afac4: .word gItemManager
_020afac8: .word data_027e0fc8
_020afac8: .word gPlayerLink
_020afacc: .word data_027e0fe4
_020afad0: .word gMapManager
_020afad4: .word data_027e0f94
@@ -1111,7 +1111,7 @@ _020afc84:
_020afc9c:
cmp r7, #0
beq _020afcf4
ldr r0, _020afe7c ; =data_027e0fc8
ldr r0, _020afe7c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
@@ -1190,7 +1190,7 @@ _020afd88:
_020afdc4:
cmp r5, #0
beq _020afe10
ldr r0, _020afe7c ; =data_027e0fc8
ldr r0, _020afe7c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
@@ -1239,7 +1239,7 @@ _020afe64:
_020afe70: .word data_027e0fe4
_020afe74: .word gItemManager
_020afe78: .word data_027e0f94
_020afe7c: .word data_027e0fc8
_020afe7c: .word gPlayerLink
_020afe80: .word data_027e0ffc
_020afe84: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020afb6cEv
+1 -1
View File
@@ -128,7 +128,7 @@
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+4 -4
View File
@@ -6626,7 +6626,7 @@ func_ov00_0208c3a4: ; 0x0208c3a4
cmp r0, #0
movle r0, #0
ldmleia sp!, {r3, pc}
ldr r0, _0208c464 ; =data_027e0fc8
ldr r0, _0208c464 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _0208c448
@@ -6643,7 +6643,7 @@ _0208c454: .word data_027e0c68
_0208c458: .word data_027e077c
_0208c45c: .word data_027e103c
_0208c460: .word data_027e0f90
_0208c464: .word data_027e0fc8
_0208c464: .word gPlayerLink
arm_func_end func_ov00_0208c3a4
.global func_ov00_0208c468
@@ -6671,7 +6671,7 @@ func_ov00_0208c468: ; 0x0208c468
cmp r0, #0
movle r0, #0
ldmleia sp!, {r3, pc}
ldr r0, _0208c4f4 ; =data_027e0fc8
ldr r0, _0208c4f4 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _0208c4e0
@@ -6686,7 +6686,7 @@ _0208c4e0:
_0208c4e8: .word data_027e077c
_0208c4ec: .word data_027e103c
_0208c4f0: .word data_027e0f90
_0208c4f4: .word data_027e0fc8
_0208c4f4: .word gPlayerLink
arm_func_end func_ov00_0208c468
.global func_ov00_0208c4f8
+1 -1
View File
@@ -107,7 +107,7 @@
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fec
+3 -3
View File
@@ -704,7 +704,7 @@ func_ov00_020989a8: ; 0x020989a8
bne _02098a34
mov r0, #0
strb r0, [r4, #0x20]
ldr r0, _02098b24 ; =data_027e0fc8
ldr r0, _02098b24 ; =gPlayerLink
ldrsh r2, [r4, #0x24]
ldr r0, [r0]
add r1, r4, #0x30
@@ -718,7 +718,7 @@ _02098a04:
mov r0, #0
strb r0, [r4, #0x20]
str r0, [r4, #0x28]
ldr r0, _02098b24 ; =data_027e0fc8
ldr r0, _02098b24 ; =gPlayerLink
ldrsh r2, [r4, #0x24]
ldr r0, [r0]
add r1, r4, #0x30
@@ -788,7 +788,7 @@ _02098af0:
ldmia sp!, {r4, pc}
.align 2, 0
_02098b20: .word data_027e071c
_02098b24: .word data_027e0fc8
_02098b24: .word gPlayerLink
_02098b28: .word data_027e0f90
_02098b2c: .word data_027e0fe4
_02098b30: .word data_027e0f68
+1 -1
View File
@@ -195,7 +195,7 @@
.extern data_027e0fb8
.extern gHealthManager
.extern data_027e0fc4
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
+19 -19
View File
@@ -5512,7 +5512,7 @@ _020b5884:
str r7, [sp, #0x40]
str r3, [sp, #0x48]
bl func_01ff9bf8
ldr r0, _020b5c94 ; =data_027e0fc8
ldr r0, _020b5c94 ; =gPlayerLink
ldr r4, [r0]
mov r0, r4
bl func_ov00_020bc46c
@@ -5740,7 +5740,7 @@ _020b5c84: .word 0x0000071c
_020b5c88: .word data_02050f54
_020b5c8c: .word gAdventureFlags
_020b5c90: .word 0x00000ccd
_020b5c94: .word data_027e0fc8
_020b5c94: .word gPlayerLink
_020b5c98: .word gMapManager
_020b5c9c: .word data_027e0f78
_020b5ca0: .word gItemManager
@@ -10059,7 +10059,7 @@ _020b9408:
add sp, sp, #0x40
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020b9444:
ldr r0, _020b9748 ; =data_027e0fc8
ldr r0, _020b9748 ; =gPlayerLink
ldr r2, [r7, #0x160]
ldr r1, [r7, #0x50]
ldr r0, [r0]
@@ -10229,7 +10229,7 @@ _020b9698:
add sp, sp, #0x40
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020b96cc:
ldr r0, _020b9748 ; =data_027e0fc8
ldr r0, _020b9748 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcf2c
cmp r0, #0
@@ -10263,7 +10263,7 @@ _020b9738:
.align 2, 0
_020b9740: .word gAdventureFlags
_020b9744: .word data_027e0c68
_020b9748: .word data_027e0fc8
_020b9748: .word gPlayerLink
_020b974c: .word data_027e0f94
_020b9750: .word data_027e0fe4
_020b9754: .word data_ov00_020e67d8
@@ -10820,7 +10820,7 @@ _020b9ee8:
add lr, lr, ip, lsr #31
smull r0, r1, r2, lr
sub lr, ip, r0
ldr r0, _020b9fd4 ; =data_027e0fc8
ldr r0, _020b9fd4 ; =gPlayerLink
strh lr, [r3, #0x20]
ldr r0, [r0]
bl func_ov00_020bcefc
@@ -10876,7 +10876,7 @@ _020b9fbc:
ldmia sp!, {r4, pc}
.align 2, 0
_020b9fd0: .word 0x55555556
_020b9fd4: .word data_027e0fc8
_020b9fd4: .word gPlayerLink
_020b9fd8: .word data_027e0fe4
arm_func_end func_ov00_020b9ccc
@@ -10968,7 +10968,7 @@ func_ov00_020ba0d4: ; 0x020ba0d4
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _020ba160 ; =data_027e0fc8
ldr r0, _020ba160 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcefc
cmp r0, #0
@@ -10995,7 +10995,7 @@ func_ov00_020ba0d4: ; 0x020ba0d4
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020ba160: .word data_027e0fc8
_020ba160: .word gPlayerLink
_020ba164: .word data_ov00_020e9c88
_020ba168: .word func_ov00_020b9fdc
_020ba16c: .word data_ov00_020e9370
@@ -11548,7 +11548,7 @@ _020ba870: .word gItemManager
func_ov00_020ba874: ; 0x020ba874
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
ldr r4, _020bac50 ; =data_027e0fc8
ldr r4, _020bac50 ; =gPlayerLink
mov r6, r0
ldr r8, [r4]
mov r7, r1
@@ -11802,7 +11802,7 @@ _020bac10:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020bac50: .word data_027e0fc8
_020bac50: .word gPlayerLink
_020bac54: .word gAdventureFlags
_020bac58: .word data_027e0c68
_020bac5c: .word data_ov00_020eec9c
@@ -11843,7 +11843,7 @@ func_ov00_020baca8: ; 0x020baca8
ldreqb r0, [r6, #0x291]
cmpeq r0, #0
ldmneia sp!, {r4, r5, r6, pc}
ldr r0, _020bad14 ; =data_027e0fc8
ldr r0, _020bad14 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
@@ -11862,7 +11862,7 @@ func_ov00_020baca8: ; 0x020baca8
blx r2
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020bad14: .word data_027e0fc8
_020bad14: .word gPlayerLink
arm_func_end func_ov00_020baca8
.global func_ov00_020bad18
@@ -16442,7 +16442,7 @@ _020be2cc:
mov r0, #1
b _020be338
_020be2d4:
ldr r0, _020be400 ; =data_027e0fc8
ldr r0, _020be400 ; =gPlayerLink
mvn r1, #0
ldr r0, [r0]
ldr r2, [r0, #0x3c]
@@ -16456,7 +16456,7 @@ _020be2fc:
mov r0, #0
b _020be338
_020be304:
ldr r0, _020be400 ; =data_027e0fc8
ldr r0, _020be400 ; =gPlayerLink
mvn r1, #0
ldr r0, [r0]
ldr r2, [r0, #0x3c]
@@ -16499,7 +16499,7 @@ _020be37c:
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
_020be39c:
ldr r0, _020be400 ; =data_027e0fc8
ldr r0, _020be400 ; =gPlayerLink
ldr r4, [r0]
cmp r4, #0
ldmeqia sp!, {r3, r4, r5, pc}
@@ -16526,7 +16526,7 @@ _020be3e4:
bl _ZN5Actor4KillEv
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020be400: .word data_027e0fc8
_020be400: .word gPlayerLink
_020be404: .word gMapManager
_020be408: .word gAdventureFlags
arm_func_end func_ov00_020be294
@@ -17503,7 +17503,7 @@ _020bef98:
strb r0, [r5, #6]
b _020befd4
_020befa4:
ldr r0, _020befdc ; =data_027e0fc8
ldr r0, _020befdc ; =gPlayerLink
ldr r4, [r0]
mov r0, r4
bl func_ov00_020bbd40
@@ -17520,7 +17520,7 @@ _020befd4:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020befdc: .word data_027e0fc8
_020befdc: .word gPlayerLink
arm_func_end func_ov00_020bef18
.global func_ov00_020befe0
+1 -1
View File
@@ -148,7 +148,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
+16 -16
View File
@@ -18096,7 +18096,7 @@ _020d1f74:
mov r1, r8
str r3, [sp, #0x28]
bl func_020385d0
ldr r1, _020d205c ; =data_027e0fc8
ldr r1, _020d205c ; =gPlayerLink
str r0, [r9, #0x40]
ldr r0, [r1]
cmp r0, #0
@@ -18148,7 +18148,7 @@ _020d204c: .word data_027e0f64
_020d2050: .word data_027e0fe4
_020d2054: .word data_027e0c68
_020d2058: .word data_ov00_020e8ae8
_020d205c: .word data_027e0fc8
_020d205c: .word gPlayerLink
_020d2060: .word 0x434d5347
_020d2064: .word 0x4d534741
arm_func_end func_ov00_020d1dd4
@@ -18436,7 +18436,7 @@ _020d2420:
ldrsh r3, [r0, r1]
_020d2450:
ldrh r1, [r6, #4]
ldr r0, _020d27d4 ; =data_027e0fc8
ldr r0, _020d27d4 ; =gPlayerLink
ldr r0, [r0]
and r1, r1, #0xff
bl func_ov00_020bc320
@@ -18449,7 +18449,7 @@ _020d2478:
ldrh r0, [r6, #6]
ldrh r1, [r6, #4]
tst r0, #0xff
ldr r0, _020d27d4 ; =data_027e0fc8
ldr r0, _020d27d4 ; =gPlayerLink
movne r2, #1
ldr r0, [r0]
moveq r2, #0
@@ -18619,7 +18619,7 @@ _020d26e0:
mov r0, #2
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020d26ec:
ldr r0, _020d27d4 ; =data_027e0fc8
ldr r0, _020d27d4 ; =gPlayerLink
ldr r1, [r6, #4]
ldr r0, [r0]
bl func_ov00_020bc2d4
@@ -18682,7 +18682,7 @@ _020d27c4: .word data_ov00_020e8ae8
_020d27c8: .word gAdventureFlags
_020d27cc: .word data_ov00_020df28c
_020d27d0: .word data_ov00_020df28c
_020d27d4: .word data_027e0fc8
_020d27d4: .word gPlayerLink
_020d27d8: .word gItemManager
_020d27dc: .word data_027e0f64
_020d27e0: .word data_ov00_020df294
@@ -19632,7 +19632,7 @@ _020d3360: .word func_ov00_020d3988
func_ov00_020d3364: ; 0x020d3364
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0xb0
ldr r1, _020d34c4 ; =data_027e0fc8
ldr r1, _020d34c4 ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
ldrh r5, [r4, #0x22]
@@ -19724,7 +19724,7 @@ _020d34b8:
add sp, sp, #0xb0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020d34c4: .word data_027e0fc8
_020d34c4: .word gPlayerLink
_020d34c8: .word data_027e0d38
_020d34cc: .word data_027e10a4
_020d34d0: .word gAdventureFlags
@@ -19877,7 +19877,7 @@ func_ov00_020d3638: ; 0x020d3638
add r1, sp, #0
ldr r2, [r2, #0x34]
blx r2
ldr r0, _020d3694 ; =data_027e0fc8
ldr r0, _020d3694 ; =gPlayerLink
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020bb68c
@@ -19885,7 +19885,7 @@ func_ov00_020d3638: ; 0x020d3638
ldmia sp!, {pc}
.align 2, 0
_020d3690: .word data_027e0fe4
_020d3694: .word data_027e0fc8
_020d3694: .word gPlayerLink
arm_func_end func_ov00_020d3638
.global func_ov00_020d3698
@@ -20899,7 +20899,7 @@ _020d423c: .word gItemManager
arm_func_start func_ov00_020d4240
func_ov00_020d4240: ; 0x020d4240
stmdb sp!, {r4, lr}
ldr r1, _020d4280 ; =data_027e0fc8
ldr r1, _020d4280 ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
cmp r0, #0
@@ -20916,7 +20916,7 @@ _020d4274:
bl func_ov00_020d3c80
ldmia sp!, {r4, pc}
.align 2, 0
_020d4280: .word data_027e0fc8
_020d4280: .word gPlayerLink
_020d4284: .word gAdventureFlags
arm_func_end func_ov00_020d4240
@@ -20926,7 +20926,7 @@ func_ov00_020d4288: ; 0x020d4288
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020d3ca8
ldr r0, _020d42e0 ; =data_027e0fc8
ldr r0, _020d42e0 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020d42d8
@@ -20949,7 +20949,7 @@ _020d42d8:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_020d42e0: .word data_027e0fc8
_020d42e0: .word gPlayerLink
arm_func_end func_ov00_020d4288
.global func_ov00_020d42e4
@@ -21516,7 +21516,7 @@ _020d4998:
add r1, r1, #0x29
str r1, [r5, #0x90]
bl _ZN5Actor18func_ov00_020c195cEv
ldr r1, _020d4aac ; =data_027e0fc8
ldr r1, _020d4aac ; =gPlayerLink
ldr r0, _020d4ab0 ; =data_027e0fd4
ldr r6, [r1]
ldr r1, [r0]
@@ -21570,7 +21570,7 @@ _020d4a8c:
.align 2, 0
_020d4aa4: .word data_027e0fac
_020d4aa8: .word data_027e0f94
_020d4aac: .word data_027e0fc8
_020d4aac: .word gPlayerLink
_020d4ab0: .word data_027e0fd4
_020d4ab4: .word 0x0000019a
arm_func_end func_ov00_020d4964
+1 -1
View File
@@ -101,7 +101,7 @@
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e103c
.extern data_027e1044
+8 -8
View File
@@ -4460,7 +4460,7 @@ _020f128c:
ldr r0, [r0]
cmp r0, #0x3b
beq _020f1350
ldr r0, _020f13a8 ; =data_027e0fc8
ldr r0, _020f13a8 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020f1330
@@ -4502,7 +4502,7 @@ _020f1398: .word data_027e103c
_020f139c: .word gAdventureFlags
_020f13a0: .word data_027e0c68
_020f13a4: .word data_027e0e28
_020f13a8: .word data_027e0fc8
_020f13a8: .word gPlayerLink
_020f13ac: .word data_ov09_0211f5b4
arm_func_end func_ov03_020f125c
@@ -6149,7 +6149,7 @@ func_ov03_020f2848: ; 0x020f2848
bl func_ov03_020f3f94
cmp r0, #0
bne _020f28b8
ldr r0, _020f28fc ; =data_027e0fc8
ldr r0, _020f28fc ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020f28d4
@@ -6177,7 +6177,7 @@ _020f28d4:
_020f28f0: .word data_027e077c
_020f28f4: .word data_027e103c
_020f28f8: .word data_ov09_0211f5b4
_020f28fc: .word data_027e0fc8
_020f28fc: .word gPlayerLink
_020f2900: .word data_ov00_020eec9c
arm_func_end func_ov03_020f2848
@@ -9127,7 +9127,7 @@ _020f42b2:
ldr r0, _020f4304 ; =0x00000005
cmp r1, r0
bne _020f42c8
ldr r0, _020f4308 ; =data_027e0fc8
ldr r0, _020f4308 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020f42c8
@@ -9159,7 +9159,7 @@ _020f42f8: .word data_027e103c
_020f42fc: .word data_027e0cbc
_020f4300: .word gOverlayManager
_020f4304: .word 0x00000005
_020f4308: .word data_027e0fc8
_020f4308: .word gPlayerLink
thumb_func_end func_ov03_020f4268
.global func_ov03_020f430c
@@ -20577,7 +20577,7 @@ func_ov03_020fbd7c: ; 0x020fbd7c
bl func_ov00_0208b9e4
cmp r0, #0
beq _020fbdec
ldr r0, _020fbdfc ; =data_027e0fc8
ldr r0, _020fbdfc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
@@ -20592,7 +20592,7 @@ _020fbdec:
bl func_ov14_0212559c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020fbdfc: .word data_027e0fc8
_020fbdfc: .word gPlayerLink
arm_func_end func_ov03_020fbd7c
.global func_ov03_020fbe00
+1 -1
View File
@@ -140,7 +140,7 @@
.extern gHealthManager
.extern data_027e0fc0
.extern data_027e0fc4
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
+8 -8
View File
@@ -19432,7 +19432,7 @@ _0210a16c:
ldr r0, _0210a474 ; =data_ov04_021104a0
str r0, [r5]
_0210a186:
ldr r0, _0210a478 ; =data_027e0fc8
ldr r0, _0210a478 ; =gPlayerLink
str r5, [r4, #0x6c]
str r4, [r0]
ldr r0, _0210a47c ; =data_027e0fcc
@@ -19804,7 +19804,7 @@ _0210a468: .word data_02057878
_0210a46c: .word data_ov04_02110934
_0210a470: .word data_0205785c
_0210a474: .word data_ov04_021104a0
_0210a478: .word data_027e0fc8
_0210a478: .word gPlayerLink
_0210a47c: .word data_027e0fcc
_0210a480: .word data_027e0fd0
_0210a484: .word data_027e0fd4
@@ -20144,7 +20144,7 @@ _0210a7c4:
str r0, [r1]
ldr r1, _0210a7ec ; =data_027e0fdc
str r0, [r1]
ldr r1, _0210a800 ; =data_027e0fc8
ldr r1, _0210a800 ; =gPlayerLink
str r0, [r1]
add r0, r6, #0
bl func_ov04_0210b2b0
@@ -20157,7 +20157,7 @@ _0210a7f0: .word data_027e0fd8
_0210a7f4: .word data_027e0fd4
_0210a7f8: .word data_027e0fcc
_0210a7fc: .word data_027e0fd0
_0210a800: .word data_027e0fc8
_0210a800: .word gPlayerLink
thumb_func_end func_ov04_0210a734
.global func_ov04_0210a804
@@ -20253,7 +20253,7 @@ _0210a894:
str r0, [r1]
ldr r1, _0210a8c4 ; =data_027e0fdc
str r0, [r1]
ldr r1, _0210a8d8 ; =data_027e0fc8
ldr r1, _0210a8d8 ; =gPlayerLink
str r0, [r1]
add r0, r6, #0
bl func_ov04_0210b2b0
@@ -20268,7 +20268,7 @@ _0210a8c8: .word data_027e0fd8
_0210a8cc: .word data_027e0fd4
_0210a8d0: .word data_027e0fcc
_0210a8d4: .word data_027e0fd0
_0210a8d8: .word data_027e0fc8
_0210a8d8: .word gPlayerLink
thumb_func_end func_ov04_0210a804
.global func_ov04_0210a8dc
@@ -20364,7 +20364,7 @@ _0210a96c:
str r0, [r1]
ldr r1, _0210a994 ; =data_027e0fdc
str r0, [r1]
ldr r1, _0210a9a8 ; =data_027e0fc8
ldr r1, _0210a9a8 ; =gPlayerLink
str r0, [r1]
add r0, r6, #0
bl func_ov04_0210b2b0
@@ -20377,7 +20377,7 @@ _0210a998: .word data_027e0fd8
_0210a99c: .word data_027e0fd4
_0210a9a0: .word data_027e0fcc
_0210a9a4: .word data_027e0fd0
_0210a9a8: .word data_027e0fc8
_0210a9a8: .word gPlayerLink
thumb_func_end func_ov04_0210a8dc
.global func_ov04_0210a9ac
+1 -1
View File
@@ -205,7 +205,7 @@
.extern data_027e0fb0
.extern data_027e0fb8
.extern data_027e0fc0
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
+18 -18
View File
@@ -4954,7 +4954,7 @@ _02104b08: .word data_02056be4
arm_func_start func_ov05_02104b0c
func_ov05_02104b0c: ; 0x02104b0c
stmdb sp!, {r3, lr}
ldr r0, _02104b2c ; =data_027e0fc8
ldr r0, _02104b2c ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
moveq r0, #0
@@ -4962,7 +4962,7 @@ func_ov05_02104b0c: ; 0x02104b0c
bl func_ov05_0210eba4
ldmia sp!, {r3, pc}
.align 2, 0
_02104b2c: .word data_027e0fc8
_02104b2c: .word gPlayerLink
arm_func_end func_ov05_02104b0c
.global func_ov05_02104b30
@@ -4980,7 +4980,7 @@ func_ov05_02104b30: ; 0x02104b30
ldrb r0, [r2, r1]
tst r0, #4
ldmneia sp!, {r4, pc}
ldr r0, _02104bc4 ; =data_027e0fc8
ldr r0, _02104bc4 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r4, pc}
@@ -5008,7 +5008,7 @@ _02104bb0:
.align 2, 0
_02104bbc: .word data_027e077c
_02104bc0: .word data_02056be4
_02104bc4: .word data_027e0fc8
_02104bc4: .word gPlayerLink
arm_func_end func_ov05_02104b30
.global func_ov05_02104bc8
@@ -5101,7 +5101,7 @@ func_ov05_02104ca4: ; 0x02104ca4
add r3, sp, #4
str ip, [sp]
bl func_01ffe468
ldr r0, _02104d70 ; =data_027e0fc8
ldr r0, _02104d70 ; =gPlayerLink
ldr r1, [r0]
cmp r1, #0
beq _02104d2c
@@ -5136,7 +5136,7 @@ _02104d48:
.align 2, 0
_02104d68: .word data_027e0f64
_02104d6c: .word data_027e0f94
_02104d70: .word data_027e0fc8
_02104d70: .word gPlayerLink
arm_func_end func_ov05_02104ca4
.global func_ov05_02104d74
@@ -5144,7 +5144,7 @@ _02104d70: .word data_027e0fc8
func_ov05_02104d74: ; 0x02104d74
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _02104e3c ; =data_027e0fc8
ldr r1, _02104e3c ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
cmp r0, #0
@@ -5194,7 +5194,7 @@ _02104e0c:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_02104e3c: .word data_027e0fc8
_02104e3c: .word gPlayerLink
_02104e40: .word gAdventureFlags
_02104e44: .word data_027e0f64
_02104e48: .word data_027e0f94
@@ -14854,7 +14854,7 @@ _0210d2bc:
str r0, [r8, #0x24]
str r0, [r8, #0x28]
_0210d2cc:
ldr r0, _0210d320 ; =data_027e0fc8
ldr r0, _0210d320 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
addeq sp, sp, #0xc
@@ -14877,7 +14877,7 @@ _0210d310: .word data_027e077c
_0210d314: .word data_027e103c
_0210d318: .word data_027e0c38
_0210d31c: .word data_ov00_020ee6f8
_0210d320: .word data_027e0fc8
_0210d320: .word gPlayerLink
arm_func_end func_ov05_0210d0e4
.global func_ov05_0210d324
@@ -15526,7 +15526,7 @@ _0210db90:
ldrb r0, [r6, #0x92]
cmp r0, #0
bne _0210dbd4
ldr r0, _0210df70 ; =data_027e0fc8
ldr r0, _0210df70 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _0210dbd4
@@ -15621,7 +15621,7 @@ _0210dcf4:
add r0, r6, #0x12
bl func_ov00_020d054c
_0210dcfc:
ldr r0, _0210df70 ; =data_027e0fc8
ldr r0, _0210df70 ; =gPlayerLink
mov r4, #0
ldr r0, [r0]
cmp r0, #0
@@ -15724,7 +15724,7 @@ _0210de50:
_0210de70:
bl func_ov00_020d0594
_0210de74:
ldr r0, _0210df70 ; =data_027e0fc8
ldr r0, _0210df70 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _0210de9c
@@ -15799,7 +15799,7 @@ _0210df60: .word data_027e077c
_0210df64: .word data_027e103c
_0210df68: .word gAdventureFlags
_0210df6c: .word data_027e0c68
_0210df70: .word data_027e0fc8
_0210df70: .word gPlayerLink
_0210df74: .word data_027e0db0
_0210df78: .word data_027e0d78
arm_func_end func_ov05_0210da7c
@@ -15815,7 +15815,7 @@ func_ov05_0210df7c: ; 0x0210df7c
bl func_ov05_0210e014
cmp r0, #0
beq _0210dfc0
ldr r0, _0210e008 ; =data_027e0fc8
ldr r0, _0210e008 ; =gPlayerLink
mov r1, #6
ldr r0, [r0]
ldr r2, [r0]
@@ -15844,7 +15844,7 @@ _0210dfc0:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0210e008: .word data_027e0fc8
_0210e008: .word gPlayerLink
_0210e00c: .word data_027e077c
_0210e010: .word data_027e0c68
arm_func_end func_ov05_0210df7c
@@ -15852,11 +15852,11 @@ _0210e010: .word data_027e0c68
.global func_ov05_0210e014
arm_func_start func_ov05_0210e014
func_ov05_0210e014: ; 0x0210e014
ldr r0, _0210e020 ; =data_027e0fc8
ldr r0, _0210e020 ; =gPlayerLink
ldr r0, [r0]
bx lr
.align 2, 0
_0210e020: .word data_027e0fc8
_0210e020: .word gPlayerLink
arm_func_end func_ov05_0210e014
.global func_ov05_0210e024
+1 -1
View File
@@ -158,7 +158,7 @@
.extern data_027e0fac
.extern data_027e0fc0
.extern data_027e0fc4
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fd8
+4 -4
View File
@@ -7938,24 +7938,24 @@ func_ov12_02119348: ; 0x02119348
.global func_ov12_0211934c
arm_func_start func_ov12_0211934c
func_ov12_0211934c: ; 0x0211934c
ldr r0, _02119358 ; =data_027e0fc8
ldr r0, _02119358 ; =gPlayerLink
ldr r0, [r0]
bx lr
.align 2, 0
_02119358: .word data_027e0fc8
_02119358: .word gPlayerLink
arm_func_end func_ov12_0211934c
.global func_ov12_0211935c
arm_func_start func_ov12_0211935c
func_ov12_0211935c: ; 0x0211935c
ldr r1, _02119374 ; =data_027e0fc8
ldr r1, _02119374 ; =gPlayerLink
mov r2, r0
ldr r0, [r1]
ldr ip, _02119378 ; =func_ov12_0211a748
ldr r1, [r2]
bx ip
.align 2, 0
_02119374: .word data_027e0fc8
_02119374: .word gPlayerLink
_02119378: .word func_ov12_0211a748
arm_func_end func_ov12_0211935c
+1 -1
View File
@@ -57,7 +57,7 @@
.extern __register_global_object
.extern data_027e0764
.extern gMapManager
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_ov00_020e9370
.extern data_ov00_020eec9c
+3 -3
View File
@@ -351,7 +351,7 @@ _ZN10ActorRupee6UpdateEb: ; 0x0213b254
bl _ZN10ActorRupee22GetRupeeCutsceneItemIdEv
movs r1, r0
bmi _0213b2f8
ldr r0, _0213b50c ; =data_027e0fc8
ldr r0, _0213b50c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bce48
cmp r0, #0
@@ -454,7 +454,7 @@ _0213b42c:
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b4fc
_0213b438:
ldr r1, _0213b50c ; =data_027e0fc8
ldr r1, _0213b50c ; =gPlayerLink
mov r0, r5
ldr r4, [r1]
bl _ZN10ActorRupee22GetRupeeCutsceneItemIdEv
@@ -513,7 +513,7 @@ _0213b4fc:
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0213b50c: .word data_027e0fc8
_0213b50c: .word gPlayerLink
_0213b510: .word gItemManager
_0213b514: .word data_ov00_020eec9c
_0213b518: .word gMapManager
+1 -1
View File
@@ -169,7 +169,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fe0
+46 -46
View File
@@ -3951,7 +3951,7 @@ func_ov14_02122b20: ; 0x02122b20
mov r7, r1
cmp r0, #0
beq _02122b74
ldr r0, _02122bb4 ; =data_027e0fc8
ldr r0, _02122bb4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -3984,7 +3984,7 @@ _02122b98:
strb r0, [r4, #0x26a]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02122bb4: .word data_027e0fc8
_02122bb4: .word gPlayerLink
arm_func_end func_ov14_02122b20
.global func_ov14_02122bb8
@@ -4573,7 +4573,7 @@ _021232b8:
mov r2, r0
str r3, [r5, #0x5c]
bl func_01ff9bc4
ldr r0, _02123554 ; =data_027e0fc8
ldr r0, _02123554 ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
bl func_ov00_020bb68c
@@ -4623,7 +4623,7 @@ _02123394:
mov r0, r5
mov r2, #0
bl func_ov14_021235bc
ldr r0, _02123554 ; =data_027e0fc8
ldr r0, _02123554 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -4736,7 +4736,7 @@ _02123530:
_02123548: .word data_027e0ffc
_0212354c: .word 0x0000019e
_02123550: .word gItemManager
_02123554: .word data_027e0fc8
_02123554: .word gPlayerLink
_02123558: .word data_027e0f90
_0212355c: .word data_027e0fb8
_02123560: .word data_027e0f64
@@ -4992,7 +4992,7 @@ func_ov14_02123858: ; 0x02123858
stmdb sp!, {r4, lr}
ldr r1, _021238a0 ; =data_ov14_02155df8
mov r4, r0
ldr r0, _021238a4 ; =data_027e0fc8
ldr r0, _021238a4 ; =gPlayerLink
str r1, [r4]
ldr r0, [r0]
cmp r0, #0
@@ -5010,7 +5010,7 @@ _02123880:
ldmia sp!, {r4, pc}
.align 2, 0
_021238a0: .word data_ov14_02155df8
_021238a4: .word data_027e0fc8
_021238a4: .word gPlayerLink
arm_func_end func_ov14_02123858
.global func_ov14_021238a8
@@ -5019,7 +5019,7 @@ func_ov14_021238a8: ; 0x021238a8
stmdb sp!, {r4, lr}
ldr r1, _021238e8 ; =data_ov14_02155df8
mov r4, r0
ldr r0, _021238ec ; =data_027e0fc8
ldr r0, _021238ec ; =gPlayerLink
str r1, [r4]
ldr r0, [r0]
cmp r0, #0
@@ -5035,7 +5035,7 @@ _021238d0:
ldmia sp!, {r4, pc}
.align 2, 0
_021238e8: .word data_ov14_02155df8
_021238ec: .word data_027e0fc8
_021238ec: .word gPlayerLink
arm_func_end func_ov14_021238a8
.global func_ov14_021238f0
@@ -6372,7 +6372,7 @@ _02124ad0:
cmp r2, r1
bne _02124a7c
_02124adc:
ldr r0, _02124c6c ; =data_027e0fc8
ldr r0, _02124c6c ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
bl func_ov00_020bb68c
@@ -6482,7 +6482,7 @@ _02124c5c: .word data_ov14_02153bfc
_02124c60: .word data_ov14_0215ac9c
_02124c64: .word gAdventureFlags
_02124c68: .word data_027e0f64
_02124c6c: .word data_027e0fc8
_02124c6c: .word gPlayerLink
arm_func_end func_ov14_021243e4
.global func_ov14_02124c70
@@ -8637,7 +8637,7 @@ func_ov14_02126600: ; 0x02126600
arm_func_start func_ov14_02126604
func_ov14_02126604: ; 0x02126604
ldr r1, _02126624 ; =data_027e0fac
ldr r3, _02126628 ; =data_027e0fc8
ldr r3, _02126628 ; =gPlayerLink
ldrsh r2, [r1]
mov r1, r0
ldr ip, _0212662c ; =func_ov00_020bcdec
@@ -8646,7 +8646,7 @@ func_ov14_02126604: ; 0x02126604
bx ip
.align 2, 0
_02126624: .word data_027e0fac
_02126628: .word data_027e0fc8
_02126628: .word gPlayerLink
_0212662c: .word func_ov00_020bcdec
arm_func_end func_ov14_02126604
@@ -27735,7 +27735,7 @@ func_ov14_02135ee4: ; 0x02135ee4
ldrsh r0, [r2]
mov r5, r1
bl func_0202bbbc
ldr r1, _02135f4c ; =data_027e0fc8
ldr r1, _02135f4c ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
bl func_ov00_020bba14
@@ -27757,7 +27757,7 @@ _02135f20:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02135f48: .word data_027e0fac
_02135f4c: .word data_027e0fc8
_02135f4c: .word gPlayerLink
arm_func_end func_ov14_02135ee4
.global func_ov14_02135f50
@@ -27902,7 +27902,7 @@ _021360d8:
ldr r0, [r0]
add r1, r5, #0x1ac
bl func_ov00_0207c2e8
ldr r0, _02136188 ; =data_027e0fc8
ldr r0, _02136188 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba00
strb r0, [r5, #0x1a4]
@@ -27929,7 +27929,7 @@ _02136178: .word data_027e0ffc
_0213617c: .word 0x000001a7
_02136180: .word 0x0000022b
_02136184: .word data_027e0e58
_02136188: .word data_027e0fc8
_02136188: .word gPlayerLink
arm_func_end func_ov14_02136078
.global func_ov14_0213618c
@@ -27952,12 +27952,12 @@ _021361c0:
bl _ZN5Actor9IsGrabbedEv
cmp r0, #0
beq _02136244
ldr r0, _0213634c ; =data_027e0fc8
ldr r0, _0213634c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba00
cmp r0, #0
bne _021361f4
ldr r0, _0213634c ; =data_027e0fc8
ldr r0, _0213634c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba14
cmp r0, #0
@@ -28055,7 +28055,7 @@ _0213630c:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0213634c: .word data_027e0fc8
_0213634c: .word gPlayerLink
_02136350: .word gMapManager
arm_func_end func_ov14_0213618c
@@ -28103,7 +28103,7 @@ _021363a4:
bl _ZN5Actor9IsGrabbedEv
cmp r0, #0
beq _02136400
ldr r0, _0213644c ; =data_027e0fc8
ldr r0, _0213644c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba48
_02136400:
@@ -28129,7 +28129,7 @@ _02136438:
bl func_ov00_0207a1c8
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0213644c: .word data_027e0fc8
_0213644c: .word gPlayerLink
arm_func_end func_ov14_02136354
.global func_ov14_02136450
@@ -29475,7 +29475,7 @@ func_ov14_02137650: ; 0x02137650
ldr r1, [r0]
ldr r1, [r1, #0xb4]
blx r1
ldr r0, _02137758 ; =data_027e0fc8
ldr r0, _02137758 ; =gPlayerLink
ldr r1, [r4, #4]
ldr r0, [r0]
add r1, r1, #0x60
@@ -29520,7 +29520,7 @@ _02137744:
_0213774c: .word gAdventureFlags
_02137750: .word data_027e0c68
_02137754: .word data_027e077c
_02137758: .word data_027e0fc8
_02137758: .word gPlayerLink
_0213775c: .word data_027e0fe4
_02137760: .word 0x424f4d42
_02137764: .word 0x424b4559
@@ -29812,7 +29812,7 @@ _02137ae4:
blx r1
ldmia sp!, {r3, r4, r5, pc}
_02137af4:
ldr r0, _02137c00 ; =data_027e0fc8
ldr r0, _02137c00 ; =gPlayerLink
ldr r5, [r0]
mov r0, r5
bl func_ov00_020bc46c
@@ -29831,7 +29831,7 @@ _02137af4:
strb r2, [sp, #1]
cmpeq r1, r0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _02137c00 ; =data_027e0fc8
ldr r0, _02137c00 ; =gPlayerLink
ldr r5, [r0]
mov r0, r5
bl func_ov00_020bc46c
@@ -29885,7 +29885,7 @@ _02137bec:
blx r1
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02137c00: .word data_027e0fc8
_02137c00: .word gPlayerLink
arm_func_end func_ov14_02137a8c
.global func_ov14_02137c04
@@ -30056,7 +30056,7 @@ _02137e34:
str r0, [r4, #0x15c]
cmp r0, #0xa
blt _02137f9c
ldr r0, _02137fb8 ; =data_027e0fc8
ldr r0, _02137fb8 ; =gPlayerLink
ldr r5, [r0]
mov r0, r5
bl func_ov00_020bc46c
@@ -30075,7 +30075,7 @@ _02137e34:
strb r2, [sp, #1]
cmpeq r1, r0
beq _02137f48
ldr r0, _02137fb8 ; =data_027e0fc8
ldr r0, _02137fb8 ; =gPlayerLink
ldr r5, [r0]
mov r0, r5
bl func_ov00_020bc46c
@@ -30152,7 +30152,7 @@ _02137f9c:
strb r0, [r4, #0x158]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02137fb8: .word data_027e0fc8
_02137fb8: .word gPlayerLink
arm_func_end func_ov14_02137c20
.global func_ov14_02137fbc
@@ -30201,7 +30201,7 @@ func_ov14_02137ff8: ; 0x02137ff8
arm_func_start func_ov14_02138000
func_ov14_02138000: ; 0x02138000
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _021380a4 ; =data_027e0fc8
ldr r1, _021380a4 ; =gPlayerLink
mov r4, r0
ldr r5, [r1]
mov r0, r5
@@ -30243,7 +30243,7 @@ _02138088:
str r0, [r4, #0x17c]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021380a4: .word data_027e0fc8
_021380a4: .word gPlayerLink
arm_func_end func_ov14_02138000
.global func_ov14_021380a8
@@ -30711,7 +30711,7 @@ _021385f0:
add sp, sp, #0xb0
ldmia sp!, {r4, r5, r6, pc}
_02138610:
ldr r0, _021389c8 ; =data_027e0fc8
ldr r0, _021389c8 ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
bl func_ov00_020bc854
@@ -30970,7 +30970,7 @@ _021389c0:
add sp, sp, #0xb0
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021389c8: .word data_027e0fc8
_021389c8: .word gPlayerLink
_021389cc: .word data_ov00_020e242c
_021389d0: .word gMapManager
_021389d4: .word data_027e0f6c
@@ -30984,7 +30984,7 @@ func_ov14_021389d8: ; 0x021389d8
ldr r2, [r4, #0x130]
cmp r2, #1
bne _02138a08
ldr r0, _02138a10 ; =data_027e0fc8
ldr r0, _02138a10 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
bl func_ov00_020bc854
@@ -30995,7 +30995,7 @@ _02138a08:
bl _ZN5Actor8vfunc_18Ej
ldmia sp!, {r4, pc}
.align 2, 0
_02138a10: .word data_027e0fc8
_02138a10: .word gPlayerLink
arm_func_end func_ov14_021389d8
.global func_ov14_02138a14
@@ -31511,7 +31511,7 @@ func_ov14_0213905c: ; 0x0213905c
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
ldr r0, _021390e8 ; =data_027e0fc8
ldr r0, _021390e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -31538,7 +31538,7 @@ func_ov14_0213905c: ; 0x0213905c
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_021390e8: .word data_027e0fc8
_021390e8: .word gPlayerLink
_021390ec: .word data_ov00_020e9370
arm_func_end func_ov14_0213905c
@@ -31720,7 +31720,7 @@ func_ov14_021392ec: ; 0x021392ec
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
ldr r0, _02139378 ; =data_027e0fc8
ldr r0, _02139378 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -31747,7 +31747,7 @@ func_ov14_021392ec: ; 0x021392ec
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_02139378: .word data_027e0fc8
_02139378: .word gPlayerLink
_0213937c: .word data_ov00_020e9370
arm_func_end func_ov14_021392ec
@@ -32045,7 +32045,7 @@ func_ov14_02139708: ; 0x02139708
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
ldr r0, _02139794 ; =data_027e0fc8
ldr r0, _02139794 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -32072,7 +32072,7 @@ func_ov14_02139708: ; 0x02139708
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_02139794: .word data_027e0fc8
_02139794: .word gPlayerLink
_02139798: .word data_ov00_020e9370
arm_func_end func_ov14_02139708
@@ -33187,7 +33187,7 @@ func_ov14_0213a4c8: ; 0x0213a4c8
_0213a588:
cmp r0, #0
beq _0213a5cc
ldr r0, _0213a810 ; =data_027e0fc8
ldr r0, _0213a810 ; =gPlayerLink
ldr r4, [r0]
mov r0, r4
bl func_ov00_020bc46c
@@ -33360,7 +33360,7 @@ _0213a7fc:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0213a80c: .word data_027e0f90
_0213a810: .word data_027e0fc8
_0213a810: .word gPlayerLink
_0213a814: .word data_ov00_020eec9c
_0213a818: .word data_02050f54
_0213a81c: .word gMapManager
@@ -33707,7 +33707,7 @@ _0213ac00:
_0213ac24:
mov r0, r5
ldr r2, [r0]
ldr r1, _0213acb4 ; =data_027e0fc8
ldr r1, _0213acb4 ; =gPlayerLink
ldr r2, [r2, #0xbc]
ldr r6, [r1]
blx r2
@@ -33745,7 +33745,7 @@ _0213ac98:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0213acb0: .word gMapManager
_0213acb4: .word data_027e0fc8
_0213acb4: .word gPlayerLink
arm_func_end func_ov14_0213aaec
.global func_ov14_0213acb8
+1 -1
View File
@@ -172,7 +172,7 @@
.extern data_027e0fb8
.extern data_027e0fc0
.extern data_027e0fc4
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
+33 -33
View File
@@ -341,7 +341,7 @@ func_ov14_0213bba0: ; 0x0213bba0
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
ldr r0, _0213bc2c ; =data_027e0fc8
ldr r0, _0213bc2c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -368,7 +368,7 @@ func_ov14_0213bba0: ; 0x0213bba0
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_0213bc2c: .word data_027e0fc8
_0213bc2c: .word gPlayerLink
_0213bc30: .word data_ov00_020e9370
arm_func_end func_ov14_0213bba0
@@ -2149,7 +2149,7 @@ func_ov14_0213d098: ; 0x0213d098
func_ov14_0213d0bc: ; 0x0213d0bc
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #8
ldr r2, _0213d150 ; =data_027e0fc8
ldr r2, _0213d150 ; =gPlayerLink
mov r5, r0
ldr r0, [r2]
mov r4, r1
@@ -2187,7 +2187,7 @@ _0213d138:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0213d150: .word data_027e0fc8
_0213d150: .word gPlayerLink
_0213d154: .word data_027e0fe4
_0213d158: .word 0x504c444d
arm_func_end func_ov14_0213d0bc
@@ -2492,7 +2492,7 @@ _0213d39c: .word func_ov14_0213d2e8 + 1
func_ov14_0213d3a0: ; 0x0213d3a0
push {r4, lr}
add r4, r0, #0
ldr r0, _0213d3c4 ; =data_027e0fc8
ldr r0, _0213d3c4 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _0213d3c2
@@ -2509,7 +2509,7 @@ func_ov14_0213d3a0: ; 0x0213d3a0
_0213d3c2:
pop {r4, pc}
.align 2, 0
_0213d3c4: .word data_027e0fc8
_0213d3c4: .word gPlayerLink
_0213d3c8: .word gItemManager
thumb_func_end func_ov14_0213d3a0
@@ -2616,7 +2616,7 @@ _0213d4c0:
arm_func_start func_ov14_0213d4c8
func_ov14_0213d4c8: ; 0x0213d4c8
stmdb sp!, {r3, lr}
ldr r0, _0213d4e8 ; =data_027e0fc8
ldr r0, _0213d4e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #1
@@ -2624,7 +2624,7 @@ func_ov14_0213d4c8: ; 0x0213d4c8
movne r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_0213d4e8: .word data_027e0fc8
_0213d4e8: .word gPlayerLink
arm_func_end func_ov14_0213d4c8
.global func_ov14_0213d4ec
@@ -4692,11 +4692,11 @@ _0213eedc: .word data_027e0ce0
.global func_ov14_0213eee0
arm_func_start func_ov14_0213eee0
func_ov14_0213eee0: ; 0x0213eee0
ldr r0, _0213eeec ; =data_027e0fc8
ldr r0, _0213eeec ; =gPlayerLink
ldr r0, [r0]
bx lr
.align 2, 0
_0213eeec: .word data_027e0fc8
_0213eeec: .word gPlayerLink
arm_func_end func_ov14_0213eee0
.global func_ov14_0213eef0
@@ -6462,7 +6462,7 @@ _02140118:
ldr r0, [r5, #0x498]
cmp r0, #0x15
bne _02140264
ldr r0, _021402b4 ; =data_027e0fc8
ldr r0, _021402b4 ; =gPlayerLink
ldr r0, [r0]
ldrb r0, [r0, #0x5e]
cmp r0, #0
@@ -6567,7 +6567,7 @@ _02140294:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_021402b0: .word data_027e0d38
_021402b4: .word data_027e0fc8
_021402b4: .word gPlayerLink
_021402b8: .word gAdventureFlags
_021402bc: .word data_027e0764
arm_func_end func_ov14_021400c0
@@ -10096,7 +10096,7 @@ _02143260:
blx r3
_02143290:
ldr r0, [r4, #0x1c]
ldr r1, _02143380 ; =data_027e0fc8
ldr r1, _02143380 ; =gPlayerLink
add r0, r0, #0xcd
add r3, r0, #0xc00
ldr r0, [r1]
@@ -10161,7 +10161,7 @@ _02143354:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0214337c: .word data_027e0f64
_02143380: .word data_027e0fc8
_02143380: .word gPlayerLink
_02143384: .word data_ov00_020eec9c
arm_func_end func_ov14_02143180
@@ -10647,7 +10647,7 @@ func_ov14_0214392c: ; 0x0214392c
cmp r0, #0
movle r0, #0
ldmleia sp!, {r3, pc}
ldr r0, _021439d4 ; =data_027e0fc8
ldr r0, _021439d4 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _021439bc
@@ -10663,7 +10663,7 @@ _021439c4: .word gAdventureFlags
_021439c8: .word data_027e077c
_021439cc: .word data_027e103c
_021439d0: .word data_027e0f90
_021439d4: .word data_027e0fc8
_021439d4: .word gPlayerLink
arm_func_end func_ov14_0214392c
.global func_ov14_021439d8
@@ -11637,7 +11637,7 @@ func_ov14_0214418c: ; 0x0214418c
cmp r0, #0
movne r0, r4
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _021442bc ; =data_027e0fc8
ldr r0, _021442bc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -11662,7 +11662,7 @@ _021442ac: .word data_027e077c
_021442b0: .word data_027e05f8
_021442b4: .word data_027e103c
_021442b8: .word 0x000002ef
_021442bc: .word data_027e0fc8
_021442bc: .word gPlayerLink
_021442c0: .word data_ov00_020eec9c
arm_func_end func_ov14_0214418c
@@ -15744,7 +15744,7 @@ func_ov14_02147584: ; 0x02147584
ldr r7, [r2]
ldr r6, [r2, #4]
mov r4, r0
ldr ip, _02147680 ; =data_027e0fc8
ldr ip, _02147680 ; =gPlayerLink
add lr, sp, #0
ldmia r1, {r0, r1, r2}
stmia lr, {r0, r1, r2}
@@ -15760,7 +15760,7 @@ func_ov14_02147584: ; 0x02147584
addne sp, sp, #0x24
movne r0, #1
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
ldr r0, _02147680 ; =data_027e0fc8
ldr r0, _02147680 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #4
@@ -15799,7 +15799,7 @@ _02147624:
.align 2, 0
_02147678: .word data_027e0fa0
_0214767c: .word data_027e0f94
_02147680: .word data_027e0fc8
_02147680: .word gPlayerLink
_02147684: .word data_027e0fd0
_02147688: .word 0xfffffe66
arm_func_end func_ov14_02147584
@@ -20227,7 +20227,7 @@ func_ov14_0214af4c: ; 0x0214af4c
mvn r0, #0
str r0, [r4, #0x168]
_0214afc0:
ldr r0, _0214b014 ; =data_027e0fc8
ldr r0, _0214b014 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
mov r2, #0x1000
@@ -20250,7 +20250,7 @@ _0214afe0:
.align 2, 0
_0214b00c: .word data_027e0c68
_0214b010: .word gAdventureFlags
_0214b014: .word data_027e0fc8
_0214b014: .word gPlayerLink
arm_func_end func_ov14_0214af4c
.global func_ov14_0214b018
@@ -20258,7 +20258,7 @@ _0214b014: .word data_027e0fc8
func_ov14_0214b018: ; 0x0214b018
stmdb sp!, {r4, r5, r6, r7, lr}
sub sp, sp, #0xec
ldr r1, _0214b284 ; =data_027e0fc8
ldr r1, _0214b284 ; =gPlayerLink
mov r5, r0
ldr r0, [r1]
cmp r0, #0
@@ -20424,7 +20424,7 @@ _0214b264:
add sp, sp, #0xec
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0214b284: .word data_027e0fc8
_0214b284: .word gPlayerLink
_0214b288: .word data_027e0fe4
_0214b28c: .word data_ov14_02159cec
_0214b290: .word 0x47524d47
@@ -25290,7 +25290,7 @@ _0214f218:
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xa
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _0214f248 ; =data_027e0fc8
ldr r0, _0214f248 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bcfb8
@@ -25298,7 +25298,7 @@ _0214f218:
.align 2, 0
_0214f240: .word data_ov00_020eec68
_0214f244: .word gAdventureFlags
_0214f248: .word data_027e0fc8
_0214f248: .word gPlayerLink
arm_func_end func_ov14_0214f184
.global func_ov14_0214f24c
@@ -28411,13 +28411,13 @@ func_ov14_02151608: ; 0x02151608
arm_func_start func_ov14_02151610
func_ov14_02151610: ; 0x02151610
stmdb sp!, {r4, lr}
ldr r1, _02151684 ; =data_027e0fc8
ldr r1, _02151684 ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
bl func_ov00_020bba28
cmp r0, #0
beq _02151640
ldr r0, _02151684 ; =data_027e0fc8
ldr r0, _02151684 ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #0x3f
@@ -28445,7 +28445,7 @@ _0215167c:
mov r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_02151684: .word data_027e0fc8
_02151684: .word gPlayerLink
_02151688: .word gItemManager
arm_func_end func_ov14_02151610
@@ -28960,7 +28960,7 @@ func_ov14_02151bec: ; 0x02151bec
bl func_ov00_02078b40
cmp r0, #2
beq _02151ca4
ldr r0, _02151ddc ; =data_027e0fc8
ldr r0, _02151ddc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #5
@@ -29009,7 +29009,7 @@ _02151d00:
strge r0, [r4, #0x10]
b _02151db0
_02151d20:
ldr r0, _02151ddc ; =data_027e0fc8
ldr r0, _02151ddc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #0
@@ -29061,7 +29061,7 @@ _02151dcc: .word data_027e077c
_02151dd0: .word data_027e0618
_02151dd4: .word data_027e0c68
_02151dd8: .word data_027e0d38
_02151ddc: .word data_027e0fc8
_02151ddc: .word gPlayerLink
arm_func_end func_ov14_02151bec
.global func_ov14_02151de0
+1 -1
View File
@@ -102,7 +102,7 @@
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc4
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+18 -18
View File
@@ -3375,7 +3375,7 @@ func_ov17_0215de10: ; 0x0215de10
ldrb r0, [r4, #0x11b]
cmp r0, #0
beq _0215de58
ldr r0, _0215dfc4 ; =data_027e0fc8
ldr r0, _0215dfc4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -3477,7 +3477,7 @@ _0215df54:
add sp, sp, #0x78
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215dfc4: .word data_027e0fc8
_0215dfc4: .word gPlayerLink
_0215dfc8: .word data_02050f54
_0215dfcc: .word data_ov00_020e9360
_0215dfd0: .word 0x000004cd
@@ -4500,7 +4500,7 @@ _0215edb8:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
_0215edf4:
ldr r0, _0215ee54 ; =data_027e0fc8
ldr r0, _0215ee54 ; =gPlayerLink
add r1, r4, #8
ldr r0, [r0]
bl func_ov00_020bc7e0
@@ -4527,7 +4527,7 @@ _0215ee3c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215ee50: .word data_027e0d0c
_0215ee54: .word data_027e0fc8
_0215ee54: .word gPlayerLink
_0215ee58: .word data_027e0f94
_0215ee5c: .word 0x00000733
arm_func_end func_ov17_0215ea94
@@ -4626,7 +4626,7 @@ func_ov17_0215ef6c: ; 0x0215ef6c
ldrb r0, [r4, #0x11b]
cmp r0, #0
beq _0215efb4
ldr r0, _0215f01c ; =data_027e0fc8
ldr r0, _0215f01c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -4660,7 +4660,7 @@ _0215efb4:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215f01c: .word data_027e0fc8
_0215f01c: .word gPlayerLink
_0215f020: .word data_ov00_020e9c88
_0215f024: .word func_ov17_0215ee60
_0215f028: .word 0x000004cd
@@ -5154,7 +5154,7 @@ _0215f66c:
bl func_ov17_0215f2e4
b _0215f6ec
_0215f6a4:
ldr r0, _0215f710 ; =data_027e0fc8
ldr r0, _0215f710 ; =gPlayerLink
add r1, r4, #8
ldr r0, [r0]
bl func_ov00_020bc7e0
@@ -5184,7 +5184,7 @@ _0215f700: .word 0xfffffe3d
_0215f704: .word 0x000001c3
_0215f708: .word data_027e0d0c
_0215f70c: .word data_027e0ffc
_0215f710: .word data_027e0fc8
_0215f710: .word gPlayerLink
_0215f714: .word data_027e0f94
_0215f718: .word 0x00000733
arm_func_end func_ov17_0215f300
@@ -5213,7 +5213,7 @@ func_ov17_0215f728: ; 0x0215f728
ldrb r0, [r4, #0x11b]
cmp r0, #0
beq _0215f770
ldr r0, _0215f84c ; =data_027e0fc8
ldr r0, _0215f84c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -5276,7 +5276,7 @@ _0215f770:
add sp, sp, #0x48
ldmia sp!, {r4, pc}
.align 2, 0
_0215f84c: .word data_027e0fc8
_0215f84c: .word gPlayerLink
_0215f850: .word data_02050f54
_0215f854: .word data_027e0f78
_0215f858: .word data_ov00_020e9370
@@ -7099,7 +7099,7 @@ _02160d94:
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, pc}
_02160dd0:
ldr r0, _02160e6c ; =data_027e0fc8
ldr r0, _02160e6c ; =gPlayerLink
ldr r1, [r5, #0x1b4]
ldr r0, [r0]
bl func_ov00_020bce48
@@ -7142,7 +7142,7 @@ _02160e5c: .word gMapManager
_02160e60: .word data_027e0ffc
_02160e64: .word 0x000001ab
_02160e68: .word 0xfffffe66
_02160e6c: .word data_027e0fc8
_02160e6c: .word gPlayerLink
arm_func_end func_ov17_02160a78
.global func_ov17_02160e70
@@ -7483,7 +7483,7 @@ _0216127c:
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xa
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _021612ac ; =data_027e0fc8
ldr r0, _021612ac ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bcfb8
@@ -7491,7 +7491,7 @@ _0216127c:
.align 2, 0
_021612a4: .word data_027e0f90
_021612a8: .word gAdventureFlags
_021612ac: .word data_027e0fc8
_021612ac: .word gPlayerLink
arm_func_end func_ov17_021611cc
.global func_ov17_021612b0
@@ -18454,7 +18454,7 @@ _02169e50:
blx r2
cmp r0, #0
beq _02169eac
ldr r0, _02169ec8 ; =data_027e0fc8
ldr r0, _02169ec8 ; =gPlayerLink
add r1, sp, #0x20
ldr r0, [r0]
mov r2, r5
@@ -18472,7 +18472,7 @@ _02169eb8: .word 0x00001333
_02169ebc: .word data_027e0fe4
_02169ec0: .word 0x42494752
_02169ec4: .word data_027e0f94
_02169ec8: .word data_027e0fc8
_02169ec8: .word gPlayerLink
arm_func_end func_ov17_02169d4c
.global func_ov17_02169ecc
@@ -18671,14 +18671,14 @@ _0216a0cc:
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xa
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _0216a0f8 ; =data_027e0fc8
ldr r0, _0216a0f8 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bcfb8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0216a0f4: .word gAdventureFlags
_0216a0f8: .word data_027e0fc8
_0216a0f8: .word gPlayerLink
arm_func_end func_ov17_0216a06c
.global func_ov17_0216a0fc
+1 -1
View File
@@ -96,7 +96,7 @@
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
.extern data_027e0fe4
+19 -19
View File
@@ -1967,7 +1967,7 @@ func_ov18_0215cdb4: ; 0x0215cdb4
ldrsh r1, [r4, #0x48]
cmp r1, #0
blt _0215ce2c
ldr r0, _0215ce40 ; =data_027e0fc8
ldr r0, _0215ce40 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bce48
cmp r0, #0
@@ -1986,7 +1986,7 @@ _0215ce2c:
.align 2, 0
_0215ce38: .word data_027e077c
_0215ce3c: .word 0x04000304
_0215ce40: .word data_027e0fc8
_0215ce40: .word gPlayerLink
arm_func_end func_ov18_0215cdb4
.global func_ov18_0215ce44
@@ -2141,7 +2141,7 @@ func_ov18_0215cfac: ; 0x0215cfac
cmp r0, #0
movne r1, #0
strneb r1, [r0, #0x11a]
ldr r1, _0215d054 ; =data_027e0fc8
ldr r1, _0215d054 ; =gPlayerLink
ldr r0, _0215d04c ; =data_027e0fe4
ldr r3, [r1]
ldr r0, [r0]
@@ -2168,7 +2168,7 @@ func_ov18_0215cfac: ; 0x0215cfac
.align 2, 0
_0215d04c: .word data_027e0fe4
_0215d050: .word 0x4c4e4232
_0215d054: .word data_027e0fc8
_0215d054: .word gPlayerLink
_0215d058: .word data_ov18_0216c2b8
_0215d05c: .word 0x4b4f4b41
arm_func_end func_ov18_0215cfac
@@ -8895,7 +8895,7 @@ func_ov18_02162634: ; 0x02162634
_02162658:
cmp r1, #0
bne _02162708
ldr r0, _02162714 ; =data_027e0fc8
ldr r0, _02162714 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #4
@@ -8942,7 +8942,7 @@ _02162708:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02162714: .word data_027e0fc8
_02162714: .word gPlayerLink
_02162718: .word data_027e0fd0
_0216271c: .word data_027e0f94
_02162720: .word 0xfffffaec
@@ -12814,7 +12814,7 @@ func_ov18_02165948: ; 0x02165948
ldr r0, [r4, #0x130]
cmp r0, #1
beq _02165980
ldr r1, _021659ac ; =data_027e0fc8
ldr r1, _021659ac ; =gPlayerLink
mvn r0, #0
ldr r1, [r1]
ldr r1, [r1, #0x3c]
@@ -12836,7 +12836,7 @@ _02165980:
str r0, [r4, #0x474]
ldmia sp!, {r4, pc}
.align 2, 0
_021659ac: .word data_027e0fc8
_021659ac: .word gPlayerLink
_021659b0: .word data_ov18_0216ce8c
arm_func_end func_ov18_02165948
@@ -13579,7 +13579,7 @@ _021662f4:
bl func_ov00_02089318
_02166354:
mov r1, #1
ldr r0, _02166674 ; =data_027e0fc8
ldr r0, _02166674 ; =gPlayerLink
strb r1, [r5, #0x51e]
ldr r0, [r0]
mov r1, r4
@@ -13592,7 +13592,7 @@ _02166354:
strb r0, [r5, #0x51c]
b _0216664c
_02166388:
ldr r0, _02166674 ; =data_027e0fc8
ldr r0, _02166674 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcec8
cmp r0, #0
@@ -13791,7 +13791,7 @@ _02166664: .word data_027e0ffc
_02166668: .word 0x00000466
_0216666c: .word data_027e0f94
_02166670: .word data_027e0f64
_02166674: .word data_027e0fc8
_02166674: .word gPlayerLink
_02166678: .word 0x00000467
arm_func_end func_ov18_02166098
@@ -14410,12 +14410,12 @@ func_ov18_02166e7c: ; 0x02166e7c
rsb r1, r1, #0
cmp r0, r1
ldmleia sp!, {r4, pc}
ldr r0, _02166f18 ; =data_027e0fc8
ldr r0, _02166f18 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd318
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02166f18 ; =data_027e0fc8
ldr r0, _02166f18 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd304
cmp r0, #0
@@ -14437,7 +14437,7 @@ func_ov18_02166e7c: ; 0x02166e7c
ldmia sp!, {r4, pc}
.align 2, 0
_02166f14: .word 0x00002aab
_02166f18: .word data_027e0fc8
_02166f18: .word gPlayerLink
_02166f1c: .word data_027e0fe4
arm_func_end func_ov18_02166e7c
@@ -14789,7 +14789,7 @@ _021673b8:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r1, [r6, #0x12]
ldr r0, _02167610 ; =data_027e0fc8
ldr r0, _02167610 ; =gPlayerLink
ldr r4, _02167614 ; =data_02050f54
mov r1, r1, asr #0x4
mov r6, r1, lsl #0x1
@@ -14913,7 +14913,7 @@ _02167600: .word 0x00000464
_02167604: .word 0x00000465
_02167608: .word 0x0000019a
_0216760c: .word data_ov18_0216d604
_02167610: .word data_027e0fc8
_02167610: .word gPlayerLink
_02167614: .word data_02050f54
_02167618: .word 0x00000333
_0216761c: .word 0x00000666
@@ -15575,7 +15575,7 @@ _02167f1c:
ldmia r3, {r0, r1, r2}
stmia r7, {r0, r1, r2}
ldr r6, [r4, #0x14]
ldr r0, _021681dc ; =data_027e0fc8
ldr r0, _021681dc ; =gPlayerLink
str r6, [sp, #0x28]
ldr r1, [r3, #4]
ldr r2, _021681e0 ; =0xffffe38e
@@ -15689,7 +15689,7 @@ _021680ac:
str r2, [sp, #4]
ldmia r1, {r1, r2, r3}
bl func_ov18_02166910
ldr r0, _021681dc ; =data_027e0fc8
ldr r0, _021681dc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
@@ -15755,7 +15755,7 @@ _021681ac:
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_021681dc: .word data_027e0fc8
_021681dc: .word gPlayerLink
_021681e0: .word 0xffffe38e
_021681e4: .word data_02050f54
_021681e8: .word data_ov18_0216d604
+1 -1
View File
@@ -122,7 +122,7 @@
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+16 -16
View File
@@ -1501,7 +1501,7 @@ _0216ea5c:
ldrsh r0, [r0, #0x20]
cmp r0, #0
bgt _0216ea98
ldr r0, _0216eac0 ; =data_027e0fc8
ldr r0, _0216eac0 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -1523,7 +1523,7 @@ _0216eab8:
mov r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_0216eac0: .word data_027e0fc8
_0216eac0: .word gPlayerLink
_0216eac4: .word data_ov00_020eec68
arm_func_end func_ov19_0216e9e8
@@ -1588,7 +1588,7 @@ _0216eb54: ; jump table
b _0216eb78 ; case 7
b _0216eb78 ; case 8
_0216eb78:
ldr r0, _0216ecfc ; =data_027e0fc8
ldr r0, _0216ecfc ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
@@ -1692,7 +1692,7 @@ _0216ece8:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216ecfc: .word data_027e0fc8
_0216ecfc: .word gPlayerLink
_0216ed00: .word data_02050f54
arm_func_end func_ov19_0216eb38
@@ -2260,7 +2260,7 @@ _0216f3d8:
mov r0, r4
str r2, [r1, #0x10]
bl func_ov19_0216f068
ldr r0, _0216f4cc ; =data_027e0fc8
ldr r0, _0216f4cc ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x80]
@@ -2319,7 +2319,7 @@ _0216f4b8:
add sp, sp, #0x8c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0216f4cc: .word data_027e0fc8
_0216f4cc: .word gPlayerLink
_0216f4d0: .word data_027e0c68
_0216f4d4: .word 0x0067000e
_0216f4d8: .word data_027e0f64
@@ -7030,7 +7030,7 @@ _021732ac:
mov r0, #0
ldmia sp!, {r4, pc}
_021732b8:
ldr r0, _02173300 ; =data_027e0fc8
ldr r0, _02173300 ; =gPlayerLink
add r1, r4, #0x18
ldr r0, [r0]
bl func_ov00_020bc520
@@ -7038,7 +7038,7 @@ _021732b8:
addlt sp, sp, #0x18
movlt r0, #0
ldmltia sp!, {r4, pc}
ldr r0, _02173300 ; =data_027e0fc8
ldr r0, _02173300 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bb9e4
mov r0, #1
@@ -7049,7 +7049,7 @@ _021732f0: .word data_027e0f78
_021732f4: .word data_027e0f64
_021732f8: .word data_027e0f94
_021732fc: .word 0xfffff19a
_02173300: .word data_027e0fc8
_02173300: .word gPlayerLink
arm_func_end func_ov19_021731e8
.global func_ov19_02173304
@@ -7373,7 +7373,7 @@ _021736d4:
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xa
bne _02173714
ldr r0, _02173790 ; =data_027e0fc8
ldr r0, _02173790 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bcfb8
@@ -7412,7 +7412,7 @@ _0217377c:
_02173784: .word 0x00000666
_02173788: .word data_027e0ffc
_0217378c: .word gAdventureFlags
_02173790: .word data_027e0fc8
_02173790: .word gPlayerLink
_02173794: .word 0x000001b3
arm_func_end func_ov19_0217358c
@@ -8940,7 +8940,7 @@ _02174bd8:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [sp, #0xc]
ldr r1, _02174d34 ; =data_027e0fc8
ldr r1, _02174d34 ; =gPlayerLink
add r0, r0, #0xcd
add r4, r0, #0x2c00
ldr r0, [r1]
@@ -9021,7 +9021,7 @@ _02174d24: .word data_027e0e58
_02174d28: .word 0x00000131
_02174d2c: .word 0x00001666
_02174d30: .word 0x0000013b
_02174d34: .word data_027e0fc8
_02174d34: .word gPlayerLink
_02174d38: .word 0x0000013a
_02174d3c: .word 0x00000136
_02174d40: .word 0x00000137
@@ -9188,7 +9188,7 @@ _02174f38:
cmp r0, r1
bge _02174fa8
mov r1, #0
ldr r0, _02175594 ; =data_027e0fc8
ldr r0, _02175594 ; =gPlayerLink
str r1, [sp]
ldr r0, [r0]
add r2, r4, #8
@@ -9296,7 +9296,7 @@ _021750d0:
mov r3, #0
bl func_ov00_020ceacc
_02175108:
ldr r0, _02175594 ; =data_027e0fc8
ldr r0, _02175594 ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #8
@@ -9605,7 +9605,7 @@ _02175584: .word 0x0000024a
_02175588: .word gMapManager
_0217558c: .word data_027e0f90
_02175590: .word 0x00000333
_02175594: .word data_027e0fc8
_02175594: .word gPlayerLink
_02175598: .word data_ov19_02175e4c
_0217559c: .word 0x0000019a
_021755a0: .word 0x000001ae
+1 -1
View File
@@ -113,7 +113,7 @@
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+11 -11
View File
@@ -385,7 +385,7 @@ _0216db78:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216dba4:
mov r1, #1
ldr r0, _0216e520 ; =data_027e0fc8
ldr r0, _0216e520 ; =gPlayerLink
strb r1, [r7, #0x11a]
ldr r0, [r0]
ldr r1, [r0]
@@ -1017,7 +1017,7 @@ _0216e514:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0216e51c: .word 0x0000ffff
_0216e520: .word data_027e0fc8
_0216e520: .word gPlayerLink
_0216e524: .word data_ov00_020eec68
_0216e528: .word data_027e103c
_0216e52c: .word 0x000900e1
@@ -1065,7 +1065,7 @@ func_ov20_0216e568: ; 0x0216e568
ldrsh r0, [r0, #0x20]
cmp r0, #0
bgt _0216e5ec
ldr r0, _0216e5fc ; =data_027e0fc8
ldr r0, _0216e5fc ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -1080,7 +1080,7 @@ _0216e5f4:
mov r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_0216e5fc: .word data_027e0fc8
_0216e5fc: .word gPlayerLink
_0216e600: .word data_ov00_020eec68
arm_func_end func_ov20_0216e568
@@ -1111,7 +1111,7 @@ _0216e64c:
add r3, sp, #0x78
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0216f46c ; =data_027e0fc8
ldr r0, _0216f46c ; =gPlayerLink
ldr r1, [sp, #0x7c]
ldr r0, [r0]
add r2, r1, #0x1000
@@ -2071,7 +2071,7 @@ _0216f460:
add sp, sp, #0x1e4
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0216f46c: .word data_027e0fc8
_0216f46c: .word gPlayerLink
_0216f470: .word 0x00001388
_0216f474: .word 0x000004cd
_0216f478: .word data_027e0ffc
@@ -4051,7 +4051,7 @@ _02170d58:
add r3, sp, #0x1c
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02171520 ; =data_027e0fc8
ldr r0, _02171520 ; =gPlayerLink
ldr r1, [sp, #0x20]
ldr r0, [r0]
add r2, r1, #0x1000
@@ -4598,7 +4598,7 @@ _02171514:
add sp, sp, #0x28
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02171520: .word data_027e0fc8
_02171520: .word gPlayerLink
_02171524: .word 0x0000019a
_02171528: .word data_027e0ffc
_0217152c: .word 0x00000272
@@ -9422,7 +9422,7 @@ _02175420:
cmp r0, #0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldr r0, _021755e8 ; =data_027e0fc8
ldr r0, _021755e8 ; =gPlayerLink
add r1, r5, #0x18
ldr r0, [r0]
bl func_ov00_020bc520
@@ -9490,7 +9490,7 @@ _02175528:
mov r1, #0
mov r2, #0x800
bl func_0202b3bc
ldr r0, _021755e8 ; =data_027e0fc8
ldr r0, _021755e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bb9e4
mov r0, r5
@@ -9538,7 +9538,7 @@ _021755d8:
.align 2, 0
_021755e0: .word data_027e0f64
_021755e4: .word data_027e0e58
_021755e8: .word data_027e0fc8
_021755e8: .word gPlayerLink
_021755ec: .word data_027e0fac
_021755f0: .word 0xffff9555
arm_func_end func_ov20_02175324
+1 -1
View File
@@ -78,7 +78,7 @@
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
.extern data_027e0fe4
+5 -5
View File
@@ -2927,7 +2927,7 @@ _0216fac4:
rsb r0, r0, #0
str r0, [r10, #0x224]
rsb r1, r1, #0
ldr r0, _0216fbb8 ; =data_027e0fc8
ldr r0, _0216fbb8 ; =gPlayerLink
str r1, [r10, #0x228]
ldr r0, [r0]
mov r4, #0
@@ -2945,7 +2945,7 @@ _0216fb20:
ldrb r0, [r10, #0x158]
cmp r0, #0
bne _0216fb60
ldr r0, _0216fbb8 ; =data_027e0fc8
ldr r0, _0216fbb8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba28
cmp r0, #0
@@ -2983,7 +2983,7 @@ _0216fba8: .word data_ov21_02171bf0
_0216fbac: .word data_ov21_02171774
_0216fbb0: .word data_ov21_02171bfc
_0216fbb4: .word func_ov00_020b1940
_0216fbb8: .word data_027e0fc8
_0216fbb8: .word gPlayerLink
_0216fbbc: .word data_027e0fd0
arm_func_end func_ov21_0216f7c8
@@ -2992,7 +2992,7 @@ _0216fbbc: .word data_027e0fd0
func_ov21_0216fbc0: ; 0x0216fbc0
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr r1, _0216fc58 ; =data_027e0fc8
ldr r1, _0216fc58 ; =gPlayerLink
mov r4, r0
ldr r5, [r1]
mov r0, r5
@@ -3031,7 +3031,7 @@ _0216fc38:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0216fc58: .word data_027e0fc8
_0216fc58: .word gPlayerLink
arm_func_end func_ov21_0216fbc0
.global func_ov21_0216fc5c
+1 -1
View File
@@ -117,7 +117,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
+2 -2
View File
@@ -12350,12 +12350,12 @@ _021777f8: .word func_ov22_02177328
.global func_ov22_021777fc
arm_func_start func_ov22_021777fc
func_ov22_021777fc: ; 0x021777fc
ldr r0, _0217780c ; =data_027e0fc8
ldr r0, _0217780c ; =gPlayerLink
ldr ip, _02177810 ; =func_ov00_020bbd60
ldr r0, [r0]
bx ip
.align 2, 0
_0217780c: .word data_027e0fc8
_0217780c: .word gPlayerLink
_02177810: .word func_ov00_020bbd60
arm_func_end func_ov22_021777fc
+1 -1
View File
@@ -153,7 +153,7 @@
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
+21 -21
View File
@@ -9295,7 +9295,7 @@ func_ov23_021750e0: ; 0x021750e0
mov r1, #0
str r0, [r4, #0x194]
ldr r2, [r4, #0xc]
ldr r0, _02175174 ; =data_027e0fc8
ldr r0, _02175174 ; =gPlayerLink
str r2, [r4, #0x198]
strb r1, [r4, #0x1c8]
ldr r0, [r0]
@@ -9306,7 +9306,7 @@ func_ov23_021750e0: ; 0x021750e0
ldmia sp!, {r4, pc}
.align 2, 0
_02175170: .word 0x00000666
_02175174: .word data_027e0fc8
_02175174: .word gPlayerLink
arm_func_end func_ov23_021750e0
.global func_ov23_02175178
@@ -9351,7 +9351,7 @@ _021751cc:
b _02175328
_02175200:
add r0, r5, #0x100
ldr r2, _02175338 ; =data_027e0fc8
ldr r2, _02175338 ; =gPlayerLink
ldrsh r1, [r0, #0x6e]
ldr r0, [r2]
bl func_ov00_020bb5f0
@@ -9435,7 +9435,7 @@ _02175328:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02175334: .word data_027e103c
_02175338: .word data_027e0fc8
_02175338: .word gPlayerLink
_0217533c: .word data_ov23_0217a62c
_02175340: .word data_ov23_0217a61c
_02175344: .word gAdventureFlags
@@ -9473,7 +9473,7 @@ func_ov23_02175384: ; 0x02175384
add r0, r6, #0x100
str r2, [r6, #0x54]
ldr r3, [r6, #0x4c]
ldr r2, _02175708 ; =data_027e0fc8
ldr r2, _02175708 ; =gPlayerLink
str r3, [r6, #0x58]
ldr r3, [r6, #0x50]
mov r5, r1
@@ -9553,7 +9553,7 @@ _021754bc:
mov r0, r6
bl func_ov23_02175b04
add r0, r6, #0x100
ldr r2, _02175708 ; =data_027e0fc8
ldr r2, _02175708 ; =gPlayerLink
ldrsh r1, [r0, #0x6e]
ldr r0, [r2]
bl func_ov00_020bc48c
@@ -9579,13 +9579,13 @@ _021754bc:
add r0, r6, #0x100
ldrb r2, [r1, #0x124]
ldrsh r1, [r0, #0x6e]
ldr r3, _02175708 ; =data_027e0fc8
ldr r3, _02175708 ; =gPlayerLink
rsb r0, r2, #0
mov r2, r0, lsl #0x10
ldr r0, [r3]
mov r2, r2, asr #0x10
bl func_ov00_020bc494
ldr r0, _02175708 ; =data_027e0fc8
ldr r0, _02175708 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc4ac
ldr r1, [sp]
@@ -9706,7 +9706,7 @@ _021756d4:
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02175708: .word data_027e0fc8
_02175708: .word gPlayerLink
_0217570c: .word 0x66666667
_02175710: .word gAdventureFlags
_02175714: .word data_027e077c
@@ -9757,7 +9757,7 @@ _02175760:
str r0, [r6, #0x168]
_021757b4:
add r0, r6, #0x100
ldr r2, _02175874 ; =data_027e0fc8
ldr r2, _02175874 ; =gPlayerLink
ldrsh r1, [r0, #0x6e]
ldr r0, [r2]
bl func_ov00_020bb5f0
@@ -9769,7 +9769,7 @@ _021757b4:
cmp r0, #1
bne _02175814
add r0, r6, #0x100
ldr r2, _02175874 ; =data_027e0fc8
ldr r2, _02175874 ; =gPlayerLink
ldrsh r1, [r0, #0x6e]
ldr r0, [r2]
bl func_ov00_020bc48c
@@ -9807,7 +9807,7 @@ _02175844:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02175870: .word gAdventureFlags
_02175874: .word data_027e0fc8
_02175874: .word gPlayerLink
arm_func_end func_ov23_0217571c
.global func_ov23_02175878
@@ -9874,7 +9874,7 @@ func_ov23_0217590c: ; 0x0217590c
cmpne r0, #5
ldmeqia sp!, {r3, r4, r5, pc}
add r0, r5, #0x100
ldr r2, _02175974 ; =data_027e0fc8
ldr r2, _02175974 ; =gPlayerLink
ldrsh r1, [r0, #0x6e]
ldr r0, [r2]
bl func_ov00_020bb5f0
@@ -9889,7 +9889,7 @@ func_ov23_0217590c: ; 0x0217590c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02175970: .word data_027e0f90
_02175974: .word data_027e0fc8
_02175974: .word gPlayerLink
arm_func_end func_ov23_0217590c
.global func_ov23_02175978
@@ -9908,7 +9908,7 @@ func_ov23_02175978: ; 0x02175978
addeq sp, sp, #0x20
ldmeqia sp!, {r4, r5, r6, pc}
add r0, r6, #0x100
ldr r2, _02175a60 ; =data_027e0fc8
ldr r2, _02175a60 ; =gPlayerLink
ldrsh r1, [r0, #0x6e]
ldr r0, [r2]
bl func_ov00_020bb5f0
@@ -9954,7 +9954,7 @@ func_ov23_02175978: ; 0x02175978
add sp, sp, #0x20
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02175a60: .word data_027e0fc8
_02175a60: .word gPlayerLink
arm_func_end func_ov23_02175978
.global func_ov23_02175a64
@@ -10543,11 +10543,11 @@ func_ov23_02176190: ; 0x02176190
ldmeqia sp!, {r4, pc}
cmp r1, #0x1c
bne _02176204
ldr r0, _0217620c ; =data_027e0fc8
ldr r0, _0217620c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
ldr r0, _0217620c ; =data_027e0fc8
ldr r0, _0217620c ; =gPlayerLink
moveq r1, #1
ldr r0, [r0]
movne r1, #0
@@ -10566,7 +10566,7 @@ _02176204:
mov r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_0217620c: .word data_027e0fc8
_0217620c: .word gPlayerLink
_02176210: .word data_027e103c
arm_func_end func_ov23_02176190
@@ -10701,7 +10701,7 @@ func_ov23_021763c0: ; 0x021763c0
beq _021763f4
cmp r1, #2
bne _02176440
ldr r0, _0217648c ; =data_027e0fc8
ldr r0, _0217648c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
@@ -10747,7 +10747,7 @@ _02176440:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217648c: .word data_027e0fc8
_0217648c: .word gPlayerLink
arm_func_end func_ov23_021763c0
.global func_ov23_02176490
+1 -1
View File
@@ -110,7 +110,7 @@
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+4 -4
View File
@@ -2268,7 +2268,7 @@ _0216f40c:
ldrb r0, [r4, #0x486]
cmp r0, #0
bne _0216f450
ldr r0, _0216f460 ; =data_027e0fc8
ldr r0, _0216f460 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd304
cmp r0, #0
@@ -2288,7 +2288,7 @@ _0216f450:
ldmia sp!, {r4, pc}
.align 2, 0
_0216f45c: .word 0x4d55544f
_0216f460: .word data_027e0fc8
_0216f460: .word gPlayerLink
arm_func_end func_ov24_0216f3d8
.global func_ov24_0216f464
@@ -2794,7 +2794,7 @@ func_ov24_0216fa3c: ; 0x0216fa3c
addeq sp, sp, #0xbc
moveq r0, #0
ldmeqia sp!, {r3, r4, pc}
ldr r0, _0216fbc0 ; =data_027e0fc8
ldr r0, _0216fbc0 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba28
cmp r0, #0
@@ -2862,7 +2862,7 @@ _0216fba8:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216fbbc: .word data_027e0f64
_0216fbc0: .word data_027e0fc8
_0216fbc0: .word gPlayerLink
_0216fbc4: .word gAdventureFlags
_0216fbc8: .word data_027e0fe4
_0216fbcc: .word 0x574c4354
+1 -1
View File
@@ -117,7 +117,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+18 -18
View File
@@ -3167,7 +3167,7 @@ _021700c0:
ldrsh r0, [r0, #0x20]
cmp r0, #0
bgt _0217017c
ldr r0, _021703ac ; =data_027e0fc8
ldr r0, _021703ac ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -3324,7 +3324,7 @@ _02170390:
.align 2, 0
_021703a4: .word 0x43425332
_021703a8: .word data_027e0764
_021703ac: .word data_027e0fc8
_021703ac: .word gPlayerLink
_021703b0: .word data_ov00_020eec68
_021703b4: .word 0x00000e39
_021703b8: .word data_02050f54
@@ -3335,7 +3335,7 @@ _021703b8: .word data_02050f54
func_ov25_021703bc: ; 0x021703bc
stmdb sp!, {r4, lr}
sub sp, sp, #0xc0
ldr r1, _02170d54 ; =data_027e0fc8
ldr r1, _02170d54 ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x48
@@ -3796,7 +3796,7 @@ _021709d4:
mov r2, #1
strb r2, [r1, #0x78]
bl _ZN5Actor14GetAngleToLinkEv
ldr r1, _02170d54 ; =data_027e0fc8
ldr r1, _02170d54 ; =gPlayerLink
sub r3, r0, #0x8000
ldr r2, _02170d5c ; =data_027e0fac
ldr r0, [r1]
@@ -3815,7 +3815,7 @@ _02170a8c:
bl func_ov25_0216f898
b _02170d10
_02170aa8:
ldr r0, _02170d54 ; =data_027e0fc8
ldr r0, _02170d54 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
mov r2, #0x1000
@@ -3831,7 +3831,7 @@ _02170aa8:
bl func_ov25_0216f898
b _02170d10
_02170ae4:
ldr r0, _02170d54 ; =data_027e0fc8
ldr r0, _02170d54 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
mov r2, #0x1000
@@ -3849,7 +3849,7 @@ _02170b1c:
mov r0, r4
mov r1, #0
bl func_ov25_0216e08c
ldr r0, _02170d54 ; =data_027e0fc8
ldr r0, _02170d54 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
mov r2, #0x1000
@@ -3889,7 +3889,7 @@ _02170b1c:
sub r0, r0, #0x8000
mov r0, r0, lsl #0x10
mov r2, r0, asr #0x10
ldr r0, _02170d54 ; =data_027e0fc8
ldr r0, _02170d54 ; =gPlayerLink
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_020bcdec
@@ -3903,7 +3903,7 @@ _02170bf0:
mov r0, r4
mov r1, #0
bl func_ov25_0216e08c
ldr r0, _02170d54 ; =data_027e0fc8
ldr r0, _02170d54 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
mov r2, #0x1000
@@ -3933,7 +3933,7 @@ _02170bf0:
bl func_ov25_0216f898
b _02170d10
_02170c70:
ldr r0, _02170d54 ; =data_027e0fc8
ldr r0, _02170d54 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
mov r2, #0x1000
@@ -3952,7 +3952,7 @@ _02170c70:
bl func_ov25_0216f898
b _02170d10
_02170cb8:
ldr r0, _02170d54 ; =data_027e0fc8
ldr r0, _02170d54 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
mov r2, #0x1000
@@ -3969,7 +3969,7 @@ _02170cb8:
bl func_ov00_020875f8
mov r0, r4
bl func_ov00_020cc960
ldr r0, _02170d54 ; =data_027e0fc8
ldr r0, _02170d54 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd0a8
mov r0, r4
@@ -3995,7 +3995,7 @@ _02170d38:
add sp, sp, #0xc0
ldmia sp!, {r4, pc}
.align 2, 0
_02170d54: .word data_027e0fc8
_02170d54: .word gPlayerLink
_02170d58: .word data_027e0fb8
_02170d5c: .word data_027e0fac
_02170d60: .word data_ov25_0217a880
@@ -10235,12 +10235,12 @@ _021760ec:
add sp, sp, #0x13c
ldmia sp!, {r4, r5, r6, r7, pc}
_0217613c:
ldr r0, _0217633c ; =data_027e0fc8
ldr r0, _0217633c ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x80]
blx r1
ldr r0, _0217633c ; =data_027e0fc8
ldr r0, _0217633c ; =gPlayerLink
mvn r1, #0
ldr r0, [r0]
bl func_ov00_020bd070
@@ -10376,7 +10376,7 @@ _02176330:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02176338: .word gAdventureFlags
_0217633c: .word data_027e0fc8
_0217633c: .word gPlayerLink
_02176340: .word data_027e0c68
_02176344: .word 0x00710012
_02176348: .word data_027e0db0
@@ -10616,7 +10616,7 @@ _02176648:
cmp r0, #0
addne sp, sp, #0x24
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
ldr r0, _02176968 ; =data_027e0fc8
ldr r0, _02176968 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd0a8
mov r0, r4
@@ -10826,7 +10826,7 @@ _02176958: .word gAdventureFlags
_0217695c: .word data_027e0c68
_02176960: .word data_027e0fe4
_02176964: .word data_027e0f64
_02176968: .word data_027e0fc8
_02176968: .word gPlayerLink
arm_func_end func_ov25_021763a4
.global func_ov25_0217696c
+1 -1
View File
@@ -122,7 +122,7 @@
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
+6 -6
View File
@@ -5001,7 +5001,7 @@ _021714b8:
cmp r0, #0
beq _02171718
mov r3, #0
ldr r0, _02171750 ; =data_027e0fc8
ldr r0, _02171750 ; =gPlayerLink
str r3, [sp]
ldr r0, [r0]
add r2, r5, #8
@@ -5177,7 +5177,7 @@ _02171740: .word gAdventureFlags
_02171744: .word data_ov00_020e8398
_02171748: .word data_027e0ff0
_0217174c: .word data_027e0f94
_02171750: .word data_027e0fc8
_02171750: .word gPlayerLink
arm_func_end func_ov26_02170d60
.global func_ov26_02171754
@@ -14573,7 +14573,7 @@ _021788fc:
ldr r3, [r3, #0x80]
blx r3
_02178924:
ldr r0, _02178990 ; =data_027e0fc8
ldr r0, _02178990 ; =gPlayerLink
add r1, r5, #0x5c
ldr r0, [r0]
bl func_ov00_020bb68c
@@ -14603,7 +14603,7 @@ _02178980: .word gAdventureFlags
_02178984: .word 0x0000019a
_02178988: .word 0xffffeccd
_0217898c: .word data_027e0ffc
_02178990: .word data_027e0fc8
_02178990: .word gPlayerLink
arm_func_end func_ov26_0217873c
.global func_ov26_02178994
@@ -14718,7 +14718,7 @@ _02178af4:
sub r2, r1, #1
str r2, [r4, #0x40]
bl func_ov26_02178c1c
ldr r0, _02178b38 ; =data_027e0fc8
ldr r0, _02178b38 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd0a8
_02178b24:
@@ -14728,7 +14728,7 @@ _02178b24:
.align 2, 0
_02178b30: .word gAdventureFlags
_02178b34: .word data_027e0f64
_02178b38: .word data_027e0fc8
_02178b38: .word gPlayerLink
arm_func_end func_ov26_021789a4
.global func_ov26_02178b3c
+1 -1
View File
@@ -102,7 +102,7 @@
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
+13 -13
View File
@@ -705,7 +705,7 @@ _0216e084:
movge r1, #1
movlt r1, #0
str r1, [sp]
ldr r0, _0216e954 ; =data_027e0fc8
ldr r0, _0216e954 ; =gPlayerLink
mov r1, #0x20
ldr r0, [r0]
mov r3, #0
@@ -1275,7 +1275,7 @@ _0216e944: .word data_ov27_02178dfc
_0216e948: .word 0x00000232
_0216e94c: .word 0x00000235
_0216e950: .word data_027e0f94
_0216e954: .word data_027e0fc8
_0216e954: .word gPlayerLink
_0216e958: .word data_027e0f64
_0216e95c: .word data_02050f54
_0216e960: .word data_027e0e58
@@ -3373,7 +3373,7 @@ func_ov27_02170480: ; 0x02170480
mov r3, #0x29
str r5, [sp]
bl func_0202b4e4
ldr r0, _021708b8 ; =data_027e0fc8
ldr r0, _021708b8 ; =gPlayerLink
add r1, sp, #0x20
ldr r0, [r0]
bl func_ov00_020bd4d8
@@ -3394,7 +3394,7 @@ _02170630:
mov r1, r1, asr #0x10
mov r2, #0x16c
bl func_0202b154
ldr r0, _021708b8 ; =data_027e0fc8
ldr r0, _021708b8 ; =gPlayerLink
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_020bd4fc
@@ -3459,7 +3459,7 @@ _02170630:
bl _ZN13PlayerControl14IsTouchingFastEv
cmp r0, #0
beq _0217078c
ldr r0, _021708b8 ; =data_027e0fc8
ldr r0, _021708b8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc210
ldr r0, [r4, #0x490]
@@ -3474,7 +3474,7 @@ _0217078c:
cmp r0, #0
addeq sp, sp, #0x38
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _021708b8 ; =data_027e0fc8
ldr r0, _021708b8 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bc280
@@ -3499,7 +3499,7 @@ _021707f8:
addle sp, sp, #0x38
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldrh r2, [r4, #0x78]
ldr r0, _021708b8 ; =data_027e0fc8
ldr r0, _021708b8 ; =gPlayerLink
mov r1, #0
mov r2, r2, asr #0x4
mov r3, r2, lsl #0x1
@@ -3543,7 +3543,7 @@ _021708a8: .word data_02050f54
_021708ac: .word 0x00001b85
_021708b0: .word data_027e0f94
_021708b4: .word 0x00000333
_021708b8: .word data_027e0fc8
_021708b8: .word gPlayerLink
_021708bc: .word data_027e0ffc
_021708c0: .word 0x00000239
_021708c4: .word data_027e0e58
@@ -9247,7 +9247,7 @@ _021754a4:
mov r1, #9
bl func_ov27_02174e4c
_021754cc:
ldr r0, _02175558 ; =data_027e0fc8
ldr r0, _02175558 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #5
@@ -9286,7 +9286,7 @@ _02175538:
.align 2, 0
_02175550: .word data_027e0cbc
_02175554: .word gMapManager
_02175558: .word data_027e0fc8
_02175558: .word gPlayerLink
_0217555c: .word data_027e0f6c
arm_func_end func_ov27_021753d8
@@ -12949,7 +12949,7 @@ _021786f8:
mov r1, #4
blx func_ov03_020f3d74
_02178718:
ldr r0, _02178864 ; =data_027e0fc8
ldr r0, _02178864 ; =gPlayerLink
mov r1, #4
ldr r0, [r0]
ldr r2, [r0]
@@ -13008,7 +13008,7 @@ _021787e0:
mov r0, r4
blx func_ov09_0211cac0
_021787f0:
ldr r0, _02178864 ; =data_027e0fc8
ldr r0, _02178864 ; =gPlayerLink
mov r1, r5
ldr r0, [r0]
bl func_ov00_020bce48
@@ -13041,7 +13041,7 @@ _0217884c:
_02178858: .word 0x00001001
_0217885c: .word data_ov27_021790dc
_02178860: .word data_027e0dbc
_02178864: .word data_027e0fc8
_02178864: .word gPlayerLink
_02178868: .word gItemManager
_0217886c: .word data_ov27_02179114
arm_func_end func_ov27_021786ac
+1 -1
View File
@@ -108,7 +108,7 @@
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fec
+21 -21
View File
@@ -1122,7 +1122,7 @@ _0216e650:
mov r0, #1
ldmia sp!, {r4, pc}
_0216e664:
ldr r0, _0216e724 ; =data_027e0fc8
ldr r0, _0216e724 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
@@ -1136,7 +1136,7 @@ _0216e664:
mov r0, #1
ldmia sp!, {r4, pc}
_0216e698:
ldr r0, _0216e724 ; =data_027e0fc8
ldr r0, _0216e724 ; =gPlayerLink
mov r1, #0x19
ldr r0, [r0]
bl func_ov00_020bce48
@@ -1176,7 +1176,7 @@ _0216e714: .word 0xfffff333
_0216e718: .word 0xfffff99a
_0216e71c: .word 0x000004cd
_0216e720: .word 0xfffffb33
_0216e724: .word data_027e0fc8
_0216e724: .word gPlayerLink
arm_func_end func_ov28_0216df0c
.global func_ov28_0216e728
@@ -1423,13 +1423,13 @@ _0216ea28:
cmp r0, #0
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, pc}
ldr r0, _0216eab0 ; =data_027e0fc8
ldr r0, _0216eab0 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, pc}
ldr r0, _0216eab0 ; =data_027e0fc8
ldr r0, _0216eab0 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd318
cmp r0, #0
@@ -1448,7 +1448,7 @@ _0216ea28:
_0216eaa4: .word 0x000031c7
_0216eaa8: .word 0xffffce39
_0216eaac: .word data_ov09_0211f5c4
_0216eab0: .word data_027e0fc8
_0216eab0: .word gPlayerLink
arm_func_end func_ov28_0216e9b8
.global func_ov28_0216eab4
@@ -5004,25 +5004,25 @@ _021716f8:
cmpeq r0, #0
addne sp, sp, #0x18
ldmneia sp!, {r4, pc}
ldr r0, _021718cc ; =data_027e0fc8
ldr r0, _021718cc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd318
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
ldr r0, _021718cc ; =data_027e0fc8
ldr r0, _021718cc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba28
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
ldr r0, _021718cc ; =data_027e0fc8
ldr r0, _021718cc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd304
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
ldr r0, _021718cc ; =data_027e0fc8
ldr r0, _021718cc ; =gPlayerLink
ldr r0, [r0]
ldrsh r1, [r0, #0xa]
cmp r1, #0
@@ -5099,7 +5099,7 @@ _021718b0:
_021718c0: .word gAdventureFlags
_021718c4: .word data_027e077c
_021718c8: .word data_027e0c68
_021718cc: .word data_027e0fc8
_021718cc: .word gPlayerLink
_021718d0: .word 0xfffff8e4
_021718d4: .word data_027e0f64
arm_func_end func_ov28_021716a0
@@ -7201,7 +7201,7 @@ func_ov28_02173330: ; 0x02173330
bl func_ov00_020d7180
cmp r0, #0
beq _021733a8
ldr r0, _021733c4 ; =data_027e0fc8
ldr r0, _021733c4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcec8
cmp r0, #0
@@ -7220,7 +7220,7 @@ _021733b4: .word 0x00008b33
_021733b8: .word data_027e0f94
_021733bc: .word 0xffff9666
_021733c0: .word data_ov00_020eec68
_021733c4: .word data_027e0fc8
_021733c4: .word gPlayerLink
arm_func_end func_ov28_02173330
.global func_ov28_021733c8
@@ -7286,7 +7286,7 @@ _02173440:
ldreq r0, [r0, #4]
cmpeq r1, r0
bne _021734e0
ldr r0, _02173508 ; =data_027e0fc8
ldr r0, _02173508 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcec8
cmp r0, #0
@@ -7320,7 +7320,7 @@ _021734f8:
.align 2, 0
_02173500: .word gAdventureFlags
_02173504: .word data_027e077c
_02173508: .word data_027e0fc8
_02173508: .word gPlayerLink
_0217350c: .word data_027e0c68
arm_func_end func_ov28_021733ec
@@ -7670,7 +7670,7 @@ func_ov28_021738e0: ; 0x021738e0
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _02173948 ; =data_027e0fc8
ldr r0, _02173948 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcec8
cmp r0, #0
@@ -7685,7 +7685,7 @@ func_ov28_021738e0: ; 0x021738e0
ldmia sp!, {r4, pc}
.align 2, 0
_02173944: .word gAdventureFlags
_02173948: .word data_027e0fc8
_02173948: .word gPlayerLink
_0217394c: .word data_ov09_0211f5b4
arm_func_end func_ov28_021738e0
@@ -7725,7 +7725,7 @@ func_ov28_02173998: ; 0x02173998
ldrne r0, [r4, #0x130]
cmpne r0, #4
ldmeqia sp!, {r4, pc}
ldr r0, _021739e8 ; =data_027e0fc8
ldr r0, _021739e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcec8
cmp r0, #0
@@ -7737,7 +7737,7 @@ func_ov28_02173998: ; 0x02173998
bl func_ov28_02173580
ldmia sp!, {r4, pc}
.align 2, 0
_021739e8: .word data_027e0fc8
_021739e8: .word gPlayerLink
_021739ec: .word data_ov09_0211f5b4
arm_func_end func_ov28_02173998
@@ -9081,7 +9081,7 @@ _02174b40:
ldrsh r0, [r4, #0xc]
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _02174ba4 ; =data_027e0fc8
ldr r0, _02174ba4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd318
cmp r0, #0
@@ -9104,7 +9104,7 @@ _02174b94: .word data_ov00_020eec68
_02174b98: .word data_027e077c
_02174b9c: .word data_027e0c68
_02174ba0: .word data_ov00_020eec9c
_02174ba4: .word data_027e0fc8
_02174ba4: .word gPlayerLink
_02174ba8: .word data_ov28_02179c2c
arm_func_end func_ov28_02174a5c
+1 -1
View File
@@ -98,7 +98,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+12 -12
View File
@@ -682,7 +682,7 @@ _0216de94:
ldr r0, _0216dffc ; =0x0000099a
cmp r1, r0
blt _0216debc
ldr r0, _0216e000 ; =data_027e0fc8
ldr r0, _0216e000 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbb78
cmp r0, #0
@@ -758,7 +758,7 @@ _0216df70:
bl _ZN11ItemManager18func_ov00_020ae4dcEi
add r0, r6, r4
add r1, r7, r5
ldr r3, _0216e000 ; =data_027e0fc8
ldr r3, _0216e000 ; =gPlayerLink
add r0, r0, r0, lsr #31
add r2, r1, r1, lsr #31
mov r1, r0, lsl #0xf
@@ -776,7 +776,7 @@ _0216dff0: .word data_ov29_0217a504
_0216dff4: .word data_027e104c
_0216dff8: .word data_ov00_020eec9c
_0216dffc: .word 0x0000099a
_0216e000: .word data_027e0fc8
_0216e000: .word gPlayerLink
_0216e004: .word data_ov29_0217a504
_0216e008: .word gItemManager
arm_func_end func_ov29_0216ddb0
@@ -10347,7 +10347,7 @@ _021762bc:
str r0, [r4, #0x6c]
cmp r0, #0xa
bne _021762e0
ldr r0, _02176324 ; =data_027e0fc8
ldr r0, _02176324 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bcfb8
@@ -10371,7 +10371,7 @@ _02176314:
.align 2, 0
_0217631c: .word data_027e0ffc
_02176320: .word 0x00000666
_02176324: .word data_027e0fc8
_02176324: .word gPlayerLink
arm_func_end func_ov29_02176180
.global func_ov29_02176328
@@ -13254,7 +13254,7 @@ _021788e4:
ldr r0, [r4, #0x4fc]
bl func_ov00_020ba458
ldr r3, [r4, #0x4fc]
ldr r0, _02178b20 ; =data_027e0fc8
ldr r0, _02178b20 ; =gPlayerLink
ldr r1, [r3, #0x48]
ldr r0, [r0]
str r1, [sp, #0x18]
@@ -13294,7 +13294,7 @@ _021789a4:
ldr r0, [r4, #0x4fc]
bl func_ov00_020ba458
ldr r3, [r4, #0x4fc]
ldr r0, _02178b20 ; =data_027e0fc8
ldr r0, _02178b20 ; =gPlayerLink
ldr r1, [r3, #0x48]
ldr r0, [r0]
str r1, [sp, #0xc]
@@ -13323,7 +13323,7 @@ _02178a10:
ldr r0, [r4, #0x4fc]
bl func_ov00_020ba458
ldr r3, [r4, #0x4fc]
ldr r0, _02178b20 ; =data_027e0fc8
ldr r0, _02178b20 ; =gPlayerLink
ldr r1, [r3, #0x48]
ldr r0, [r0]
str r1, [sp]
@@ -13367,7 +13367,7 @@ _02178a50:
strb r0, [r4, #0x523]
ldmia sp!, {r3, r4, pc}
_02178ac4:
ldr r0, _02178b20 ; =data_027e0fc8
ldr r0, _02178b20 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
bl func_ov00_020bb948
@@ -13393,7 +13393,7 @@ _02178b0c:
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02178b20: .word data_027e0fc8
_02178b20: .word gPlayerLink
_02178b24: .word data_027e0c68
arm_func_end func_ov29_021788b0
@@ -13558,7 +13558,7 @@ _02178d58:
ldr r0, [r4, #0x4fc]
bl func_ov00_020ba458
ldr r3, [r4, #0x4fc]
ldr r0, _02178dac ; =data_027e0fc8
ldr r0, _02178dac ; =gPlayerLink
ldr r1, [r3, #0x48]
ldr r0, [r0]
str r1, [sp]
@@ -13576,7 +13576,7 @@ _02178d98:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02178da8: .word data_02050f54
_02178dac: .word data_027e0fc8
_02178dac: .word gPlayerLink
arm_func_end func_ov29_02178ca0
.global func_ov29_02178db0
+1 -1
View File
@@ -89,7 +89,7 @@
.extern data_027e0f6c
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+6 -6
View File
@@ -7763,7 +7763,7 @@ func_ov30_02181e94: ; 0x02181e94
cmp r0, #0x11
moveq r0, #1
ldmeqia sp!, {r4, pc}
ldr r0, _02181ef4 ; =data_027e0fc8
ldr r0, _02181ef4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbb64
cmp r0, #0
@@ -7776,7 +7776,7 @@ _02181eec:
mov r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_02181ef4: .word data_027e0fc8
_02181ef4: .word gPlayerLink
arm_func_end func_ov30_02181e94
.global func_ov30_02181ef8
@@ -8648,7 +8648,7 @@ func_ov30_02182ae4: ; 0x02182ae4
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
ldr r0, _02182b48 ; =data_027e0fc8
ldr r0, _02182b48 ; =gPlayerLink
ldrsh r3, [sp, #0x10]
ldr r0, [r0]
mov r1, r4
@@ -8659,7 +8659,7 @@ func_ov30_02182ae4: ; 0x02182ae4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02182b44: .word data_027e0f90
_02182b48: .word data_027e0fc8
_02182b48: .word gPlayerLink
arm_func_end func_ov30_02182ae4
.global func_ov30_02182b4c
@@ -10452,7 +10452,7 @@ func_ov30_021840ec: ; 0x021840ec
func_ov30_0218411c: ; 0x0218411c
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
ldr r1, _021842fc ; =data_027e0fc8
ldr r1, _021842fc ; =gPlayerLink
mov r10, r0
ldr r0, [r1]
bl func_ov00_020bbb64
@@ -10577,7 +10577,7 @@ _021842d4:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021842fc: .word data_027e0fc8
_021842fc: .word gPlayerLink
_02184300: .word data_027e0fe4
_02184304: .word data_ov00_020eec68
_02184308: .word gMapManager
+1 -1
View File
@@ -76,7 +76,7 @@
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+6 -6
View File
@@ -341,7 +341,7 @@ _0217c184:
str r1, [r4, #0x44]
mov r0, #0
str r0, [r4, #0x4c]
ldr r0, _0217c220 ; =data_027e0fc8
ldr r0, _0217c220 ; =gPlayerLink
strb r1, [r4, #0x64]
ldr r5, [r0]
bl func_ov31_0217cf1c
@@ -363,7 +363,7 @@ _0217c184:
_0217c214: .word data_027e0f64
_0217c218: .word gMapManager
_0217c21c: .word 0x0000ffff
_0217c220: .word data_027e0fc8
_0217c220: .word gPlayerLink
arm_func_end func_ov31_0217bfb4
.global func_ov31_0217c224
@@ -2152,7 +2152,7 @@ _0217d88c: .word data_027e0e28
arm_func_start func_ov31_0217d890
func_ov31_0217d890: ; 0x0217d890
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _0217d8cc ; =data_027e0fc8
ldr r1, _0217d8cc ; =gPlayerLink
mov r5, r0
ldr r4, [r1]
bl func_ov31_0217bdb8
@@ -2168,7 +2168,7 @@ _0217d8c0:
bl func_ov31_0217d8d0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217d8cc: .word data_027e0fc8
_0217d8cc: .word gPlayerLink
arm_func_end func_ov31_0217d890
.global func_ov31_0217d8d0
@@ -2183,7 +2183,7 @@ func_ov31_0217d8d0: ; 0x0217d8d0
arm_func_start func_ov31_0217d8dc
func_ov31_0217d8dc: ; 0x0217d8dc
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _0217d938 ; =data_027e0fc8
ldr r1, _0217d938 ; =gPlayerLink
mov r5, r0
ldr r4, [r1]
bl func_ov31_0217bdb8
@@ -2208,7 +2208,7 @@ _0217d930:
bl func_ov31_0217d62c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217d938: .word data_027e0fc8
_0217d938: .word gPlayerLink
arm_func_end func_ov31_0217d8dc
.global func_ov31_0217d93c
+1 -1
View File
@@ -98,7 +98,7 @@
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+3 -3
View File
@@ -6210,7 +6210,7 @@ _02180d14:
bl _ZN5Actor18CollidesWithPlayerEj
cmp r0, #0
beq _02180dc8
ldr r0, _02180df4 ; =data_027e0fc8
ldr r0, _02180df4 ; =gPlayerLink
mov r5, #0
ldr r0, [r0]
ldr r1, [r0]
@@ -6243,7 +6243,7 @@ _02180d8c:
cmp r5, #0
bne _02180dc8
mov r3, #0
ldr r0, _02180df4 ; =data_027e0fc8
ldr r0, _02180df4 ; =gPlayerLink
str r3, [sp]
ldr r0, [r0]
add r2, r4, #8
@@ -6269,7 +6269,7 @@ _02180dec:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02180df4: .word data_027e0fc8
_02180df4: .word gPlayerLink
arm_func_end func_ov32_02180c7c
.global func_ov32_02180df8
+1 -1
View File
@@ -75,7 +75,7 @@
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+7 -7
View File
@@ -3893,7 +3893,7 @@ _0217efbc:
_0217efd8:
bl _ZN5Actor18func_ov00_020c195cEv
ldr r1, _0217f3d4 ; =data_027e0fac
ldr r0, _0217f3d8 ; =data_027e0fc8
ldr r0, _0217f3d8 ; =gPlayerLink
ldrsh r1, [r1]
strh r1, [r4, #0x78]
ldr r0, [r0]
@@ -3935,7 +3935,7 @@ _0217f06c:
ldrb r0, [r0, #0x6a]
cmp r0, #0
beq _0217f0a4
ldr r0, _0217f3d8 ; =data_027e0fc8
ldr r0, _0217f3d8 ; =gPlayerLink
add r1, r4, #8
ldr r0, [r0]
bl func_ov00_020bc7e0
@@ -3955,7 +3955,7 @@ _0217f0b4:
ldrb r0, [r0, #0x6a]
cmp r0, #0
beq _0217f0ec
ldr r0, _0217f3d8 ; =data_027e0fc8
ldr r0, _0217f3d8 ; =gPlayerLink
add r1, r4, #8
ldr r0, [r0]
bl func_ov00_020bc7e0
@@ -4104,7 +4104,7 @@ _0217f2e0:
add r0, r4, #0x3d0
bhi _0217f368
bl func_ov00_020b7e6c
ldr r0, _0217f3d8 ; =data_027e0fc8
ldr r0, _0217f3d8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -4169,7 +4169,7 @@ _0217f3c0:
_0217f3cc: .word data_027e0ffc
_0217f3d0: .word 0x00000242
_0217f3d4: .word data_027e0fac
_0217f3d8: .word data_027e0fc8
_0217f3d8: .word gPlayerLink
_0217f3dc: .word data_ov33_0217fb80
_0217f3e0: .word data_02050f54
_0217f3e4: .word data_027e0e58
@@ -4215,7 +4215,7 @@ func_ov33_0217f438: ; 0x0217f438
ldrb r0, [r4, #0x11b]
cmp r0, #0
beq _0217f46c
ldr r0, _0217f49c ; =data_027e0fc8
ldr r0, _0217f49c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbe94
cmp r0, #0
@@ -4236,7 +4236,7 @@ _0217f46c:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217f49c: .word data_027e0fc8
_0217f49c: .word gPlayerLink
arm_func_end func_ov33_0217f438
.global func_ov33_0217f4a0
+1 -1
View File
@@ -75,7 +75,7 @@
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+13 -13
View File
@@ -1875,7 +1875,7 @@ _0217d6ac:
add r1, sp, #0x3c
mov r2, #2
bl func_ov00_02089318
ldr r0, _0217deac ; =data_027e0fc8
ldr r0, _0217deac ; =gPlayerLink
ldr r1, [sp, #0x98]
ldr r0, [r0]
add r3, r1, #0xf000
@@ -2376,7 +2376,7 @@ _0217de9c: .word data_ov34_021861e8
_0217dea0: .word data_ov34_0218622c
_0217dea4: .word data_ov34_021862fc
_0217dea8: .word data_027e0f64
_0217deac: .word data_027e0fc8
_0217deac: .word gPlayerLink
_0217deb0: .word data_027e0f94
_0217deb4: .word data_ov34_0218632c
_0217deb8: .word data_ov34_02186294
@@ -2490,7 +2490,7 @@ func_ov34_0217ded4: ; 0x0217ded4
add r1, sp, #0
mov r0, r4
bl func_ov00_020cc908
ldr r0, _0217e098 ; =data_027e0fc8
ldr r0, _0217e098 ; =gPlayerLink
mov r1, r5
ldr r0, [r0]
bl func_ov00_020bd070
@@ -2505,7 +2505,7 @@ _0217e088: .word data_ov34_0218622c
_0217e08c: .word data_ov34_021862fc
_0217e090: .word data_ov34_02186294
_0217e094: .word data_ov34_02186308
_0217e098: .word data_027e0fc8
_0217e098: .word gPlayerLink
arm_func_end func_ov34_0217ded4
.global func_ov34_0217e09c
@@ -2615,13 +2615,13 @@ _0217e214:
mvn r0, #0
str r0, [r5, #0x218]
_0217e22c:
ldr r0, _0217e288 ; =data_027e0fc8
ldr r0, _0217e288 ; =gPlayerLink
add r1, r5, #0x104
ldr r0, [r0]
ldr r2, _0217e28c ; =0x00000333
add r1, r1, #0x1c00
bl func_ov00_020bb810
ldr r0, _0217e288 ; =data_027e0fc8
ldr r0, _0217e288 ; =gPlayerLink
add r1, r5, #0x104
ldr r0, [r0]
add r1, r1, #0x1c00
@@ -2639,7 +2639,7 @@ _0217e278: .word data_ov34_02186308
_0217e27c: .word data_ov34_021862fc
_0217e280: .word data_ov34_0218622c
_0217e284: .word data_027e0f64
_0217e288: .word data_027e0fc8
_0217e288: .word gPlayerLink
_0217e28c: .word 0x00000333
arm_func_end func_ov34_0217e09c
@@ -2788,7 +2788,7 @@ func_ov34_0217e410: ; 0x0217e410
mov r1, #0xcb
mov r3, #0x7f
bl func_ov00_020d70a4
ldr r0, _0217e508 ; =data_027e0fc8
ldr r0, _0217e508 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x80]
@@ -2832,7 +2832,7 @@ _0217e474:
.align 2, 0
_0217e500: .word data_ov34_021861a0
_0217e504: .word data_ov00_020eec68
_0217e508: .word data_027e0fc8
_0217e508: .word gPlayerLink
_0217e50c: .word data_027e0ffc
_0217e510: .word 0x000002ef
_0217e514: .word data_ov22_0217a5d4
@@ -7237,7 +7237,7 @@ _02182380:
ldr r0, _02182440 ; =data_ov00_020eec68
mov r1, #5
bl func_ov00_020d716c
ldr r0, _02182444 ; =data_027e0fc8
ldr r0, _02182444 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -7261,7 +7261,7 @@ _02182434: .word data_027e0ffc
_02182438: .word 0x000002fb
_0218243c: .word data_ov34_021861e0
_02182440: .word data_ov00_020eec68
_02182444: .word data_027e0fc8
_02182444: .word gPlayerLink
arm_func_end func_ov34_02182324
.global func_ov34_02182448
@@ -9459,7 +9459,7 @@ _02184364:
ldrb r0, [r5, #0x11a]
cmp r0, #0
beq _02184384
ldr r0, _021843d0 ; =data_027e0fc8
ldr r0, _021843d0 ; =gPlayerLink
add r1, r5, #0x104
ldr r0, [r0]
add r1, r1, #0x1c00
@@ -9486,7 +9486,7 @@ _021843c0: .word data_ov34_02185788
_021843c4: .word data_02050f54
_021843c8: .word 0x00001666
_021843cc: .word 0x0000119a
_021843d0: .word data_027e0fc8
_021843d0: .word gPlayerLink
arm_func_end func_ov34_02184130
.global func_ov34_021843d4
+1 -1
View File
@@ -96,7 +96,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fe0
.extern data_027e0fe4
+31 -31
View File
@@ -2401,7 +2401,7 @@ _0217dd70:
bl func_ov00_020cb58c
cmp r0, #0
bne _0217e294
ldr r0, _0217e2c8 ; =data_027e0fc8
ldr r0, _0217e2c8 ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #4
@@ -2422,7 +2422,7 @@ _0217ddd8:
bl func_ov00_020cb58c
cmp r0, #0
bne _0217e23c
ldr r0, _0217e2c8 ; =data_027e0fc8
ldr r0, _0217e2c8 ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #4
@@ -2747,7 +2747,7 @@ _0217e2ac:
.align 2, 0
_0217e2c0: .word data_027e0fe4
_0217e2c4: .word data_027e0d0c
_0217e2c8: .word data_027e0fc8
_0217e2c8: .word gPlayerLink
_0217e2cc: .word data_027e0f94
_0217e2d0: .word data_027e0764
_0217e2d4: .word 0x00555600
@@ -4140,7 +4140,7 @@ _0217f5a0:
bl _ZN5Actor10SetUnk_11cEc
b _02180974
_0217f5c4:
ldr r0, _021800ac ; =data_027e0fc8
ldr r0, _021800ac ; =gPlayerLink
mvn r1, #0
ldr r0, [r0]
bl func_ov00_020bd030
@@ -4193,7 +4193,7 @@ _0217f5f8:
str r0, [r4, #0x68]
b _02180974
_0217f688:
ldr r0, _021800ac ; =data_027e0fc8
ldr r0, _021800ac ; =gPlayerLink
mvn r1, #0
ldr r0, [r0]
bl func_ov00_020bd070
@@ -4435,7 +4435,7 @@ _0217fa0c:
movge r1, #1
movlt r1, #0
str r1, [sp]
ldr r0, _021800ac ; =data_027e0fc8
ldr r0, _021800ac ; =gPlayerLink
mov r1, #4
ldr r0, [r0]
bl func_ov00_020bd3b0
@@ -4862,7 +4862,7 @@ _02180084:
_021800a0: .word data_027e0f64
_021800a4: .word gAdventureFlags
_021800a8: .word data_027e0c68
_021800ac: .word data_027e0fc8
_021800ac: .word gPlayerLink
_021800b0: .word data_027e071c
_021800b4: .word 0x00000333
_021800b8: .word data_027e0d0c
@@ -5096,7 +5096,7 @@ _02180424:
movge r1, #1
movlt r1, #0
str r1, [sp]
ldr r0, _021800ac ; =data_027e0fc8
ldr r0, _021800ac ; =gPlayerLink
mov r1, #4
ldr r0, [r0]
bl func_ov00_020bd3b0
@@ -5198,7 +5198,7 @@ _021805ac:
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _021800ac ; =data_027e0fc8
ldr r0, _021800ac ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -5571,7 +5571,7 @@ _02180b10:
ldr r0, [r4, #0x530]
cmp r0, #0x1f000
bne _02180b58
ldr r0, _02180b64 ; =data_027e0fc8
ldr r0, _02180b64 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
@@ -5580,7 +5580,7 @@ _02180b58:
ldmia sp!, {r4, pc}
.align 2, 0
_02180b60: .word data_ov35_021854d8
_02180b64: .word data_027e0fc8
_02180b64: .word gPlayerLink
arm_func_end func_ov35_02180a3c
.global func_ov35_02180b68
@@ -5979,7 +5979,7 @@ _0218107c:
mov r0, r4
mov r1, #8
bl func_ov35_0217f234
ldr r0, _021810b8 ; =data_027e0fc8
ldr r0, _021810b8 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x80]
@@ -5989,7 +5989,7 @@ _0218107c:
_021810ac: .word data_027e0c54
_021810b0: .word data_027e0ffc
_021810b4: .word 0x0000022a
_021810b8: .word data_027e0fc8
_021810b8: .word gPlayerLink
arm_func_end func_ov35_02180fd0
.global func_ov35_021810bc
@@ -6076,7 +6076,7 @@ _021811b4:
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_021811f0:
mvn r1, #0
ldr r0, _0218126c ; =data_027e0fc8
ldr r0, _0218126c ; =gPlayerLink
str r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_020bd0a8
@@ -6107,7 +6107,7 @@ _021811f0:
_02181260: .word data_027e0f64
_02181264: .word data_027e071c
_02181268: .word gAdventureFlags
_0218126c: .word data_027e0fc8
_0218126c: .word gPlayerLink
_02181270: .word data_ov35_02185c70
_02181274: .word data_ov35_02185ce0
arm_func_end func_ov35_021810bc
@@ -6477,7 +6477,7 @@ func_ov35_0218174c: ; 0x0218174c
bl _ZN13PlayerControl14IsTouchingFastEv
cmp r0, #0
beq _02181788
ldr r0, _02181800 ; =data_027e0fc8
ldr r0, _02181800 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc210
ldr r0, [r4, #0x554]
@@ -6503,7 +6503,7 @@ _021817b4:
_021817c4:
cmp r1, #0
ldmneia sp!, {r4, pc}
ldr r0, _02181800 ; =data_027e0fc8
ldr r0, _02181800 ; =gPlayerLink
mov r1, #1
ldr r0, [r0]
mov r2, #0
@@ -6517,7 +6517,7 @@ _021817c4:
ldmia sp!, {r4, pc}
.align 2, 0
_021817fc: .word data_027e0fb8
_02181800: .word data_027e0fc8
_02181800: .word gPlayerLink
_02181804: .word data_027e0f90
_02181808: .word data_ov00_020eec9c
_0218180c: .word data_027e0f94
@@ -7480,7 +7480,7 @@ func_ov35_02182560: ; 0x02182560
bl _ZN13PlayerControl14CheckTouchFastEj
cmp r0, #0
beq _02182598
ldr r0, _02182610 ; =data_027e0fc8
ldr r0, _02182610 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc210
ldr r0, [r4, #0x554]
@@ -7506,7 +7506,7 @@ _021825c4:
_021825d4:
cmp r1, #0
ldmneia sp!, {r4, pc}
ldr r0, _02182610 ; =data_027e0fc8
ldr r0, _02182610 ; =gPlayerLink
mov r1, #1
ldr r0, [r0]
mov r2, #0
@@ -7520,7 +7520,7 @@ _021825d4:
ldmia sp!, {r4, pc}
.align 2, 0
_0218260c: .word data_027e0fb8
_02182610: .word data_027e0fc8
_02182610: .word gPlayerLink
_02182614: .word data_027e0f90
_02182618: .word data_ov00_020eec9c
_0218261c: .word data_027e0f94
@@ -7674,7 +7674,7 @@ _021827cc:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
_021827ec:
ldr r0, _02182830 ; =data_027e0fc8
ldr r0, _02182830 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -7693,7 +7693,7 @@ _02182820: .word data_027e0f90
_02182824: .word data_027e0ffc
_02182828: .word 0x00000229
_0218282c: .word 0x0000019a
_02182830: .word data_027e0fc8
_02182830: .word gPlayerLink
arm_func_end func_ov35_02182720
.global func_ov35_02182834
@@ -7834,7 +7834,7 @@ func_ov35_021829c0: ; 0x021829c0
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _02182aa8 ; =data_027e0fc8
ldr r0, _02182aa8 ; =gPlayerLink
mov r1, #1
ldr r0, [r0]
bl func_ov00_020bbc68
@@ -7877,7 +7877,7 @@ _02182a94:
_02182a9c: .word 0x00002aab
_02182aa0: .word data_027e0f94
_02182aa4: .word 0x00001e66
_02182aa8: .word data_027e0fc8
_02182aa8: .word gPlayerLink
arm_func_end func_ov35_021829c0
.global func_ov35_02182aac
@@ -8491,7 +8491,7 @@ _021832ec:
add r1, r4, #0x48
mov r2, r0
bl func_01ff9bc4
ldr r0, _021833e8 ; =data_027e0fc8
ldr r0, _021833e8 ; =gPlayerLink
add r1, sp, #0xc
ldr r0, [r0]
bl func_ov00_020bd4d8
@@ -8523,7 +8523,7 @@ _0218332c:
add r1, r4, #0x48
mov r2, r0
bl func_01ff9bc4
ldr r0, _021833e8 ; =data_027e0fc8
ldr r0, _021833e8 ; =gPlayerLink
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020bd4d8
@@ -8547,7 +8547,7 @@ _021833d8: .word data_ov35_0218536c
_021833dc: .word data_ov35_02185388
_021833e0: .word data_027e0ffc
_021833e4: .word 0x00000225
_021833e8: .word data_027e0fc8
_021833e8: .word gPlayerLink
_021833ec: .word data_ov35_02185478
_021833f0: .word 0x00000226
arm_func_end func_ov35_02183200
@@ -9740,7 +9740,7 @@ func_ov35_02184440: ; 0x02184440
mla ip, r0, r2, ip
mov r5, r6, lsr #0xc
orr r5, r5, r4, lsl #20
ldr r1, _02184518 ; =data_027e0fc8
ldr r1, _02184518 ; =gPlayerLink
adc r0, ip, #0
mov r3, lr, lsr #0xc
orr r3, r3, r0, lsl #20
@@ -9750,7 +9750,7 @@ func_ov35_02184440: ; 0x02184440
str r2, [sp, #4]
str r3, [sp, #8]
bl func_ov00_020bc280
ldr r0, _02184518 ; =data_027e0fc8
ldr r0, _02184518 ; =gPlayerLink
add r1, sp, #0
ldr r0, [r0]
mov r2, #1
@@ -9760,7 +9760,7 @@ func_ov35_02184440: ; 0x02184440
.align 2, 0
_02184510: .word 0x000004cd
_02184514: .word data_02050f54
_02184518: .word data_027e0fc8
_02184518: .word gPlayerLink
arm_func_end func_ov35_02184440
.global func_ov35_0218451c
+1 -1
View File
@@ -82,7 +82,7 @@
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fe0
+38 -38
View File
@@ -2158,7 +2158,7 @@ func_ov36_0217da6c: ; 0x0217da6c
blt _0217dafc
cmp r0, #0x15
bgt _0217dafc
ldr r0, _0217dd64 ; =data_027e0fc8
ldr r0, _0217dd64 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -2333,14 +2333,14 @@ _0217dbac:
cmp r0, #0x16
addge sp, sp, #0x60
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0217dd64 ; =data_027e0fc8
ldr r0, _0217dd64 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
add sp, sp, #0x60
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217dd64: .word data_027e0fc8
_0217dd64: .word gPlayerLink
_0217dd68: .word data_027e0f64
_0217dd6c: .word data_ov36_02186768
_0217dd70: .word data_02050f54
@@ -2482,7 +2482,7 @@ _0217df28:
ldr r0, [r5, #0x138]
cmp r0, #0xc
bne _0217df50
ldr r0, _0217e3a4 ; =data_027e0fc8
ldr r0, _0217e3a4 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x80]
@@ -2532,7 +2532,7 @@ _0217df94:
mov r1, #0x1000
str r1, [r0, #0x10]
mov r1, #0
ldr r0, _0217e3a4 ; =data_027e0fc8
ldr r0, _0217e3a4 ; =gPlayerLink
str r1, [r5, #0x138]
ldr r0, [r0]
bl func_ov00_020bd0a8
@@ -2713,13 +2713,13 @@ _0217e260:
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_0217e2a4:
mvn r1, #0
ldr r0, _0217e3a4 ; =data_027e0fc8
ldr r0, _0217e3a4 ; =gPlayerLink
str r1, [r5, #0x66c]
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
bne _0217e2dc
ldr r0, _0217e3a4 ; =data_027e0fc8
ldr r0, _0217e3a4 ; =gPlayerLink
mov r1, #1
ldr r0, [r0]
mov r2, r1
@@ -2780,7 +2780,7 @@ _0217e37c:
add sp, sp, #0x44
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0217e3a4: .word data_027e0fc8
_0217e3a4: .word gPlayerLink
_0217e3a8: .word 0xffffe99a
_0217e3ac: .word data_027e103c
_0217e3b0: .word 0x000c014f
@@ -3166,7 +3166,7 @@ _0217e868:
cmp r0, #0
beq _0217e934
ldr r1, [r6, #0x878]
ldr r0, _0217eb3c ; =data_027e0fc8
ldr r0, _0217eb3c ; =gPlayerLink
orr r1, r1, #0x100
str r1, [r6, #0x878]
str r4, [r6, #0x138]
@@ -3174,7 +3174,7 @@ _0217e868:
bl func_ov00_020bc46c
cmp r0, #1
bne _0217e934
ldr r0, _0217eb3c ; =data_027e0fc8
ldr r0, _0217eb3c ; =gPlayerLink
mov r1, #1
ldr r0, [r0]
bl func_ov00_020bb5f0
@@ -3318,7 +3318,7 @@ _0217eacc:
.align 2, 0
_0217eb34: .word 0x00000337
_0217eb38: .word 0x00000112
_0217eb3c: .word data_027e0fc8
_0217eb3c: .word gPlayerLink
_0217eb40: .word data_027e0fe4
_0217eb44: .word 0x504c444d
_0217eb48: .word 0x0000219a
@@ -3654,7 +3654,7 @@ _0217efbc: .word data_ov36_02186ca0
arm_func_start func_ov36_0217efc0
func_ov36_0217efc0: ; 0x0217efc0
stmdb sp!, {r4, r5, r6, lr}
ldr r1, _0217f0b4 ; =data_027e0fc8
ldr r1, _0217f0b4 ; =gPlayerLink
mov r6, r0
ldr r0, [r1]
bl func_ov00_020bc46c
@@ -3720,7 +3720,7 @@ _0217f0a8:
bl func_ov36_02183204
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0217f0b4: .word data_027e0fc8
_0217f0b4: .word gPlayerLink
_0217f0b8: .word 0x00001555
_0217f0bc: .word 0x00002aab
arm_func_end func_ov36_0217efc0
@@ -5689,7 +5689,7 @@ _02180bd0:
addne sp, sp, #0x3c
ldmneia sp!, {r3, r4, r5, r6, pc}
ldr r1, [r4, #0x878]
ldr r0, _02180d14 ; =data_027e0fc8
ldr r0, _02180d14 ; =gPlayerLink
orr r1, r1, #8
bic r1, r1, #1
str r1, [r4, #0x878]
@@ -5697,7 +5697,7 @@ _02180bd0:
bl func_ov00_020bc46c
cmp r0, #1
bne _02180c58
ldr r0, _02180d14 ; =data_027e0fc8
ldr r0, _02180d14 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
mov r2, #1
@@ -5758,7 +5758,7 @@ _02180d04: .word data_027e0f64
_02180d08: .word data_027e0ffc
_02180d0c: .word 0x000002c7
_02180d10: .word 0x000002c1
_02180d14: .word data_027e0fc8
_02180d14: .word gPlayerLink
_02180d18: .word gAdventureFlags
arm_func_end func_ov36_021809b0
@@ -6722,13 +6722,13 @@ _021818fc:
str r0, [r4, #0x66c]
ldr r1, [r4, #0x168]
mov r2, #0
ldr r0, _02181b9c ; =data_027e0fc8
ldr r0, _02181b9c ; =gPlayerLink
str r2, [r1, #0x10]
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
bne _02181b40
ldr r0, _02181b9c ; =data_027e0fc8
ldr r0, _02181b9c ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
mov r2, r11
@@ -6760,7 +6760,7 @@ _02181b8c: .word data_ov00_020eec68
_02181b90: .word data_027e0f64
_02181b94: .word 0x0000038e
_02181b98: .word 0x00000dac
_02181b9c: .word data_027e0fc8
_02181b9c: .word gPlayerLink
_02181ba0: .word data_027e0f90
_02181ba4: .word data_027e0e58
arm_func_end func_ov36_021818b4
@@ -7736,7 +7736,7 @@ _021829ec:
mov r1, #0x2cc
mov r3, #0
bl func_ov00_020ceacc
ldr r0, _02182c70 ; =data_027e0fc8
ldr r0, _02182c70 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -7894,7 +7894,7 @@ _02182a7c:
_02182c64: .word gMapManager
_02182c68: .word data_027e0f64
_02182c6c: .word data_027e0ffc
_02182c70: .word data_027e0fc8
_02182c70: .word gPlayerLink
_02182c74: .word data_ov00_020eec68
_02182c78: .word data_027e0d0c
_02182c7c: .word gAdventureFlags
@@ -7985,7 +7985,7 @@ _02182d94:
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
_02182dbc:
ldr r0, _02182e0c ; =data_027e0fc8
ldr r0, _02182e0c ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -8007,7 +8007,7 @@ _02182dfc: .word data_027e0f64
_02182e00: .word data_027e0ffc
_02182e04: .word 0x000002c7
_02182e08: .word 0x0000019a
_02182e0c: .word data_027e0fc8
_02182e0c: .word gPlayerLink
arm_func_end func_ov36_02182c88
.global func_ov36_02182e10
@@ -8220,7 +8220,7 @@ func_ov36_021830e8: ; 0x021830e8
mov r5, r0
ldr r0, [r5, #0x878]
tst r0, #0x100000
ldr r0, _021831fc ; =data_027e0fc8
ldr r0, _021831fc ; =gPlayerLink
moveq r4, #1
ldr r0, [r0]
movne r4, #0
@@ -8291,7 +8291,7 @@ _021831f4:
mov r0, #0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021831fc: .word data_027e0fc8
_021831fc: .word gPlayerLink
_02183200: .word 0x00001555
arm_func_end func_ov36_021830e8
@@ -8330,7 +8330,7 @@ func_ov36_02183204: ; 0x02183204
rsblt r0, r0, #0
cmp r0, #0x1f40
bge _02183360
ldr r0, _021834f0 ; =data_027e0fc8
ldr r0, _021834f0 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcc78
cmp r0, #0
@@ -8417,7 +8417,7 @@ _02183360:
mov r0, #0
ldmia sp!, {r3, r4, r5, pc}
_021833c4:
ldr r0, _021834f0 ; =data_027e0fc8
ldr r0, _021834f0 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcc78
cmp r0, #0
@@ -8499,7 +8499,7 @@ _021834e8:
mov r0, #0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021834f0: .word data_027e0fc8
_021834f0: .word gPlayerLink
_021834f4: .word 0x00000333
_021834f8: .word data_027e0ffc
_021834fc: .word data_027e0fa0
@@ -10287,7 +10287,7 @@ func_ov36_02184e10: ; 0x02184e10
bl func_ov00_020cfe10
b _02184f2c
_02184e60:
ldr r0, _02184f40 ; =data_027e0fc8
ldr r0, _02184f40 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -10348,7 +10348,7 @@ _02184f2c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02184f3c: .word data_027e103c
_02184f40: .word data_027e0fc8
_02184f40: .word gPlayerLink
arm_func_end func_ov36_02184e10
.global func_ov36_02184f44
@@ -10436,7 +10436,7 @@ _0218504c: .word gMapManager
func_ov36_02185050: ; 0x02185050
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _021850c0 ; =data_027e0fc8
ldr r1, _021850c0 ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
bl func_ov00_020bc46c
@@ -10465,7 +10465,7 @@ _021850ac:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021850c0: .word data_027e0fc8
_021850c0: .word gPlayerLink
_021850c4: .word data_027e0f94
arm_func_end func_ov36_02185050
@@ -10671,7 +10671,7 @@ _02185368:
subeq r1, r2, #1
streqh r1, [r0, #0x88]
beq _021853a4
ldr r0, _0218540c ; =data_027e0fc8
ldr r0, _0218540c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bcc78
cmp r0, #0
@@ -10712,7 +10712,7 @@ _021853d0:
strneh r1, [r0, #0x8c]
ldmia sp!, {r4, pc}
.align 2, 0
_0218540c: .word data_027e0fc8
_0218540c: .word gPlayerLink
arm_func_end func_ov36_021852fc
.global func_ov36_02185410
@@ -10808,7 +10808,7 @@ func_ov36_021854e8: ; 0x021854e8
and r0, r1, r0
cmp r0, #0x1000000
ldmneia sp!, {r4, pc}
ldr r0, _0218557c ; =data_027e0fc8
ldr r0, _0218557c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -10826,7 +10826,7 @@ func_ov36_021854e8: ; 0x021854e8
str r0, [r4, #0x878]
ldmia sp!, {r4, pc}
.align 2, 0
_0218557c: .word data_027e0fc8
_0218557c: .word gPlayerLink
_02185580: .word data_027e0c68
_02185584: .word 0x00690332
arm_func_end func_ov36_021854e8
@@ -11017,7 +11017,7 @@ _021857a8:
mov r0, #0
str r0, [sp, #0x10]
_0218581c:
ldr r0, _02185860 ; =data_027e0fc8
ldr r0, _02185860 ; =gPlayerLink
add r1, sp, #0xc
ldr r0, [r0]
mov r2, r6
@@ -11035,7 +11035,7 @@ _0218581c:
_02185854: .word data_027e0fa0
_02185858: .word data_027e0fcc
_0218585c: .word data_027e0f94
_02185860: .word data_027e0fc8
_02185860: .word gPlayerLink
arm_func_end func_ov36_021856cc
.global func_ov36_02185864
+1 -1
View File
@@ -84,7 +84,7 @@
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+15 -15
View File
@@ -633,7 +633,7 @@ _0217c53c:
ldr r0, [r4, #0x22c]
mov r1, #0x1000
str r1, [r0, #0x10]
ldr r1, _0217c908 ; =data_027e0fc8
ldr r1, _0217c908 ; =gPlayerLink
mov r2, #0
add r0, r4, #0x2000
str r2, [r0, #0xfac]
@@ -797,13 +797,13 @@ _0217c7b4:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _0217c908 ; =data_027e0fc8
ldr r0, _0217c908 ; =gPlayerLink
str r2, [r1, #0x10]
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x80]
blx r1
ldr r0, _0217c908 ; =data_027e0fc8
ldr r0, _0217c908 ; =gPlayerLink
mvn r1, #0
ldr r0, [r0]
bl func_ov00_020bd070
@@ -878,7 +878,7 @@ _0217c8f8:
.align 2, 0
_0217c900: .word 0x0000ffff
_0217c904: .word data_ov00_020eec68
_0217c908: .word data_027e0fc8
_0217c908: .word gPlayerLink
_0217c90c: .word data_ov37_02189160
_0217c910: .word data_027e0c54
_0217c914: .word func_ov37_0217be34
@@ -1952,7 +1952,7 @@ _0217d760:
add r3, sp, #0x128
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0217e32c ; =data_027e0fc8
ldr r0, _0217e32c ; =gPlayerLink
ldr r1, [sp, #0x12c]
ldr r0, [r0]
add r2, r1, #0x7000
@@ -2309,7 +2309,7 @@ _0217dcb0:
addeq sp, sp, #0x400
ldmeqia sp!, {r4, r5, r6, r7, pc}
mvn r1, #0
ldr r0, _0217e32c ; =data_027e0fc8
ldr r0, _0217e32c ; =gPlayerLink
str r1, [r4, #0x218]
ldr r0, [r0]
bl func_ov00_020bd0a8
@@ -2756,7 +2756,7 @@ _0217e2f8:
mov r0, r0, asr #0x10
b _0217e380
.align 2, 0
_0217e32c: .word data_027e0fc8
_0217e32c: .word gPlayerLink
_0217e330: .word data_027e0ff8
_0217e334: .word data_027e0f64
_0217e338: .word 0x094f2095
@@ -3092,7 +3092,7 @@ _0217e7ec:
mov r3, #0
str r0, [r4, #0x48]
ldr r0, [r4, #0x18]
ldr r5, _0217e32c ; =data_027e0fc8
ldr r5, _0217e32c ; =gPlayerLink
str r0, [r4, #0x4c]
ldr r0, [r4, #0x1c]
add r1, sp, #0x70
@@ -3210,7 +3210,7 @@ _0217e99c:
mov r3, #0
str r0, [sp, #0x48]
ldr r1, [r4, #0x4c]
ldr r0, _0217e32c ; =data_027e0fc8
ldr r0, _0217e32c ; =gPlayerLink
str r1, [sp, #0x4c]
ldr r2, [r4, #0x50]
add r1, sp, #0x48
@@ -3378,7 +3378,7 @@ _0217ec60:
addeq sp, sp, #0x400
ldmeqia sp!, {r4, r5, r6, r7, pc}
mvn r1, #0
ldr r0, _0217e32c ; =data_027e0fc8
ldr r0, _0217e32c ; =gPlayerLink
str r1, [r4, #0x218]
ldr r0, [r0]
bl func_ov00_020bd0a8
@@ -11809,7 +11809,7 @@ func_ov37_02186184: ; 0x02186184
bne _021861b4
ldr r0, [r4, #4]
bl func_ov37_02186e60
ldr r0, _02186208 ; =data_027e0fc8
ldr r0, _02186208 ; =gPlayerLink
ldr r1, [r4, #4]
ldr r0, [r0]
add r1, r1, #0x60
@@ -11839,7 +11839,7 @@ _02186200:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02186208: .word data_027e0fc8
_02186208: .word gPlayerLink
_0218620c: .word data_027e0fe4
_02186210: .word 0x424b4559
_02186214: .word 0x43525953
@@ -13008,7 +13008,7 @@ _021870d0:
ldr r1, [sp, #0x10]
str r1, [r4, #0x68]
bl func_ov37_021854c4
ldr r0, _02187748 ; =data_027e0fc8
ldr r0, _02187748 ; =gPlayerLink
add r1, sp, #0x44
ldr r0, [r0]
bl func_ov00_020bb6d4
@@ -13109,7 +13109,7 @@ _02187284:
add r2, r5, #0x48
mov r3, #0
bl func_ov00_020ceacc
ldr r0, _02187748 ; =data_027e0fc8
ldr r0, _02187748 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -13411,7 +13411,7 @@ _02187730:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02187744: .word data_027e0fe4
_02187748: .word data_027e0fc8
_02187748: .word gPlayerLink
_0218774c: .word data_027e0f94
_02187750: .word 0x424d524e
_02187754: .word data_027e0ffc
+1 -1
View File
@@ -83,7 +83,7 @@
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+37 -37
View File
@@ -3272,7 +3272,7 @@ func_ov38_0217eaa0: ; 0x0217eaa0
mov r3, #0x7f
strb ip, [r4, #0x11a]
bl func_ov00_020d70a4
ldr r0, _0217eb74 ; =data_027e0fc8
ldr r0, _0217eb74 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x80]
@@ -3286,7 +3286,7 @@ func_ov38_0217eaa0: ; 0x0217eaa0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217eb70: .word data_ov00_020eec68
_0217eb74: .word data_027e0fc8
_0217eb74: .word gPlayerLink
arm_func_end func_ov38_0217eaa0
.global func_ov38_0217eb78
@@ -3648,14 +3648,14 @@ _0217f0a4:
cmp r1, #0
bne _0217f0d0
ldr r2, [r0, #0x68]
ldr r1, _0217f220 ; =data_027e0fc8
ldr r1, _0217f220 ; =gPlayerLink
add r2, r2, #1
str r2, [r0, #0x68]
ldr r0, [r1]
bl func_ov00_020bb9b0
b _0217f114
_0217f0d0:
ldr r0, _0217f220 ; =data_027e0fc8
ldr r0, _0217f220 ; =gPlayerLink
ldr ip, [r4, #0xf5c]
ldr r5, [r4, #0xf60]
ldr r3, [r4, #0xf58]
@@ -3743,7 +3743,7 @@ _0217f210: .word 0x00000733
_0217f214: .word 0x00007fff
_0217f218: .word 0x00005555
_0217f21c: .word data_02050f54
_0217f220: .word data_027e0fc8
_0217f220: .word gPlayerLink
_0217f224: .word data_ov00_020eec9c
_0217f228: .word 0x0000042c
arm_func_end func_ov38_0217eb78
@@ -8857,7 +8857,7 @@ _02183a28:
rsb r0, r0, #0
cmp ip, r0
movle ip, r0
ldr r0, _02183aa0 ; =data_027e0fc8
ldr r0, _02183aa0 ; =gPlayerLink
ldr r3, [r5, #0xf60]
ldr r2, [r5, #0xf58]
ldr r0, [r0]
@@ -8877,7 +8877,7 @@ _02183a7c:
_02183a94: .word 0x0000151f
_02183a98: .word 0x00001ccd
_02183a9c: .word 0x00000e66
_02183aa0: .word data_027e0fc8
_02183aa0: .word gPlayerLink
arm_func_end func_ov38_0218381c
.global func_ov38_02183aa4
@@ -8966,7 +8966,7 @@ func_ov38_02183b60: ; 0x02183b60
ldr r0, _02183ca8 ; =data_ov00_020eec68
mov r1, #5
bl func_ov00_020d716c
ldr r0, _02183cac ; =data_027e0fc8
ldr r0, _02183cac ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x84]
@@ -9026,7 +9026,7 @@ _02183c9c: .word data_027e0e5c
_02183ca0: .word data_027e0ffc
_02183ca4: .word 0x00000191
_02183ca8: .word data_ov00_020eec68
_02183cac: .word data_027e0fc8
_02183cac: .word gPlayerLink
_02183cb0: .word data_02050f54
arm_func_end func_ov38_02183b60
@@ -11524,7 +11524,7 @@ _02185f5c:
str ip, [r1, #0x21c]
str r5, [r1, #0x220]
ldr r2, [r0, #8]
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
str r2, [r1, #0x224]
sub r3, r2, #0x1800
ldr r0, [r0]
@@ -11705,7 +11705,7 @@ _02186194:
mov r2, r0
str r3, [sp, #0x64]
bl func_01ff9bc4
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
add r1, sp, #0x8c
ldr r0, [r0]
mov r2, #0x400
@@ -11730,7 +11730,7 @@ _02186268:
mov r2, r0
str r3, [sp, #0x58]
bl func_01ff9bc4
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
add r1, sp, #0x8c
ldr r0, [r0]
mov r2, #0x200
@@ -11745,7 +11745,7 @@ _021862c8:
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
beq _02186304
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bcfb8
@@ -11803,7 +11803,7 @@ _02186350:
str r0, [r1, #0x110]
str r2, [r1, #0x210]
ldr r2, [r1, #0x20c]
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
add r2, r2, #1
str r2, [r1, #0x20c]
ldr r0, [r0]
@@ -12015,12 +12015,12 @@ _021866d4:
str r2, [sp, #0x88]
cmp r3, #6
bne _02186710
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bd070
_02186710:
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
add r1, sp, #0x80
ldr r0, [r0]
mov r2, #0x400
@@ -12183,14 +12183,14 @@ _02186914:
cmpeq r0, #4
bne _021869a8
ldr r1, _02186a10 ; =data_ov38_021891e0
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
ldr r2, [r1, #0x20c]
ldr r0, [r0]
add r2, r2, #1
str r2, [r1, #0x20c]
bl func_ov00_020bd0a8
_021869a8:
ldr r0, _02186a20 ; =data_027e0fc8
ldr r0, _02186a20 ; =gPlayerLink
ldr lr, [r4, #0xf60]
ldr ip, [r4, #0xf5c]
ldr r3, [r4, #0xf58]
@@ -12222,7 +12222,7 @@ _02186a10: .word data_ov38_021891e0
_02186a14: .word gMapManager
_02186a18: .word 0x00000ccd
_02186a1c: .word data_027e0f94
_02186a20: .word data_027e0fc8
_02186a20: .word gPlayerLink
_02186a24: .word 0x00000333
_02186a28: .word data_027e0f64
_02186a2c: .word data_ov38_02189360
@@ -12252,7 +12252,7 @@ func_ov38_02186a64: ; 0x02186a64
addeq sp, sp, #0xc
ldmeqia sp!, {pc}
ldr r1, [r2, #0x48]
ldr r0, _02186ac0 ; =data_027e0fc8
ldr r0, _02186ac0 ; =gPlayerLink
str r1, [sp]
ldr r1, [r2, #0x4c]
ldr r0, [r0]
@@ -12268,7 +12268,7 @@ func_ov38_02186a64: ; 0x02186a64
ldmia sp!, {pc}
.align 2, 0
_02186abc: .word data_ov38_02189484
_02186ac0: .word data_027e0fc8
_02186ac0: .word gPlayerLink
arm_func_end func_ov38_02186a64
.global func_ov38_02186ac4
@@ -12277,7 +12277,7 @@ func_ov38_02186ac4: ; 0x02186ac4
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r3, [r0, #0xff8]
ldr r0, _02186b04 ; =data_027e0fc8
ldr r0, _02186b04 ; =gPlayerLink
ldr r1, [r3, #0x48]
ldr r0, [r0]
str r1, [sp]
@@ -12291,7 +12291,7 @@ func_ov38_02186ac4: ; 0x02186ac4
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_02186b04: .word data_027e0fc8
_02186b04: .word gPlayerLink
arm_func_end func_ov38_02186ac4
.global func_ov38_02186b08
@@ -12347,7 +12347,7 @@ func_ov38_02186b08: ; 0x02186b08
bl func_ov00_020a61ac
mov r3, #0
str r3, [sp]
ldr r0, _02186c70 ; =data_027e0fc8
ldr r0, _02186c70 ; =gPlayerLink
str r3, [sp, #4]
ldr r0, [r0]
add r1, sp, #8
@@ -12388,7 +12388,7 @@ _02186c60: .word data_ov38_02189360
_02186c64: .word data_ov38_021893d4
_02186c68: .word data_ov38_02189414
_02186c6c: .word data_027e071c
_02186c70: .word data_027e0fc8
_02186c70: .word gPlayerLink
_02186c74: .word gItemManager
_02186c78: .word data_ov38_02188ca0
_02186c7c: .word data_ov00_020eec68
@@ -12700,7 +12700,7 @@ _02187068:
ldr r0, [r0, #4]
mov r2, #2
bl func_ov00_02089318
ldr r0, _02187508 ; =data_027e0fc8
ldr r0, _02187508 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bb9b0
ldr r0, _021874c4 ; =data_ov38_021891e0
@@ -12962,7 +12962,7 @@ _021874f8: .word 0xffffce66
_021874fc: .word 0x00011333
_02187500: .word 0xfffffac4
_02187504: .word 0x000073a0
_02187508: .word data_027e0fc8
_02187508: .word gPlayerLink
_0218750c: .word data_ov00_020eec68
_02187510: .word gAdventureFlags
_02187514: .word data_ov38_02188ca0
@@ -13039,7 +13039,7 @@ _021875f4:
str r1, [r0, #0x210]
cmp r1, #0xa
ldmneia sp!, {r3, pc}
ldr r0, _02187628 ; =data_027e0fc8
ldr r0, _02187628 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bcfb8
@@ -13047,7 +13047,7 @@ _021875f4:
.align 2, 0
_02187620: .word gAdventureFlags
_02187624: .word data_ov38_021891e0
_02187628: .word data_027e0fc8
_02187628: .word gPlayerLink
arm_func_end func_ov38_021875cc
.global func_ov38_0218762c
@@ -13235,7 +13235,7 @@ func_ov38_0218762c: ; 0x0218762c
ldr r3, [sp, #0x38]
strb r3, [sp, #0xcc]
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
ldr r1, _0218795c ; =data_027e0fc8
ldr r1, _0218795c ; =gPlayerLink
str r0, [r4, #0x2e8]
ldr r0, [r1]
mov r1, #0
@@ -13258,7 +13258,7 @@ _0218794c: .word data_ov38_02189360
_02187950: .word data_ov38_021893d4
_02187954: .word gAdventureFlags
_02187958: .word 0x00000bb8
_0218795c: .word data_027e0fc8
_0218795c: .word gPlayerLink
_02187960: .word data_ov38_02188ca0
arm_func_end func_ov38_0218762c
@@ -13381,7 +13381,7 @@ _02187994:
ldmia sp!, {r4, r5, pc}
_02187b28:
ldr r3, _02188068 ; =data_ov38_021891e0
ldr r0, _02188078 ; =data_027e0fc8
ldr r0, _02188078 ; =gPlayerLink
ldr r1, [r3, #0x210]
add r4, r5, #0x358
add ip, r1, #1
@@ -13390,7 +13390,7 @@ _02187b28:
mov r2, #0x400
str ip, [r3, #0x210]
bl func_ov00_020bb810
ldr r0, _02188078 ; =data_027e0fc8
ldr r0, _02188078 ; =gPlayerLink
add r1, r4, #0xc00
ldr r0, [r0]
bl func_ov00_020bb8c4
@@ -13505,7 +13505,7 @@ _02187cd8:
ldr r1, _02188068 ; =data_ov38_021891e0
mov r2, #0
ldr r3, [r1, #0x20c]
ldr r0, _02188078 ; =data_027e0fc8
ldr r0, _02188078 ; =gPlayerLink
add r3, r3, #1
str r3, [r1, #0x20c]
str r2, [r1, #0x104]
@@ -13537,7 +13537,7 @@ _02187cd8:
str r1, [r0, #0x18c]
b _02187e98
_02187d90:
ldr r0, _02188078 ; =data_027e0fc8
ldr r0, _02188078 ; =gPlayerLink
add r1, r5, #0x358
ldr r0, [r0]
add r1, r1, #0xc00
@@ -13717,7 +13717,7 @@ _02187fac:
ldrsh r1, [r0, #0x94]
add r0, sp, #0x48
bl func_ov00_020a61ac
ldr r0, _02188078 ; =data_027e0fc8
ldr r0, _02188078 ; =gPlayerLink
add r1, sp, #0x48
ldr r0, [r0]
mov r2, #0x800
@@ -13729,7 +13729,7 @@ _02188068: .word data_ov38_021891e0
_0218806c: .word data_ov38_021892e4
_02188070: .word data_027e0f64
_02188074: .word data_ov38_02189360
_02188078: .word data_027e0fc8
_02188078: .word gPlayerLink
_0218807c: .word 0x00000bb8
_02188080: .word data_ov38_021893c8
_02188084: .word data_ov38_021893d4
+1 -1
View File
@@ -86,7 +86,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+24 -24
View File
@@ -1596,7 +1596,7 @@ func_ov39_0217d210: ; 0x0217d210
add r0, r0, #0x800
str r4, [r4, #0xa54]
bl func_02018cb8
ldr r0, _0217d514 ; =data_027e0fc8
ldr r0, _0217d514 ; =gPlayerLink
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x80]
@@ -1750,7 +1750,7 @@ _0217d504: .word gItemManager
_0217d508: .word 0x00001333
_0217d50c: .word 0x0000199a
_0217d510: .word func_ov39_0217c24c
_0217d514: .word data_027e0fc8
_0217d514: .word gPlayerLink
_0217d518: .word data_027e0fec
_0217d51c: .word data_ov00_020eec9c
_0217d520: .word data_ov29_0217a4ac
@@ -2119,7 +2119,7 @@ _0217d9a4:
ldr r0, [r0, #4]
mov r2, r4
bl func_ov00_02087fe0
ldr r0, _0217dd10 ; =data_027e0fc8
ldr r0, _0217dd10 ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
@@ -2211,7 +2211,7 @@ _0217db54:
ldr r0, [r5, #0x194]
cmp r0, #1
beq _0217dcc4
ldr r0, _0217dd10 ; =data_027e0fc8
ldr r0, _0217dd10 ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
@@ -2287,7 +2287,7 @@ _0217dc74:
ldr r0, [r0, #4]
add r1, sp, #0
bl func_ov00_02087fe0
ldr r0, _0217dd10 ; =data_027e0fc8
ldr r0, _0217dd10 ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
@@ -2312,7 +2312,7 @@ _0217dd00: .word data_ov00_020eec9c
_0217dd04: .word 0x00000325
_0217dd08: .word 0x0000011f
_0217dd0c: .word data_027e0f64
_0217dd10: .word data_027e0fc8
_0217dd10: .word gPlayerLink
_0217dd14: .word 0x000004cd
_0217dd18: .word data_027e0f94
arm_func_end func_ov39_0217d790
@@ -2572,7 +2572,7 @@ _0217e05c:
mov r1, #0x55
bl func_ov00_02087584
mov r3, #0
ldr r0, _0217e284 ; =data_027e0fc8
ldr r0, _0217e284 ; =gPlayerLink
str r3, [sp]
ldr r0, [r0]
add r2, r4, #8
@@ -2654,7 +2654,7 @@ _0217e1ec:
b _0217e274
_0217e200:
mov r3, #0
ldr r0, _0217e284 ; =data_027e0fc8
ldr r0, _0217e284 ; =gPlayerLink
str r3, [sp]
ldr r0, [r0]
add r2, r4, #8
@@ -2690,7 +2690,7 @@ _0217e274:
ldmia sp!, {r4, pc}
.align 2, 0
_0217e280: .word data_027e0f64
_0217e284: .word data_027e0fc8
_0217e284: .word gPlayerLink
arm_func_end func_ov39_0217dfc0
.global func_ov39_0217e288
@@ -3876,11 +3876,11 @@ func_ov39_0217f10c: ; 0x0217f10c
add r0, r1, r0, asr #12
strh r0, [sp]
_0217f23c:
ldr r0, _0217f274 ; =data_027e0fc8
ldr r0, _0217f274 ; =gPlayerLink
add r1, sp, #0x10
ldr r0, [r0]
bl func_ov00_020bd4d8
ldr r0, _0217f274 ; =data_027e0fc8
ldr r0, _0217f274 ; =gPlayerLink
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020bd4fc
@@ -3891,7 +3891,7 @@ _0217f264: .word data_027e0fac
_0217f268: .word data_027e0f94
_0217f26c: .word data_02050f54
_0217f270: .word 0x00002b33
_0217f274: .word data_027e0fc8
_0217f274: .word gPlayerLink
arm_func_end func_ov39_0217f10c
.global func_ov39_0217f278
@@ -4896,7 +4896,7 @@ _0217ffc0:
ldr r1, [r0, #0x44]
cmp r1, #0
beq _02180004
ldr r0, _02180f20 ; =data_027e0fc8
ldr r0, _02180f20 ; =gPlayerLink
ldr r0, [r0]
ldr r0, [r0, #4]
cmp r1, r0
@@ -5020,7 +5020,7 @@ _02180004:
bl func_ov39_02185120
mov r1, #1
str r1, [r5, #0x194]
ldr r0, _02180f20 ; =data_027e0fc8
ldr r0, _02180f20 ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
@@ -5114,11 +5114,11 @@ _02180328:
ldr r0, [r5, #0x280]
add r1, sp, #0x5c
bl func_ov39_02185208
ldr r0, _02180f20 ; =data_027e0fc8
ldr r0, _02180f20 ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
ldr r0, _02180f20 ; =data_027e0fc8
ldr r0, _02180f20 ; =gPlayerLink
add r1, sp, #0x5c
ldr r0, [r0]
mov r2, #0x400
@@ -5231,7 +5231,7 @@ _02180450:
mov r0, r5
mov r1, #1
bl _ZN5Actor10SetUnk_11cEc
ldr r0, _02180f20 ; =data_027e0fc8
ldr r0, _02180f20 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bb9b0
add sp, sp, #0x130
@@ -5912,7 +5912,7 @@ _02180f14:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02180f1c: .word data_027e071c
_02180f20: .word data_027e0fc8
_02180f20: .word gPlayerLink
_02180f24: .word data_027e0f64
_02180f28: .word gAdventureFlags
_02180f2c: .word 0x00001b33
@@ -7319,7 +7319,7 @@ func_ov39_02182284: ; 0x02182284
bl _ZN13PlayerControl14IsTouchingFastEv
cmp r0, #0
beq _021822c8
ldr r0, _021823ec ; =data_027e0fc8
ldr r0, _021823ec ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc210
ldr r0, [r4, #0x184]
@@ -7329,7 +7329,7 @@ _021822c8:
ldr r0, [r4, #0x184]
cmp r0, #0
bgt _0218233c
ldr r0, _021823ec ; =data_027e0fc8
ldr r0, _021823ec ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bc280
@@ -7361,7 +7361,7 @@ _0218233c:
addle sp, sp, #0xc
ldmleia sp!, {r3, r4, pc}
ldrh r2, [r4, #0x78]
ldr r0, _021823ec ; =data_027e0fc8
ldr r0, _021823ec ; =gPlayerLink
mov r1, #0
mov r2, r2, asr #0x4
mov r3, r2, lsl #0x1
@@ -7401,7 +7401,7 @@ _0218233c:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021823e8: .word data_027e0fb8
_021823ec: .word data_027e0fc8
_021823ec: .word gPlayerLink
_021823f0: .word data_027e0f94
_021823f4: .word data_027e0ffc
_021823f8: .word 0x000001bd
@@ -8929,7 +8929,7 @@ func_ov39_021838c4: ; 0x021838c4
mov r1, #0
str r1, [r4, #0x60]
str r1, [r4, #0x64]
ldr r0, _02183c18 ; =data_027e0fc8
ldr r0, _02183c18 ; =gPlayerLink
str r1, [r4, #0x68]
ldr r0, [r0]
ldr r1, [r0]
@@ -9132,7 +9132,7 @@ func_ov39_021838c4: ; 0x021838c4
.align 2, 0
_02183c10: .word data_027e0ffc
_02183c14: .word 0x00000321
_02183c18: .word data_027e0fc8
_02183c18: .word gPlayerLink
_02183c1c: .word 0x00000326
_02183c20: .word gAdventureFlags
_02183c24: .word data_027e0f64
+1 -1
View File
@@ -86,7 +86,7 @@
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
.extern data_027e0fe4
+24 -24
View File
@@ -1565,14 +1565,14 @@ _0218a904:
mov r4, #1
b _0218a938
_0218a90c:
ldr r0, _0218a954 ; =data_027e0fc8
ldr r0, _0218a954 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbabc
cmp r0, #0
movne r4, #1
b _0218a938
_0218a924:
ldr r0, _0218a954 ; =data_027e0fc8
ldr r0, _0218a954 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bbb18
cmp r0, #0
@@ -1586,7 +1586,7 @@ _0218a938:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0218a954: .word data_027e0fc8
_0218a954: .word gPlayerLink
arm_func_end func_ov41_0218a8b0
.global func_ov41_0218a958
@@ -2170,7 +2170,7 @@ func_ov41_0218b054: ; 0x0218b054
movne r4, #0
bne _0218b0b8
_0218b07c:
ldr r0, _0218b0cc ; =data_027e0fc8
ldr r0, _0218b0cc ; =gPlayerLink
mov r4, #5
ldr r0, [r0]
bl func_ov00_020bbb18
@@ -2193,7 +2193,7 @@ _0218b0b8:
bl func_ov41_0218b1e8
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0218b0cc: .word data_027e0fc8
_0218b0cc: .word gPlayerLink
_0218b0d0: .word data_027e0ffc
_0218b0d4: .word 0x000001bd
arm_func_end func_ov41_0218b054
@@ -2329,7 +2329,7 @@ func_ov41_0218b260: ; 0x0218b260
ldmeqia sp!, {r3, r4, r5, pc}
_0218b288:
mov r1, #0
ldr r0, _0218b30c ; =data_027e0fc8
ldr r0, _0218b30c ; =gPlayerLink
strb r1, [r5, #0x526]
ldr r0, [r0]
bl func_ov00_020bbb18
@@ -2365,7 +2365,7 @@ _0218b304:
mov r0, #0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0218b30c: .word data_027e0fc8
_0218b30c: .word gPlayerLink
_0218b310: .word data_027e0c68
arm_func_end func_ov41_0218b260
@@ -2790,12 +2790,12 @@ _0218b84c:
beq _0218b8d4
b _0218bda8
_0218b870:
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
beq _0218bda8
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd304
cmp r0, #0
@@ -2941,7 +2941,7 @@ _0218ba88:
ldrsb r0, [r0, #0x1d]
cmp r0, #3
blt _0218bacc
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #1
@@ -2977,12 +2977,12 @@ _0218bb10:
beq _0218bba4
b _0218bda8
_0218bb2c:
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
beq _0218bda8
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd304
cmp r0, #0
@@ -3090,7 +3090,7 @@ _0218bcac:
strb r0, [r4, #0x51c]
b _0218bda8
_0218bcd0:
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #1
@@ -3118,7 +3118,7 @@ _0218bd10:
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
ldr r1, [sp, #8]
ldr r0, [r0]
add r1, r1, #0x4000
@@ -3126,7 +3126,7 @@ _0218bd10:
bl func_ov00_020bc500
cmp r0, #0
bne _0218bda8
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
add r1, sp, #0
ldr r0, [r0]
mov r2, #0x1000
@@ -3139,7 +3139,7 @@ _0218bd10:
strb r0, [r4, #0x51c]
b _0218bda8
_0218bd88:
ldr r0, _0218bdfc ; =data_027e0fc8
ldr r0, _0218bdfc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
@@ -3171,7 +3171,7 @@ _0218bdd4:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218bdfc: .word data_027e0fc8
_0218bdfc: .word gPlayerLink
_0218be00: .word data_027e0ffc
_0218be04: .word 0x00000329
_0218be08: .word data_ov00_020eec68
@@ -3496,7 +3496,7 @@ func_ov41_0218c204: ; 0x0218c204
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _0218c3bc ; =data_027e0f94
ldr r3, _0218c3c0 ; =data_027e0fc8
ldr r3, _0218c3c0 ; =gPlayerLink
mov r4, r0
add ip, sp, #0xc
ldmia r1, {r0, r1, r2}
@@ -3608,7 +3608,7 @@ _0218c3b0:
ldmia sp!, {r4, pc}
.align 2, 0
_0218c3bc: .word data_027e0f94
_0218c3c0: .word data_027e0fc8
_0218c3c0: .word gPlayerLink
_0218c3c4: .word 0x0000319a
_0218c3c8: .word gAdventureFlags
_0218c3cc: .word data_027e0fe4
@@ -3997,7 +3997,7 @@ func_ov41_0218c834: ; 0x0218c834
addne sp, sp, #0x18
movne r0, #1
ldmneia sp!, {r4, r5, r6, pc}
ldr r1, _0218cbe4 ; =data_027e0fc8
ldr r1, _0218cbe4 ; =gPlayerLink
mvn r0, #0
ldr r2, [r1]
ldr r1, [r2, #0x3c]
@@ -4097,7 +4097,7 @@ _0218c9c4:
_0218ca08:
cmp r4, #0
bne _0218cbd0
ldr r0, _0218cbe4 ; =data_027e0fc8
ldr r0, _0218cbe4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd304
cmp r0, #0
@@ -4115,7 +4115,7 @@ _0218ca3c:
bl _ZN5Actor14DistanceToLinkEv
cmp r0, #0x2000
bge _0218ca80
ldr r0, _0218cbe4 ; =data_027e0fc8
ldr r0, _0218cbe4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd304
cmp r0, #0
@@ -4201,7 +4201,7 @@ _0218cb5c:
bl _ZN5Actor14DistanceToLinkEv
cmp r0, #0x2000
bge _0218cbd0
ldr r0, _0218cbe4 ; =data_027e0fc8
ldr r0, _0218cbe4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd304
cmp r0, #0
@@ -4219,7 +4219,7 @@ _0218cbd0:
.align 2, 0
_0218cbdc: .word data_027e0f68
_0218cbe0: .word gAdventureFlags
_0218cbe4: .word data_027e0fc8
_0218cbe4: .word gPlayerLink
_0218cbe8: .word data_027e0fe4
_0218cbec: .word gMapManager
_0218cbf0: .word data_02050f54
+1 -1
View File
@@ -67,7 +67,7 @@
.extern data_027e0f78
.extern data_027e0f94
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+5 -5
View File
@@ -327,7 +327,7 @@ _02189918:
mov r1, #5
ldr r0, [r0]
blx _ZN11ItemManager14ForceEquipItemEi
ldr r1, _02189b00 ; =data_027e0fc8
ldr r1, _02189b00 ; =gPlayerLink
mov r0, r7
ldr r4, [r1]
bl func_ov42_02189560
@@ -449,7 +449,7 @@ _02189a74:
_02189af4: .word gMapManager
_02189af8: .word data_027e0f64
_02189afc: .word gItemManager
_02189b00: .word data_027e0fc8
_02189b00: .word gPlayerLink
_02189b04: .word data_ov42_0218c6f4
_02189b08: .word 0x4d544748
_02189b0c: .word data_027e0fe8
@@ -608,7 +608,7 @@ func_ov42_02189cf8: ; 0x02189cf8
ldrb r0, [r4, #0x64]
cmp r0, #0
bne _02189d64
ldr r0, _02189e4c ; =data_027e0fc8
ldr r0, _02189e4c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
@@ -620,7 +620,7 @@ func_ov42_02189cf8: ; 0x02189cf8
ldr r0, _02189e50 ; =data_027e0fb8
strb r3, [r4, #0x64]
ldr r1, [r0]
ldr r0, _02189e4c ; =data_027e0fc8
ldr r0, _02189e4c ; =gPlayerLink
strb r3, [r1, #0x79]
strb r3, [r1, #0x7b]
ldr r0, [r0]
@@ -694,7 +694,7 @@ _02189e44:
bl func_ov42_02189e88
ldmia sp!, {r4, pc}
.align 2, 0
_02189e4c: .word data_027e0fc8
_02189e4c: .word gPlayerLink
_02189e50: .word data_027e0fb8
_02189e54: .word data_027e0f94
_02189e58: .word data_ov00_020eec9c
+1 -1
View File
@@ -68,7 +68,7 @@
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+15 -15
View File
@@ -3266,7 +3266,7 @@ _0218c128:
ldr r0, _0218c99c ; =data_ov00_020eec9c
mov r1, #0x3a
bl func_ov00_020d77e4
ldr r0, _0218c9a0 ; =data_027e0fc8
ldr r0, _0218c9a0 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -3843,7 +3843,7 @@ _0218c990: .word data_027e0d0c
_0218c994: .word data_027e0c68
_0218c998: .word 0x00690330
_0218c99c: .word data_ov00_020eec9c
_0218c9a0: .word data_027e0fc8
_0218c9a0: .word gPlayerLink
_0218c9a4: .word 0x000c00a4
_0218c9a8: .word data_027e0764
_0218c9ac: .word 0x00fffe00
@@ -3945,7 +3945,7 @@ _0218cab4:
ldr r0, [r5, #0x3bc]
cmp r0, #0
beq _0218cb0c
ldr r0, _0218cd24 ; =data_027e0fc8
ldr r0, _0218cd24 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
@@ -3966,7 +3966,7 @@ _0218cb0c:
mov r1, #4
bl func_ov43_0218b7b8
_0218cb34:
ldr r0, _0218cd24 ; =data_027e0fc8
ldr r0, _0218cd24 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
@@ -4093,7 +4093,7 @@ _0218cd10:
.align 2, 0
_0218cd1c: .word 0x50424652
_0218cd20: .word 0x50425a4b
_0218cd24: .word data_027e0fc8
_0218cd24: .word gPlayerLink
_0218cd28: .word data_027e0f64
_0218cd2c: .word gAdventureFlags
_0218cd30: .word 0x00000333
@@ -4131,7 +4131,7 @@ func_ov43_0218cd7c: ; 0x0218cd7c
mov r10, r0
ldrsh r4, [r10, #0x78]
mov r8, r2
ldr r0, _0218cf84 ; =data_027e0fc8
ldr r0, _0218cf84 ; =gPlayerLink
strh r4, [r8]
ldr r0, [r0]
mov r9, r1
@@ -4266,7 +4266,7 @@ _0218cf78:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218cf84: .word data_027e0fc8
_0218cf84: .word gPlayerLink
_0218cf88: .word data_027e0f94
_0218cf8c: .word gMapManager
arm_func_end func_ov43_0218cd7c
@@ -4295,12 +4295,12 @@ func_ov43_0218cf90: ; 0x0218cf90
ldr r0, [r4, #0x130]
cmp r0, #7
ldmeqia sp!, {r4, pc}
ldr r0, _0218d028 ; =data_027e0fc8
ldr r0, _0218d028 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
bne _0218d014
ldr r0, _0218d028 ; =data_027e0fc8
ldr r0, _0218d028 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
mov r2, r1
@@ -4314,7 +4314,7 @@ _0218d014:
strb r0, [r1, #0x8a8]
ldmia sp!, {r4, pc}
.align 2, 0
_0218d028: .word data_027e0fc8
_0218d028: .word gPlayerLink
arm_func_end func_ov43_0218cf90
.global func_ov43_0218d02c
@@ -4325,7 +4325,7 @@ func_ov43_0218d02c: ; 0x0218d02c
ldrb r0, [r4, #0x3e6]
cmp r0, #0
beq _0218d054
ldr r0, _0218d084 ; =data_027e0fc8
ldr r0, _0218d084 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -4334,7 +4334,7 @@ _0218d054:
ldrb r0, [r4, #0x3e6]
cmp r0, #0
bne _0218d07c
ldr r0, _0218d084 ; =data_027e0fc8
ldr r0, _0218d084 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #1
@@ -4346,7 +4346,7 @@ _0218d07c:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0218d084: .word data_027e0fc8
_0218d084: .word gPlayerLink
arm_func_end func_ov43_0218d02c
.global func_ov43_0218d088
@@ -4390,7 +4390,7 @@ _0218d0e4:
cmp r2, r1
addne sp, sp, #0x1c
ldmneia sp!, {r3, r4, pc}
ldr r3, _0218d1a0 ; =data_027e0fc8
ldr r3, _0218d1a0 ; =gPlayerLink
add r0, r0, #0x48
add ip, sp, #0x10
ldmia r0, {r0, r1, r2}
@@ -4425,7 +4425,7 @@ _0218d168:
.align 2, 0
_0218d198: .word data_027e0fe4
_0218d19c: .word 0x504c444d
_0218d1a0: .word data_027e0fc8
_0218d1a0: .word gPlayerLink
_0218d1a4: .word data_ov00_020eec9c
_0218d1a8: .word data_027e0c68
_0218d1ac: .word 0x000c00a6
+1 -1
View File
@@ -62,7 +62,7 @@
.extern data_027e0f64
.extern data_027e0f94
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0ff8
.extern data_027e0ffc
+6 -6
View File
@@ -1983,7 +1983,7 @@ _0218ae00:
sub r4, lr, #0x18
blx func_ov09_0211cac0
_0218ae0c:
ldr r0, _0218ae30 ; =data_027e0fc8
ldr r0, _0218ae30 ; =gPlayerLink
mov r1, r4
ldr r0, [r0]
bl func_ov00_020bce48
@@ -1993,14 +1993,14 @@ _0218ae0c:
_0218ae24: .word data_ov45_0218e6c4
_0218ae28: .word data_ov00_020ec7dc
_0218ae2c: .word 0x38e38e39
_0218ae30: .word data_027e0fc8
_0218ae30: .word gPlayerLink
arm_func_end func_ov45_0218ad80
.global func_ov45_0218ae34
arm_func_start func_ov45_0218ae34
func_ov45_0218ae34: ; 0x0218ae34
stmdb sp!, {r4, lr}
ldr r1, _0218ae5c ; =data_027e0fc8
ldr r1, _0218ae5c ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
bl func_ov00_020bc500
@@ -2010,7 +2010,7 @@ func_ov45_0218ae34: ; 0x0218ae34
bl func_ov45_0218ae60
ldmia sp!, {r4, pc}
.align 2, 0
_0218ae5c: .word data_027e0fc8
_0218ae5c: .word gPlayerLink
arm_func_end func_ov45_0218ae34
.global func_ov45_0218ae60
@@ -2032,7 +2032,7 @@ _0218ae80: .word data_ov45_0218e6c4
arm_func_start func_ov45_0218ae84
func_ov45_0218ae84: ; 0x0218ae84
stmdb sp!, {r4, lr}
ldr r1, _0218aec4 ; =data_027e0fc8
ldr r1, _0218aec4 ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
bl func_ov00_020bc500
@@ -2048,7 +2048,7 @@ func_ov45_0218ae84: ; 0x0218ae84
bl func_ov45_0218acf8
ldmia sp!, {r4, pc}
.align 2, 0
_0218aec4: .word data_027e0fc8
_0218aec4: .word gPlayerLink
arm_func_end func_ov45_0218ae84
.global func_ov45_0218aec8
+1 -1
View File
@@ -76,7 +76,7 @@
.extern data_027e0e58
.extern data_027e0f6c
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fe0
.extern data_027e0fe4
+3 -3
View File
@@ -1315,7 +1315,7 @@ _021910c8:
cmp r1, #0
bne _02191258
ldrsh r1, [r0, #0xce]
ldr r0, _021912ac ; =data_027e0fc8
ldr r0, _021912ac ; =gPlayerLink
ldr r4, [r0]
cmp r1, #4
addls pc, pc, r1, lsl #2
@@ -1430,7 +1430,7 @@ _02191260:
add r1, sp, #0x10
ldr r2, [r2, #0x34]
blx r2
ldr r0, _021912ac ; =data_027e0fc8
ldr r0, _021912ac ; =gPlayerLink
add r1, sp, #0x10
ldr r0, [r0]
mov r2, #0x400
@@ -1440,7 +1440,7 @@ _02191260:
.align 2, 0
_021912a4: .word 0x00000aab
_021912a8: .word 0x00000133
_021912ac: .word data_027e0fc8
_021912ac: .word gPlayerLink
_021912b0: .word data_027e0fcc
arm_func_end func_ov46_02190f54
+1 -1
View File
@@ -80,7 +80,7 @@
.extern data_027e0f64
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe8
.extern data_027e0fec
+24 -24
View File
@@ -774,7 +774,7 @@ func_ov49_02195f1c: ; 0x02195f1c
ldmeqia sp!, {r3, r4, pc}
mov r1, #0
str r1, [sp]
ldr r0, _02195f84 ; =data_027e0fc8
ldr r0, _02195f84 ; =gPlayerLink
add r2, r4, #8
ldr r0, [r0]
mov r1, #0x10
@@ -792,14 +792,14 @@ func_ov49_02195f1c: ; 0x02195f1c
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02195f84: .word data_027e0fc8
_02195f84: .word gPlayerLink
arm_func_end func_ov49_02195f1c
.global func_ov49_02195f88
arm_func_start func_ov49_02195f88
func_ov49_02195f88: ; 0x02195f88
stmdb sp!, {r4, lr}
ldr r0, _02195ff4 ; =data_027e0fc8
ldr r0, _02195ff4 ; =gPlayerLink
mov r4, #1
ldr r0, [r0]
bl func_ov00_020bc500
@@ -815,7 +815,7 @@ _02195fb8:
moveq r4, #0
cmp r4, #0
beq _02195fec
ldr r0, _02195ff4 ; =data_027e0fc8
ldr r0, _02195ff4 ; =gPlayerLink
ldr r0, [r0]
ldrh r1, [r0, #0x48]
tst r1, #0x10
@@ -829,7 +829,7 @@ _02195fec:
mov r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_02195ff4: .word data_027e0fc8
_02195ff4: .word gPlayerLink
arm_func_end func_ov49_02195f88
.global func_ov49_02195ff8
@@ -1068,7 +1068,7 @@ _0219632c:
add r0, r5, #0x1b4
str r1, [r5, #0x5b4]
ldr r1, [r5, #0x4c]
ldr r2, _021965d8 ; =data_027e0fc8
ldr r2, _021965d8 ; =gPlayerLink
str r1, [r5, #0x5b8]
ldr r3, [r5, #0x50]
add r1, r0, #0x400
@@ -1147,7 +1147,7 @@ _0219641c:
add r0, r0, #0x400
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _021965d8 ; =data_027e0fc8
ldr r0, _021965d8 ; =gPlayerLink
mov r1, r3
ldr r6, [sp, #0xc]
ldr r3, _021965ec ; =0xfffff382
@@ -1247,7 +1247,7 @@ _021965b4:
_021965cc: .word data_027e0764
_021965d0: .word data_027e0ffc
_021965d4: .word 0x00000303
_021965d8: .word data_027e0fc8
_021965d8: .word gPlayerLink
_021965dc: .word data_027e103c
_021965e0: .word 0x00000305
_021965e4: .word data_027e0e58
@@ -1270,7 +1270,7 @@ func_ov49_021965f4: ; 0x021965f4
movne r0, #0
ldmneia sp!, {r4, pc}
_0219661c:
ldr r0, _0219670c ; =data_027e0fc8
ldr r0, _0219670c ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #0x10
@@ -1337,7 +1337,7 @@ _021966e4:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0219670c: .word data_027e0fc8
_0219670c: .word gPlayerLink
arm_func_end func_ov49_021965f4
.global func_ov49_02196710
@@ -1355,7 +1355,7 @@ func_ov49_02196710: ; 0x02196710
cmp r0, #2
cmpne r0, #3
bne _02196788
ldr r0, _02196fec ; =data_027e0fc8
ldr r0, _02196fec ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #0x10
@@ -1664,7 +1664,7 @@ _02196ac0:
add r1, sp, #0x64
mov r2, r0
bl func_01ff9bc4
ldr r0, _02196fec ; =data_027e0fc8
ldr r0, _02196fec ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
cmp r0, #0
@@ -1687,7 +1687,7 @@ _02196bec:
cmp r0, #0
beq _02196c54
mov r1, #0
ldr r0, _02196fec ; =data_027e0fc8
ldr r0, _02196fec ; =gPlayerLink
str r1, [sp]
ldr r0, [r0]
add r2, r5, #8
@@ -1720,7 +1720,7 @@ _02196c80:
bl func_ov49_021960fc
b _02196e34
_02196c90:
ldr r0, _02196fec ; =data_027e0fc8
ldr r0, _02196fec ; =gPlayerLink
add r1, r5, #0x1b4
ldr r0, [r0]
add r1, r1, #0x400
@@ -1758,7 +1758,7 @@ _02196d04:
ldr r1, _02197014 ; =0x00000306
add r2, r5, #0x48
bl func_ov00_020cec60
ldr r0, _02196fec ; =data_027e0fc8
ldr r0, _02196fec ; =gPlayerLink
add r1, r5, #0x1b4
ldr r0, [r0]
add r1, r1, #0x400
@@ -1768,7 +1768,7 @@ _02196d04:
ldrb r0, [r5, #0x5cd]
cmp r0, #0
bne _02196d5c
ldr r0, _02196fec ; =data_027e0fc8
ldr r0, _02196fec ; =gPlayerLink
ldr r0, [r0]
ldrh r0, [r0, #0x48]
tst r0, #0x10
@@ -1948,7 +1948,7 @@ _02196fe0:
add sp, sp, #0xa8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02196fec: .word data_027e0fc8
_02196fec: .word gPlayerLink
_02196ff0: .word data_027e0f90
_02196ff4: .word 0x00000ccd
_02196ff8: .word 0x00004333
@@ -2766,7 +2766,7 @@ _02197a64:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, pc}
_02197a88:
ldr r0, _02197b20 ; =data_027e0fc8
ldr r0, _02197b20 ; =gPlayerLink
ldr r1, [r5, #0x158]
ldr r0, [r0]
bl func_ov00_020bce48
@@ -2808,7 +2808,7 @@ _02197b10: .word gMapManager
_02197b14: .word data_027e0ffc
_02197b18: .word 0x000001ab
_02197b1c: .word 0xfffffe66
_02197b20: .word data_027e0fc8
_02197b20: .word gPlayerLink
arm_func_end func_ov49_02197860
.global func_ov49_02197b24
@@ -3101,7 +3101,7 @@ _02197e70:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02197efc ; =data_027e0fc8
ldr r0, _02197efc ; =gPlayerLink
mov r1, #7
ldr r0, [r0]
ldr r2, [r0]
@@ -3131,7 +3131,7 @@ _02197ed0:
bl func_ov49_02198040
ldmia sp!, {r4, pc}
.align 2, 0
_02197efc: .word data_027e0fc8
_02197efc: .word gPlayerLink
_02197f00: .word gAdventureFlags
arm_func_end func_ov49_02197e10
@@ -3268,7 +3268,7 @@ _021980b8:
ldr r0, [r0]
ldr r0, [r0, #4]
bl func_ov00_02088000
ldr r0, _02198158 ; =data_027e0fc8
ldr r0, _02198158 ; =gPlayerLink
mov r1, #0
ldr r0, [r0]
bl func_ov00_020bd030
@@ -3295,7 +3295,7 @@ _02198114:
bl _ZN5Actor18func_ov00_020c1c20Eiii
cmp r5, #0
bne _0219813c
ldr r0, _02198158 ; =data_027e0fc8
ldr r0, _02198158 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd0a8
_0219813c:
@@ -3308,7 +3308,7 @@ _02198144:
.align 2, 0
_02198150: .word gAdventureFlags
_02198154: .word data_027e0f64
_02198158: .word data_027e0fc8
_02198158: .word gPlayerLink
_0219815c: .word data_ov00_020eec9c
_02198160: .word 0x0000048e
arm_func_end func_ov49_02198040
+1 -1
View File
@@ -82,7 +82,7 @@
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fec
+11 -11
View File
@@ -615,7 +615,7 @@ _02195d2c:
cmp r0, #0
addeq sp, sp, #0x3c
ldmeqia sp!, {r3, r4, r5, r6, pc}
ldr r0, _021960a4 ; =data_027e0fc8
ldr r0, _021960a4 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba00
cmp r0, #0
@@ -852,7 +852,7 @@ _0219609c:
add sp, sp, #0x3c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_021960a4: .word data_027e0fc8
_021960a4: .word gPlayerLink
_021960a8: .word 0x00001333
_021960ac: .word gAdventureFlags
_021960b0: .word data_027e0f64
@@ -938,7 +938,7 @@ _02196184:
cmp r0, #0
addeq sp, sp, #0xbc
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc}
ldr r0, _021963e8 ; =data_027e0fc8
ldr r0, _021963e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba48
add sp, sp, #0xbc
@@ -948,7 +948,7 @@ _021961e4:
bl _ZN5Actor9IsGrabbedEv
cmp r0, #0
beq _02196200
ldr r0, _021963e8 ; =data_027e0fc8
ldr r0, _021963e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba48
_02196200:
@@ -1010,7 +1010,7 @@ _021962c8:
bl _ZN5Actor9IsGrabbedEv
cmp r0, #0
beq _021962e4
ldr r0, _021963e8 ; =data_027e0fc8
ldr r0, _021963e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba48
_021962e4:
@@ -1074,7 +1074,7 @@ _021963ac:
cmp r0, #0
addeq sp, sp, #0xbc
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc}
ldr r0, _021963e8 ; =data_027e0fc8
ldr r0, _021963e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba48
_021963d4:
@@ -1084,7 +1084,7 @@ _021963d4:
_021963dc: .word data_027e0ffc
_021963e0: .word 0x00000396
_021963e4: .word gMapManager
_021963e8: .word data_027e0fc8
_021963e8: .word gPlayerLink
_021963ec: .word gAdventureFlags
arm_func_end func_ov50_021960c8
@@ -1786,7 +1786,7 @@ func_ov50_02196d28: ; 0x02196d28
ldrsh r0, [r2]
mov r5, r1
bl func_0202bbbc
ldr r1, _02196d90 ; =data_027e0fc8
ldr r1, _02196d90 ; =gPlayerLink
mov r4, r0
ldr r0, [r1]
bl func_ov00_020bba14
@@ -1808,7 +1808,7 @@ _02196d64:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02196d8c: .word data_027e0fac
_02196d90: .word data_027e0fc8
_02196d90: .word gPlayerLink
arm_func_end func_ov50_02196d28
.global func_ov50_02196d94
@@ -3300,7 +3300,7 @@ _02197ff8:
mov r5, lr, lsr #0xc
orr r3, r3, r6, lsl #20
orr r5, r5, r0, lsl #20
ldr ip, _0219858c ; =data_027e0fc8
ldr ip, _0219858c ; =gPlayerLink
add r2, sp, #0x2c
ldr r0, [ip]
str r1, [sp, #0x30]
@@ -3620,7 +3620,7 @@ _0219857c: .word data_027e0f94
_02198580: .word data_027e0764
_02198584: .word data_02050f54
_02198588: .word 0x0000019a
_0219858c: .word data_027e0fc8
_0219858c: .word gPlayerLink
_02198590: .word data_027e0fe4
_02198594: .word 0x52555059
arm_func_end func_ov50_02197fd4
+1 -1
View File
@@ -77,7 +77,7 @@
.extern data_027e0f78
.extern data_027e0fa0
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
+6 -6
View File
@@ -2312,13 +2312,13 @@ func_ov52_0219726c: ; 0x0219726c
cmp r0, #0
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, pc}
ldr r0, _02197308 ; =data_027e0fc8
ldr r0, _02197308 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, pc}
ldr r0, _02197308 ; =data_027e0fc8
ldr r0, _02197308 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bd318
cmp r0, #0
@@ -2329,7 +2329,7 @@ func_ov52_0219726c: ; 0x0219726c
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02197308: .word data_027e0fc8
_02197308: .word gPlayerLink
arm_func_end func_ov52_0219726c
.global func_ov52_0219730c
@@ -2574,7 +2574,7 @@ _021975fc:
mov r0, #1
ldmia sp!, {r4, pc}
_02197604:
ldr r0, _02197660 ; =data_027e0fc8
ldr r0, _02197660 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
@@ -2588,7 +2588,7 @@ _02197604:
mov r0, #1
ldmia sp!, {r4, pc}
_02197638:
ldr r0, _02197660 ; =data_027e0fc8
ldr r0, _02197660 ; =gPlayerLink
mov r1, #0x2b
ldr r0, [r0]
bl func_ov00_020bce48
@@ -2600,7 +2600,7 @@ _02197658:
mov r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_02197660: .word data_027e0fc8
_02197660: .word gPlayerLink
arm_func_end func_ov52_021975bc
.global func_ov52_02197664
+1 -1
View File
@@ -35,7 +35,7 @@
.extern data_027e0f6c
.extern data_027e0f94
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0ffc
+2 -2
View File
@@ -316,12 +316,12 @@ func_ov57_021990b4: ; 0x021990b4
cmp r4, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _021990e8 ; =data_027e0fc8
ldr r0, _021990e8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba28
ldmia sp!, {r4, pc}
.align 2, 0
_021990e8: .word data_027e0fc8
_021990e8: .word gPlayerLink
arm_func_end func_ov57_021990b4
.global func_ov57_021990ec
+1 -1
View File
@@ -25,7 +25,7 @@
.extern data_027e0f6c
.extern data_027e0f94
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe4
.extern data_027e0fe8
+4 -4
View File
@@ -400,7 +400,7 @@ _02199138:
ldr r0, [r5, #0x34]
str r0, [r5, #0x28]
_02199144:
ldr r0, _0219916c ; =data_027e0fc8
ldr r0, _0219916c ; =gPlayerLink
add r5, #0x20
mov r2, #2
ldr r0, [r0]
@@ -416,7 +416,7 @@ _0219915c: .word data_027e103c
_02199160: .word data_ov58_0219b0a0
_02199164: .word data_027e077c
_02199168: .word 0x00000333
_0219916c: .word data_027e0fc8
_0219916c: .word gPlayerLink
thumb_func_end func_ov58_0219906c
.global func_ov58_02199170
@@ -626,7 +626,7 @@ _02199314:
ldmleia sp!, {r3, r4, r5, pc}
cmp r4, #0
beq _021993e0
ldr r0, _021993f8 ; =data_027e0fc8
ldr r0, _021993f8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba28
cmp r0, #0
@@ -679,7 +679,7 @@ _021993e8: .word gMapManager
_021993ec: .word data_027e0c54
_021993f0: .word data_027e0d38
_021993f4: .word data_027e0fd4
_021993f8: .word data_027e0fc8
_021993f8: .word gPlayerLink
_021993fc: .word data_027e077c
arm_func_end func_ov58_021992c4
+1 -1
View File
@@ -21,7 +21,7 @@
.extern gMapManager
.extern data_027e0f94
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fd4
.extern data_027e0fe4
+2 -2
View File
@@ -61,7 +61,7 @@ _02198da4:
bl func_ov00_020a5e9c
cmp r0, #0x2f
beq _02198e10
ldr r0, _02198e24 ; =data_027e0fc8
ldr r0, _02198e24 ; =gPlayerLink
mov r4, #0
ldr r0, [r0]
bl func_ov00_020bc500
@@ -85,7 +85,7 @@ _02198e10:
_02198e18: .word data_027e0fd4
_02198e1c: .word gItemManager
_02198e20: .word data_027e0d38
_02198e24: .word data_027e0fc8
_02198e24: .word gPlayerLink
_02198e28: .word data_027e0fd0
arm_func_end func_ov59_02198d00
+5
View File
@@ -19,6 +19,7 @@ enum PlayerCharacter_ {
};
class PlayerLinkBase: public PlayerBase {
public:
/* 00 (base) */
/* 14 */ Vec3p mPos;
/* 20 */ Vec3p mVel;
@@ -73,4 +74,8 @@ class PlayerLinkBase: public PlayerBase {
/* 80 */ virtual void SetUnk_5e();
/* 84 */ virtual void ResetUnk_5e();
/* 88 */
void func_ov00_020bc854(Vec3p *param1);
};
extern PlayerLinkBase *gPlayerLink;