mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-09-11 12:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name gActorManager singleton

Browse Source
This commit is contained in:
Aetias
2024-05-19 10:34:27 +02:00
parent b2d053475e
commit 7ccd1447b0
118 changed files with 1504 additions and 1502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dtcm.s
+2 -2
View File
@@ -4031,8 +4031,8 @@ data_027e0fdc:
.global data_027e0fe0
data_027e0fe0:
.space 0x4
.global data_027e0fe4
data_027e0fe4:
.global gActorManager
gActorManager:
.space 0x4
.global data_027e0fe8
data_027e0fe8:
asm/main/main_02000000.inc
+1 -1
View File
@@ -123,7 +123,7 @@
.extern data_027e0f94
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0ffc
.extern data_027e103c
.extern data_027e1054
asm/main/main_02000000.s
+5 -5
View File
@@ -74923,13 +74923,13 @@ _02036b24:
cmp r3, #0
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, r5, r6, pc}
ldr r0, _02036bac ; =data_027e0fe4
ldr r0, _02036bac ; =gActorManager
ldr r2, _02036bb0 ; =data_0205691c
ldr r1, [r0]
ldr r2, [r2, r3, lsl #2]
add r0, sp, #4
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02036bac ; =data_027e0fe4
ldr r0, _02036bac ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -74952,7 +74952,7 @@ _02036b24:
_02036ba0: .word data_027e0c54
_02036ba4: .word data_027e077c
_02036ba8: .word data_02056be4
_02036bac: .word data_027e0fe4
_02036bac: .word gActorManager
_02036bb0: .word data_0205691c
_02036bb4: .word data_02056918
_02036bb8: .word data_027e0ffc
@@ -76484,7 +76484,7 @@ _02037d64:
mov r0, r0, asr #0x18
ldmia sp!, {r4, r5, r6, pc}
_02037d90:
ldr r0, _02037f54 ; =data_027e0fe4
ldr r0, _02037f54 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -76605,7 +76605,7 @@ _02037f44: .word data_027e0764
_02037f48: .word gAdventureFlags
_02037f4c: .word data_027e0cb4
_02037f50: .word gItemManager
_02037f54: .word data_027e0fe4
_02037f54: .word gActorManager
arm_func_end func_02037b88
.global func_02037f58
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -31,7 +31,7 @@
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe4
.extern gActorManager
.extern data_027e103c
.extern data_ov00_020e9c88
.extern func_01ff9bc4
asm/ov00/Actor/Actor.s
+14 -14
View File
@@ -611,7 +611,7 @@ _020c1b2c:
add r2, r2, #8
cmp r2, r0
blo _020c1b2c
ldr r0, _020c1b64 ; =data_027e0fe4
ldr r0, _020c1b64 ; =gActorManager
ldr r3, _020c1b68 ; =_ZTV20KillPickupItemActors
ldr r0, [r0]
add r1, sp, #0
@@ -621,7 +621,7 @@ _020c1b2c:
add sp, sp, #0xa4
ldmia sp!, {pc}
.align 2, 0
_020c1b64: .word data_027e0fe4
_020c1b64: .word gActorManager
_020c1b68: .word _ZTV20KillPickupItemActors
arm_func_end _ZN5Actor20KillPickupItemActorsEv
@@ -1291,7 +1291,7 @@ _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder: ; 0x020c23d4
mov r6, r0
str r1, [r6]
ldr r1, [r4, #0x44]
ldr r0, _020c2438 ; =data_027e0fe4
ldr r0, _020c2438 ; =gActorManager
str r1, [r6, #4]
ldr r0, [r0]
ldr r1, [r4, #0xc]
@@ -1304,14 +1304,14 @@ _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder: ; 0x020c23d4
mvn r0, #0
str r0, [r4, #0x40]
str r0, [r4, #0x44]
ldr r0, _020c2438 ; =data_027e0fe4
ldr r0, _020c2438 ; =gActorManager
ldr r1, [r4, #0xc]
ldr r0, [r0]
mov r2, r5
bl _ZN12ActorManager18func_ov00_020c399cEv
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020c2438: .word data_027e0fe4
_020c2438: .word gActorManager
arm_func_end _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.global _ZN5Actor18func_ov00_020c243cEiPi
@@ -1335,7 +1335,7 @@ _ZN5Actor18func_ov00_020c243cEiPi: ; 0x020c243c
mov r4, #0
cmp r0, #0
blt _020c26e4
ldr r0, _020c26f4 ; =data_027e0fe4
ldr r0, _020c26f4 ; =gActorManager
ldr r1, [r7, #0xc]
ldr r0, [r0]
mov r2, r5
@@ -1514,7 +1514,7 @@ _020c26e4:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020c26f0: .word gAdventureFlags
_020c26f4: .word data_027e0fe4
_020c26f4: .word gActorManager
_020c26f8: .word 0x41525257
_020c26fc: .word 0x5342454d
_020c2700: .word data_02050f54
@@ -1952,7 +1952,7 @@ _ZN5Actor18func_ov00_020c2c0cEv: ; 0x020c2c0c
add r2, sp, #0
cmp r1, #0
blt _020c2c5c
ldr r3, _020c2c6c ; =data_027e0fe4
ldr r3, _020c2c6c ; =gActorManager
ldr r1, [r0, #0xc]
ldr r0, [r3]
mov r3, #0
@@ -1967,7 +1967,7 @@ _020c2c5c:
ldmia sp!, {r3, pc}
.align 2, 0
_020c2c68: .word data_ov00_020dd370
_020c2c6c: .word data_027e0fe4
_020c2c6c: .word gActorManager
arm_func_end _ZN5Actor18func_ov00_020c2c0cEv
.global _ZN5Actor18func_ov00_020c2c70Ev
@@ -2057,7 +2057,7 @@ _ZN5Actor18func_ov00_020c2d54Ev: ; 0x020c2d54
add r2, sp, #0
cmp r0, #0
blt _020c2dd0
ldr r0, _020c2de0 ; =data_027e0fe4
ldr r0, _020c2de0 ; =gActorManager
ldr r1, [r4, #0xc]
ldr r0, [r0]
mov r3, #0
@@ -2082,7 +2082,7 @@ _020c2dd0:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020c2ddc: .word data_ov00_020dd370
_020c2de0: .word data_027e0fe4
_020c2de0: .word gActorManager
arm_func_end _ZN5Actor18func_ov00_020c2d54Ev
.global _ZN5Actor18func_ov00_020c2de4Ev
@@ -2508,13 +2508,13 @@ _020c328c: .word data_027e0f94
_ZN5Actor15GetLinkDummyPosEP5Vec3p: ; 0x020c3290
stmdb sp!, {r4, lr}
sub sp, sp, #8
ldr r0, _020c331c ; =data_027e0fe4
ldr r0, _020c331c ; =gActorManager
mov r4, r1
ldr r1, [r0]
ldr r2, _020c3320 ; =0x504c444d
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _020c331c ; =data_027e0fe4
ldr r0, _020c331c ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2543,7 +2543,7 @@ _020c32f8:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_020c331c: .word data_027e0fe4
_020c331c: .word gActorManager
_020c3320: .word 0x504c444d
_020c3324: .word data_027e0f94
arm_func_end _ZN5Actor15GetLinkDummyPosEP5Vec3p
asm/ov00/Map/MapManager.inc
+1 -1
View File
@@ -53,7 +53,7 @@
.extern data_027e0f7c
.extern gPlayer
.extern data_027e0f94
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e103c
.extern data_ov00_020e24a4
asm/ov00/Map/MapManager.s
+13 -13
View File
@@ -956,7 +956,7 @@ _02082bac:
ldr r0, _02082ce8 ; =data_027e0f64
ldr r0, [r0]
bl func_ov00_0208b13c
ldr r1, _02082cec ; =data_027e0fe4
ldr r1, _02082cec ; =gActorManager
mov r0, r6
ldr r4, [r1]
bl _ZN10MapManager18func_ov00_02082d08Ev
@@ -999,7 +999,7 @@ _02082bac:
mov r3, #0
strb ip, [r6, #0x1d]
blx func_ov04_021024c4
ldr r0, _02082cec ; =data_027e0fe4
ldr r0, _02082cec ; =gActorManager
ldrb r1, [r5, #0x12]
ldr r0, [r0]
blx func_ov04_02105578
@@ -1033,7 +1033,7 @@ _02082cd8:
_02082ce0: .word data_027e0d38
_02082ce4: .word gAdventureFlags
_02082ce8: .word data_027e0f64
_02082cec: .word data_027e0fe4
_02082cec: .word gActorManager
_02082cf0: .word data_027e0f68
_02082cf4: .word data_027e0f6c
_02082cf8: .word data_027e0f78
@@ -1971,7 +1971,7 @@ _ZN10MapManager18func_ov00_020836dcEii: ; 0x020836dc
str r0, [sp, #8]
b _02083750
_02083718:
ldr r0, _0208376c ; =data_027e0fe4
ldr r0, _0208376c ; =gActorManager
mov r1, r2
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -1994,7 +1994,7 @@ _02083750:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02083768: .word data_027e0f94
_0208376c: .word data_027e0fe4
_0208376c: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_020836dcEii
.global _ZN10MapManager18func_ov00_02083770Eji
@@ -2050,7 +2050,7 @@ _ZN10MapManager18func_ov00_02083790Ei: ; 0x02083790
ldr r0, [r0]
mov r2, #0x10
bl func_ov00_02079898
ldr r0, _0208383c ; =data_027e0fe4
ldr r0, _0208383c ; =gActorManager
mov r1, r4
ldr r0, [r0]
mov r2, #1
@@ -2065,7 +2065,7 @@ _0208381c:
_02083830: .word data_027e0f64
_02083834: .word data_027e0d38
_02083838: .word data_027e0d3c
_0208383c: .word data_027e0fe4
_0208383c: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_02083790Ei
.global _ZN10MapManager18func_ov00_02083840Ei
@@ -2093,7 +2093,7 @@ _ZN10MapManager18func_ov00_02083840Ei: ; 0x02083840
mov r1, #0x10
ldr r0, [r0]
bl func_ov00_020798bc
ldr r0, _020838c4 ; =data_027e0fe4
ldr r0, _020838c4 ; =gActorManager
mov r1, r4
ldr r0, [r0]
mov r2, #0
@@ -2106,7 +2106,7 @@ _020838ac:
.align 2, 0
_020838bc: .word data_027e0f64
_020838c0: .word data_027e0d3c
_020838c4: .word data_027e0fe4
_020838c4: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_02083840Ei
.global _ZN10MapManager18func_ov00_020838c8Ei
@@ -3349,7 +3349,7 @@ _ZN10MapManager18func_ov00_02084700Ev: ; 0x02084700
ldreq r2, [r0, #0xc4]
cmp r2, #0x1b
bne _02084734
ldr r0, _0208473c ; =data_027e0fe4
ldr r0, _0208473c ; =gActorManager
ldr r0, [r0]
ldrb r0, [r0, #0x29]
cmp r0, #0
@@ -3358,7 +3358,7 @@ _02084734:
mov r0, r2
bx lr
.align 2, 0
_0208473c: .word data_027e0fe4
_0208473c: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_02084700Ev
.global _ZN10MapManager18func_ov00_02084740Ev
@@ -3681,7 +3681,7 @@ _02084ac0: .word 0x45564943
arm_func_start _ZN10MapManager18func_ov00_02084ac4Ej
_ZN10MapManager18func_ov00_02084ac4Ej: ; 0x02084ac4
stmdb sp!, {r3, lr}
ldr r0, _02084b00 ; =data_027e0fe4
ldr r0, _02084b00 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -3696,7 +3696,7 @@ _ZN10MapManager18func_ov00_02084ac4Ej: ; 0x02084ac4
moveq r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_02084b00: .word data_027e0fe4
_02084b00: .word gActorManager
_02084b04: .word 0x45564943
arm_func_end _ZN10MapManager18func_ov00_02084ac4Ej
asm/ov00/Player/LinkStateBase.inc
+1 -1
View File
@@ -21,7 +21,7 @@
.extern data_027e0fb8
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern func_01ff9bf8
.extern func_01ffa0f4
asm/ov00/Player/LinkStateBase.s
+4 -4
View File
@@ -465,7 +465,7 @@ _ZN13LinkStateBase18func_ov00_020a8390EiPv: ; 0x020a8390
add r3, sp, #0xc
str r4, [sp]
bl func_ov00_020c4048
ldr r0, _020a84b8 ; =data_027e0fe4
ldr r0, _020a84b8 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -487,7 +487,7 @@ _020a84a8:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020a84b4: .word data_027e0fe8
_020a84b8: .word data_027e0fe4
_020a84b8: .word gActorManager
arm_func_end _ZN13LinkStateBase18func_ov00_020a8390EiPv
.global _ZN13LinkStateBase18func_ov00_020a84bcEi
@@ -1244,14 +1244,14 @@ _020a8ca0: .word data_027e0fcc
.global _ZN13LinkStateBase12GetGrabActorEv
arm_func_start _ZN13LinkStateBase12GetGrabActorEv
_ZN13LinkStateBase12GetGrabActorEv: ; 0x020a8ca4
ldr r1, _020a8cbc ; =data_027e0fe4
ldr r1, _020a8cbc ; =gActorManager
ldr r2, [r0, #8]
ldr r0, [r1]
ldr ip, _020a8cc0 ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0x3c
bx ip
.align 2, 0
_020a8cbc: .word data_027e0fe4
_020a8cbc: .word gActorManager
_020a8cc0: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end _ZN13LinkStateBase12GetGrabActorEv
asm/ov00/Player/LinkStateInteract.inc
+1 -1
View File
@@ -45,7 +45,7 @@
.extern data_027e0d0c
.extern gMapManager
.extern data_027e0fb8
.extern data_027e0fe4
.extern gActorManager
.extern data_ov00_020eec9c
.extern func_01ff9bc4
.extern func_01ff9bf8
asm/ov00/Player/LinkStateInteract.s
+6 -6
View File
@@ -346,7 +346,7 @@ _020aa684:
ldr r0, _020aa78c ; =data_027e0fb8
ldr r0, [r0]
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r0, _020aa7a8 ; =data_027e0fe4
ldr r0, _020aa7a8 ; =gActorManager
add r1, r4, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -426,7 +426,7 @@ _020aa798: .word data_ov00_020eec9c
_020aa79c: .word 0x00000125
_020aa7a0: .word data_ov00_020e595c
_020aa7a4: .word data_ov00_020e594c
_020aa7a8: .word data_027e0fe4
_020aa7a8: .word gActorManager
_020aa7ac: .word data_ov00_020e5908
arm_func_end _ZN17LinkStateInteract12OnStateEnterEv
@@ -851,7 +851,7 @@ _020aadb0:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020aadbc:
ldr r1, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3d0 ; =data_027e0fe4
ldr r0, _020ab3d0 ; =gActorManager
ldr r3, [r1]
ldr r0, [r0]
ldr r2, [r3, #0x84]
@@ -1267,7 +1267,7 @@ _020ab3c0: .word data_027e0d0c
_020ab3c4: .word data_02050f54
_020ab3c8: .word 0x000004cd
_020ab3cc: .word data_027e0fb8
_020ab3d0: .word data_027e0fe4
_020ab3d0: .word gActorManager
_020ab3d4: .word 0x0000ffff
_020ab3d8: .word gMapManager
_020ab3dc: .word 0x00001ccd
@@ -1986,7 +1986,7 @@ _020abcd8:
mov r0, #0
ldmia sp!, {r4, r5, r6, pc}
_020abce0:
ldr r0, _020abd70 ; =data_027e0fe4
ldr r0, _020abd70 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2023,7 +2023,7 @@ _020abce0:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020abd6c: .word data_027e0fb8
_020abd70: .word data_027e0fe4
_020abd70: .word gActorManager
_020abd74: .word data_ov00_020eec9c
arm_func_end _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef
asm/ov00/Player/PlayerBase.inc
+1 -1
View File
@@ -14,7 +14,7 @@
.extern data_027e0fac
.extern data_027e0fb0
.extern data_027e0fb8
.extern data_027e0fe4
.extern gActorManager
.extern func_01ff9bf8
.extern func_01ffa0f4
.extern func_01ffec34
asm/ov00/Player/PlayerBase.s
+2 -2
View File
@@ -359,7 +359,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
str r5, [r1, #8]
ldr r0, [r0]
blx _ZN13PlayerControl9UpdateAimEv
ldr r0, _020a7f7c ; =data_027e0fe4
ldr r0, _020a7f7c ; =gActorManager
ldrb r1, [sp, #0x18]
ldr r0, [r0]
bl _ZN12ActorManager14Actor_vfunc_10Ej
@@ -390,7 +390,7 @@ _020a7f6c: .word data_027e0fac
_020a7f70: .word data_027e0fa0
_020a7f74: .word data_027e0fb0
_020a7f78: .word data_027e0fb8
_020a7f7c: .word data_027e0fe4
_020a7f7c: .word gActorManager
_020a7f80: .word gAdventureFlags
_020a7f84: .word data_027e0f64
arm_func_end _ZN10PlayerBase18TeleportToEntranceEib
asm/ov00/Player/PlayerControl.inc
+1 -1
View File
@@ -33,7 +33,7 @@
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0ffc
.extern data_027e103c
.extern data_ov00_020eec60
asm/ov00/Player/PlayerControl.s
+8 -8
View File
@@ -157,14 +157,14 @@ _020aeff8: .word data_027e103c
.global _ZN13PlayerControl14GetFollowActorEv
arm_func_start _ZN13PlayerControl14GetFollowActorEv
_ZN13PlayerControl14GetFollowActorEv: ; 0x020aeffc
ldr r1, _020af014 ; =data_027e0fe4
ldr r1, _020af014 ; =gActorManager
mov r2, r0
ldr r0, [r1]
ldr ip, _020af018 ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0x84
bx ip
.align 2, 0
_020af014: .word data_027e0fe4
_020af014: .word gActorManager
_020af018: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end _ZN13PlayerControl14GetFollowActorEv
@@ -834,7 +834,7 @@ _020af8b0:
ldr r1, [r0]
cmp r1, #0
beq _020af8dc
ldr r0, _020afacc ; =data_027e0fe4
ldr r0, _020afacc ; =gActorManager
add r1, r1, #0x3c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -844,7 +844,7 @@ _020af8dc:
cmp r4, #0
mov r4, #0
beq _020afa68
ldr r0, _020afacc ; =data_027e0fe4
ldr r0, _020afacc ; =gActorManager
add r1, r9, #0x8c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -945,7 +945,7 @@ _020afa18:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020afa68:
ldr r1, _020afacc ; =data_027e0fe4
ldr r1, _020afacc ; =gActorManager
add r0, sp, #0
ldr r1, [r1]
mov r2, r4
@@ -972,7 +972,7 @@ _020afabc: .word gAdventureFlags
_020afac0: .word gPlayer
_020afac4: .word gItemManager
_020afac8: .word gPlayerLink
_020afacc: .word data_027e0fe4
_020afacc: .word gActorManager
_020afad0: .word gMapManager
_020afad4: .word data_027e0f94
arm_func_end _ZN13PlayerControl18func_ov00_020af778Ev
@@ -1029,7 +1029,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
sub sp, sp, #0x20
mov r9, r0
bl _ZN13PlayerControl18func_ov00_020af778Ev
ldr r1, _020afe70 ; =data_027e0fe4
ldr r1, _020afe70 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r9, #0x84
@@ -1236,7 +1236,7 @@ _020afe64:
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020afe70: .word data_027e0fe4
_020afe70: .word gActorManager
_020afe74: .word gItemManager
_020afe78: .word data_027e0f94
_020afe7c: .word gPlayerLink
asm/ov00/ov00_0207afa0.inc
+1 -1
View File
@@ -39,7 +39,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fcc
.extern data_027e0fe4
.extern gActorManager
.extern data_027e103c
.extern data_ov09_0211f5dc
.extern func_01ff892c
asm/ov00/ov00_0207afa0.s
+3 -3
View File
@@ -777,7 +777,7 @@ func_ov00_0207b5bc: ; 0x0207b5bc
_0207b5fa:
cmp r2, #0
beq _0207b6cc
ldr r1, _0207b800 ; =data_027e0fe4
ldr r1, _0207b800 ; =gActorManager
ldr r2, _0207b804 ; =0x414e4353
ldr r1, [r1]
add r0, sp, #0
@@ -787,7 +787,7 @@ _0207b5fa:
mvn r0, r0
cmp r1, r0
beq _0207b6cc
ldr r0, _0207b800 ; =data_027e0fe4
ldr r0, _0207b800 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -1018,7 +1018,7 @@ _0207b7f0:
add sp, #0x20
pop {r4, r5, r6, pc}
nop
_0207b800: .word data_027e0fe4
_0207b800: .word gActorManager
_0207b804: .word 0x414e4353
_0207b808: .word gMapManager
_0207b80c: .word data_027e0f94
asm/ov00/ov00_02086cd0.inc
+1 -1
View File
@@ -130,7 +130,7 @@
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e103c
.extern data_027e10a4
asm/ov00/ov00_02086cd0.s
+12 -12
View File
@@ -6844,7 +6844,7 @@ _0208c708:
movs r1, r0
addmi sp, sp, #0x48
ldmmiia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0208c954 ; =data_027e0fe4
ldr r0, _0208c954 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -6986,7 +6986,7 @@ _0208c944: .word data_027e0764
_0208c948: .word 0x00000335
_0208c94c: .word 0xfffffe66
_0208c950: .word data_027e0fe8
_0208c954: .word data_027e0fe4
_0208c954: .word gActorManager
_0208c958: .word 0x4b4f4b4f
_0208c95c: .word 0x0000019a
_0208c960: .word 0x00002001
@@ -11187,7 +11187,7 @@ _0208ffb4:
ldr r0, [r0, #0x170]
cmp r0, r4
beq _02090004
ldr r0, _02090314 ; =data_027e0fe4
ldr r0, _02090314 ; =gActorManager
ldr r1, [sp, #8]
ldr r0, [r0]
add r1, r1, r6, lsl #3
@@ -11365,7 +11365,7 @@ _02090250:
add r5, r5, #1
b _020902f8
_0209025c:
ldr r1, _02090314 ; =data_027e0fe4
ldr r1, _02090314 ; =gActorManager
ldr r2, _02090324 ; =0x5053424c
ldr r1, [r1]
add r0, sp, #0x1c
@@ -11374,7 +11374,7 @@ _0209025c:
ldr r0, [sp, #0x1c]
cmp r0, r4
beq _020902d4
ldr r0, _02090314 ; =data_027e0fe4
ldr r0, _02090314 ; =gActorManager
add r1, sp, #0x1c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -11414,7 +11414,7 @@ _020902f8:
.align 2, 0
_0209030c: .word data_ov00_020eec9c
_02090310: .word data_027e0f94
_02090314: .word data_027e0fe4
_02090314: .word gActorManager
_02090318: .word 0x534e414b
_0209031c: .word data_027e0764
_02090320: .word gMapManager
@@ -11522,7 +11522,7 @@ _0209042c:
ldrh r1, [r4, #0x20]
cmp r1, #0
beq _02090460
ldr r0, _02090488 ; =data_027e0fe4
ldr r0, _02090488 ; =gActorManager
mov r2, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -11533,7 +11533,7 @@ _0209042c:
bl func_ov00_0209048c
ldmia sp!, {r4, pc}
_02090460:
ldr r0, _02090488 ; =data_027e0fe4
ldr r0, _02090488 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -11544,7 +11544,7 @@ _02090460:
bl func_ov00_0209048c
ldmia sp!, {r4, pc}
.align 2, 0
_02090488: .word data_027e0fe4
_02090488: .word gActorManager
arm_func_end func_ov00_02090404
.global func_ov00_0209048c
@@ -19711,14 +19711,14 @@ _020968f4:
add lr, lr, #8
cmp lr, r0
blo _020968f4
ldr r0, _020969f8 ; =data_027e0fe4
ldr r0, _020969f8 ; =gActorManager
add r1, sp, #0x20
ldr r0, [r0]
add r2, sp, #0x58
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
cmp r0, #0
ble _02096974
ldr r0, _020969f8 ; =data_027e0fe4
ldr r0, _020969f8 ; =gActorManager
ldr r1, [sp, #0x58]
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -19775,7 +19775,7 @@ _02096994:
.align 2, 0
_020969f0: .word data_027e0fe8
_020969f4: .word data_ov00_020e30c8
_020969f8: .word data_027e0fe4
_020969f8: .word gActorManager
arm_func_end func_ov00_020967ac
.global func_ov00_020969fc
asm/ov00/ov00_020980f4.inc
+1 -1
View File
@@ -109,7 +109,7 @@
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fec
.extern data_027e10a4
.extern data_ov00_020e2fa8
asm/ov00/ov00_020980f4.s
+7 -7
View File
@@ -751,7 +751,7 @@ _02098a8c:
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r2, #0
ldr r0, _02098b2c ; =data_027e0fe4
ldr r0, _02098b2c ; =gActorManager
strb r2, [r4, #0x22]
ldr r1, [r0]
ldr r0, _02098b30 ; =data_027e0f68
@@ -778,7 +778,7 @@ _02098af0:
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r2, #0
ldr r0, _02098b2c ; =data_027e0fe4
ldr r0, _02098b2c ; =gActorManager
strb r2, [r4, #0x22]
ldr r1, [r0]
ldr r0, _02098b30 ; =data_027e0f68
@@ -790,7 +790,7 @@ _02098af0:
_02098b20: .word data_027e071c
_02098b24: .word gPlayerLink
_02098b28: .word gPlayer
_02098b2c: .word data_027e0fe4
_02098b2c: .word gActorManager
_02098b30: .word data_027e0f68
arm_func_end func_ov00_020989a8
@@ -1399,7 +1399,7 @@ _020992d0:
_020992d4:
cmp r1, #0
beq _020992f8
ldr r0, _020994b8 ; =data_027e0fe4
ldr r0, _020994b8 ; =gActorManager
mov r2, #1
ldr r1, [r0]
ldr r0, _020994bc ; =data_027e0f68
@@ -1494,7 +1494,7 @@ _020993b4:
ldr r1, [sp, #0xc]
cmp r1, #1
bne _02099484
ldr r1, _020994b8 ; =data_027e0fe4
ldr r1, _020994b8 ; =gActorManager
ldr r2, _020994d4 ; =0x414e4353
ldr r1, [r1]
add r0, sp, #0
@@ -1503,7 +1503,7 @@ _020993b4:
mvn r0, #0
cmp r1, r0
beq _020994a4
ldr r0, _020994b8 ; =data_027e0fe4
ldr r0, _020994b8 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1529,7 +1529,7 @@ _020994a4:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020994b4: .word gPlayer
_020994b8: .word data_027e0fe4
_020994b8: .word gActorManager
_020994bc: .word data_027e0f68
_020994c0: .word data_027e0f64
_020994c4: .word data_027e0c68
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -202,7 +202,7 @@
.extern data_027e0fd8
.extern data_027e0fdc
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov00/ov00_020b1498.s
+19 -19
View File
@@ -6728,14 +6728,14 @@ func_ov00_020b6af0: ; 0x020b6af0
cmp r1, #0
beq _020b6b84
bl _ZN10MapManager18func_ov00_0208412cEv
ldr r1, _020b6b98 ; =data_027e0fe4
ldr r1, _020b6b98 ; =gActorManager
mov r4, r0
ldr r1, [r1]
ldr r2, _020b6b9c ; =0x574c4354
add r0, sp, #0
ldr r6, _020b6ba0 ; =0xfffff666
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _020b6b98 ; =data_027e0fe4
ldr r0, _020b6b98 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6763,7 +6763,7 @@ _020b6b84:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020b6b94: .word gMapManager
_020b6b98: .word data_027e0fe4
_020b6b98: .word gActorManager
_020b6b9c: .word 0x574c4354
_020b6ba0: .word 0xfffff666
arm_func_end func_ov00_020b6af0
@@ -7605,7 +7605,7 @@ func_ov00_020b7754: ; 0x020b7754
strgeh r0, [r7, #0xc6]
b _020b7814
_020b779c:
ldr r0, _020b783c ; =data_027e0fe4
ldr r0, _020b783c ; =gActorManager
mov r1, r5
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -7649,7 +7649,7 @@ _020b7814:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020b7838: .word data_027e0f6c
_020b783c: .word data_027e0fe4
_020b783c: .word gActorManager
_020b7840: .word 0x464c4e4b
_020b7844: .word 0x54534e4d
arm_func_end func_ov00_020b7754
@@ -10101,7 +10101,7 @@ _020b9444:
str r0, [r7, #0x15c]
b _020b95ec
_020b94e8:
ldr r0, _020b9750 ; =data_027e0fe4
ldr r0, _020b9750 ; =gActorManager
ldr ip, _020b9754 ; =data_ov00_020e67d8
ldr r0, [r0]
mov r3, #0x3000
@@ -10265,7 +10265,7 @@ _020b9740: .word gAdventureFlags
_020b9744: .word data_027e0c68
_020b9748: .word gPlayerLink
_020b974c: .word data_027e0f94
_020b9750: .word data_027e0fe4
_020b9750: .word gActorManager
_020b9754: .word data_ov00_020e67d8
_020b9758: .word gMapManager
arm_func_end func_ov00_020b9330
@@ -10826,7 +10826,7 @@ _020b9ee8:
bl func_ov00_020bcefc
cmp r0, #0
bne _020b9f38
ldr r0, _020b9fd8 ; =data_027e0fe4
ldr r0, _020b9fd8 ; =gActorManager
ldr r0, [r0]
ldrb r0, [r0, #0x18]
cmp r0, #0
@@ -10877,7 +10877,7 @@ _020b9fbc:
.align 2, 0
_020b9fd0: .word 0x55555556
_020b9fd4: .word gPlayerLink
_020b9fd8: .word data_027e0fe4
_020b9fd8: .word gActorManager
arm_func_end func_ov00_020b9ccc
.global func_ov00_020b9fdc
@@ -13416,7 +13416,7 @@ _020bbdd0:
mov r0, #0
ldmia sp!, {r3, r4, r5, pc}
_020bbdd8:
ldr r0, _020bbe8c ; =data_027e0fe4
ldr r0, _020bbe8c ; =gActorManager
add r1, r5, #0x3c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13465,7 +13465,7 @@ _020bbe78:
_020bbe80: .word gOverlayManager
_020bbe84: .word 0x00000005
_020bbe88: .word data_027e0fd4
_020bbe8c: .word data_027e0fe4
_020bbe8c: .word gActorManager
_020bbe90: .word 0x424f4d42
arm_func_end _ZN14PlayerLinkBase18func_ov00_020bbd80Ei
@@ -14155,7 +14155,7 @@ _020bc718: .word data_027e0fd0
arm_func_start func_ov00_020bc71c
func_ov00_020bc71c: ; 0x020bc71c
stmdb sp!, {r3, lr}
ldr r1, _020bc7c4 ; =data_027e0fe4
ldr r1, _020bc7c4 ; =gActorManager
mov r2, r0
ldr r0, [r1]
add r1, r2, #0x3c
@@ -14203,7 +14203,7 @@ _020bc7bc:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_020bc7c4: .word data_027e0fe4
_020bc7c4: .word gActorManager
_020bc7c8: .word 0x43525953
_020bc7cc: .word 0x424b4559
_020bc7d0: .word 0x42545246
@@ -14386,7 +14386,7 @@ func_ov00_020bc960: ; 0x020bc960
blx r2
cmp r0, #0
beq _020bca38
ldr r0, _020bca48 ; =data_027e0fe4
ldr r0, _020bca48 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -14410,7 +14410,7 @@ _020bca38:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020bca44: .word gAdventureFlags
_020bca48: .word data_027e0fe4
_020bca48: .word gActorManager
arm_func_end func_ov00_020bc960
.global func_ov00_020bca4c
@@ -15350,7 +15350,7 @@ func_ov00_020bd510: ; 0x020bd510
addeq sp, sp, #0x20
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _020bd5ec ; =data_027e0fe4
ldr r0, _020bd5ec ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -15372,7 +15372,7 @@ func_ov00_020bd510: ; 0x020bd510
.align 2, 0
_020bd5e4: .word gItemManager
_020bd5e8: .word data_027e0f94
_020bd5ec: .word data_027e0fe4
_020bd5ec: .word gActorManager
arm_func_end func_ov00_020bd510
.global func_ov00_020bd5f0
@@ -18361,7 +18361,7 @@ _020bfb20:
ldrsh r0, [r4, #0x54]
cmp r0, #0
ble _020bfc80
ldr r0, _020bff48 ; =data_027e0fe4
ldr r0, _020bff48 ; =gActorManager
add r1, r4, #0x38
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -18639,7 +18639,7 @@ _020bff38: .word gItemManager
_020bff3c: .word gMapManager
_020bff40: .word 0x0000099a
_020bff44: .word data_ov00_020dd268
_020bff48: .word data_027e0fe4
_020bff48: .word gActorManager
_020bff4c: .word data_02050f54
_020bff50: .word 0x00000666
_020bff54: .word data_027e0fe8
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -151,7 +151,7 @@
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov00/ov00_020c3e54.s
+59 -59
View File
@@ -209,7 +209,7 @@ _020c4040:
arm_func_start func_ov00_020c4048
func_ov00_020c4048: ; 0x020c4048
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r4, _020c42cc ; =data_027e0fe4
ldr r4, _020c42cc ; =gActorManager
mov r11, r1
ldr r7, [r4]
mov r10, r2
@@ -375,7 +375,7 @@ _020c42c4:
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_020c42cc: .word data_027e0fe4
_020c42cc: .word gActorManager
_020c42d0: .word 0x0000ffff
_020c42d4: .word gMapManager
arm_func_end func_ov00_020c4048
@@ -1760,7 +1760,7 @@ func_ov00_020c53e8: ; 0x020c53e8
str r1, [r4, #8]
ldmia sp!, {r4, pc}
_020c5420:
ldr r2, _020c5460 ; =data_027e0fe4
ldr r2, _020c5460 ; =gActorManager
mov r1, r0
ldr r0, [r2]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1777,7 +1777,7 @@ _020c5420:
ldmia sp!, {r4, pc}
.align 2, 0
_020c545c: .word data_027e0f94
_020c5460: .word data_027e0fe4
_020c5460: .word gActorManager
arm_func_end func_ov00_020c53e8
.global func_ov00_020c5464
@@ -4265,7 +4265,7 @@ func_ov00_020c73b8: ; 0x020c73b8
mov r2, r6
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _020c7480 ; =data_027e0fe4
ldr r0, _020c7480 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4290,7 +4290,7 @@ _020c744c:
.align 2, 0
_020c7478: .word data_027e0fe8
_020c747c: .word 0x45465756
_020c7480: .word data_027e0fe4
_020c7480: .word gActorManager
arm_func_end func_ov00_020c73b8
.global func_ov00_020c7484
@@ -4387,7 +4387,7 @@ func_ov00_020c7528: ; 0x020c7528
mov r2, r6
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _020c75f0 ; =data_027e0fe4
ldr r0, _020c75f0 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4414,7 +4414,7 @@ _020c75b4:
.align 2, 0
_020c75e8: .word data_027e0fe8
_020c75ec: .word 0x45465250
_020c75f0: .word data_027e0fe4
_020c75f0: .word gActorManager
arm_func_end func_ov00_020c7528
.global func_ov00_020c75f4
@@ -4447,7 +4447,7 @@ func_ov00_020c761c: ; 0x020c761c
func_ov00_020c7630: ; 0x020c7630
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x38
ldr r4, _020c7728 ; =data_027e0fe4
ldr r4, _020c7728 ; =gActorManager
mov r6, r0
ldr r0, [r4]
mov r7, r1
@@ -4476,7 +4476,7 @@ func_ov00_020c7630: ; 0x020c7630
add r3, sp, #0xc
mov r2, r5
bl func_ov00_020c4048
ldr r0, _020c7728 ; =data_027e0fe4
ldr r0, _020c7728 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4510,7 +4510,7 @@ _020c76f8:
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020c7728: .word data_027e0fe4
_020c7728: .word gActorManager
_020c772c: .word data_027e0fe8
_020c7730: .word 0x4546524c
arm_func_end func_ov00_020c7630
@@ -5061,7 +5061,7 @@ func_ov00_020c7edc: ; 0x020c7edc
mov r2, r6
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _020c7f94 ; =data_027e0fe4
ldr r0, _020c7f94 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5086,7 +5086,7 @@ _020c7f60:
.align 2, 0
_020c7f8c: .word data_027e0fe8
_020c7f90: .word 0x4546574c
_020c7f94: .word data_027e0fe4
_020c7f94: .word gActorManager
arm_func_end func_ov00_020c7edc
.global func_ov00_020c7f98
@@ -8175,7 +8175,7 @@ func_ov00_020ca600: ; 0x020ca600
ldrh r0, [r0, #0xa]
tst r0, #0x10
bne _020ca644
ldr r0, _020ca64c ; =data_027e0fe4
ldr r0, _020ca64c ; =gActorManager
mov r1, r2
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -8192,7 +8192,7 @@ _020ca644:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_020ca64c: .word data_027e0fe4
_020ca64c: .word gActorManager
_020ca650: .word 0x43525053
arm_func_end func_ov00_020ca600
@@ -8316,7 +8316,7 @@ func_ov00_020ca7e8: ; 0x020ca7e8
mov r4, r0
cmp r1, #0
ldmeqia sp!, {r4, pc}
ldr r0, _020ca82c ; =data_027e0fe4
ldr r0, _020ca82c ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8330,7 +8330,7 @@ func_ov00_020ca7e8: ; 0x020ca7e8
bl _ZN5Actor4KillEv
ldmia sp!, {r4, pc}
.align 2, 0
_020ca82c: .word data_027e0fe4
_020ca82c: .word gActorManager
_020ca830: .word 0x454e4745
arm_func_end func_ov00_020ca7e8
@@ -11537,7 +11537,7 @@ func_ov00_020ccf7c: ; 0x020ccf7c
cmp r0, #0
mov r4, #0
ble _020cd004
ldr r9, _020cd00c ; =data_027e0fe4
ldr r9, _020cd00c ; =gActorManager
mov r5, r4
_020ccfa4:
ldr r1, [r8, #0x10]
@@ -11570,7 +11570,7 @@ _020cd004:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020cd00c: .word data_027e0fe4
_020cd00c: .word gActorManager
arm_func_end func_ov00_020ccf7c
.global func_ov00_020cd010
@@ -17563,7 +17563,7 @@ _020d1868:
func_ov00_020d1870: ; 0x020d1870
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r2, _020d18ac ; =data_027e0fe4
ldr r2, _020d18ac ; =gActorManager
str r0, [sp, #4]
ldr ip, _020d18b0 ; =data_ov00_020e8b14
ldr r0, [r2]
@@ -17577,7 +17577,7 @@ func_ov00_020d1870: ; 0x020d1870
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020d18ac: .word data_027e0fe4
_020d18ac: .word gActorManager
_020d18b0: .word data_ov00_020e8b14
arm_func_end func_ov00_020d1870
@@ -17586,7 +17586,7 @@ _020d18b0: .word data_ov00_020e8b14
func_ov00_020d18b4: ; 0x020d18b4
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r1, _020d18ec ; =data_027e0fe4
ldr r1, _020d18ec ; =gActorManager
mov r2, #0
str r0, [sp, #4]
ldr r3, _020d18f0 ; =data_ov00_020e8b14
@@ -17599,7 +17599,7 @@ func_ov00_020d18b4: ; 0x020d18b4
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020d18ec: .word data_027e0fe4
_020d18ec: .word gActorManager
_020d18f0: .word data_ov00_020e8b14
arm_func_end func_ov00_020d18b4
@@ -17718,7 +17718,7 @@ func_ov00_020d1a30: ; 0x020d1a30
arm_func_start func_ov00_020d1a50
func_ov00_020d1a50: ; 0x020d1a50
stmdb sp!, {r4, lr}
ldr r1, _020d1aec ; =data_027e0fe4
ldr r1, _020d1aec ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x20
@@ -17758,7 +17758,7 @@ _020d1ad4:
bl func_02037918
ldmia sp!, {r4, pc}
.align 2, 0
_020d1aec: .word data_027e0fe4
_020d1aec: .word gActorManager
arm_func_end func_ov00_020d1a50
.global func_ov00_020d1af0
@@ -17767,7 +17767,7 @@ func_ov00_020d1af0: ; 0x020d1af0
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0x44
ldr r1, _020d1d8c ; =data_027e0fe4
ldr r1, _020d1d8c ; =gActorManager
ldrb r2, [r0, #0x55]
add r3, r0, #0x20
ldr r0, [r1]
@@ -17944,7 +17944,7 @@ _020d1d7c:
add sp, sp, #0x10
bx lr
.align 2, 0
_020d1d8c: .word data_027e0fe4
_020d1d8c: .word gActorManager
_020d1d90: .word 0x00040001
_020d1d94: .word 0x000300ff
arm_func_end func_ov00_020d1af0
@@ -17961,7 +17961,7 @@ _020d1da0: .word gItemManager
arm_func_start func_ov00_020d1da4
func_ov00_020d1da4: ; 0x020d1da4
stmdb sp!, {r4, lr}
ldr r1, _020d1dd0 ; =data_027e0fe4
ldr r1, _020d1dd0 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x20
@@ -17972,7 +17972,7 @@ func_ov00_020d1da4: ; 0x020d1da4
bl func_ov00_020d29d4
ldmia sp!, {r4, pc}
.align 2, 0
_020d1dd0: .word data_027e0fe4
_020d1dd0: .word gActorManager
arm_func_end func_ov00_020d1da4
.global func_ov00_020d1dd4
@@ -18011,13 +18011,13 @@ _020d1e24:
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020d1e4c:
ldrb r1, [r9, #0x55]
ldr r0, _020d2050 ; =data_027e0fe4
ldr r0, _020d2050 ; =gActorManager
add r2, r9, #0x20
add r7, r2, r1, lsl #3
ldr r0, [r0]
mov r1, r7
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, _020d2050 ; =data_027e0fe4
ldr r1, _020d2050 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r9, #0x20
@@ -18145,7 +18145,7 @@ _020d1ff8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020d204c: .word data_027e0f64
_020d2050: .word data_027e0fe4
_020d2050: .word gActorManager
_020d2054: .word data_027e0c68
_020d2058: .word data_ov00_020e8ae8
_020d205c: .word gPlayerLink
@@ -18211,7 +18211,7 @@ func_ov00_020d20e8: ; 0x020d20e8
ldreqb r0, [r0, #4]
cmpeq r0, #0
bne _020d2180
ldr r0, _020d27c0 ; =data_027e0fe4
ldr r0, _020d27c0 ; =gActorManager
add r1, r7, #0x20
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -18356,7 +18356,7 @@ _020d2308:
moveq r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020d2330:
ldr r0, _020d27c0 ; =data_027e0fe4
ldr r0, _020d27c0 ; =gActorManager
ldrb r1, [r7, #0x55]
add r2, r7, #0x20
ldr r0, [r0]
@@ -18372,7 +18372,7 @@ _020d2330:
moveq r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020d236c:
ldr r0, _020d27c0 ; =data_027e0fe4
ldr r0, _020d27c0 ; =gActorManager
ldrh r2, [r6, #4]
add r1, r7, #0x20
ldr r0, [r0]
@@ -18394,7 +18394,7 @@ _020d23b0:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020d23bc:
ldr r0, _020d27c0 ; =data_027e0fe4
ldr r0, _020d27c0 ; =gActorManager
ldrh r1, [r6, #4]
add r2, r7, #0x20
ldrh r3, [r6, #6]
@@ -18466,7 +18466,7 @@ _020d24a8:
and r4, r1, #0xff
ldr r1, [r2, r3, lsl #3]
cmp r0, #0
ldr r0, _020d27c0 ; =data_027e0fe4
ldr r0, _020d27c0 ; =gActorManager
str r1, [sp]
add r2, r2, r3, lsl #3
ldr r2, [r2, #4]
@@ -18677,7 +18677,7 @@ _020d27a8:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020d27bc: .word data_027e0c68
_020d27c0: .word data_027e0fe4
_020d27c0: .word gActorManager
_020d27c4: .word data_ov00_020e8ae8
_020d27c8: .word gAdventureFlags
_020d27cc: .word data_ov00_020df28c
@@ -18695,7 +18695,7 @@ _020d27ec: .word 0x00007fff
arm_func_start func_ov00_020d27f0
func_ov00_020d27f0: ; 0x020d27f0
stmdb sp!, {r4, lr}
ldr r1, _020d281c ; =data_027e0fe4
ldr r1, _020d281c ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x20
@@ -18706,14 +18706,14 @@ func_ov00_020d27f0: ; 0x020d27f0
bl func_ov00_020d29d4
ldmia sp!, {r4, pc}
.align 2, 0
_020d281c: .word data_027e0fe4
_020d281c: .word gActorManager
arm_func_end func_ov00_020d27f0
.global func_ov00_020d2820
arm_func_start func_ov00_020d2820
func_ov00_020d2820: ; 0x020d2820
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldr r2, _020d28b0 ; =data_027e0fe4
ldr r2, _020d28b0 ; =gActorManager
mov r4, r0
ldr r0, [r2]
mov r5, r1
@@ -18725,7 +18725,7 @@ func_ov00_020d2820: ; 0x020d2820
blx r2
cmp r0, #0
beq _020d28a8
ldr r6, _020d28b0 ; =data_027e0fe4
ldr r6, _020d28b0 ; =gActorManager
add r8, r4, #0x28
mov r7, #1
mvn r5, #0
@@ -18752,7 +18752,7 @@ _020d28a8:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_020d28b0: .word data_027e0fe4
_020d28b0: .word gActorManager
arm_func_end func_ov00_020d2820
.global func_ov00_020d28b4
@@ -18762,7 +18762,7 @@ func_ov00_020d28b4: ; 0x020d28b4
sub sp, sp, #0x28
mov r8, r0
strb r1, [r8, #0x55]
ldr r0, _020d29cc ; =data_027e0fe4
ldr r0, _020d29cc ; =gActorManager
add r2, r8, #0x20
and r1, r1, #0xff
add r6, r2, r1, lsl #3
@@ -18774,7 +18774,7 @@ func_ov00_020d28b4: ; 0x020d28b4
ldr r2, [r2, #0x34]
mov r4, r0
blx r2
ldr r10, _020d29cc ; =data_027e0fe4
ldr r10, _020d29cc ; =gActorManager
add r7, r8, #0x20
mov r5, #0
mvn r9, #0
@@ -18832,7 +18832,7 @@ _020d29c0:
add sp, sp, #0x28
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_020d29cc: .word data_027e0fe4
_020d29cc: .word gActorManager
_020d29d0: .word data_027e0f64
arm_func_end func_ov00_020d28b4
@@ -18973,7 +18973,7 @@ _020d2ba8:
mov r0, r4
mov r1, #0
bl _ZN5Actor10SetUnk_11cEc
ldr r7, _020d2c14 ; =data_027e0fe4
ldr r7, _020d2c14 ; =gActorManager
add r5, r6, #0x28
mov r4, #1
mvn r8, #0
@@ -19000,7 +19000,7 @@ _020d2bfc:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_020d2c14: .word data_027e0fe4
_020d2c14: .word gActorManager
arm_func_end func_ov00_020d2b78
.global func_ov00_020d2c18
@@ -19391,7 +19391,7 @@ func_ov00_020d30b0: ; 0x020d30b0
add r0, sp, #0
mov r5, r1
bl func_02037628
ldr r0, _020d3128 ; =data_027e0fe4
ldr r0, _020d3128 ; =gActorManager
add r1, r4, #0x20
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -19417,7 +19417,7 @@ _020d30f8:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020d3128: .word data_027e0fe4
_020d3128: .word gActorManager
_020d312c: .word data_027e0c68
arm_func_end func_ov00_020d30b0
@@ -19867,7 +19867,7 @@ func_ov00_020d3638: ; 0x020d3638
tst r0, #4
addeq sp, sp, #0xc
ldmeqia sp!, {pc}
ldr r0, _020d3690 ; =data_027e0fe4
ldr r0, _020d3690 ; =gActorManager
ldrb r2, [r1, #0x55]
add r1, r1, #0x20
ldr r0, [r0]
@@ -19884,7 +19884,7 @@ func_ov00_020d3638: ; 0x020d3638
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020d3690: .word data_027e0fe4
_020d3690: .word gActorManager
_020d3694: .word gPlayerLink
arm_func_end func_ov00_020d3638
@@ -19896,7 +19896,7 @@ func_ov00_020d3698: ; 0x020d3698
ldr r0, [r4]
tst r0, #1
ldmneia sp!, {r4, pc}
ldr r0, _020d36d4 ; =data_027e0fe4
ldr r0, _020d36d4 ; =gActorManager
add r1, r1, #0x20
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -19907,14 +19907,14 @@ func_ov00_020d3698: ; 0x020d3698
strne r0, [r4]
ldmia sp!, {r4, pc}
.align 2, 0
_020d36d4: .word data_027e0fe4
_020d36d4: .word gActorManager
arm_func_end func_ov00_020d3698
.global func_ov00_020d36d8
arm_func_start func_ov00_020d36d8
func_ov00_020d36d8: ; 0x020d36d8
stmdb sp!, {r4, r5, r6, lr}
ldr r3, _020d37c8 ; =data_027e0fe4
ldr r3, _020d37c8 ; =gActorManager
mov r5, r0
mov r6, r1
ldr r0, [r3]
@@ -19978,7 +19978,7 @@ _020d37c0:
mvn r0, #0
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020d37c8: .word data_027e0fe4
_020d37c8: .word gActorManager
_020d37cc: .word data_027e0f94
_020d37d0: .word data_ov00_020df2e0
_020d37d4: .word data_ov00_020df2ec
@@ -20462,7 +20462,7 @@ _020d3d1c:
add r2, r2, #8
cmp r2, r0
blo _020d3d1c
ldr r0, _020d3e20 ; =data_027e0fe4
ldr r0, _020d3e20 ; =gActorManager
add ip, sp, #0x10
ldr r0, [r0]
mov r5, #0x20
@@ -20477,7 +20477,7 @@ _020d3d1c:
cmp r6, #0
mov r7, #0
ble _020d3e10
ldr r5, _020d3e20 ; =data_027e0fe4
ldr r5, _020d3e20 ; =gActorManager
mov r8, r7
_020d3d74:
ldr r1, [sp, #4]
@@ -20530,7 +20530,7 @@ _020d3e10:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_020d3e1c: .word data_ov00_020e8df0
_020d3e20: .word data_027e0fe4
_020d3e20: .word gActorManager
_020d3e24: .word 0x4d534741
_020d3e28: .word 0x434d5347
_020d3e2c: .word 0x4e434d41
asm/ov04.inc
+1 -1
View File
@@ -146,7 +146,7 @@
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fdc
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov04.s
+28 -28
View File
@@ -3252,7 +3252,7 @@ _02102382:
ldr r0, _021024ac ; =data_0205785c
str r2, [sp, #0x7c]
str r0, [sp, #0x70]
ldr r0, _021024b4 ; =data_027e0fe4
ldr r0, _021024b4 ; =gActorManager
add r1, sp, #0x70
strb r2, [r1, #0x10]
ldr r0, [r0]
@@ -3295,7 +3295,7 @@ _02102382:
blx r2
ldr r0, [sp, #0xc]
bl func_0202d5dc
ldr r0, _021024b4 ; =data_027e0fe4
ldr r0, _021024b4 ; =gActorManager
ldr r0, [r0]
bl func_ov04_021056b8
mov r2, #1
@@ -3324,7 +3324,7 @@ _02102382:
add r3, r2, #0
blx func_ov00_020872e8
_02102478:
ldr r0, _021024b4 ; =data_027e0fe4
ldr r0, _021024b4 ; =gActorManager
add r1, sp, #0x118
ldrb r1, [r1, #0x12]
ldr r0, [r0]
@@ -3346,7 +3346,7 @@ _021024a4: .word data_ov00_020e250c
_021024a8: .word data_02057878
_021024ac: .word data_0205785c
_021024b0: .word data_027e0f68
_021024b4: .word data_027e0fe4
_021024b4: .word gActorManager
_021024b8: .word data_027e0fec
_021024bc: .word data_027e0f64
_021024c0: .word data_027e0f7c
@@ -3398,7 +3398,7 @@ func_ov04_021024c4: ; 0x021024c4
ldr r3, [r0]
ldr r3, [r3, #0x38]
blx r3
ldr r0, _021025c0 ; =data_027e0fe4
ldr r0, _021025c0 ; =gActorManager
ldr r0, [r0]
bl func_ov04_0210554c
ldr r0, _021025c4 ; =data_027e0d38
@@ -3438,7 +3438,7 @@ _02102578:
ldr r0, [sp, #0x20]
cmp r0, #1
bne _021025a8
ldr r1, _021025c0 ; =data_027e0fe4
ldr r1, _021025c0 ; =gActorManager
ldr r2, _021025d4 ; =0x414e4353
ldr r1, [r1]
add r0, sp, #8
@@ -3448,7 +3448,7 @@ _02102578:
mvn r0, r0
cmp r1, r0
beq _021025ac
ldr r0, _021025c0 ; =data_027e0fe4
ldr r0, _021025c0 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -3468,7 +3468,7 @@ _021025ae:
_021025b4: .word data_027e0ff0
_021025b8: .word data_027e0f6c
_021025bc: .word gPlayer
_021025c0: .word data_027e0fe4
_021025c0: .word gActorManager
_021025c4: .word data_027e0d38
_021025c8: .word data_027e0f70
_021025cc: .word data_027e0f68
@@ -7833,7 +7833,7 @@ _021048c6:
_021048cc:
ldr r0, _021049e4 ; =data_027e0c68
bl func_ov04_021069c4
ldr r0, _021049e8 ; =data_027e0fe4
ldr r0, _021049e8 ; =gActorManager
ldr r0, [r0]
bl func_ov04_0210532c
bl func_ov04_021026a0
@@ -7931,7 +7931,7 @@ _021049d8: .word data_027e103c
_021049dc: .word data_027e1094
_021049e0: .word data_027e1060
_021049e4: .word data_027e0c68
_021049e8: .word data_027e0fe4
_021049e8: .word gActorManager
_021049ec: .word data_027e0db0
_021049f0: .word data_027e0f64
_021049f4: .word data_ov09_0211f5b4
@@ -7982,7 +7982,7 @@ _02104a3c:
bl func_ov04_0210453c
bl func_ov04_0210bd28
bl func_ov04_0210b1f0
ldr r0, _02104aec ; =data_027e0fe4
ldr r0, _02104aec ; =gActorManager
ldr r0, [r0]
bl func_ov04_021053dc
bl func_ov04_02101fe8
@@ -8023,7 +8023,7 @@ _02104adc: .word data_027e0f68
_02104ae0: .word gMapManager
_02104ae4: .word data_027e0f64
_02104ae8: .word gAdventureFlags
_02104aec: .word data_027e0fe4
_02104aec: .word gActorManager
_02104af0: .word data_027e0c68
_02104af4: .word data_027e103c
_02104af8: .word data_02068e64
@@ -8916,7 +8916,7 @@ _021051dc: .word data_ov04_0210f836
thumb_func_start func_ov04_021051e0
func_ov04_021051e0: ; 0x021051e0
push {r3, lr}
ldr r0, _02105204 ; =data_027e0fe4
ldr r0, _02105204 ; =gActorManager
ldr r0, [r0]
cmp r0, #0
bne _02105202
@@ -8929,12 +8929,12 @@ func_ov04_021051e0: ; 0x021051e0
beq _021051fe
bl func_ov04_02105230
_021051fe:
ldr r1, _02105204 ; =data_027e0fe4
ldr r1, _02105204 ; =gActorManager
str r0, [r1]
_02105202:
pop {r3, pc}
.align 2, 0
_02105204: .word data_027e0fe4
_02105204: .word gActorManager
_02105208: .word data_027e0ce0
thumb_func_end func_ov04_021051e0
@@ -8942,7 +8942,7 @@ _02105208: .word data_027e0ce0
thumb_func_start func_ov04_0210520c
func_ov04_0210520c: ; 0x0210520c
push {r4, lr}
ldr r0, _0210522c ; =data_027e0fe4
ldr r0, _0210522c ; =gActorManager
ldr r4, [r0]
cmp r4, #0
beq _0210522a
@@ -8952,13 +8952,13 @@ func_ov04_0210520c: ; 0x0210520c
add r0, r4, #0
blx _ZN9SysObjectdlEPv
_02105224:
ldr r0, _0210522c ; =data_027e0fe4
ldr r0, _0210522c ; =gActorManager
mov r1, #0
str r1, [r0]
_0210522a:
pop {r4, pc}
.align 2, 0
_0210522c: .word data_027e0fe4
_0210522c: .word gActorManager
thumb_func_end func_ov04_0210520c
.global func_ov04_02105230
@@ -14002,7 +14002,7 @@ _0210775c:
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, _02107804 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x14]
@@ -14015,7 +14015,7 @@ _0210775c:
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, _02107804 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x18]
@@ -14028,7 +14028,7 @@ _0210775c:
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, _02107804 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x1c]
@@ -14040,7 +14040,7 @@ _021077f4: .word data_027e0d38
_021077f8: .word data_027e0fe8
_021077fc: .word 0x4e415649
_02107800: .word data_027e0d0c
_02107804: .word data_027e0fe4
_02107804: .word gActorManager
_02107808: .word 0x46434e56
_0210780c: .word 0x57534e56
thumb_func_end func_ov04_02107750
@@ -23392,7 +23392,7 @@ _0210bffc:
mov r0, #0
strb r0, [r4, #4]
_0210c000:
ldr r1, _0210c0f4 ; =data_027e0fe4
ldr r1, _0210c0f4 ; =gActorManager
ldr r2, _0210c0f8 ; =0x524d5447
ldr r1, [r1]
add r0, sp, #0x10
@@ -23407,7 +23407,7 @@ _0210c000:
strb r0, [r4, #7]
mov r0, #0
strb r0, [r4, #4]
ldr r0, _0210c0f4 ; =data_027e0fe4
ldr r0, _0210c0f4 ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -23443,7 +23443,7 @@ _0210c054:
mov r0, #4
str r0, [r4, #0x34]
_0210c062:
ldr r1, _0210c0f4 ; =data_027e0fe4
ldr r1, _0210c0f4 ; =gActorManager
ldr r2, _0210c104 ; =0x524d4654
ldr r1, [r1]
add r0, sp, #8
@@ -23484,7 +23484,7 @@ _0210c092:
str r0, [sp, #0x1c]
mov r0, #9
str r0, [sp, #0x20]
ldr r0, _0210c0f4 ; =data_027e0fe4
ldr r0, _0210c0f4 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
cmp r0, #0
@@ -23492,7 +23492,7 @@ _0210c092:
mov r0, #0
strb r0, [r4, #4]
_0210c0c2:
ldr r1, _0210c0f4 ; =data_027e0fe4
ldr r1, _0210c0f4 ; =gActorManager
ldr r2, _0210c114 ; =0x574c4354
ldr r1, [r1]
add r0, sp, #0
@@ -23515,7 +23515,7 @@ _0210c0dc:
pop {r3, r4, r5, pc}
.align 2, 0
_0210c0f0: .word data_027e0d38
_0210c0f4: .word data_027e0fe4
_0210c0f4: .word gActorManager
_0210c0f8: .word 0x524d5447
_0210c0fc: .word 0x000001b6
_0210c100: .word 0x000001b7
asm/ov05.inc
+1 -1
View File
@@ -209,7 +209,7 @@
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0ff4
.extern data_027e0ff8
.extern data_027e0ffc
asm/ov05.s
+24 -24
View File
@@ -2015,7 +2015,7 @@ _0210259c:
bl func_ov05_0210112c
cmp r9, #2
beq _02102608
ldr r0, _021026e4 ; =data_027e0fe4
ldr r0, _021026e4 ; =gActorManager
mov r1, r8
ldr r0, [r0]
bl func_ov05_02105140
@@ -2081,7 +2081,7 @@ _021026d4: .word gPlayer
_021026d8: .word data_027e0f64
_021026dc: .word data_027e0f78
_021026e0: .word gMapManager
_021026e4: .word data_027e0fe4
_021026e4: .word gActorManager
_021026e8: .word data_027e0f6c
_021026ec: .word data_ov12_0213deb0
_021026f0: .word data_ov15_02190458
@@ -2160,7 +2160,7 @@ _021027d8:
cmpne r0, #0
addne sp, sp, #4
ldmneia sp!, {r3, r4, r5, r6, pc}
ldr r0, _02102820 ; =data_027e0fe4
ldr r0, _02102820 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl func_ov05_02105304
@@ -2174,7 +2174,7 @@ _021027d8:
_02102814: .word data_027e103c
_02102818: .word data_027e0c54
_0210281c: .word gPlayer
_02102820: .word data_027e0fe4
_02102820: .word gActorManager
_02102824: .word gMapManager
arm_func_end func_ov05_0210274c
@@ -2281,7 +2281,7 @@ _02102978:
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
cmp r9, #2
beq _021029b0
ldr r0, _02102a64 ; =data_027e0fe4
ldr r0, _02102a64 ; =gActorManager
mov r1, r8
ldr r0, [r0]
bl func_ov05_0210535c
@@ -2334,7 +2334,7 @@ _02102a54: .word data_027e0f88
_02102a58: .word data_027e0f64
_02102a5c: .word gMapManager
_02102a60: .word gPlayer
_02102a64: .word data_027e0fe4
_02102a64: .word gActorManager
_02102a68: .word data_027e0618
_02102a6c: .word data_027e1048
_02102a70: .word data_027e077c
@@ -8185,7 +8185,7 @@ _02107664:
orr r1, r1, r0, lsl #20
add r0, r2, r1
str r0, [sp, #0x14]
ldr r0, _02107864 ; =data_027e0fe4
ldr r0, _02107864 ; =gActorManager
mov r2, #0
ldr r0, [r0]
add r1, sp, #8
@@ -8232,7 +8232,7 @@ _02107854: .word 0x0000011f
_02107858: .word data_ov05_0211274c
_0210785c: .word data_02050f54
_02107860: .word data_ov05_021126ac
_02107864: .word data_027e0fe4
_02107864: .word gActorManager
_02107868: .word 0x00000614
_0210786c: .word 0x00001666
arm_func_end func_ov05_021075bc
@@ -8492,7 +8492,7 @@ func_ov05_02107bd4: ; 0x02107bd4
mov r10, r0
ldr r4, _02107c80 ; =0x47454c4c
ldr r11, _02107c84 ; =0x57544352
ldr r6, _02107c88 ; =data_027e0fe4
ldr r6, _02107c88 ; =gActorManager
add r9, r10, #0x44
mov r8, #0
mvn r5, #0
@@ -8538,7 +8538,7 @@ _02107c68:
.align 2, 0
_02107c80: .word 0x47454c4c
_02107c84: .word 0x57544352
_02107c88: .word data_027e0fe4
_02107c88: .word gActorManager
arm_func_end func_ov05_02107bd4
.global func_ov05_02107c8c
@@ -8787,7 +8787,7 @@ func_ov05_02107fc0: ; 0x02107fc0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r6, #0
ldr r11, _02108088 ; =0x47454c4c
ldr r4, _0210808c ; =data_027e0fe4
ldr r4, _0210808c ; =gActorManager
mov r9, r6
add r8, r10, #0x44
mvn r5, #0
@@ -8836,7 +8836,7 @@ _02108060:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02108088: .word 0x47454c4c
_0210808c: .word data_027e0fe4
_0210808c: .word gActorManager
_02108090: .word 0x57544352
arm_func_end func_ov05_02107fc0
@@ -12016,7 +12016,7 @@ func_ov05_0210ab1c: ; 0x0210ab1c
mov r6, r0
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r2, #1
ldr r1, _0210ad68 ; =data_027e0fe4
ldr r1, _0210ad68 ; =gActorManager
strb r2, [r0, #0xba]
ldr r0, [r1]
add r1, r6, #0x10
@@ -12166,7 +12166,7 @@ _0210ad54:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0210ad68: .word data_027e0fe4
_0210ad68: .word gActorManager
_0210ad6c: .word data_027e0d38
_0210ad70: .word gAdventureFlags
_0210ad74: .word gItemManager
@@ -12184,7 +12184,7 @@ func_ov05_0210ad88: ; 0x0210ad88
mov r5, r0
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r2, #0
ldr r1, _0210b280 ; =data_027e0fe4
ldr r1, _0210b280 ; =gActorManager
strb r2, [r0, #0xbc]
ldr r0, [r1]
add r1, r5, #0x10
@@ -12509,7 +12509,7 @@ _0210b264:
add sp, sp, #0x100
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0210b280: .word data_027e0fe4
_0210b280: .word gActorManager
_0210b284: .word gAdventureFlags
_0210b288: .word data_02050f54
_0210b28c: .word 0x0000ffff
@@ -12531,7 +12531,7 @@ func_ov05_0210b2a4: ; 0x0210b2a4
mov r0, r5
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r2, #0
ldr r1, _0210b3b0 ; =data_027e0fe4
ldr r1, _0210b3b0 ; =gActorManager
strb r2, [r0, #0xbc]
ldr r0, [r1]
add r1, r5, #0x10
@@ -12597,7 +12597,7 @@ _0210b3a0:
bl _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0210b3b0: .word data_027e0fe4
_0210b3b0: .word gActorManager
_0210b3b4: .word data_027e0fb8
_0210b3b8: .word gAdventureFlags
arm_func_end func_ov05_0210b2a4
@@ -12665,7 +12665,7 @@ _0210b474:
moveq r4, #1
movne r4, #2
_0210b484:
ldr r0, _0210b4f0 ; =data_027e0fe4
ldr r0, _0210b4f0 ; =gActorManager
add r1, r6, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -12693,7 +12693,7 @@ _0210b484:
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0210b4f0: .word data_027e0fe4
_0210b4f0: .word gActorManager
arm_func_end func_ov05_0210b3bc
.global func_ov05_0210b4f4
@@ -13061,7 +13061,7 @@ func_ov05_0210b9c4: ; 0x0210b9c4
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, pc}
ldr r0, [r4, #0x24]
ldr r1, _0210ba8c ; =data_027e0fe4
ldr r1, _0210ba8c ; =gActorManager
str r0, [sp]
ldr r2, [r4, #0x28]
ldr r0, _0210ba90 ; =gMapManager
@@ -13104,7 +13104,7 @@ _0210ba7c:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0210ba8c: .word data_027e0fe4
_0210ba8c: .word gActorManager
_0210ba90: .word gMapManager
_0210ba94: .word data_ov00_020eec9c
arm_func_end func_ov05_0210b9c4
@@ -19888,7 +19888,7 @@ _02111744:
str r1, [sp, #0x38]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrsh r2, [r0]
ldr r0, _02111a7c ; =data_027e0fe4
ldr r0, _02111a7c ; =gActorManager
add r1, sp, #0x24
strh r2, [sp, #0x3c]
ldr r0, [r0]
@@ -20070,7 +20070,7 @@ _02111a6c: .word data_ov05_02112be4
_02111a70: .word data_ov00_020e56f0
_02111a74: .word 0x00000333
_02111a78: .word data_ov05_02112c04
_02111a7c: .word data_027e0fe4
_02111a7c: .word gActorManager
_02111a80: .word 0x4b4f4b4f
_02111a84: .word 0x000004cd
_02111a88: .word data_027e0ffc
asm/ov09.inc
+1 -1
View File
@@ -52,7 +52,7 @@
.extern gMapManager
.extern data_027e0f64
.extern gPlayer
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0ffc
.extern data_027e103c
.extern data_027e1040
asm/ov09.s
+2 -2
View File
@@ -3200,7 +3200,7 @@ func_ov09_02114554: ; 0x02114554
push {r4, r5, r6, r7, lr}
sub sp, #0x1ec
add r5, r0, #0
ldr r0, _021146a8 ; =data_027e0fe4
ldr r0, _021146a8 ; =gActorManager
str r1, [sp, #4]
ldr r0, [r0]
blx _ZN12ActorManager14Actor_vfunc_28Ev
@@ -3351,7 +3351,7 @@ _02114688:
add sp, #0x1ec
pop {r4, r5, r6, r7, pc}
.align 2, 0
_021146a8: .word data_027e0fe4
_021146a8: .word gActorManager
_021146ac: .word gMapManager
_021146b0: .word data_027e0d38
_021146b4: .word data_ov00_020e9f10
asm/ov12.inc
+1 -1
View File
@@ -163,7 +163,7 @@
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
asm/ov12.s
+14 -14
View File
@@ -3823,7 +3823,7 @@ _02115f08:
cmp r0, #0
bne _02115f48
bl func_ov12_0211934c
ldr r2, _02116170 ; =data_027e0fe4
ldr r2, _02116170 ; =gActorManager
add r1, r0, #0x3c
ldr r0, [r2]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3977,7 +3977,7 @@ _02116014:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0211616c: .word data_027e0618
_02116170: .word data_027e0fe4
_02116170: .word gActorManager
_02116174: .word 0x42545246
_02116178: .word data_027e0d3c
_0211617c: .word data_ov12_02137c68
@@ -5724,7 +5724,7 @@ func_ov12_0211776c: ; 0x0211776c
str r1, [sp, #4]
cmp r2, r0
beq _021177c8
ldr r0, _021177d4 ; =data_027e0fe4
ldr r0, _021177d4 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5735,7 +5735,7 @@ _021177c8:
add sp, sp, #8
ldmia sp!, {r3, pc}
.align 2, 0
_021177d4: .word data_027e0fe4
_021177d4: .word gActorManager
arm_func_end func_ov12_0211776c
.global func_ov12_021177d8
@@ -8493,7 +8493,7 @@ func_ov12_02119a28: ; 0x02119a28
bl func_ov12_02120108
cmp r0, #0
bne _02119aa0
ldr r0, _02119db8 ; =data_027e0fe4
ldr r0, _02119db8 ; =gActorManager
add r1, r6, #0x3c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8727,7 +8727,7 @@ _02119d9c:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02119db4: .word data_ov12_02137c64
_02119db8: .word data_027e0fe4
_02119db8: .word gActorManager
_02119dbc: .word data_027e0f94
_02119dc0: .word data_027e0d0c
_02119dc4: .word gItemManager
@@ -30938,7 +30938,7 @@ func_ov12_0212bff0: ; 0x0212bff0
strh r0, [r4]
b _0212c10c
_0212c058:
ldr r0, _0212c1b4 ; =data_027e0fe4
ldr r0, _0212c1b4 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -31029,7 +31029,7 @@ _0212c10c:
_0212c1a8: .word data_027e0f94
_0212c1ac: .word data_027e0fa0
_0212c1b0: .word data_027e0fac
_0212c1b4: .word data_027e0fe4
_0212c1b4: .word gActorManager
_0212c1b8: .word data_027e0c68
_0212c1bc: .word data_02050f54
arm_func_end func_ov12_0212bff0
@@ -33801,7 +33801,7 @@ func_ov12_0212e274: ; 0x0212e274
ldr r2, _0212e2fc ; =data_027e0f94
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _0212e300 ; =data_027e0fe4
ldr r0, _0212e300 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -33815,7 +33815,7 @@ func_ov12_0212e274: ; 0x0212e274
_0212e2f4: .word data_027e0fe8
_0212e2f8: .word 0x4254444c
_0212e2fc: .word data_027e0f94
_0212e300: .word data_027e0fe4
_0212e300: .word gActorManager
_0212e304: .word data_ov12_0213dd10
arm_func_end func_ov12_0212e274
@@ -38258,7 +38258,7 @@ _02131e40:
cmp r0, #0
bne _02131e8c
bl func_ov12_0211934c
ldr r2, _02131f54 ; =data_027e0fe4
ldr r2, _02131f54 ; =gActorManager
add r1, r0, #0x3c
ldr r0, [r2]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -38324,7 +38324,7 @@ _02131ea0:
.align 2, 0
_02131f4c: .word data_027e0618
_02131f50: .word data_ov12_02137c64
_02131f54: .word data_027e0fe4
_02131f54: .word gActorManager
_02131f58: .word 0x42545246
_02131f5c: .word data_027e0d3c
_02131f60: .word data_ov12_02137d1c
@@ -38445,7 +38445,7 @@ _02132058:
_0213207c:
ldrh r2, [r4, #0x24]
ldr r1, _021320e8 ; =data_ov12_02135474
ldr r0, _021320ec ; =data_027e0fe4
ldr r0, _021320ec ; =gActorManager
ldr lr, [r1, r2, lsl #2]
ldrh ip, [r4, #0x20]
ldr r3, _021320f0 ; =data_ov12_02137818
@@ -38473,7 +38473,7 @@ _021320dc:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021320e8: .word data_ov12_02135474
_021320ec: .word data_027e0fe4
_021320ec: .word gActorManager
_021320f0: .word data_ov12_02137818
arm_func_end func_ov12_02132020
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -173,7 +173,7 @@
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov14/ov14_0211f640.s
+56 -56
View File
@@ -275,7 +275,7 @@ func_ov14_0211f8d0: ; 0x0211f8d0
cmp r1, #0
ble _0211f968
ldr r2, [r0, #0xc]
ldr r1, _0211f978 ; =data_027e0fe4
ldr r1, _0211f978 ; =gActorManager
str r2, [sp]
ldr r2, [r0, #0x10]
ldr r0, [r1]
@@ -301,7 +301,7 @@ _0211f968:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0211f974: .word gItemManager
_0211f978: .word data_027e0fe4
_0211f978: .word gActorManager
_0211f97c: .word 0x424d5459
arm_func_end func_ov14_0211f8d0
@@ -1276,7 +1276,7 @@ _021205e8:
bl _ZN5Actor12ApplyGravityEv
b _02120720
_02120618:
ldr r0, _0212076c ; =data_027e0fe4
ldr r0, _0212076c ; =gActorManager
add r1, r6, #0x164
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1367,7 +1367,7 @@ _0212075c: .word data_027e0ffc
_02120760: .word 0x0000019a
_02120764: .word 0x00001555
_02120768: .word 0xfffff1c7
_0212076c: .word data_027e0fe4
_0212076c: .word gActorManager
_02120770: .word data_02050f54
arm_func_end func_ov14_02120300
@@ -1421,7 +1421,7 @@ func_ov14_021207b8: ; 0x021207b8
mov r1, #1
str r2, [r5, #0x168]
bl func_ov14_02120dec
ldr r0, _0212098c ; =data_027e0fe4
ldr r0, _0212098c ; =gActorManager
add r1, r5, #0x164
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1527,7 +1527,7 @@ _0212094c:
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0212098c: .word data_027e0fe4
_0212098c: .word gActorManager
_02120990: .word 0x00001555
_02120994: .word data_027e0d0c
arm_func_end func_ov14_021207b8
@@ -1551,7 +1551,7 @@ func_ov14_02120998: ; 0x02120998
mov r1, #1
str r2, [r6, #0x168]
bl func_ov14_02120dec
ldr r0, _02120a74 ; =data_027e0fe4
ldr r0, _02120a74 ; =gActorManager
add r1, r6, #0x164
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1592,7 +1592,7 @@ _02120a30:
add sp, sp, #0x10
bx lr
.align 2, 0
_02120a74: .word data_027e0fe4
_02120a74: .word gActorManager
_02120a78: .word 0x00001555
_02120a7c: .word data_027e0d0c
arm_func_end func_ov14_02120998
@@ -7906,7 +7906,7 @@ func_ov14_02125e60: ; 0x02125e60
ldrh r1, [r4, #0x26]
cmp r1, #0
beq _02125ea4
ldr r0, _02125ec4 ; =data_027e0fe4
ldr r0, _02125ec4 ; =gActorManager
mov r2, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -7915,7 +7915,7 @@ func_ov14_02125e60: ; 0x02125e60
movne r0, #0
ldmia sp!, {r4, pc}
_02125ea4:
ldr r0, _02125ec4 ; =data_027e0fe4
ldr r0, _02125ec4 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -7924,7 +7924,7 @@ _02125ea4:
movne r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_02125ec4: .word data_027e0fe4
_02125ec4: .word gActorManager
arm_func_end func_ov14_02125e60
.global func_ov14_02125ec8
@@ -8249,7 +8249,7 @@ func_ov14_021261e4: ; 0x021261e4
ldrh r1, [r4, #0x26]
cmp r1, #0
beq _02126228
ldr r0, _02126248 ; =data_027e0fe4
ldr r0, _02126248 ; =gActorManager
mov r2, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -8258,7 +8258,7 @@ func_ov14_021261e4: ; 0x021261e4
movne r0, #0
ldmia sp!, {r4, pc}
_02126228:
ldr r0, _02126248 ; =data_027e0fe4
ldr r0, _02126248 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -8267,7 +8267,7 @@ _02126228:
movne r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_02126248: .word data_027e0fe4
_02126248: .word gActorManager
arm_func_end func_ov14_021261e4
.global func_ov14_0212624c
@@ -13781,7 +13781,7 @@ func_ov14_0212aaa8: ; 0x0212aaa8
ldr r0, [r4, #8]
cmp r0, #0
bne _0212ab04
ldr r0, _0212ab0c ; =data_027e0fe4
ldr r0, _0212ab0c ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -13803,7 +13803,7 @@ _0212ab04:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0212ab0c: .word data_027e0fe4
_0212ab0c: .word gActorManager
_0212ab10: .word 0x424c5354
arm_func_end func_ov14_0212aaa8
@@ -14189,7 +14189,7 @@ func_ov14_0212b010: ; 0x0212b010
ldr r0, [r4, #8]
cmp r0, #0
bne _0212b06c
ldr r0, _0212b074 ; =data_027e0fe4
ldr r0, _0212b074 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -14211,7 +14211,7 @@ _0212b06c:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0212b074: .word data_027e0fe4
_0212b074: .word gActorManager
_0212b078: .word 0x424c5354
arm_func_end func_ov14_0212b010
@@ -14664,7 +14664,7 @@ func_ov14_0212b658: ; 0x0212b658
ldr r0, [r4, #8]
cmp r0, #0
bne _0212b6b4
ldr r0, _0212b6bc ; =data_027e0fe4
ldr r0, _0212b6bc ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -14686,7 +14686,7 @@ _0212b6b4:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0212b6bc: .word data_027e0fe4
_0212b6bc: .word gActorManager
_0212b6c0: .word 0x424c5354
arm_func_end func_ov14_0212b658
@@ -15173,7 +15173,7 @@ func_ov14_0212bc98: ; 0x0212bc98
_0212bcd4:
cmp r1, #0xb
blt _0212bd2c
ldr r0, _0212bd38 ; =data_027e0fe4
ldr r0, _0212bd38 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -15198,7 +15198,7 @@ _0212bd2c:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0212bd38: .word data_027e0fe4
_0212bd38: .word gActorManager
_0212bd3c: .word 0x424c5354
arm_func_end func_ov14_0212bc98
@@ -15561,7 +15561,7 @@ _0212c184:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
_0212c1ac:
ldr r0, _0212c234 ; =data_027e0fe4
ldr r0, _0212c234 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -15600,7 +15600,7 @@ _0212c228:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0212c234: .word data_027e0fe4
_0212c234: .word gActorManager
_0212c238: .word 0x424c5354
_0212c23c: .word 0x41525257
_0212c240: .word 0x424d524e
@@ -16765,7 +16765,7 @@ func_ov14_0212d040: ; 0x0212d040
blx r3
b _0212d1a4
_0212d0b4:
ldr r0, _0212d1b0 ; =data_027e0fe4
ldr r0, _0212d1b0 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -16834,7 +16834,7 @@ _0212d1a4:
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0212d1b0: .word data_027e0fe4
_0212d1b0: .word gActorManager
_0212d1b4: .word 0x424c5354
_0212d1b8: .word 0x41525257
_0212d1bc: .word 0x424d524e
@@ -17842,7 +17842,7 @@ func_ov14_0212dd94: ; 0x0212dd94
cmp r4, r0
addeq sp, sp, #0x30
ldmeqia sp!, {r4, pc}
ldr r0, _0212de70 ; =data_027e0fe4
ldr r0, _0212de70 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -17861,7 +17861,7 @@ func_ov14_0212dd94: ; 0x0212dd94
.align 2, 0
_0212de68: .word data_027e0fe8
_0212de6c: .word 0x424f4d42
_0212de70: .word data_027e0fe4
_0212de70: .word gActorManager
arm_func_end func_ov14_0212dd94
.global func_ov14_0212de74
@@ -17988,7 +17988,7 @@ _0212dfcc:
blx r3
b _0212e0e4
_0212dff0:
ldr r0, _0212e0f4 ; =data_027e0fe4
ldr r0, _0212e0f4 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -18061,7 +18061,7 @@ _0212e0e4:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0212e0f0: .word data_027e0f94
_0212e0f4: .word data_027e0fe4
_0212e0f4: .word gActorManager
_0212e0f8: .word 0x50534241
_0212e0fc: .word 0x424c5354
_0212e100: .word 0x41525257
@@ -18776,7 +18776,7 @@ _0212e97c:
mov r1, #0
ldr r0, [r0]
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _0212eb40 ; =data_027e0fe4
ldr r0, _0212eb40 ; =gActorManager
mov r1, #0
ldr r0, [r0]
strb r1, [r0, #0x18]
@@ -18825,7 +18825,7 @@ _0212eacc:
mov r1, #1
ldr r0, [r0]
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _0212eb40 ; =data_027e0fe4
ldr r0, _0212eb40 ; =gActorManager
mov r2, #1
ldr r1, [r0]
ldr r0, _0212eb2c ; =data_027e0f64
@@ -18846,7 +18846,7 @@ _0212eb30: .word 0x00001555
_0212eb34: .word 0x000004cd
_0212eb38: .word gAdventureFlags
_0212eb3c: .word gPlayer
_0212eb40: .word data_027e0fe4
_0212eb40: .word gActorManager
_0212eb44: .word data_027e0c68
arm_func_end func_ov14_0212e8dc
@@ -19279,14 +19279,14 @@ func_ov14_0212f08c: ; 0x0212f08c
blx r3
mov r4, #0
str r4, [r5, #0x3c]
ldr r0, _0212f168 ; =data_027e0fe4
ldr r0, _0212f168 ; =gActorManager
strh r4, [r5, #0xe]
ldr r1, [r0]
ldr r2, _0212f16c ; =0x44475447
add r0, sp, #0
add r3, r5, #0x18
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
ldr r0, _0212f168 ; =data_027e0fe4
ldr r0, _0212f168 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -19326,7 +19326,7 @@ _0212f154:
add sp, sp, #0x14
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0212f168: .word data_027e0fe4
_0212f168: .word gActorManager
_0212f16c: .word 0x44475447
_0212f170: .word data_027e0d38
arm_func_end func_ov14_0212f08c
@@ -19592,7 +19592,7 @@ _0212f4cc:
add r3, sp, #0x2c
mov r1, r4
bl func_ov00_020c4048
ldr r2, _0212f570 ; =data_027e0fe4
ldr r2, _0212f570 ; =gActorManager
mov r1, r0
ldr r0, [r2]
bl _ZN12ActorManager13FindActorByIdEj
@@ -19619,7 +19619,7 @@ _0212f560: .word 0x00000666
_0212f564: .word 0x0000019a
_0212f568: .word 0x00000333
_0212f56c: .word data_027e0fe8
_0212f570: .word data_027e0fe4
_0212f570: .word gActorManager
arm_func_end func_ov14_0212f190
.global func_ov14_0212f574
@@ -22841,7 +22841,7 @@ func_ov14_02131fec: ; 0x02131fec
ldmeqia sp!, {r3, pc}
cmp r1, #0xb
blt _02132044
ldr r0, _0213204c ; =data_027e0fe4
ldr r0, _0213204c ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -22861,7 +22861,7 @@ _02132044:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0213204c: .word data_027e0fe4
_0213204c: .word gActorManager
_02132050: .word 0x50534241
_02132054: .word 0x57424c4b
arm_func_end func_ov14_02131fec
@@ -23769,7 +23769,7 @@ func_ov14_02132c18: ; 0x02132c18
blx r1
b _02132cd4
_02132c38:
ldr r0, _02132cdc ; =data_027e0fe4
ldr r0, _02132cdc ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -23817,7 +23817,7 @@ _02132cd4:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02132cdc: .word data_027e0fe4
_02132cdc: .word gActorManager
_02132ce0: .word 0x424c5354
_02132ce4: .word 0x41525257
_02132ce8: .word 0x424d524e
@@ -24341,7 +24341,7 @@ _021333a8: .word data_027e0e58
arm_func_start func_ov14_021333ac
func_ov14_021333ac: ; 0x021333ac
stmdb sp!, {r4, lr}
ldr r2, _02133418 ; =data_027e0fe4
ldr r2, _02133418 ; =gActorManager
mov r4, r0
ldr r0, [r2]
bl _ZN12ActorManager13FindActorByIdEj
@@ -24370,7 +24370,7 @@ _02133410:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02133418: .word data_027e0fe4
_02133418: .word gActorManager
_0213341c: .word 0x424d524e
arm_func_end func_ov14_021333ac
@@ -25326,7 +25326,7 @@ func_ov14_0213411c: ; 0x0213411c
stmdb sp!, {r3, lr}
cmp r1, #0xb
blt _02134160
ldr r0, _02134168 ; =data_027e0fe4
ldr r0, _02134168 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -25344,7 +25344,7 @@ _02134160:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_02134168: .word data_027e0fe4
_02134168: .word gActorManager
_0213416c: .word 0x5053424c
_02134170: .word 0x57424c4b
arm_func_end func_ov14_0213411c
@@ -25862,7 +25862,7 @@ func_ov14_021347e0: ; 0x021347e0
ldr r0, [r4, #8]
cmp r0, #0
bne _0213483c
ldr r0, _02134844 ; =data_027e0fe4
ldr r0, _02134844 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -25884,7 +25884,7 @@ _0213483c:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02134844: .word data_027e0fe4
_02134844: .word gActorManager
_02134848: .word 0x424c5354
arm_func_end func_ov14_021347e0
@@ -29482,7 +29482,7 @@ func_ov14_02137650: ; 0x02137650
bl func_ov00_020bbbb8
b _02137744
_021376d4:
ldr r0, _0213775c ; =data_027e0fe4
ldr r0, _0213775c ; =gActorManager
mov r1, r5
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -29521,7 +29521,7 @@ _0213774c: .word gAdventureFlags
_02137750: .word data_027e0c68
_02137754: .word data_027e077c
_02137758: .word gPlayerLink
_0213775c: .word data_027e0fe4
_0213775c: .word gActorManager
_02137760: .word 0x424f4d42
_02137764: .word 0x424b4559
_02137768: .word 0x43525953
@@ -32378,7 +32378,7 @@ _02139b24:
add r1, sp, #0
str r2, [sp, #8]
bl _ZN10MapManager18func_ov00_02083780Ei
ldr r2, _02139b80 ; =data_027e0fe4
ldr r2, _02139b80 ; =gActorManager
mov r1, r0
ldr r0, [r2]
mov r2, #0
@@ -32392,7 +32392,7 @@ _02139b24:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02139b7c: .word gMapManager
_02139b80: .word data_027e0fe4
_02139b80: .word gActorManager
arm_func_end func_ov14_02139a7c
.global func_ov14_02139b84
@@ -32553,7 +32553,7 @@ _02139d4c:
mvn r0, #0
cmp r1, r0
beq _02139dcc
ldr r0, _02139e20 ; =data_027e0fe4
ldr r0, _02139e20 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -32594,7 +32594,7 @@ _02139e10: .word 0x42454530
_02139e14: .word 0x45475354
_02139e18: .word 0x53504452
_02139e1c: .word data_027e0fe8
_02139e20: .word data_027e0fe4
_02139e20: .word gActorManager
arm_func_end func_ov14_02139b84
.global func_ov14_02139e24
@@ -32918,7 +32918,7 @@ _0213a1f0:
cmp r0, #0
addlt sp, sp, #0x44
ldmltia sp!, {r4, r5, pc}
ldr r0, _0213a268 ; =data_027e0fe4
ldr r0, _0213a268 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -32935,7 +32935,7 @@ _0213a1f0:
.align 2, 0
_0213a260: .word data_027e0fe8
_0213a264: .word 0x4e4b4559
_0213a268: .word data_027e0fe4
_0213a268: .word gActorManager
_0213a26c: .word data_027e0ffc
arm_func_end func_ov14_0213a160
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -178,7 +178,7 @@
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
asm/ov14/ov14_0213b778.s
+55 -55
View File
@@ -18,7 +18,7 @@ _0213b794:
add r3, r3, #8
cmp r3, r0
blo _0213b794
ldr r0, _0213b8fc ; =data_027e0fe4
ldr r0, _0213b8fc ; =gActorManager
mov r6, #0
ldr r5, _0213b900 ; =_ZTV11FilterActor
add r3, sp, #0x40
@@ -62,7 +62,7 @@ _0213b840:
ble _0213b8f0
mov r7, r5
_0213b850:
ldr r0, _0213b8fc ; =data_027e0fe4
ldr r0, _0213b8fc ; =gActorManager
ldr r1, [sp]
ldr r0, [r0]
add r1, r1, r7
@@ -108,7 +108,7 @@ _0213b8f0:
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0213b8fc: .word data_027e0fe4
_0213b8fc: .word gActorManager
_0213b900: .word _ZTV11FilterActor
arm_func_end func_ov14_0213b778
@@ -2156,12 +2156,12 @@ func_ov14_0213d0bc: ; 0x0213d0bc
bl func_ov00_020bc46c
cmp r0, #1
bne _0213d11c
ldr r1, _0213d154 ; =data_027e0fe4
ldr r1, _0213d154 ; =gActorManager
ldr r2, _0213d158 ; =0x504c444d
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0213d154 ; =data_027e0fe4
ldr r0, _0213d154 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2188,21 +2188,21 @@ _0213d138:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0213d150: .word gPlayerLink
_0213d154: .word data_027e0fe4
_0213d154: .word gActorManager
_0213d158: .word 0x504c444d
arm_func_end func_ov14_0213d0bc
.global func_ov14_0213d15c
arm_func_start func_ov14_0213d15c
func_ov14_0213d15c: ; 0x0213d15c
ldr r1, _0213d174 ; =data_027e0fe4
ldr r1, _0213d174 ; =gActorManager
mov r2, r0
ldr r0, [r1]
ldr ip, _0213d178 ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0x10
bx ip
.align 2, 0
_0213d174: .word data_027e0fe4
_0213d174: .word gActorManager
_0213d178: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end func_ov14_0213d15c
@@ -2552,14 +2552,14 @@ func_ov14_0213d404: ; 0x0213d404
.global func_ov14_0213d420
arm_func_start func_ov14_0213d420
func_ov14_0213d420: ; 0x0213d420
ldr r1, _0213d438 ; =data_027e0fe4
ldr r1, _0213d438 ; =gActorManager
mov r2, r0
ldr r0, [r1]
ldr ip, _0213d43c ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0x10
bx ip
.align 2, 0
_0213d438: .word data_027e0fe4
_0213d438: .word gActorManager
_0213d43c: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end func_ov14_0213d420
@@ -2810,7 +2810,7 @@ func_ov14_0213d6e0: ; 0x0213d6e0
arm_func_start func_ov14_0213d71c
func_ov14_0213d71c: ; 0x0213d71c
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r3, _0213d784 ; =data_027e0fe4
ldr r3, _0213d784 ; =gActorManager
mov r6, r0
mov r5, r2
mov r7, r1
@@ -2836,7 +2836,7 @@ func_ov14_0213d71c: ; 0x0213d71c
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0213d784: .word data_027e0fe4
_0213d784: .word gActorManager
arm_func_end func_ov14_0213d71c
.global func_ov14_0213d788
@@ -3061,7 +3061,7 @@ _0213d9fc:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0213da84:
ldr r0, _0213dad8 ; =data_027e0fe4
ldr r0, _0213dad8 ; =gActorManager
mov r1, r9
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3085,7 +3085,7 @@ _0213dac0:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0213dad4: .word gMapManager
_0213dad8: .word data_027e0fe4
_0213dad8: .word gActorManager
arm_func_end func_ov14_0213d9ac
.global func_ov14_0213dadc
@@ -3726,7 +3726,7 @@ _0213e36c:
str r0, [sp]
movne r9, #0
bne _0213e394
ldr r0, _0213e538 ; =data_027e0fe4
ldr r0, _0213e538 ; =gActorManager
mov r1, r6
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3850,7 +3850,7 @@ _0213e52c:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0213e538: .word data_027e0fe4
_0213e538: .word gActorManager
_0213e53c: .word gMapManager
_0213e540: .word data_027e0fd4
arm_func_end func_ov14_0213e328
@@ -4510,14 +4510,14 @@ _0213ed70: .word data_02063e4c
.global func_ov14_0213ed74
arm_func_start func_ov14_0213ed74
func_ov14_0213ed74: ; 0x0213ed74
ldr r1, _0213ed8c ; =data_027e0fe4
ldr r1, _0213ed8c ; =gActorManager
mov r2, r0
ldr r0, [r1]
ldr ip, _0213ed90 ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0xc
bx ip
.align 2, 0
_0213ed8c: .word data_027e0fe4
_0213ed8c: .word gActorManager
_0213ed90: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end func_ov14_0213ed74
@@ -7113,7 +7113,7 @@ _021409d0:
bl func_ov00_020a5e9c
cmp r0, #5
bne _02140a7c
ldr r0, _02141148 ; =data_027e0fe4
ldr r0, _02141148 ; =gActorManager
add r1, sp, #0x18
ldr r0, [r0]
ldrb r0, [r0, #0x29]
@@ -7437,7 +7437,7 @@ _02140eb4:
bl func_ov00_020a5e9c
cmp r0, #5
bne _02140f5c
ldr r0, _02141148 ; =data_027e0fe4
ldr r0, _02141148 ; =gActorManager
add r1, sp, #0x18
ldr r0, [r0]
ldrb r0, [r0, #0x29]
@@ -7591,7 +7591,7 @@ _02141138: .word gMapManager
_0214113c: .word data_027e1054
_02141140: .word data_027e0d3c
_02141144: .word data_02063e4c
_02141148: .word data_027e0fe4
_02141148: .word gActorManager
_0214114c: .word gAdventureFlags
_02141150: .word 0x00000186
arm_func_end func_ov14_021407b8
@@ -15392,7 +15392,7 @@ func_ov14_021470a0: ; 0x021470a0
cmp r4, r0
addeq sp, sp, #0x30
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _021471d0 ; =data_027e0fe4
ldr r0, _021471d0 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -15433,7 +15433,7 @@ func_ov14_021470a0: ; 0x021470a0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021471cc: .word data_027e0fe8
_021471d0: .word data_027e0fe4
_021471d0: .word gActorManager
arm_func_end func_ov14_021470a0
.global func_ov14_021471d4
@@ -15485,7 +15485,7 @@ _02147240:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
_02147268:
ldr r0, _021472f0 ; =data_027e0fe4
ldr r0, _021472f0 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -15524,7 +15524,7 @@ _021472e4:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021472f0: .word data_027e0fe4
_021472f0: .word gActorManager
_021472f4: .word 0x424c5354
_021472f8: .word 0x41525257
_021472fc: .word 0x424d524e
@@ -15577,7 +15577,7 @@ func_ov14_02147304: ; 0x02147304
cmp r4, r0
addeq sp, sp, #0x30
ldmeqia sp!, {r4, r5, r6, pc}
ldr r0, _0214744c ; =data_027e0fe4
ldr r0, _0214744c ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -15617,7 +15617,7 @@ func_ov14_02147304: ; 0x02147304
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02147448: .word data_027e0fe8
_0214744c: .word data_027e0fe4
_0214744c: .word gActorManager
arm_func_end func_ov14_02147304
.global func_ov14_02147450
@@ -17010,7 +17010,7 @@ _021483f8:
mov r7, #4
str r3, [sp, #0xb0]
ldr r0, [r10, #0x50]
ldr r5, _02148650 ; =data_027e0fe4
ldr r5, _02148650 ; =gActorManager
str r0, [sp, #0xb4]
ldmia r9, {r0, r1, r2}
sub r6, r7, #5
@@ -17054,7 +17054,7 @@ _021483f8:
cmp r6, #0
mov r7, #0
ble _02148638
ldr r11, _02148650 ; =data_027e0fe4
ldr r11, _02148650 ; =gActorManager
mov r8, r7
add r5, sp, #0x38
mvn r4, #0
@@ -17111,7 +17111,7 @@ _02148638:
_02148644: .word gMapManager
_02148648: .word 0x0000ffff
_0214864c: .word data_ov14_02153ed8
_02148650: .word data_027e0fe4
_02148650: .word gActorManager
_02148654: .word data_ov14_02159a44
arm_func_end func_ov14_02148364
@@ -18211,7 +18211,7 @@ _02149574:
blx r2
b _02149794
_0214959c:
ldr r0, _02149800 ; =data_027e0fe4
ldr r0, _02149800 ; =gActorManager
ldr r0, [r0]
ldrb r0, [r0, #0x29]
cmp r0, #0
@@ -18378,7 +18378,7 @@ _021497f0: .word data_027e0fec
_021497f4: .word gAdventureFlags
_021497f8: .word data_027e0fe8
_021497fc: .word 0x5352574c
_02149800: .word data_027e0fe4
_02149800: .word gActorManager
_02149804: .word data_027e0e58
_02149808: .word 0x0000019f
arm_func_end func_ov14_021488c0
@@ -19801,7 +19801,7 @@ _0214aa64:
str r1, [r4, #4]
ldmia sp!, {r4, pc}
_0214aaa8:
ldr r0, _0214ab10 ; =data_027e0fe4
ldr r0, _0214ab10 ; =gActorManager
add r1, r2, #0x70
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -19829,7 +19829,7 @@ _0214aad8:
ldmia sp!, {r4, pc}
.align 2, 0
_0214ab0c: .word data_027e0f94
_0214ab10: .word data_027e0fe4
_0214ab10: .word gActorManager
arm_func_end func_ov14_0214aa2c
.global func_ov14_0214ab14
@@ -20269,7 +20269,7 @@ func_ov14_0214b018: ; 0x0214b018
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, pc}
_0214b048:
ldr r0, _0214b288 ; =data_027e0fe4
ldr r0, _0214b288 ; =gActorManager
mvn r7, #0
ldr r4, [r0]
ldr r3, _0214b28c ; =data_ov14_02159cec
@@ -20425,7 +20425,7 @@ _0214b264:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0214b284: .word gPlayerLink
_0214b288: .word data_027e0fe4
_0214b288: .word gActorManager
_0214b28c: .word data_ov14_02159cec
_0214b290: .word 0x47524d47
_0214b294: .word gAdventureFlags
@@ -24430,7 +24430,7 @@ func_ov14_0214e6d0: ; 0x0214e6d0
ldr r0, [r4, #8]
cmp r0, #0
bne _0214e72c
ldr r0, _0214e734 ; =data_027e0fe4
ldr r0, _0214e734 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -24452,7 +24452,7 @@ _0214e72c:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0214e734: .word data_027e0fe4
_0214e734: .word gActorManager
_0214e738: .word 0x424c5354
arm_func_end func_ov14_0214e6d0
@@ -24818,7 +24818,7 @@ func_ov14_0214ebd4: ; 0x0214ebd4
ldr r0, [r4, #8]
cmp r0, #0
bne _0214ec30
ldr r0, _0214ec38 ; =data_027e0fe4
ldr r0, _0214ec38 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -24840,7 +24840,7 @@ _0214ec30:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0214ec38: .word data_027e0fe4
_0214ec38: .word gActorManager
_0214ec3c: .word 0x424c5354
arm_func_end func_ov14_0214ebd4
@@ -25518,7 +25518,7 @@ func_ov14_0214f504: ; 0x0214f504
ldrh r1, [r4, #0x24]
cmp r1, #0
beq _0214f574
ldr r0, _0214f5a0 ; =data_027e0fe4
ldr r0, _0214f5a0 ; =gActorManager
mov r2, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -25527,7 +25527,7 @@ func_ov14_0214f504: ; 0x0214f504
movne r0, #0
ldmia sp!, {r4, pc}
_0214f574:
ldr r0, _0214f5a0 ; =data_027e0fe4
ldr r0, _0214f5a0 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -25540,7 +25540,7 @@ _0214f594:
ldmia sp!, {r4, pc}
.align 2, 0
_0214f59c: .word gMapManager
_0214f5a0: .word data_027e0fe4
_0214f5a0: .word gActorManager
arm_func_end func_ov14_0214f504
.global func_ov14_0214f5a4
@@ -25574,7 +25574,7 @@ _0214f600:
ldrh r1, [r4, #0x24]
cmp r1, #0
beq _0214f640
ldr r0, _0214f664 ; =data_027e0fe4
ldr r0, _0214f664 ; =gActorManager
add r2, r4, #0xb4
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -25588,7 +25588,7 @@ _0214f600:
mov r0, #1
ldmia sp!, {r4, pc}
_0214f640:
ldr r0, _0214f664 ; =data_027e0fe4
ldr r0, _0214f664 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -25598,7 +25598,7 @@ _0214f640:
ldmia sp!, {r4, pc}
.align 2, 0
_0214f660: .word gMapManager
_0214f664: .word data_027e0fe4
_0214f664: .word gActorManager
arm_func_end func_ov14_0214f5a4
.global func_ov14_0214f668
@@ -25639,7 +25639,7 @@ _0214f6e0:
ldrh r1, [r4, #0x24]
cmp r1, #0
beq _0214f70c
ldr r0, _0214f770 ; =data_027e0fe4
ldr r0, _0214f770 ; =gActorManager
mov r2, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -25648,7 +25648,7 @@ _0214f6e0:
mov r0, #0
ldmia sp!, {r4, pc}
_0214f70c:
ldr r0, _0214f770 ; =data_027e0fe4
ldr r0, _0214f770 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -25676,7 +25676,7 @@ _0214f760:
.align 2, 0
_0214f768: .word data_027e077c
_0214f76c: .word gMapManager
_0214f770: .word data_027e0fe4
_0214f770: .word gActorManager
arm_func_end func_ov14_0214f668
.global func_ov14_0214f774
@@ -27839,7 +27839,7 @@ func_ov14_02151084: ; 0x02151084
mov r4, r2
cmp r0, #0
bne _02151150
ldr r0, _0215115c ; =data_027e0fe4
ldr r0, _0215115c ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -27891,7 +27891,7 @@ _02151150:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0215115c: .word data_027e0fe4
_0215115c: .word gActorManager
_02151160: .word 0x41525257
arm_func_end func_ov14_02151084
@@ -30335,7 +30335,7 @@ func_ov14_02152d54: ; 0x02152d54
cmp r4, r0
addeq sp, sp, #0x30
ldmeqia sp!, {r4, pc}
ldr r0, _02152e2c ; =data_027e0fe4
ldr r0, _02152e2c ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -30354,7 +30354,7 @@ func_ov14_02152d54: ; 0x02152d54
.align 2, 0
_02152e24: .word data_027e0fe8
_02152e28: .word 0x424f4d42
_02152e2c: .word data_027e0fe4
_02152e2c: .word gActorManager
arm_func_end func_ov14_02152d54
.global func_ov14_02152e30
@@ -30413,7 +30413,7 @@ _02152eac:
blx r3
b _02152fc4
_02152ed0:
ldr r0, _02152fd4 ; =data_027e0fe4
ldr r0, _02152fd4 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -30486,7 +30486,7 @@ _02152fc4:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02152fd0: .word data_027e0f94
_02152fd4: .word data_027e0fe4
_02152fd4: .word gActorManager
_02152fd8: .word 0x50534241
_02152fdc: .word 0x424c5354
_02152fe0: .word 0x41525257
asm/ov15.inc
+1 -1
View File
@@ -225,7 +225,7 @@
.extern data_027e0fb8
.extern data_027e0fc4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov15.s
+306 -306
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+1 -1
View File
@@ -104,7 +104,7 @@
.extern data_027e0fc4
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov17.s
+39 -39
View File
@@ -1926,7 +1926,7 @@ _0215cabc:
bl func_ov00_0208b9e4
cmp r0, #0
bne _0215cb50
ldr r0, _0215cba4 ; =data_027e0fe4
ldr r0, _0215cba4 ; =gActorManager
ldr r1, [r4, #0xc0]
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -1974,7 +1974,7 @@ _0215cb84:
ldmia sp!, {r4, pc}
.align 2, 0
_0215cba0: .word gMapManager
_0215cba4: .word data_027e0fe4
_0215cba4: .word gActorManager
arm_func_end func_ov17_0215ca70
.global func_ov17_0215cba8
@@ -2033,7 +2033,7 @@ func_ov17_0215cc14: ; 0x0215cc14
cmp r0, #0
mvnge r0, #0
ldmgeia sp!, {r3, r4, r5, pc}
ldr r0, _0215cca8 ; =data_027e0fe4
ldr r0, _0215cca8 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -2061,7 +2061,7 @@ _0215cca0:
mvn r0, #0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215cca8: .word data_027e0fe4
_0215cca8: .word gActorManager
_0215ccac: .word 0x43525953
arm_func_end func_ov17_0215cc14
@@ -2187,7 +2187,7 @@ func_ov17_0215ce04: ; 0x0215ce04
func_ov17_0215ce24: ; 0x0215ce24
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr r2, _0215cee0 ; =data_027e0fe4
ldr r2, _0215cee0 ; =gActorManager
mov r5, r0
mov r4, r1
ldr r1, [r2]
@@ -2201,7 +2201,7 @@ func_ov17_0215ce24: ; 0x0215ce24
addeq sp, sp, #0xc
moveq r0, #0
ldmeqia sp!, {r4, r5, pc}
ldr r0, _0215cee0 ; =data_027e0fe4
ldr r0, _0215cee0 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2233,7 +2233,7 @@ func_ov17_0215ce24: ; 0x0215ce24
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0215cee0: .word data_027e0fe4
_0215cee0: .word gActorManager
_0215cee4: .word 0x43525953
_0215cee8: .word gMapManager
arm_func_end func_ov17_0215ce24
@@ -7753,7 +7753,7 @@ func_ov17_0216161c: ; 0x0216161c
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _02161670
ldr r0, _0216167c ; =data_027e0fe4
ldr r0, _0216167c ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -7766,7 +7766,7 @@ _02161670:
ldmia sp!, {r4, pc}
.align 2, 0
_02161678: .word gMapManager
_0216167c: .word data_027e0fe4
_0216167c: .word gActorManager
arm_func_end func_ov17_0216161c
.global func_ov17_02161680
@@ -8828,7 +8828,7 @@ _021623e4: .word 0x00000257
func_ov17_021623e8: ; 0x021623e8
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr r3, _021624d8 ; =data_027e0fe4
ldr r3, _021624d8 ; =gActorManager
mov r4, r0
ldr r0, [r3]
mov r5, r2
@@ -8890,7 +8890,7 @@ _021624cc:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021624d8: .word data_027e0fe4
_021624d8: .word gActorManager
_021624dc: .word 0x41525257
arm_func_end func_ov17_021623e8
@@ -9680,7 +9680,7 @@ func_ov17_02162e84: ; 0x02162e84
blx r1
b _02162f30
_02162ea4:
ldr r0, _02162f38 ; =data_027e0fe4
ldr r0, _02162f38 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -9723,7 +9723,7 @@ _02162f30:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02162f38: .word data_027e0fe4
_02162f38: .word gActorManager
_02162f3c: .word 0x424c5354
_02162f40: .word 0x41525257
_02162f44: .word 0x424d524e
@@ -12504,7 +12504,7 @@ func_ov17_02165284: ; 0x02165284
addne sp, sp, #0x14
movne r0, #1
ldmneia sp!, {r3, r4, pc}
ldr r0, _02165308 ; =data_027e0fe4
ldr r0, _02165308 ; =gActorManager
ldr r3, _0216530c ; =data_ov17_0216c794
ldr r0, [r0]
add r1, sp, #0
@@ -12519,7 +12519,7 @@ func_ov17_02165284: ; 0x02165284
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02165304: .word data_027e0f94
_02165308: .word data_027e0fe4
_02165308: .word gActorManager
_0216530c: .word data_ov17_0216c794
arm_func_end func_ov17_02165284
@@ -15746,7 +15746,7 @@ _02167b7c:
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
_02167b9c:
ldr r0, _02167cc8 ; =data_027e0fe4
ldr r0, _02167cc8 ; =gActorManager
add r1, r5, #0x68
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -15826,7 +15826,7 @@ _02167cbc:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02167cc4: .word gAdventureFlags
_02167cc8: .word data_027e0fe4
_02167cc8: .word gActorManager
_02167ccc: .word data_027e0fb8
_02167cd0: .word data_027e0f64
arm_func_end func_ov17_02167aac
@@ -15970,7 +15970,7 @@ _02167eac:
mov r0, #0
ldmia sp!, {r4, r5, pc}
_02167eb8:
ldr r0, _02168064 ; =data_027e0fe4
ldr r0, _02168064 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
movs r4, r0
@@ -16082,7 +16082,7 @@ _02168058:
add sp, sp, #0x14
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02168064: .word data_027e0fe4
_02168064: .word gActorManager
_02168068: .word 0x41525257
_0216806c: .word 0x424d524e
_02168070: .word 0x5342454d
@@ -17437,7 +17437,7 @@ _02168fd4:
add r3, sp, #0x54
add r2, r6, #0x18
bl func_ov00_020c4048
ldr r0, _02169194 ; =data_027e0fe4
ldr r0, _02169194 ; =gActorManager
add r1, r6, #0xe0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -17472,7 +17472,7 @@ _02169184: .word 0x00001333
_02169188: .word data_027e0d38
_0216918c: .word data_027e0fe8
_02169190: .word 0x4c4f4e44
_02169194: .word data_027e0fe4
_02169194: .word gActorManager
arm_func_end func_ov17_02168ed0
.global func_ov17_02169198
@@ -18162,7 +18162,7 @@ func_ov17_02169a58: ; 0x02169a58
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02169b08
ldr r0, _02169b40 ; =data_027e0fe4
ldr r0, _02169b40 ; =gActorManager
add r1, r4, #0x68
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -18202,7 +18202,7 @@ _02169b08:
ldmia sp!, {r4, pc}
.align 2, 0
_02169b3c: .word gAdventureFlags
_02169b40: .word data_027e0fe4
_02169b40: .word gActorManager
_02169b44: .word data_027e0f64
arm_func_end func_ov17_02169a58
@@ -18316,7 +18316,7 @@ func_ov17_02169cb4: ; 0x02169cb4
stmdb sp!, {r3, lr}
cmp r1, #0xb
ble _02169cec
ldr r0, _02169cf4 ; =data_027e0fe4
ldr r0, _02169cf4 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -18331,7 +18331,7 @@ _02169cec:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_02169cf4: .word data_027e0fe4
_02169cf4: .word gActorManager
_02169cf8: .word 0x42494752
arm_func_end func_ov17_02169cb4
@@ -18393,7 +18393,7 @@ func_ov17_02169d4c: ; 0x02169d4c
add r1, r6, #0x18
mov r2, r0
bl func_01ff9bc4
ldr r1, _02169ebc ; =data_027e0fe4
ldr r1, _02169ebc ; =gActorManager
ldr r2, _02169ec0 ; =0x42494752
ldr r1, [r1]
add r0, sp, #0
@@ -18403,7 +18403,7 @@ func_ov17_02169d4c: ; 0x02169d4c
mvn r0, #0
cmp r1, r0
beq _02169e50
ldr r0, _02169ebc ; =data_027e0fe4
ldr r0, _02169ebc ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -18469,7 +18469,7 @@ _02169eac:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02169eb8: .word 0x00001333
_02169ebc: .word data_027e0fe4
_02169ebc: .word gActorManager
_02169ec0: .word 0x42494752
_02169ec4: .word data_027e0f94
_02169ec8: .word gPlayerLink
@@ -18486,7 +18486,7 @@ func_ov17_02169ecc: ; 0x02169ecc
addeq sp, sp, #0xc
moveq r0, #1
ldmeqia sp!, {pc}
ldr r2, _02169f48 ; =data_027e0fe4
ldr r2, _02169f48 ; =gActorManager
add r1, r0, #0x68
ldr r0, [r2]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -18510,7 +18510,7 @@ func_ov17_02169ecc: ; 0x02169ecc
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_02169f48: .word data_027e0fe4
_02169f48: .word gActorManager
arm_func_end func_ov17_02169ecc
.global func_ov17_02169f4c
@@ -18869,7 +18869,7 @@ func_ov17_0216a348: ; 0x0216a348
ldrh r1, [r4, #0x24]
cmp r1, #0
beq _0216a3b8
ldr r0, _0216a3e4 ; =data_027e0fe4
ldr r0, _0216a3e4 ; =gActorManager
mov r2, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -18878,7 +18878,7 @@ func_ov17_0216a348: ; 0x0216a348
movne r0, #0
ldmia sp!, {r4, pc}
_0216a3b8:
ldr r0, _0216a3e4 ; =data_027e0fe4
ldr r0, _0216a3e4 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -18891,7 +18891,7 @@ _0216a3d8:
ldmia sp!, {r4, pc}
.align 2, 0
_0216a3e0: .word gMapManager
_0216a3e4: .word data_027e0fe4
_0216a3e4: .word gActorManager
arm_func_end func_ov17_0216a348
.global func_ov17_0216a3e8
@@ -18925,7 +18925,7 @@ _0216a444:
ldrh r1, [r4, #0x24]
cmp r1, #0
beq _0216a484
ldr r0, _0216a4a8 ; =data_027e0fe4
ldr r0, _0216a4a8 ; =gActorManager
mov r2, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -18939,7 +18939,7 @@ _0216a444:
mov r0, #1
ldmia sp!, {r4, pc}
_0216a484:
ldr r0, _0216a4a8 ; =data_027e0fe4
ldr r0, _0216a4a8 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -18949,7 +18949,7 @@ _0216a484:
ldmia sp!, {r4, pc}
.align 2, 0
_0216a4a4: .word gMapManager
_0216a4a8: .word data_027e0fe4
_0216a4a8: .word gActorManager
arm_func_end func_ov17_0216a3e8
.global func_ov17_0216a4ac
@@ -18990,7 +18990,7 @@ _0216a524:
ldrh r1, [r4, #0x24]
cmp r1, #0
beq _0216a550
ldr r0, _0216a5b4 ; =data_027e0fe4
ldr r0, _0216a5b4 ; =gActorManager
mov r2, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -18999,7 +18999,7 @@ _0216a524:
mov r0, #0
ldmia sp!, {r4, pc}
_0216a550:
ldr r0, _0216a5b4 ; =data_027e0fe4
ldr r0, _0216a5b4 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -19027,7 +19027,7 @@ _0216a5a4:
.align 2, 0
_0216a5ac: .word data_027e077c
_0216a5b0: .word gMapManager
_0216a5b4: .word data_027e0fe4
_0216a5b4: .word gActorManager
arm_func_end func_ov17_0216a4ac
.global func_ov17_0216a5b8
asm/ov18.inc
+1 -1
View File
@@ -99,7 +99,7 @@
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov18.s
+27 -27
View File
@@ -2127,14 +2127,14 @@ func_ov18_0215cf90: ; 0x0215cf90
func_ov18_0215cfac: ; 0x0215cfac
stmdb sp!, {r3, lr}
sub sp, sp, #0x10
ldr r1, _0215d04c ; =data_027e0fe4
ldr r1, _0215d04c ; =gActorManager
mov r3, r0
ldr r1, [r1]
ldr r2, _0215d050 ; =0x4c4e4232
add r0, sp, #8
add r3, r3, #4
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
ldr r0, _0215d04c ; =data_027e0fe4
ldr r0, _0215d04c ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2142,7 +2142,7 @@ func_ov18_0215cfac: ; 0x0215cfac
movne r1, #0
strneb r1, [r0, #0x11a]
ldr r1, _0215d054 ; =gPlayerLink
ldr r0, _0215d04c ; =data_027e0fe4
ldr r0, _0215d04c ; =gActorManager
ldr r3, [r1]
ldr r0, [r0]
ldr r2, [r3, #0x3c]
@@ -2154,7 +2154,7 @@ func_ov18_0215cfac: ; 0x0215cfac
cmp r0, #0
movne r1, #0
strneb r1, [r0, #0x11a]
ldr r0, _0215d04c ; =data_027e0fe4
ldr r0, _0215d04c ; =gActorManager
ldr ip, _0215d058 ; =data_ov18_0216c2b8
ldr r3, _0215d05c ; =0x4b4f4b41
ldr r0, [r0]
@@ -2166,7 +2166,7 @@ func_ov18_0215cfac: ; 0x0215cfac
add sp, sp, #0x10
ldmia sp!, {r3, pc}
.align 2, 0
_0215d04c: .word data_027e0fe4
_0215d04c: .word gActorManager
_0215d050: .word 0x4c4e4232
_0215d054: .word gPlayerLink
_0215d058: .word data_ov18_0216c2b8
@@ -2178,14 +2178,14 @@ _0215d05c: .word 0x4b4f4b41
func_ov18_0215d060: ; 0x0215d060
stmdb sp!, {r3, lr}
sub sp, sp, #8
ldr r1, _0215d0a8 ; =data_027e0fe4
ldr r1, _0215d0a8 ; =gActorManager
mov r3, r0
ldr r1, [r1]
ldr r2, _0215d0ac ; =0x4c4e4232
add r0, sp, #0
add r3, r3, #4
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
ldr r0, _0215d0a8 ; =data_027e0fe4
ldr r0, _0215d0a8 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2195,7 +2195,7 @@ func_ov18_0215d060: ; 0x0215d060
add sp, sp, #8
ldmia sp!, {r3, pc}
.align 2, 0
_0215d0a8: .word data_027e0fe4
_0215d0a8: .word gActorManager
_0215d0ac: .word 0x4c4e4232
arm_func_end func_ov18_0215d060
@@ -4269,7 +4269,7 @@ _0215ecb8:
add r2, sp, #0x74
add r3, sp, #0x24
bl func_ov00_020c4048
ldr r0, _0215ee78 ; =data_027e0fe4
ldr r0, _0215ee78 ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4351,7 +4351,7 @@ _0215ee68: .word gAdventureFlags
_0215ee6c: .word func_ov18_0215f048
_0215ee70: .word data_027e0fe8
_0215ee74: .word 0x48534b42
_0215ee78: .word data_027e0fe4
_0215ee78: .word gActorManager
_0215ee7c: .word data_ov18_0216c3a8
_0215ee80: .word data_ov18_0216c3ce
_0215ee84: .word data_ov18_0216c3a9
@@ -6392,7 +6392,7 @@ func_ov18_0216065c: ; 0x0216065c
add r2, sp, #0x50
add r3, sp, #0x24
bl func_ov00_020c4048
ldr r0, _02160814 ; =data_027e0fe4
ldr r0, _02160814 ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6447,7 +6447,7 @@ _021607ec:
.align 2, 0
_0216080c: .word data_027e0fe8
_02160810: .word 0x48534b42
_02160814: .word data_027e0fe4
_02160814: .word gActorManager
_02160818: .word 0x0000099a
_0216081c: .word gMapManager
arm_func_end func_ov18_0216065c
@@ -10108,7 +10108,7 @@ func_ov18_02163718: ; 0x02163718
blx r1
b _021637a8
_02163758:
ldr r0, _021637b0 ; =data_027e0fe4
ldr r0, _021637b0 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -10132,7 +10132,7 @@ _021637a8:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_021637b0: .word data_027e0fe4
_021637b0: .word gActorManager
_021637b4: .word 0x424c5354
_021637b8: .word 0x424d524e
_021637bc: .word 0x5342454d
@@ -10917,7 +10917,7 @@ _0216424c:
blx r1
b _021642ac
_0216425c:
ldr r0, _021642b4 ; =data_027e0fe4
ldr r0, _021642b4 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -10941,7 +10941,7 @@ _021642ac:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_021642b4: .word data_027e0fe4
_021642b4: .word gActorManager
_021642b8: .word 0x424c5354
_021642bc: .word 0x424d524e
_021642c0: .word 0x5342454d
@@ -11100,7 +11100,7 @@ func_ov18_02164440: ; 0x02164440
_0216447c:
cmp r1, #0xb
blt _0216452c
ldr r0, _02164538 ; =data_027e0fe4
ldr r0, _02164538 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -11151,7 +11151,7 @@ _0216452c:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02164538: .word data_027e0fe4
_02164538: .word gActorManager
_0216453c: .word 0x424c5354
_02164540: .word 0x41525257
_02164544: .word 0x424d524e
@@ -14427,7 +14427,7 @@ func_ov18_02166e7c: ; 0x02166e7c
mvn r0, #0
cmp r1, r0
ldmeqia sp!, {r4, pc}
ldr r0, _02166f1c ; =data_027e0fe4
ldr r0, _02166f1c ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -14438,7 +14438,7 @@ func_ov18_02166e7c: ; 0x02166e7c
.align 2, 0
_02166f14: .word 0x00002aab
_02166f18: .word gPlayerLink
_02166f1c: .word data_027e0fe4
_02166f1c: .word gActorManager
arm_func_end func_ov18_02166e7c
.global func_ov18_02166f20
@@ -15338,7 +15338,7 @@ _02167bac:
sub r0, r0, #1
cmp r1, r0
beq _02167bdc
ldr r0, _02167dfc ; =data_027e0fe4
ldr r0, _02167dfc ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -15372,7 +15372,7 @@ _02167c34:
mvn r0, #0
cmp r1, r0
beq _02167c58
ldr r0, _02167dfc ; =data_027e0fe4
ldr r0, _02167dfc ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -15485,7 +15485,7 @@ _02167dec: .word 0xfffffee1
_02167df0: .word data_027e0f64
_02167df4: .word 0x00001555
_02167df8: .word data_02050f54
_02167dfc: .word data_027e0fe4
_02167dfc: .word gActorManager
_02167e00: .word gAdventureFlags
arm_func_end func_ov18_02167838
@@ -15928,7 +15928,7 @@ _02168388:
add r1, sp, #0x64
add r2, r6, #0x48
bl func_ov00_020c5e88
ldr r0, _021686d8 ; =data_027e0fe4
ldr r0, _021686d8 ; =gActorManager
add r1, r6, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -16094,7 +16094,7 @@ _021686c8: .word data_027e0fec
_021686cc: .word data_ov18_0216b5f8
_021686d0: .word data_ov18_0216b60c
_021686d4: .word data_02050f54
_021686d8: .word data_027e0fe4
_021686d8: .word gActorManager
_021686dc: .word data_ov18_0216d604
_021686e0: .word data_02051054
_021686e4: .word 0x00001ccd
@@ -16529,7 +16529,7 @@ _02168c84:
_02168cbc:
cmp r1, #0xb
blt _02168d60
ldr r0, _02168d70 ; =data_027e0fe4
ldr r0, _02168d70 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -16574,7 +16574,7 @@ _02168d60:
ldmia sp!, {r4, pc}
.align 2, 0
_02168d6c: .word data_027e0f94
_02168d70: .word data_027e0fe4
_02168d70: .word gActorManager
_02168d74: .word 0x424c5354
arm_func_end func_ov18_02168c10
asm/ov19.inc
+1 -1
View File
@@ -124,7 +124,7 @@
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov19.s
+23 -23
View File
@@ -1075,7 +1075,7 @@ _0216e46c:
ldr r0, [sp, #0x20]
cmp r1, r0
beq _0216e64c
ldr r0, _0216e69c ; =data_027e0fe4
ldr r0, _0216e69c ; =gActorManager
add r1, sp, #0x24
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1204,7 +1204,7 @@ _0216e68c: .word 0x00004001
_0216e690: .word data_027e0764
_0216e694: .word 0x57425341
_0216e698: .word data_027e0fe8
_0216e69c: .word data_027e0fe4
_0216e69c: .word gActorManager
_0216e6a0: .word data_027e0f94
arm_func_end func_ov19_0216e334
@@ -1755,7 +1755,7 @@ func_ov19_0216eda4: ; 0x0216eda4
addne sp, sp, #0x28
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _0216ee58 ; =data_027e0fe4
ldr r0, _0216ee58 ; =gActorManager
mvn r6, #0
ldr lr, _0216ee5c ; =data_ov19_021763c8
add ip, sp, #0x10
@@ -1775,7 +1775,7 @@ func_ov19_0216eda4: ; 0x0216eda4
str r5, [sp, #8]
str r3, [sp, #0xc]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
ldr r5, _0216ee58 ; =data_027e0fe4
ldr r5, _0216ee58 ; =gActorManager
add r7, sp, #0x10
mov r6, #0
_0216ee24:
@@ -1793,7 +1793,7 @@ _0216ee24:
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0216ee58: .word data_027e0fe4
_0216ee58: .word gActorManager
_0216ee5c: .word data_ov19_021763c8
arm_func_end func_ov19_0216eda4
@@ -5203,7 +5203,7 @@ func_ov19_02171a9c: ; 0x02171a9c
ldr r1, [r5, #0x50]
str r1, [r5, #0x5c]
bl _ZN5Actor20IncreaseActiveFramesEv
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
add r1, r5, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5232,7 +5232,7 @@ _02171b14:
mov r1, r5
bl _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
_02171b40:
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
add r1, r5, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5438,7 +5438,7 @@ _02171e30:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02171e48: .word data_027e0fe4
_02171e48: .word gActorManager
_02171e4c: .word 0x0000099a
_02171e50: .word data_027e0764
_02171e54: .word 0xffffd555
@@ -7789,7 +7789,7 @@ _02173cf0: .word 0x00001333
arm_func_start func_ov19_02173cf4
func_ov19_02173cf4: ; 0x02173cf4
stmdb sp!, {r4, lr}
ldr r1, _02173d28 ; =data_027e0fe4
ldr r1, _02173d28 ; =gActorManager
mov r4, r0
ldr r0, [r1]
mov r1, #0
@@ -7802,14 +7802,14 @@ func_ov19_02173cf4: ; 0x02173cf4
bl func_ov00_0208b9e4
ldmia sp!, {r4, pc}
.align 2, 0
_02173d28: .word data_027e0fe4
_02173d28: .word gActorManager
arm_func_end func_ov19_02173cf4
.global func_ov19_02173d2c
arm_func_start func_ov19_02173d2c
func_ov19_02173d2c: ; 0x02173d2c
stmdb sp!, {r3, lr}
ldr r0, _02173d50 ; =data_027e0fe4
ldr r0, _02173d50 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -7818,7 +7818,7 @@ func_ov19_02173d2c: ; 0x02173d2c
movne r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_02173d50: .word data_027e0fe4
_02173d50: .word gActorManager
arm_func_end func_ov19_02173d2c
.global func_ov19_02173d54
@@ -8194,7 +8194,7 @@ func_ov19_0217416c: ; 0x0217416c
mov r2, r5
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _02174208 ; =data_027e0fe4
ldr r0, _02174208 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8212,7 +8212,7 @@ func_ov19_0217416c: ; 0x0217416c
.align 2, 0
_02174200: .word data_027e0fe8
_02174204: .word 0x45465357
_02174208: .word data_027e0fe4
_02174208: .word gActorManager
arm_func_end func_ov19_0217416c
.global func_ov19_0217420c
@@ -8496,7 +8496,7 @@ func_ov19_021745b8: ; 0x021745b8
mvn r0, #0
cmp r1, r0
beq _02174604
ldr r0, _02174784 ; =data_027e0fe4
ldr r0, _02174784 ; =gActorManager
add r1, r7, #0x34c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8509,13 +8509,13 @@ func_ov19_021745b8: ; 0x021745b8
moveq r0, #1
ldmeqia sp!, {r4, r5, r6, r7, pc}
_02174604:
ldr r1, _02174784 ; =data_027e0fe4
ldr r1, _02174784 ; =gActorManager
ldr r2, _02174788 ; =0x424f4d42
ldr r1, [r1]
add r0, sp, #0
add r3, r7, #0x48
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
ldr r0, _02174784 ; =data_027e0fe4
ldr r0, _02174784 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8610,7 +8610,7 @@ _0217475c:
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02174784: .word data_027e0fe4
_02174784: .word gActorManager
_02174788: .word 0x424f4d42
_0217478c: .word data_027e0f94
_02174790: .word data_027e0fa0
@@ -8644,7 +8644,7 @@ _021747e4:
mvn r0, #0
cmp r1, r0
beq _02174824
ldr r0, _02174874 ; =data_027e0fe4
ldr r0, _02174874 ; =gActorManager
add r1, r4, #0x34c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8678,7 +8678,7 @@ _02174824:
ldmia sp!, {r4, pc}
.align 2, 0
_02174870: .word data_027e0f94
_02174874: .word data_027e0fe4
_02174874: .word gActorManager
_02174878: .word 0x0000071c
_0217487c: .word 0x00000333
arm_func_end func_ov19_0217479c
@@ -8739,7 +8739,7 @@ _02174910:
add r1, r1, #8
cmp r1, r0
blo _02174910
ldr r0, _021749e8 ; =data_027e0fe4
ldr r0, _021749e8 ; =gActorManager
mov lr, #0
ldr r6, _021749ec ; =_ZTV11FilterActor
add ip, sp, #0x40
@@ -8769,7 +8769,7 @@ _02174910:
movgt r5, #0
cmpgt r0, #0
ble _021749dc
ldr r4, _021749e8 ; =data_027e0fe4
ldr r4, _021749e8 ; =gActorManager
mov r6, r5
_021749a4:
ldr r1, [sp]
@@ -8791,7 +8791,7 @@ _021749dc:
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_021749e8: .word data_027e0fe4
_021749e8: .word gActorManager
_021749ec: .word _ZTV11FilterActor
_021749f0: .word 0x4d4c4457
arm_func_end func_ov19_021748fc
asm/ov20.inc
+1 -1
View File
@@ -115,7 +115,7 @@
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov20.s
+21 -21
View File
@@ -159,7 +159,7 @@ func_ov20_0216d848: ; 0x0216d848
bl func_ov00_020cb140
ldr r11, _0216da04 ; =0x46425331
ldr r5, _0216da08 ; =data_027e0fe8
ldr r4, _0216da0c ; =data_027e0fe4
ldr r4, _0216da0c ; =gActorManager
mov r9, #0
add r8, sp, #0x18
mvn r7, #0
@@ -246,7 +246,7 @@ _0216d9fc: .word gAdventureFlags
_0216da00: .word data_ov20_02178320
_0216da04: .word 0x46425331
_0216da08: .word data_027e0fe8
_0216da0c: .word data_027e0fe4
_0216da0c: .word gActorManager
_0216da10: .word data_02050f54
_0216da14: .word 0x55555556
arm_func_end func_ov20_0216d848
@@ -4700,7 +4700,7 @@ _0217163c: .word 0x46425334
arm_func_start func_ov20_02171640
func_ov20_02171640: ; 0x02171640
stmdb sp!, {r3, lr}
ldr r1, _02171660 ; =data_027e0fe4
ldr r1, _02171660 ; =gActorManager
mov r2, r0
ldr r0, [r1]
add r1, r2, #0x34
@@ -4708,7 +4708,7 @@ func_ov20_02171640: ; 0x02171640
bl func_ov20_0216f720
ldmia sp!, {r3, pc}
.align 2, 0
_02171660: .word data_027e0fe4
_02171660: .word gActorManager
arm_func_end func_ov20_02171640
.global func_ov20_02171664
@@ -5763,7 +5763,7 @@ _02172494:
_021724cc:
mov r0, r5
bl _ZN5Actor12KillInBoundsEv
ldr r0, _02172554 ; =data_027e0fe4
ldr r0, _02172554 ; =gActorManager
add r1, r5, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5798,7 +5798,7 @@ _02172544: .word data_027e0ffc
_02172548: .word data_027e0e58
_0217254c: .word 0x00000261
_02172550: .word data_027e0f64
_02172554: .word data_027e0fe4
_02172554: .word gActorManager
_02172558: .word 0x46425353
arm_func_end func_ov20_021720b8
@@ -6029,12 +6029,12 @@ _021727fc:
add r3, sp, #8
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r1, _0217294c ; =data_027e0fe4
ldr r1, _0217294c ; =gActorManager
ldr r2, _02172950 ; =0x564c4352
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217294c ; =data_027e0fe4
ldr r0, _0217294c ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6115,7 +6115,7 @@ _02172940:
add sp, sp, #0x14
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0217294c: .word data_027e0fe4
_0217294c: .word gActorManager
_02172950: .word 0x564c4352
_02172954: .word data_027e0ffc
_02172958: .word data_027e0764
@@ -7415,14 +7415,14 @@ _02173a7c: .word data_ov20_021779dc
func_ov20_02173a80: ; 0x02173a80
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #8
ldr r2, _02173bc0 ; =data_027e0fe4
ldr r2, _02173bc0 ; =gActorManager
mov r5, r1
ldr r1, [r2]
mov r6, r0
ldr r2, _02173bc4 ; =0x524d4654
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02173bc0 ; =data_027e0fe4
ldr r0, _02173bc0 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -7503,7 +7503,7 @@ _02173bb4:
add sp, sp, #8
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02173bc0: .word data_027e0fe4
_02173bc0: .word gActorManager
_02173bc4: .word 0x524d4654
_02173bc8: .word data_ov00_020e8b08
arm_func_end func_ov20_02173a80
@@ -7536,7 +7536,7 @@ func_ov20_02173bf4: ; 0x02173bf4
beq _02173c3c
b _02173cbc
_02173c14:
ldr r1, _02173cd4 ; =data_027e0fe4
ldr r1, _02173cd4 ; =gActorManager
ldr r2, _02173cd8 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
@@ -7547,13 +7547,13 @@ _02173c14:
str r0, [r4, #0x184]
b _02173cc8
_02173c3c:
ldr r1, _02173cd4 ; =data_027e0fe4
ldr r1, _02173cd4 ; =gActorManager
ldr r2, _02173cd8 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #8
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r1, [sp, #8]
ldr r0, _02173cd4 ; =data_027e0fe4
ldr r0, _02173cd4 ; =gActorManager
str r1, [r4, #0x180]
ldr r1, [sp, #0xc]
mvn r7, #0
@@ -7588,7 +7588,7 @@ _02173cc8:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02173cd4: .word data_027e0fe4
_02173cd4: .word gActorManager
_02173cd8: .word 0x4e415649
_02173cdc: .word data_ov20_021789c4
_02173ce0: .word 0x4c4e424b
@@ -9958,7 +9958,7 @@ _02175b0c:
str r1, [sp, #0xc8]
bl func_ov00_020c3348
ldr r1, [r4, #8]
ldr r0, _02175f28 ; =data_027e0fe4
ldr r0, _02175f28 ; =gActorManager
str r1, [sp, #0xc4]
ldr r3, [r4, #0xc]
ldr r1, [r0]
@@ -9966,7 +9966,7 @@ _02175b0c:
add r0, sp, #4
str r3, [sp, #0xc8]
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02175f28 ; =data_027e0fe4
ldr r0, _02175f28 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -10222,7 +10222,7 @@ _02175f18: .word data_027e077c
_02175f1c: .word gAdventureFlags
_02175f20: .word data_027e0ffc
_02175f24: .word 0x00000391
_02175f28: .word data_027e0fe4
_02175f28: .word gActorManager
_02175f2c: .word 0x564c4352
_02175f30: .word 0xfffffe66
_02175f34: .word data_027e0fe8
@@ -10641,7 +10641,7 @@ func_ov20_021763b4: ; 0x021763b4
mov r4, r0
cmp r1, #0
bne _021763f0
ldr r1, _02176408 ; =data_027e0fe4
ldr r1, _02176408 ; =gActorManager
ldr r2, _0217640c ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
@@ -10660,7 +10660,7 @@ _021763fc:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_02176408: .word data_027e0fe4
_02176408: .word gActorManager
_0217640c: .word 0x4e415649
arm_func_end func_ov20_021763b4
asm/ov21.inc
+1 -1
View File
@@ -81,7 +81,7 @@
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov21.s
+2 -2
View File
@@ -885,7 +885,7 @@ func_ov21_0216e128: ; 0x0216e128
ldr r1, _0216e1d4 ; =0x4e4b4559
mov r2, r5
bl func_ov00_020c4048
ldr r0, _0216e1d8 ; =data_027e0fe4
ldr r0, _0216e1d8 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -897,7 +897,7 @@ func_ov21_0216e128: ; 0x0216e128
.align 2, 0
_0216e1d0: .word data_027e0fe8
_0216e1d4: .word 0x4e4b4559
_0216e1d8: .word data_027e0fe4
_0216e1d8: .word gActorManager
arm_func_end func_ov21_0216e128
.global func_ov21_0216e1dc
asm/ov22.inc
+1 -1
View File
@@ -120,7 +120,7 @@
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov22.s
+15 -15
View File
@@ -3358,7 +3358,7 @@ _021702f8:
str r3, [sp, #0x24]
str r2, [sp, #0x28]
bl func_ov22_0216f618
ldr r0, _021703bc ; =data_027e0fe4
ldr r0, _021703bc ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
add r2, sp, #0x20
@@ -3368,7 +3368,7 @@ _021702f8:
ldr r0, [sp, #0x1c]
str r0, [r4, #0x184]
_0217034c:
ldr r1, _021703bc ; =data_027e0fe4
ldr r1, _021703bc ; =gActorManager
ldr r2, _021703c0 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #8
@@ -3382,7 +3382,7 @@ _0217034c:
str r0, [r4, #0x18c]
b _021703b0
_02170380:
ldr r1, _021703bc ; =data_027e0fe4
ldr r1, _021703bc ; =gActorManager
ldr r2, _021703c0 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
@@ -3399,7 +3399,7 @@ _021703b0:
add sp, sp, #0x2c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021703bc: .word data_027e0fe4
_021703bc: .word gActorManager
_021703c0: .word 0x4e415649
arm_func_end func_ov22_021702cc
@@ -6747,7 +6747,7 @@ _02172f1c:
str r3, [sp, #0x24]
str r2, [sp, #0x28]
bl func_ov22_02172e48
ldr r0, _0217307c ; =data_027e0fe4
ldr r0, _0217307c ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
add r2, sp, #0x20
@@ -6756,7 +6756,7 @@ _02172f1c:
mvn r0, #0
cmp r1, r0
beq _02172ffc
ldr r0, _0217307c ; =data_027e0fe4
ldr r0, _0217307c ; =gActorManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6829,7 +6829,7 @@ _0217304c:
add sp, sp, #0x2c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217307c: .word data_027e0fe4
_0217307c: .word gActorManager
_02173080: .word data_027e0ffc
_02173084: .word 0x00000296
arm_func_end func_ov22_02172ef4
@@ -7686,7 +7686,7 @@ func_ov22_02173ab0: ; 0x02173ab0
add r2, r4, #0x48
add r3, sp, #4
bl func_ov00_020c4048
ldr r0, _02173c14 ; =data_027e0fe4
ldr r0, _02173c14 ; =gActorManager
add r1, r4, #0x364
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -7706,7 +7706,7 @@ func_ov22_02173ab0: ; 0x02173ab0
_02173c08: .word 0x00001b33
_02173c0c: .word data_027e0fe8
_02173c10: .word 0x484c4d4b
_02173c14: .word data_027e0fe4
_02173c14: .word gActorManager
arm_func_end func_ov22_02173ab0
.global func_ov22_02173c18
@@ -8236,7 +8236,7 @@ _02174364:
bl func_ov22_0217477c
b _021744c8
_0217436c:
ldr r0, _0217462c ; =data_027e0fe4
ldr r0, _0217462c ; =gActorManager
add r1, r5, #0x364
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8428,7 +8428,7 @@ _0217461c: .word 0x00001555
_02174620: .word 0x000005dc
_02174624: .word 0xffffeaab
_02174628: .word 0x0000071c
_0217462c: .word data_027e0fe4
_0217462c: .word gActorManager
_02174630: .word data_027e0ffc
_02174634: .word 0x0000033a
_02174638: .word 0x0000033b
@@ -8773,7 +8773,7 @@ func_ov22_02174990: ; 0x02174990
ldr r2, [r2, #0xc]
blx r2
mov r1, #0
ldr r0, _02174a7c ; =data_027e0fe4
ldr r0, _02174a7c ; =gActorManager
str r1, [r4, #0x164]
ldr r0, [r0]
add r1, r4, #0x34
@@ -8789,7 +8789,7 @@ func_ov22_02174990: ; 0x02174990
_02174a70: .word 0x00000666
_02174a74: .word data_027e0d0c
_02174a78: .word data_027e0fec
_02174a7c: .word data_027e0fe4
_02174a7c: .word gActorManager
arm_func_end func_ov22_02174990
.global func_ov22_02174a80
@@ -9641,7 +9641,7 @@ func_ov22_0217556c: ; 0x0217556c
mov r4, r0
cmp r1, #0xb
blt _021755cc
ldr r0, _021755d4 ; =data_027e0fe4
ldr r0, _021755d4 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -9666,7 +9666,7 @@ _021755cc:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_021755d4: .word data_027e0fe4
_021755d4: .word gActorManager
_021755d8: .word 0x47524f4b
arm_func_end func_ov22_0217556c
asm/ov23.inc
+1 -1
View File
@@ -159,7 +159,7 @@
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff4
asm/ov23.s
+44 -44
View File
@@ -646,7 +646,7 @@ _0216dee0: .word data_ov00_020e8b08
func_ov23_0216dee4: ; 0x0216dee4
stmdb sp!, {r4, lr}
sub sp, sp, #8
ldr r1, _0216df20 ; =data_027e0fe4
ldr r1, _0216df20 ; =gActorManager
mov r4, r0
ldr r1, [r1]
ldr r2, _0216df24 ; =0x4e415649
@@ -660,7 +660,7 @@ func_ov23_0216dee4: ; 0x0216dee4
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0216df20: .word data_027e0fe4
_0216df20: .word gActorManager
_0216df24: .word 0x4e415649
arm_func_end func_ov23_0216dee4
@@ -1321,7 +1321,7 @@ _0216e7ac: .word 0x47524d47
func_ov23_0216e7b0: ; 0x0216e7b0
stmdb sp!, {r3, lr}
sub sp, sp, #8
ldr r1, _0216e7e0 ; =data_027e0fe4
ldr r1, _0216e7e0 ; =gActorManager
strh r0, [sp, #4]
ldr r3, _0216e7e4 ; =data_ov23_02179db8
ldr r0, [r1]
@@ -1332,7 +1332,7 @@ func_ov23_0216e7b0: ; 0x0216e7b0
add sp, sp, #8
ldmia sp!, {r3, pc}
.align 2, 0
_0216e7e0: .word data_027e0fe4
_0216e7e0: .word gActorManager
_0216e7e4: .word data_ov23_02179db8
arm_func_end func_ov23_0216e7b0
@@ -1919,7 +1919,7 @@ _0216eeec: .word data_ov00_020eec68
func_ov23_0216eef0: ; 0x0216eef0
stmdb sp!, {r4, lr}
sub sp, sp, #8
ldr r1, _0216ef2c ; =data_027e0fe4
ldr r1, _0216ef2c ; =gActorManager
mov r4, r0
ldr r1, [r1]
ldr r2, _0216ef30 ; =0x4e415649
@@ -1933,7 +1933,7 @@ func_ov23_0216eef0: ; 0x0216eef0
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0216ef2c: .word data_027e0fe4
_0216ef2c: .word gActorManager
_0216ef30: .word 0x4e415649
arm_func_end func_ov23_0216eef0
@@ -2461,7 +2461,7 @@ func_ov23_0216f428: ; 0x0216f428
addne sp, sp, #0x1fc
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
ldr r1, _0216f884 ; =data_027e0fe4
ldr r1, _0216f884 ; =gActorManager
ldr r2, _0216f888 ; =0x4e545250
ldr r1, [r1]
add r0, sp, #0x30
@@ -2471,7 +2471,7 @@ func_ov23_0216f428: ; 0x0216f428
mvn r0, #0
cmp r1, r0
beq _0216f630
ldr r0, _0216f884 ; =data_027e0fe4
ldr r0, _0216f884 ; =gActorManager
add r1, sp, #0x30
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2499,7 +2499,7 @@ func_ov23_0216f428: ; 0x0216f428
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0216f630:
ldr r1, _0216f884 ; =data_027e0fe4
ldr r1, _0216f884 ; =gActorManager
ldr r2, _0216f88c ; =0x50534241
ldr r1, [r1]
add r0, sp, #0x28
@@ -2509,7 +2509,7 @@ _0216f630:
mvn r0, #0
cmp r1, r0
beq _0216f6bc
ldr r0, _0216f884 ; =data_027e0fe4
ldr r0, _0216f884 ; =gActorManager
add r1, sp, #0x28
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2581,7 +2581,7 @@ _0216f73c:
str r2, [sp, #0x94]
str r1, [sp, #0x98]
ldr r1, [r5, #8]
ldr r0, _0216f884 ; =data_027e0fe4
ldr r0, _0216f884 ; =gActorManager
str r1, [sp, #0x80]
ldr r5, [r5, #0xc]
add r4, sp, #0x80
@@ -2597,7 +2597,7 @@ _0216f73c:
mov r4, #0
cmp r0, #0
ble _0216f86c
ldr r7, _0216f884 ; =data_027e0fe4
ldr r7, _0216f884 ; =gActorManager
mov r5, r4
_0216f7b4:
ldr r1, [sp, #0x90]
@@ -2656,7 +2656,7 @@ _0216f86c:
_0216f878: .word gMapManager
_0216f87c: .word 0x0000ffff
_0216f880: .word 0x00000733
_0216f884: .word data_027e0fe4
_0216f884: .word gActorManager
_0216f888: .word 0x4e545250
_0216f88c: .word 0x50534241
_0216f890: .word _ZTV11FilterActor
@@ -3397,7 +3397,7 @@ func_ov23_021701c0: ; 0x021701c0
bl func_ov00_020ce2f0
cmp r0, #0xa000
ble _02170374
ldr r1, _02170668 ; =data_027e0fe4
ldr r1, _02170668 ; =gActorManager
ldr r2, _0217066c ; =0x50534241
ldr r1, [r1]
add r0, sp, #0xc
@@ -3408,7 +3408,7 @@ func_ov23_021701c0: ; 0x021701c0
mvn r0, #0
cmp r1, r0
beq _021702d0
ldr r0, _02170668 ; =data_027e0fe4
ldr r0, _02170668 ; =gActorManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3687,7 +3687,7 @@ _02170658:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02170664: .word data_027e0f94
_02170668: .word data_027e0fe4
_02170668: .word gActorManager
_0217066c: .word 0x50534241
_02170670: .word gMapManager
_02170674: .word data_027e0ffc
@@ -4724,7 +4724,7 @@ _02171324:
ldmia sp!, {r4, pc}
_02171338:
ldr r1, _02171394 ; =data_027e0fb8
ldr r0, _02171398 ; =data_027e0fe4
ldr r0, _02171398 ; =gActorManager
ldr r3, [r1]
ldr r0, [r0]
ldr r2, [r3, #0x84]
@@ -4749,7 +4749,7 @@ _02171388:
ldmia sp!, {r4, pc}
.align 2, 0
_02171394: .word data_027e0fb8
_02171398: .word data_027e0fe4
_02171398: .word gActorManager
arm_func_end func_ov23_021712fc
.global func_ov23_0217139c
@@ -6410,7 +6410,7 @@ func_ov23_02172998: ; 0x02172998
add r5, sp, #0x1c
ldmia r3, {r0, r1, r2}
stmia r5, {r0, r1, r2}
ldr r0, _02172b08 ; =data_027e0fe4
ldr r0, _02172b08 ; =gActorManager
ldr r5, _02172b0c ; =0x00000666
ldr r1, [r0]
ldr r2, _02172b10 ; =0x424f4d42
@@ -6421,7 +6421,7 @@ func_ov23_02172998: ; 0x02172998
mvn r0, #0
cmp r1, r0
beq _02172a44
ldr r0, _02172b08 ; =data_027e0fe4
ldr r0, _02172b08 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6498,7 +6498,7 @@ _02172ae4:
add sp, sp, #0x2c
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_02172b08: .word data_027e0fe4
_02172b08: .word gActorManager
_02172b0c: .word 0x00000666
_02172b10: .word 0x424f4d42
_02172b14: .word gMapManager
@@ -6549,7 +6549,7 @@ func_ov23_02172b60: ; 0x02172b60
func_ov23_02172b88: ; 0x02172b88
stmdb sp!, {r4, lr}
sub sp, sp, #0x48
ldr r0, _02172bf4 ; =data_027e0fe4
ldr r0, _02172bf4 ; =gActorManager
mov r2, #0
ldr r4, _02172bf8 ; =_ZTV11FilterActor
add r3, sp, #0x34
@@ -6575,7 +6575,7 @@ func_ov23_02172b88: ; 0x02172b88
add sp, sp, #0x48
ldmia sp!, {r4, pc}
.align 2, 0
_02172bf4: .word data_027e0fe4
_02172bf4: .word gActorManager
_02172bf8: .word _ZTV11FilterActor
_02172bfc: .word 0x424f4d42
arm_func_end func_ov23_02172b88
@@ -7014,7 +7014,7 @@ _021731ec:
add r5, r5, #8
cmp r5, r0
blo _021731ec
ldr r0, _021734d8 ; =data_027e0fe4
ldr r0, _021734d8 ; =gActorManager
mov r3, #0
ldr r0, [r0]
add r5, sp, #0x44
@@ -7039,7 +7039,7 @@ _021731ec:
sub r8, r0, #0x400
mov r9, r8
_02173260:
ldr r0, _021734d8 ; =data_027e0fe4
ldr r0, _021734d8 ; =gActorManager
ldr r1, [sp, #0x2c]
ldr r0, [r0]
add r1, r1, r7
@@ -7146,7 +7146,7 @@ _02173388:
bl func_ov14_0212de90
cmp r0, #0
beq _021734a8
ldr r0, _021734d8 ; =data_027e0fe4
ldr r0, _021734d8 ; =gActorManager
add r1, sp, #0x14
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -7203,7 +7203,7 @@ _021734c8: .word data_02050f54
_021734cc: .word data_027e0ffc
_021734d0: .word _ZTV11FilterActor
_021734d4: .word 0x424f4d42
_021734d8: .word data_027e0fe4
_021734d8: .word gActorManager
_021734dc: .word 0x00000733
_021734e0: .word gMapManager
arm_func_end func_ov23_02173124
@@ -8167,7 +8167,7 @@ func_ov23_02174204: ; 0x02174204
addlt sp, sp, #0x44
movlt r0, #0
ldmltia sp!, {r4, r5, r6, r7, pc}
ldr r0, _02174378 ; =data_027e0fe4
ldr r0, _02174378 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8227,7 +8227,7 @@ func_ov23_02174204: ; 0x02174204
.align 2, 0
_02174370: .word data_027e0fe8
_02174374: .word 0x424f4d42
_02174378: .word data_027e0fe4
_02174378: .word gActorManager
_0217437c: .word data_027e0764
_02174380: .word 0x00001801
_02174384: .word 0x66666667
@@ -8828,7 +8828,7 @@ _021749f8:
mvn r0, #0
cmp r1, r0
beq _02174bbc
ldr r0, _02174d20 ; =data_027e0fe4
ldr r0, _02174d20 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8948,7 +8948,7 @@ _02174d10: .word data_ov23_02179640
_02174d14: .word data_02050f54
_02174d18: .word data_027e0fe8
_02174d1c: .word 0x41525257
_02174d20: .word data_027e0fe4
_02174d20: .word gActorManager
_02174d24: .word 0x00000277
arm_func_end func_ov23_02174718
@@ -12592,12 +12592,12 @@ func_ov23_02177ba0: ; 0x02177ba0
bl _ZN13LinkStateBase19GetCurrentCharacterEv
cmp r0, #1
bne _02177d24
ldr r1, _02177e14 ; =data_027e0fe4
ldr r1, _02177e14 ; =gActorManager
ldr r2, _02177e18 ; =0x504c444d
ldr r1, [r1]
add r0, sp, #0x10
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02177e14 ; =data_027e0fe4
ldr r0, _02177e14 ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -12613,12 +12613,12 @@ func_ov23_02177ba0: ; 0x02177ba0
str r0, [sp, #0x74]
b _02177df0
_02177c5c:
ldr r1, _02177e14 ; =data_027e0fe4
ldr r1, _02177e14 ; =gActorManager
ldr r2, _02177e1c ; =0x50574253
ldr r1, [r1]
add r0, sp, #8
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02177e14 ; =data_027e0fe4
ldr r0, _02177e14 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -12664,12 +12664,12 @@ _02177c5c:
str r0, [sp, #0x74]
b _02177df0
_02177d24:
ldr r1, _02177e14 ; =data_027e0fe4
ldr r1, _02177e14 ; =gActorManager
ldr r2, _02177e1c ; =0x50574253
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02177e14 ; =data_027e0fe4
ldr r0, _02177e14 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -12727,7 +12727,7 @@ _02177df0:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02177e10: .word gMapManager
_02177e14: .word data_027e0fe4
_02177e14: .word gActorManager
_02177e18: .word 0x504c444d
_02177e1c: .word 0x50574253
_02177e20: .word data_027e0fd4
@@ -13007,13 +13007,13 @@ _02178170: .word func_01fffcd8
func_ov23_02178174: ; 0x02178174
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x28
ldr r1, _02178308 ; =data_027e0fe4
ldr r1, _02178308 ; =gActorManager
mov r5, r0
ldr r1, [r1]
ldr r2, _0217830c ; =0x504c444d
add r0, sp, #4
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02178308 ; =data_027e0fe4
ldr r0, _02178308 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13110,7 +13110,7 @@ _02178298:
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02178308: .word data_027e0fe4
_02178308: .word gActorManager
_0217830c: .word 0x504c444d
_02178310: .word data_027e0f94
_02178314: .word data_027e0fac
@@ -13148,13 +13148,13 @@ _02178350: .word func_01fffcec
func_ov23_02178354: ; 0x02178354
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr r1, _02178400 ; =data_027e0fe4
ldr r1, _02178400 ; =gActorManager
mov r5, r0
ldr r1, [r1]
ldr r2, _02178404 ; =0x504c444d
add r0, sp, #4
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02178400 ; =data_027e0fe4
ldr r0, _02178400 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13190,7 +13190,7 @@ func_ov23_02178354: ; 0x02178354
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02178400: .word data_027e0fe4
_02178400: .word gActorManager
_02178404: .word 0x504c444d
_02178408: .word data_027e0f94
_0217840c: .word data_027e0fac
asm/ov24.inc
+1 -1
View File
@@ -112,7 +112,7 @@
.extern data_027e0f94
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov24.s
+95 -95
View File
@@ -2817,13 +2817,13 @@ func_ov24_0216fa3c: ; 0x0216fa3c
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mov r1, #0
str r1, [r4, #0x6c]
ldr r0, _0216fbc8 ; =data_027e0fe4
ldr r0, _0216fbc8 ; =gActorManager
str r1, [r4, #0x70]
ldr r1, [r0]
ldr r2, _0216fbcc ; =0x574c4354
add r0, sp, #4
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0216fbc8 ; =data_027e0fe4
ldr r0, _0216fbc8 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2864,7 +2864,7 @@ _0216fba8:
_0216fbbc: .word data_027e0f64
_0216fbc0: .word gPlayerLink
_0216fbc4: .word gAdventureFlags
_0216fbc8: .word data_027e0fe4
_0216fbc8: .word gActorManager
_0216fbcc: .word 0x574c4354
_0216fbd0: .word gMapManager
arm_func_end func_ov24_0216fa3c
@@ -2882,7 +2882,7 @@ func_ov24_0216fbd4: ; 0x0216fbd4
mov r0, #0
ldmia sp!, {r4, pc}
_0216fbf8:
ldr r0, _0216fc64 ; =data_027e0fe4
ldr r0, _0216fc64 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -2912,7 +2912,7 @@ _0216fc5c:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0216fc64: .word data_027e0fe4
_0216fc64: .word gActorManager
_0216fc68: .word 0x41525257
_0216fc6c: .word 0x5342454d
arm_func_end func_ov24_0216fbd4
@@ -4721,7 +4721,7 @@ func_ov24_02171358: ; 0x02171358
bl func_ov00_020c4048
cmp r0, #0
blt _02171420
ldr r0, _021714d4 ; =data_027e0fe4
ldr r0, _021714d4 ; =gActorManager
add r1, r5, #0x3c0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4799,7 +4799,7 @@ _021714c0:
.align 2, 0
_021714cc: .word data_027e0fe8
_021714d0: .word 0x53544c48
_021714d4: .word data_027e0fe4
_021714d4: .word gActorManager
_021714d8: .word data_ov24_0217a38c
_021714dc: .word 0x0000ffff
arm_func_end func_ov24_02171358
@@ -5084,7 +5084,7 @@ _02171748: .word 0x00002aab
arm_func_start func_ov24_0217174c
func_ov24_0217174c: ; 0x0217174c
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _0217178c ; =data_027e0fe4
ldr r2, _0217178c ; =gActorManager
mov r3, r0
ldr r0, [r2]
mov r5, r1
@@ -5100,7 +5100,7 @@ func_ov24_0217174c: ; 0x0217174c
bl func_ov24_021768d8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217178c: .word data_027e0fe4
_0217178c: .word gActorManager
arm_func_end func_ov24_0217174c
.global func_ov24_02171790
@@ -5109,7 +5109,7 @@ func_ov24_02171790: ; 0x02171790
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN5Actor4KillEv
ldr r0, _021717cc ; =data_027e0fe4
ldr r0, _021717cc ; =gActorManager
add r1, r4, #0x3c0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5122,7 +5122,7 @@ func_ov24_02171790: ; 0x02171790
bl _ZN5Actor4KillEv
ldmia sp!, {r4, pc}
.align 2, 0
_021717cc: .word data_027e0fe4
_021717cc: .word gActorManager
arm_func_end func_ov24_02171790
.global func_ov24_021717d0
@@ -5168,7 +5168,7 @@ _0217184c:
mov r2, #0
str r2, [r0, #0x10]
ldr r1, [r4, #0x22c]
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
str r2, [r1, #0x14]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -5187,7 +5187,7 @@ _02171894:
mov r2, #0
str r2, [r0, #0x10]
ldr r1, [r4, #0x22c]
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
str r2, [r1, #0x14]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -5206,7 +5206,7 @@ _021718dc:
mov r2, #0
str r2, [r0, #0x10]
ldr r1, [r4, #0x22c]
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
str r2, [r1, #0x14]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -5240,7 +5240,7 @@ _02171950:
mov r2, #0
str r2, [r0, #0x10]
ldr r1, [r4, #0x22c]
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
str r2, [r1, #0x14]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -5278,7 +5278,7 @@ _021719f0:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -5321,7 +5321,7 @@ _02171a8c:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -5359,7 +5359,7 @@ _02171ad0:
str r2, [r0, #4]
add r1, r1, #0xf
str r1, [r4, #0x13c]
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
add r1, r4, #0x3c0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5396,7 +5396,7 @@ _02171b5c:
str r2, [r0, #4]
add r1, r1, #0xf
str r1, [r4, #0x13c]
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
add r1, r4, #0x3c0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5433,7 +5433,7 @@ _02171be8:
str r2, [r0, #4]
add r1, r1, #0xf
str r1, [r4, #0x13c]
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
add r1, r4, #0x3c0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5482,7 +5482,7 @@ _02171cdc:
str r1, [r0, #0x10]
add r0, r4, #0x300
mov r2, #0
ldr r1, _02171e48 ; =data_027e0fe4
ldr r1, _02171e48 ; =gActorManager
strh r2, [r0, #0xbc]
ldr r0, [r1]
add r1, r4, #0x3c0
@@ -5504,7 +5504,7 @@ _02171d2c:
str r1, [r0, #0x10]
add r0, r4, #0x300
mov r2, #0
ldr r1, _02171e48 ; =data_027e0fe4
ldr r1, _02171e48 ; =gActorManager
strh r2, [r0, #0xbc]
ldr r0, [r1]
add r1, r4, #0x3c0
@@ -5525,7 +5525,7 @@ _02171d7c:
mov r2, #0
str r2, [r0, #0x10]
ldr r1, [r4, #0x22c]
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
str r2, [r1, #0x14]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -5549,7 +5549,7 @@ _02171ddc:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02171e48 ; =data_027e0fe4
ldr r0, _02171e48 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -5575,7 +5575,7 @@ _02171e40:
add sp, sp, #0x20
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02171e48: .word data_027e0fe4
_02171e48: .word gActorManager
_02171e4c: .word data_027e0e58
_02171e50: .word 0x000001b3
_02171e54: .word gMapManager
@@ -5593,7 +5593,7 @@ func_ov24_02171e64: ; 0x02171e64
ldr r0, [r4, #0x160]
cmp r0, #1
ldmneia sp!, {r4, pc}
ldr r0, _02171ef0 ; =data_027e0fe4
ldr r0, _02171ef0 ; =gActorManager
add r1, r4, #0x3c0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5625,7 +5625,7 @@ _02171ee0:
bl func_ov24_021717d0
ldmia sp!, {r4, pc}
.align 2, 0
_02171ef0: .word data_027e0fe4
_02171ef0: .word gActorManager
arm_func_end func_ov24_02171e64
.global func_ov24_02171ef4
@@ -5968,7 +5968,7 @@ _02172358: ; jump table
b _021723a4 ; case 18
_021723a4:
mov r1, #0
ldr r0, _02172bd8 ; =data_027e0fe4
ldr r0, _02172bd8 ; =gActorManager
strb r1, [r4, #0x1a8]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -6033,7 +6033,7 @@ _02172478:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02172bd8 ; =data_027e0fe4
ldr r0, _02172bd8 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -6355,7 +6355,7 @@ _0217291c:
bl func_0202e58c
cmp r0, #0
beq _02172bd0
ldr r0, _02172bd8 ; =data_027e0fe4
ldr r0, _02172bd8 ; =gActorManager
add r1, r4, #0x3c0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6381,7 +6381,7 @@ _02172970:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02172bd8 ; =data_027e0fe4
ldr r0, _02172bd8 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3c0
@@ -6542,7 +6542,7 @@ _02172bd0:
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02172bd8: .word data_027e0fe4
_02172bd8: .word gActorManager
_02172bdc: .word 0x0000019a
_02172be0: .word data_027e0764
_02172be4: .word data_027e0ffc
@@ -6585,7 +6585,7 @@ func_ov24_02172bf8: ; 0x02172bf8
ldr r2, [sp, #0x38]
str r1, [sp, #0xc]
ldr r1, [sp, #0x3c]
ldr r0, _02172cf0 ; =data_027e0fe4
ldr r0, _02172cf0 ; =gActorManager
str r3, [sp, #0x10]
ldr r3, [sp, #0x40]
str r2, [sp, #0x14]
@@ -6625,7 +6625,7 @@ _02172ce4:
add sp, sp, #0x60
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02172cf0: .word data_027e0fe4
_02172cf0: .word gActorManager
arm_func_end func_ov24_02172bf8
.global func_ov24_02172cf4
@@ -6877,7 +6877,7 @@ func_ov24_02172fe0: ; 0x02172fe0
bl func_ov00_020c4048
cmp r0, #0
blt _021730a0
ldr r0, _02173104 ; =data_027e0fe4
ldr r0, _02173104 ; =gActorManager
add r1, r5, #0x3bc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6929,7 +6929,7 @@ _021730ac:
.align 2, 0
_021730fc: .word data_027e0fe8
_02173100: .word 0x53544c48
_02173104: .word data_027e0fe4
_02173104: .word gActorManager
_02173108: .word data_ov24_0217a52c
_0217310c: .word 0x0000ffff
arm_func_end func_ov24_02172fe0
@@ -6969,7 +6969,7 @@ func_ov24_02173134: ; 0x02173134
arm_func_start func_ov24_02173148
func_ov24_02173148: ; 0x02173148
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _02173188 ; =data_027e0fe4
ldr r2, _02173188 ; =gActorManager
mov r3, r0
ldr r0, [r2]
mov r5, r1
@@ -6985,7 +6985,7 @@ func_ov24_02173148: ; 0x02173148
bl func_ov24_021768d8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02173188: .word data_027e0fe4
_02173188: .word gActorManager
arm_func_end func_ov24_02173148
.global func_ov24_0217318c
@@ -6994,7 +6994,7 @@ func_ov24_0217318c: ; 0x0217318c
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN5Actor4KillEv
ldr r0, _021731c8 ; =data_027e0fe4
ldr r0, _021731c8 ; =gActorManager
add r1, r4, #0x3bc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -7007,7 +7007,7 @@ func_ov24_0217318c: ; 0x0217318c
bl _ZN5Actor4KillEv
ldmia sp!, {r4, pc}
.align 2, 0
_021731c8: .word data_027e0fe4
_021731c8: .word gActorManager
arm_func_end func_ov24_0217318c
.global func_ov24_021731cc
@@ -7076,7 +7076,7 @@ _021732a0:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02173374 ; =data_027e0fe4
ldr r0, _02173374 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3bc
@@ -7095,7 +7095,7 @@ _021732e4:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02173374 ; =data_027e0fe4
ldr r0, _02173374 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3bc
@@ -7114,7 +7114,7 @@ _02173328:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02173374 ; =data_027e0fe4
ldr r0, _02173374 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3bc
@@ -7131,7 +7131,7 @@ _02173364:
.align 2, 0
_0217336c: .word data_027e0e58
_02173370: .word 0x000001b3
_02173374: .word data_027e0fe4
_02173374: .word gActorManager
arm_func_end func_ov24_021731cc
.global func_ov24_02173378
@@ -7143,7 +7143,7 @@ func_ov24_02173378: ; 0x02173378
ldr r0, [r4, #0x160]
cmp r0, #1
ldmneia sp!, {r4, pc}
ldr r0, _02173404 ; =data_027e0fe4
ldr r0, _02173404 ; =gActorManager
add r1, r4, #0x3bc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -7175,7 +7175,7 @@ _021733f4:
bl func_ov24_021731cc
ldmia sp!, {r4, pc}
.align 2, 0
_02173404: .word data_027e0fe4
_02173404: .word gActorManager
arm_func_end func_ov24_02173378
.global func_ov24_02173408
@@ -7400,7 +7400,7 @@ func_ov24_021736e4: ; 0x021736e4
cmpne r0, #5
bne _0217373c
mov r1, #0
ldr r0, _02173a10 ; =data_027e0fe4
ldr r0, _02173a10 ; =gActorManager
strb r1, [r4, #0x1a8]
ldr r0, [r0]
add r1, r4, #0x3bc
@@ -7473,7 +7473,7 @@ _021737f0:
bl func_0202e58c
cmp r0, #0
beq _02173a08
ldr r0, _02173a10 ; =data_027e0fe4
ldr r0, _02173a10 ; =gActorManager
add r1, r4, #0x3bc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -7499,7 +7499,7 @@ _02173844:
bl func_ov00_020c5d74
ldr r1, [r4, #0x22c]
mov r2, #0x1000
ldr r0, _02173a10 ; =data_027e0fe4
ldr r0, _02173a10 ; =gActorManager
str r2, [r1, #0x10]
ldr r0, [r0]
add r1, r4, #0x3bc
@@ -7615,7 +7615,7 @@ _02173a08:
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02173a10: .word data_027e0fe4
_02173a10: .word gActorManager
_02173a14: .word 0x88888889
_02173a18: .word data_027e0764
arm_func_end func_ov24_021736e4
@@ -7647,7 +7647,7 @@ func_ov24_02173a1c: ; 0x02173a1c
ldr r2, [sp, #0x38]
str r1, [sp, #0xc]
ldr r1, [sp, #0x3c]
ldr r0, _02173b14 ; =data_027e0fe4
ldr r0, _02173b14 ; =gActorManager
str r3, [sp, #0x10]
ldr r3, [sp, #0x40]
str r2, [sp, #0x14]
@@ -7687,7 +7687,7 @@ _02173b08:
add sp, sp, #0x60
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02173b14: .word data_027e0fe4
_02173b14: .word gActorManager
arm_func_end func_ov24_02173a1c
.global func_ov24_02173b18
@@ -8016,7 +8016,7 @@ func_ov24_02173f10: ; 0x02173f10
bl func_ov00_020c4048
cmp r0, #0
blt _02173fe0
ldr r0, _02174040 ; =data_027e0fe4
ldr r0, _02174040 ; =gActorManager
add r1, r5, #0x2b8
ldr r0, [r0]
add r1, r1, #0x400
@@ -8068,7 +8068,7 @@ _02173fec:
.align 2, 0
_02174038: .word data_027e0fe8
_0217403c: .word 0x53544c48
_02174040: .word data_027e0fe4
_02174040: .word gActorManager
_02174044: .word data_ov24_0217a70c
_02174048: .word 0x0000ffff
arm_func_end func_ov24_02173f10
@@ -8448,7 +8448,7 @@ _021743d4: .word 0x00002aab
arm_func_start func_ov24_021743d8
func_ov24_021743d8: ; 0x021743d8
stmdb sp!, {r3, r4, r5, lr}
ldr r3, _02174418 ; =data_027e0fe4
ldr r3, _02174418 ; =gActorManager
add r2, r0, #0x2b8
ldr r0, [r3]
mov r5, r1
@@ -8464,7 +8464,7 @@ func_ov24_021743d8: ; 0x021743d8
bl func_ov24_021768d8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02174418: .word data_027e0fe4
_02174418: .word gActorManager
arm_func_end func_ov24_021743d8
.global func_ov24_0217441c
@@ -8473,7 +8473,7 @@ func_ov24_0217441c: ; 0x0217441c
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN5Actor4KillEv
ldr r0, _0217445c ; =data_027e0fe4
ldr r0, _0217445c ; =gActorManager
add r1, r4, #0x2b8
ldr r0, [r0]
add r1, r1, #0x400
@@ -8487,7 +8487,7 @@ func_ov24_0217441c: ; 0x0217441c
bl _ZN5Actor4KillEv
ldmia sp!, {r4, pc}
.align 2, 0
_0217445c: .word data_027e0fe4
_0217445c: .word gActorManager
arm_func_end func_ov24_0217441c
.global func_ov24_02174460
@@ -8533,7 +8533,7 @@ _021744d8:
str r3, [r0, #0x10]
ldr r2, [r4, #0x22c]
add r1, r4, #0x2b8
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x14]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8553,7 +8553,7 @@ _02174524:
str r3, [r0, #0x10]
ldr r2, [r4, #0x22c]
add r1, r4, #0x2b8
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x14]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8573,7 +8573,7 @@ _02174570:
str r3, [r0, #0x10]
ldr r2, [r4, #0x22c]
add r1, r4, #0x2b8
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x14]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8608,7 +8608,7 @@ _021745e8:
str r3, [r0, #0x10]
ldr r2, [r4, #0x22c]
add r1, r4, #0x2b8
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x14]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8647,7 +8647,7 @@ _0217468c:
add r1, r4, #0x2b8
ldr r2, [r4, #0x22c]
mov r3, #0x1000
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x10]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8710,7 +8710,7 @@ _0217472c:
mla r6, r1, r0, r6
str ip, [r3, #4]
add r1, r6, #0x14
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r1, [r4, #0x13c]
add r2, r4, #0x2b8
ldr r0, [r0]
@@ -8731,7 +8731,7 @@ _021747c4:
add r1, r4, #0x2b8
ldr r2, [r4, #0x22c]
mov r3, #0x1000
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x10]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8769,7 +8769,7 @@ _0217480c:
orr r2, r2, r3, lsr #28
str r3, [r0, #4]
add r2, r2, #0xf
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r2, [r4, #0x13c]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8807,7 +8807,7 @@ _0217489c:
orr r2, r2, r3, lsr #28
str r3, [r0, #4]
add r2, r2, #0xf
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r2, [r4, #0x13c]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8845,7 +8845,7 @@ _0217492c:
orr r2, r2, r3, lsr #28
str r3, [r0, #4]
add r2, r2, #0xf
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r2, [r4, #0x13c]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8893,7 +8893,7 @@ _02174a24:
add r1, r4, #0x2b8
ldr r2, [r4, #0x22c]
mov r3, #0x1000
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x10]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8941,7 +8941,7 @@ _02174ad4:
str r3, [r0, #0x10]
ldr r2, [r4, #0x22c]
add r1, r4, #0x2b8
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x14]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8966,7 +8966,7 @@ _02174b38:
add r1, r4, #0x2b8
ldr r2, [r4, #0x22c]
mov r3, #0x1000
ldr r0, _02174ba8 ; =data_027e0fe4
ldr r0, _02174ba8 ; =gActorManager
str r3, [r2, #0x10]
ldr r0, [r0]
add r1, r1, #0x400
@@ -8992,7 +8992,7 @@ _02174ba0:
add sp, sp, #0x20
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02174ba8: .word data_027e0fe4
_02174ba8: .word gActorManager
_02174bac: .word data_027e0e58
_02174bb0: .word 0x000001b3
_02174bb4: .word gMapManager
@@ -9010,7 +9010,7 @@ func_ov24_02174bc4: ; 0x02174bc4
ldr r0, [r4, #0x160]
cmp r0, #1
ldmneia sp!, {r4, pc}
ldr r0, _02174c54 ; =data_027e0fe4
ldr r0, _02174c54 ; =gActorManager
add r1, r4, #0x2b8
ldr r0, [r0]
add r1, r1, #0x400
@@ -9043,7 +9043,7 @@ _02174c44:
bl func_ov24_02174460
ldmia sp!, {r4, pc}
.align 2, 0
_02174c54: .word data_027e0fe4
_02174c54: .word gActorManager
arm_func_end func_ov24_02174bc4
.global func_ov24_02174c58
@@ -9529,7 +9529,7 @@ _021752e8:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, pc}
_02175320:
ldr r0, _02175ebc ; =data_027e0fe4
ldr r0, _02175ebc ; =gActorManager
add r1, r4, #0x2b8
ldr r0, [r0]
add r1, r1, #0x400
@@ -9587,7 +9587,7 @@ _021753ac: ; jump table
b _021753f4 ; case 17
_021753f4:
mov r1, #0
ldr r0, _02175ebc ; =data_027e0fe4
ldr r0, _02175ebc ; =gActorManager
strb r1, [r4, #0x1a8]
add r1, r4, #0x2b8
ldr r0, [r0]
@@ -9885,7 +9885,7 @@ _02175848:
add r1, r4, #0x2b8
ldr r2, [r4, #0x22c]
mov r3, #0x1000
ldr r0, _02175ebc ; =data_027e0fe4
ldr r0, _02175ebc ; =gActorManager
str r3, [r2, #0x10]
ldr r0, [r0]
add r1, r1, #0x400
@@ -10179,7 +10179,7 @@ _02175c84:
bl func_0202e58c
cmp r0, #0
beq _02175eac
ldr r0, _02175ebc ; =data_027e0fe4
ldr r0, _02175ebc ; =gActorManager
add r1, r4, #0x2b8
ldr r0, [r0]
add r1, r1, #0x400
@@ -10207,7 +10207,7 @@ _02175cdc:
add r1, r4, #0x2b8
ldr r2, [r4, #0x22c]
mov r3, #0x1000
ldr r0, _02175ebc ; =data_027e0fe4
ldr r0, _02175ebc ; =gActorManager
str r3, [r2, #0x10]
ldr r0, [r0]
add r1, r1, #0x400
@@ -10255,7 +10255,7 @@ _02175d50:
add r1, r4, #0x2b8
ldr r2, [r4, #0x22c]
mov r3, #0x1000
ldr r0, _02175ebc ; =data_027e0fe4
ldr r0, _02175ebc ; =gActorManager
str r3, [r2, #0x10]
ldr r0, [r0]
add r1, r1, #0x400
@@ -10327,7 +10327,7 @@ _02175eac:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02175eb8: .word gMapManager
_02175ebc: .word data_027e0fe4
_02175ebc: .word gActorManager
_02175ec0: .word data_ov24_021792e4
_02175ec4: .word 0x00000b33
_02175ec8: .word data_02050f54
@@ -10375,7 +10375,7 @@ func_ov24_02175ef4: ; 0x02175ef4
ldr r3, [sp, #0x34]
str r2, [sp, #8]
ldr r2, [sp, #0x38]
ldr r0, _02175ff0 ; =data_027e0fe4
ldr r0, _02175ff0 ; =gActorManager
str r4, [sp, #0xc]
ldr r4, [sp, #0x3c]
str r3, [sp, #0x10]
@@ -10417,7 +10417,7 @@ _02175fe4:
add sp, sp, #0x60
ldmia sp!, {r4, pc}
.align 2, 0
_02175ff0: .word data_027e0fe4
_02175ff0: .word gActorManager
arm_func_end func_ov24_02175ef4
.global func_ov24_02175ff4
@@ -11635,7 +11635,7 @@ func_ov24_02176eb8: ; 0x02176eb8
mov r4, r0
add r0, r4, #0x300
ldrsh r3, [r0, #0x5c]
ldr r2, _0217722c ; =data_027e0fe4
ldr r2, _0217722c ; =gActorManager
add r1, r4, #0x34
add r3, r3, #1
strh r3, [r0, #0x5c]
@@ -11727,7 +11727,7 @@ _02176fe4:
bl func_020079d8
b _02177048
_02177018:
ldr r0, _0217722c ; =data_027e0fe4
ldr r0, _0217722c ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -11756,7 +11756,7 @@ _02177054:
_02177078:
mov r0, r4
bl func_ov24_02176954
ldr r0, _0217722c ; =data_027e0fe4
ldr r0, _0217722c ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -11800,7 +11800,7 @@ _02177100:
_02177118:
mov r0, r4
bl func_ov24_02176a34
ldr r0, _0217722c ; =data_027e0fe4
ldr r0, _0217722c ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -11828,7 +11828,7 @@ _02177164:
str r3, [sp, #4]
str ip, [sp, #8]
bl func_ov24_02176a94
ldr r0, _0217722c ; =data_027e0fe4
ldr r0, _0217722c ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -11850,7 +11850,7 @@ _021771b0:
bl func_ov24_02176be4
b _02177220
_021771d8:
ldr r0, _0217722c ; =data_027e0fe4
ldr r0, _0217722c ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -11874,7 +11874,7 @@ _02177220:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217722c: .word data_027e0fe4
_0217722c: .word gActorManager
_02177230: .word 0x53544c46
_02177234: .word 0x0000019a
arm_func_end func_ov24_02176eb8
@@ -13250,7 +13250,7 @@ func_ov24_02178348: ; 0x02178348
mov r5, r1
bl func_ov24_021786a0
mvn r3, #0
ldr r1, _02178690 ; =data_027e0fe4
ldr r1, _02178690 ; =gActorManager
add r0, sp, #0x20
ldr r1, [r1]
mov r2, #7
@@ -13266,7 +13266,7 @@ func_ov24_02178348: ; 0x02178348
beq _021783f8
str r2, [r6, #0xc8]
ldr r1, [sp, #0x34]
ldr r0, _02178690 ; =data_027e0fe4
ldr r0, _02178690 ; =gActorManager
str r1, [r6, #0xcc]
ldr r0, [r0]
add r1, sp, #0x30
@@ -13331,7 +13331,7 @@ _021783f8:
mov r3, #0
bl func_02005dcc
mvn r0, #0
ldr r1, _02178690 ; =data_027e0fe4
ldr r1, _02178690 ; =gActorManager
ldr r2, _02178698 ; =0x57534253
ldr r1, [r1]
str r0, [sp, #0x28]
@@ -13345,7 +13345,7 @@ _021783f8:
str r1, [sp, #0x28]
cmp r1, r0
beq _02178504
ldr r0, _02178690 ; =data_027e0fe4
ldr r0, _02178690 ; =gActorManager
add r1, sp, #0x28
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13459,7 +13459,7 @@ _0217866c:
add sp, sp, #0xcc
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02178690: .word data_027e0fe4
_02178690: .word gActorManager
_02178694: .word data_027e0f64
_02178698: .word 0x57534253
_0217869c: .word gMapManager
asm/ov25.inc
+1 -1
View File
@@ -119,7 +119,7 @@
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov25.s
+66 -66
View File
@@ -162,7 +162,7 @@ _0216d860:
add r2, r2, #8
cmp r2, r0
blo _0216d860
ldr r0, _0216da98 ; =data_027e0fe4
ldr r0, _0216da98 ; =gActorManager
mov r9, #0
ldr lr, _0216da9c ; =_ZTV11FilterActor
add r8, sp, #0x40
@@ -194,7 +194,7 @@ _0216d860:
addle sp, sp, #0xd4
ldmleia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0216d8f0:
ldr r0, _0216da98 ; =data_027e0fe4
ldr r0, _0216da98 ; =gActorManager
ldr r1, [sp]
ldr r0, [r0]
add r1, r1, r9
@@ -305,7 +305,7 @@ _0216da7c:
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0216da98: .word data_027e0fe4
_0216da98: .word gActorManager
_0216da9c: .word _ZTV11FilterActor
_0216daa0: .word 0x43425331
arm_func_end func_ov25_0216d844
@@ -1746,7 +1746,7 @@ func_ov25_0216ecf4: ; 0x0216ecf4
str r5, [sp, #0x40]
str r2, [sp, #0x38]
ldr r2, [r0, #8]
ldr r1, _0216eedc ; =data_027e0fe4
ldr r1, _0216eedc ; =gActorManager
str r2, [sp, #0x28]
ldr r5, [r0, #0xc]
ldr r0, [r1]
@@ -1772,7 +1772,7 @@ func_ov25_0216ecf4: ; 0x0216ecf4
str r1, [sp, #0x24]
cmp r0, #0
ble _0216ee54
ldr r10, _0216eedc ; =data_027e0fe4
ldr r10, _0216eedc ; =gActorManager
mov r8, r6
add r4, sp, #8
add r5, sp, #0
@@ -1838,7 +1838,7 @@ _0216eeb4:
.align 2, 0
_0216eed4: .word _ZTV11FilterActor
_0216eed8: .word 0x43425330
_0216eedc: .word data_027e0fe4
_0216eedc: .word gActorManager
_0216eee0: .word data_027e0764
arm_func_end func_ov25_0216ecf4
@@ -4201,7 +4201,7 @@ _02170fd8:
bl func_ov00_020c4048
cmp r0, #0
blt _021710ec
ldr r0, _02171350 ; =data_027e0fe4
ldr r0, _02171350 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4394,7 +4394,7 @@ _02171200:
addlt sp, sp, #0x94
movlt r0, #0
ldmltia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02171350 ; =data_027e0fe4
ldr r0, _02171350 ; =gActorManager
add r1, r8, #0x2dc
ldr r0, [r0]
add r1, r1, #0x400
@@ -4416,7 +4416,7 @@ _02171340: .word 0x00000266
_02171344: .word data_027e0ffc
_02171348: .word data_027e0fe8
_0217134c: .word 0x43425332
_02171350: .word data_027e0fe4
_02171350: .word gActorManager
_02171354: .word 0x000002da
_02171358: .word data_ov25_0217934c
arm_func_end func_ov25_02170e64
@@ -4425,7 +4425,7 @@ _02171358: .word data_ov25_0217934c
arm_func_start func_ov25_0217135c
func_ov25_0217135c: ; 0x0217135c
stmdb sp!, {r3, lr}
ldr r2, _02171384 ; =data_027e0fe4
ldr r2, _02171384 ; =gActorManager
add r1, r0, #0x2dc
ldr r0, [r2]
add r1, r1, #0x400
@@ -4435,14 +4435,14 @@ func_ov25_0217135c: ; 0x0217135c
movne r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_02171384: .word data_027e0fe4
_02171384: .word gActorManager
arm_func_end func_ov25_0217135c
.global func_ov25_02171388
arm_func_start func_ov25_02171388
func_ov25_02171388: ; 0x02171388
stmdb sp!, {r3, lr}
ldr r2, _021713c0 ; =data_027e0fe4
ldr r2, _021713c0 ; =gActorManager
add r1, r0, #0x2dc
ldr r0, [r2]
add r1, r1, #0x400
@@ -4457,14 +4457,14 @@ _021713b8:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_021713c0: .word data_027e0fe4
_021713c0: .word gActorManager
arm_func_end func_ov25_02171388
.global func_ov25_021713c4
arm_func_start func_ov25_021713c4
func_ov25_021713c4: ; 0x021713c4
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r2, _02171474 ; =data_027e0fe4
ldr r2, _02171474 ; =gActorManager
mov r4, r0
add r1, r4, #0x2dc
ldr r0, [r2]
@@ -4508,7 +4508,7 @@ func_ov25_021713c4: ; 0x021713c4
strgt r1, [r4, #0x69c]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02171474: .word data_027e0fe4
_02171474: .word gActorManager
_02171478: .word data_027e0764
_0217147c: .word 0x00004001
arm_func_end func_ov25_021713c4
@@ -4596,7 +4596,7 @@ func_ov25_02171508: ; 0x02171508
add r3, sp, #0xc
mov r2, r4
bl func_ov00_020c4048
ldr r0, _021715e8 ; =data_027e0fe4
ldr r0, _021715e8 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4613,7 +4613,7 @@ func_ov25_02171508: ; 0x02171508
_021715dc: .word gMapManager
_021715e0: .word data_027e0fe8
_021715e4: .word 0x4e4b4559
_021715e8: .word data_027e0fe4
_021715e8: .word gActorManager
arm_func_end func_ov25_02171508
.global func_ov25_021715ec
@@ -5519,7 +5519,7 @@ _0217210c:
bl func_ov00_020ceacc
add r0, r6, #0x48
bl func_ov25_02171c2c
ldr r0, _021721e0 ; =data_027e0fe4
ldr r0, _021721e0 ; =gActorManager
add r1, r6, #0x174
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5567,7 +5567,7 @@ _021721d0: .word data_027e0ffc
_021721d4: .word 0x000002df
_021721d8: .word 0x0000119a
_021721dc: .word data_027e0764
_021721e0: .word data_027e0fe4
_021721e0: .word gActorManager
arm_func_end func_ov25_02171fe8
.global func_ov25_021721e4
@@ -6980,7 +6980,7 @@ _021734c4:
add r8, r8, #8
cmp r8, r0
blo _021734c4
ldr r0, _02173588 ; =data_027e0fe4
ldr r0, _02173588 ; =gActorManager
add r1, sp, #0x8c
ldr r0, [r0]
add r2, sp, #0
@@ -6994,7 +6994,7 @@ _021734c4:
mov r6, #0
addle sp, sp, #0xd4
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r11, _02173588 ; =data_027e0fe4
ldr r11, _02173588 ; =gActorManager
mov r8, r6
_02173518:
ldr r1, [sp]
@@ -7027,7 +7027,7 @@ _02173564:
.align 2, 0
_02173580: .word _ZTV11FilterActor
_02173584: .word 0x53504452
_02173588: .word data_027e0fe4
_02173588: .word gActorManager
arm_func_end func_ov25_0217345c
.global func_ov25_0217358c
@@ -7174,7 +7174,7 @@ _02173724: .word 0x00710007
func_ov25_02173728: ; 0x02173728
stmdb sp!, {r3, r4, r5, r6, r7, r8, lr}
sub sp, sp, #0x74
ldr r1, _02173a3c ; =data_027e0fe4
ldr r1, _02173a3c ; =gActorManager
mvn r8, #0
mov r4, r0
mov r7, #0
@@ -7225,7 +7225,7 @@ _021737e4:
mov r5, r7
cmp r0, #0
ble _02173a30
ldr r7, _02173a3c ; =data_027e0fe4
ldr r7, _02173a3c ; =gActorManager
add r6, sp, #0xc
_021737fc:
ldr r0, [r7]
@@ -7269,7 +7269,7 @@ _02173878:
mov r5, r7
cmp r0, #0
ble _02173a30
ldr r7, _02173a3c ; =data_027e0fe4
ldr r7, _02173a3c ; =gActorManager
add r6, sp, #0xc
_02173890:
ldr r0, [r7]
@@ -7313,7 +7313,7 @@ _0217390c:
mov r5, r7
cmp r0, #0
ble _02173a30
ldr r7, _02173a3c ; =data_027e0fe4
ldr r7, _02173a3c ; =gActorManager
add r6, sp, #0xc
_02173924:
ldr r0, [r7]
@@ -7357,7 +7357,7 @@ _021739a0:
mov r5, r7
cmp r0, #0
ble _02173a30
ldr r7, _02173a3c ; =data_027e0fe4
ldr r7, _02173a3c ; =gActorManager
add r6, sp, #0xc
_021739b8:
ldr r0, [r7]
@@ -7400,7 +7400,7 @@ _02173a30:
add sp, sp, #0x74
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_02173a3c: .word data_027e0fe4
_02173a3c: .word gActorManager
_02173a40: .word _ZTV11FilterActor
_02173a44: .word 0x43425331
arm_func_end func_ov25_02173728
@@ -7727,7 +7727,7 @@ _02173e74:
mov r2, #0x1000
str r2, [r0, #0x10]
mov r2, #0
ldr r0, _02174040 ; =data_027e0fe4
ldr r0, _02174040 ; =gActorManager
str r2, [r4, #0x12c]
ldr r0, [r0]
add r1, r1, #0x400
@@ -7764,7 +7764,7 @@ _02173f0c:
add r2, r4, #0x48
str r3, [r4, #0x12c]
bl func_ov00_020ceacc
ldr r0, _02174040 ; =data_027e0fe4
ldr r0, _02174040 ; =gActorManager
add r1, r4, #0x144
ldr r0, [r0]
add r1, r1, #0x400
@@ -7830,7 +7830,7 @@ _02174030: .word 0x000e005c
_02174034: .word data_027e0c68
_02174038: .word data_027e0ffc
_0217403c: .word 0x000002e1
_02174040: .word data_027e0fe4
_02174040: .word gActorManager
_02174044: .word 0x0071002d
arm_func_end func_ov25_02173ab4
@@ -8633,7 +8633,7 @@ _02174aa4:
str r2, [sp, #0x314]
mov r2, #1
str r5, [sp, #0x318]
ldr r3, _021750a4 ; =data_027e0fe4
ldr r3, _021750a4 ; =gActorManager
str r8, [sp, #0x2bc]
add r5, sp, #0x13c
strb r7, [sp, #0x31f]
@@ -8760,7 +8760,7 @@ _02174d9c:
add r7, r7, #8
cmp r7, r0
blo _02174d9c
ldr r0, _021750a4 ; =data_027e0fe4
ldr r0, _021750a4 ; =gActorManager
add r1, sp, #0x1e0
ldr r0, [r0]
add r2, sp, #0x154
@@ -8770,7 +8770,7 @@ _02174d9c:
cmp r0, #0
mov r7, #0
ble _02174e14
ldr r9, _021750a4 ; =data_027e0fe4
ldr r9, _021750a4 ; =gActorManager
mov r8, r7
mov r5, r7
_02174de4:
@@ -8962,7 +8962,7 @@ _02175094: .word 0x000002aa
_02175098: .word data_ov00_020eed2c
_0217509c: .word 0x00000bb8
_021750a0: .word data_027e0f64
_021750a4: .word data_027e0fe4
_021750a4: .word gActorManager
_021750a8: .word data_027e0c68
_021750ac: .word _ZTV11FilterActor
_021750b0: .word 0x43425331
@@ -9768,7 +9768,7 @@ func_ov25_02175af0: ; 0x02175af0
func_ov25_02175b08: ; 0x02175b08
stmdb sp!, {r3, r4, r5, r6, r7, r8, lr}
sub sp, sp, #0x74
ldr r1, _02175c48 ; =data_027e0fe4
ldr r1, _02175c48 ; =gActorManager
mvn r8, #0
mov r7, #0
add r5, sp, #0x60
@@ -9808,7 +9808,7 @@ func_ov25_02175b08: ; 0x02175b08
movgt r4, r7
cmpgt r0, #0
ble _02175bfc
ldr r7, _02175c48 ; =data_027e0fe4
ldr r7, _02175c48 ; =gActorManager
mov r5, r4
_02175bb8:
ldr r1, [sp]
@@ -9831,7 +9831,7 @@ _02175bb8:
_02175bfc:
ldr r0, [sp, #8]
add r4, r6, #0x100
ldr r5, _02175c48 ; =data_027e0fe4
ldr r5, _02175c48 ; =gActorManager
strh r0, [r4, #0x78]
add r6, r6, #0x158
mov r7, #0
@@ -9851,7 +9851,7 @@ _02175c30:
add sp, sp, #0x74
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_02175c48: .word data_027e0fe4
_02175c48: .word gActorManager
_02175c4c: .word _ZTV11FilterActor
_02175c50: .word 0x43425330
arm_func_end func_ov25_02175b08
@@ -9917,7 +9917,7 @@ _02175d18: .word gMapManager
arm_func_start func_ov25_02175d1c
func_ov25_02175d1c: ; 0x02175d1c
stmdb sp!, {r4, r5, r6, lr}
ldr r4, _02175d68 ; =data_027e0fe4
ldr r4, _02175d68 ; =gActorManager
add r6, r0, #0x158
mov r5, #0
_02175d2c:
@@ -9938,14 +9938,14 @@ _02175d50:
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02175d68: .word data_027e0fe4
_02175d68: .word gActorManager
arm_func_end func_ov25_02175d1c
.global func_ov25_02175d6c
arm_func_start func_ov25_02175d6c
func_ov25_02175d6c: ; 0x02175d6c
stmdb sp!, {r4, r5, r6, lr}
ldr r4, _02175db8 ; =data_027e0fe4
ldr r4, _02175db8 ; =gActorManager
add r6, r0, #0x158
mov r5, #0
_02175d7c:
@@ -9966,7 +9966,7 @@ _02175da0:
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02175db8: .word data_027e0fe4
_02175db8: .word gActorManager
arm_func_end func_ov25_02175d6c
.global func_ov25_02175dbc
@@ -9974,7 +9974,7 @@ _02175db8: .word data_027e0fe4
func_ov25_02175dbc: ; 0x02175dbc
stmdb sp!, {r4, r5, r6, r7, r8, lr}
sub sp, sp, #8
ldr r1, _02175e78 ; =data_027e0fe4
ldr r1, _02175e78 ; =gActorManager
mov r5, r0
ldr r1, [r1]
ldr r2, _02175e7c ; =0x43425330
@@ -9994,7 +9994,7 @@ func_ov25_02175dbc: ; 0x02175dbc
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
add r7, r5, #0x158
ldr r6, _02175e80 ; =data_027e0764
ldr r5, _02175e78 ; =data_027e0fe4
ldr r5, _02175e78 ; =gActorManager
mov r8, #0
_02175e1c:
ldr r1, [r6]
@@ -10021,7 +10021,7 @@ _02175e1c:
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02175e78: .word data_027e0fe4
_02175e78: .word gActorManager
_02175e7c: .word 0x43425330
_02175e80: .word data_027e0764
arm_func_end func_ov25_02175dbc
@@ -10061,7 +10061,7 @@ _02175ee4:
cmp r2, #4
blt _02175ee4
mov r7, #0
ldr r11, _02175fa8 ; =data_027e0fe4
ldr r11, _02175fa8 ; =gActorManager
mov r9, r7
add r5, r10, #0x158
add r4, sp, #0
@@ -10111,7 +10111,7 @@ _02175f90:
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02175fa8: .word data_027e0fe4
_02175fa8: .word gActorManager
arm_func_end func_ov25_02175e84
.global func_ov25_02175fac
@@ -10145,7 +10145,7 @@ func_ov25_02175ff8: ; 0x02175ff8
stmdb sp!, {r4, r5, r6, r7, r8, lr}
mov r8, r0
mov r6, #0
ldr r4, _02176084 ; =data_027e0fe4
ldr r4, _02176084 ; =gActorManager
mov r5, r6
add r7, r8, #0x158
_02176010:
@@ -10162,7 +10162,7 @@ _02176010:
ldrsh r0, [r4, #0x78]
cmp r0, r6
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldr r5, _02176084 ; =data_027e0fe4
ldr r5, _02176084 ; =gActorManager
strh r6, [r4, #0x78]
add r6, r8, #0x158
mov r7, #0
@@ -10181,7 +10181,7 @@ _02176070:
blt _02176054
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02176084: .word data_027e0fe4
_02176084: .word gActorManager
arm_func_end func_ov25_02175ff8
.global func_ov25_02176088
@@ -10345,7 +10345,7 @@ _021762c4:
_021762d0:
bl func_ov25_02175dbc
add r7, r4, #0x158
ldr r5, _02176368 ; =data_027e0fe4
ldr r5, _02176368 ; =gActorManager
mov r6, #0
add r4, r4, #0x100
_021762e4:
@@ -10387,7 +10387,7 @@ _02176358: .word 0x0000038e
_0217635c: .word data_ov00_020eec68
_02176360: .word data_027e103c
_02176364: .word 0x000e005e
_02176368: .word data_027e0fe4
_02176368: .word gActorManager
arm_func_end func_ov25_02176088
.global func_ov25_0217636c
@@ -10521,7 +10521,7 @@ _02176510:
mvn r0, #0
cmp r6, r0
beq _02176554
ldr r0, _02176960 ; =data_027e0fe4
ldr r0, _02176960 ; =gActorManager
add r1, r4, #0x158
ldr r0, [r0]
add r1, r1, r6, lsl #3
@@ -10537,7 +10537,7 @@ _02176510:
bl func_ov25_0216eb98
_02176554:
mov r9, #0
ldr r5, _02176960 ; =data_027e0fe4
ldr r5, _02176960 ; =gActorManager
add r8, r4, #0x158
mov r7, #1
mov r6, r9
@@ -10625,7 +10625,7 @@ _02176648:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0217669c:
ldr r8, _02176960 ; =data_027e0fe4
ldr r8, _02176960 ; =gActorManager
add r7, r4, #0x158
mov r6, #0
add r9, sp, #0xc
@@ -10671,7 +10671,7 @@ _02176720:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_02176744:
ldr r9, _02176960 ; =data_027e0fe4
ldr r9, _02176960 ; =gActorManager
add r7, r4, #0x158
mov r6, #0
add r5, r4, #0x17c
@@ -10712,7 +10712,7 @@ _021767b4:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_021767d8:
ldr r5, _02176960 ; =data_027e0fe4
ldr r5, _02176960 ; =gActorManager
add r8, r4, #0x158
mov r7, #0
_021767e4:
@@ -10743,7 +10743,7 @@ _02176830:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_02176848:
ldr r5, _02176960 ; =data_027e0fe4
ldr r5, _02176960 ; =gActorManager
add r7, r4, #0x158
mov r6, #0
_02176854:
@@ -10759,7 +10759,7 @@ _02176870:
cmp r6, #4
add r7, r7, #8
blt _02176854
ldr r5, _02176960 ; =data_027e0fe4
ldr r5, _02176960 ; =gActorManager
add r7, r4, #0x158
mov r6, #1
mov r8, #0
@@ -10786,7 +10786,7 @@ _021768c4:
ldrsh r0, [r0, #0x78]
cmp r0, #1
bne _02176940
ldr r5, _02176960 ; =data_027e0fe4
ldr r5, _02176960 ; =gActorManager
add r7, r4, #0x158
mov r8, #0
_021768ec:
@@ -10824,7 +10824,7 @@ _0217694c:
_02176954: .word gMapManager
_02176958: .word gAdventureFlags
_0217695c: .word data_027e0c68
_02176960: .word data_027e0fe4
_02176960: .word gActorManager
_02176964: .word data_027e0f64
_02176968: .word gPlayerLink
arm_func_end func_ov25_021763a4
@@ -11384,7 +11384,7 @@ func_ov25_02176fbc: ; 0x02176fbc
_02176ff8:
cmp r1, #0xb
blt _02177050
ldr r0, _0217705c ; =data_027e0fe4
ldr r0, _0217705c ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -11409,7 +11409,7 @@ _02177050:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217705c: .word data_027e0fe4
_0217705c: .word gActorManager
_02177060: .word 0x424c5354
arm_func_end func_ov25_02176fbc
@@ -11423,7 +11423,7 @@ func_ov25_02177064: ; 0x02177064
cmp r0, #1
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, pc}
ldr r0, _021770e4 ; =data_027e0fe4
ldr r0, _021770e4 ; =gActorManager
ldrb r5, [r4, #0x15]
ldrb lr, [r4, #0x14]
ldr ip, _021770e8 ; =data_ov25_0217a19c
@@ -11449,7 +11449,7 @@ func_ov25_02177064: ; 0x02177064
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021770e4: .word data_027e0fe4
_021770e4: .word gActorManager
_021770e8: .word data_ov25_0217a19c
_021770ec: .word 0x43425331
arm_func_end func_ov25_02177064
asm/ov26.inc
+1 -1
View File
@@ -125,7 +125,7 @@
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov26.s
+11 -11
View File
@@ -481,7 +481,7 @@ func_ov26_0216db44: ; 0x0216db44
mov r4, r0
cmp r1, #0
bne _0216db80
ldr r1, _0216db98 ; =data_027e0fe4
ldr r1, _0216db98 ; =gActorManager
ldr r2, _0216db9c ; =0x43574d42
ldr r1, [r1]
add r0, sp, #0
@@ -500,7 +500,7 @@ _0216db8c:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0216db98: .word data_027e0fe4
_0216db98: .word gActorManager
_0216db9c: .word 0x43574d42
arm_func_end func_ov26_0216db44
@@ -783,7 +783,7 @@ func_ov26_0216de8c: ; 0x0216de8c
mov r4, r0
cmp r1, #0
bne _0216dec8
ldr r1, _0216dee0 ; =data_027e0fe4
ldr r1, _0216dee0 ; =gActorManager
ldr r2, _0216dee4 ; =0x434f4253
ldr r1, [r1]
add r0, sp, #0
@@ -802,7 +802,7 @@ _0216ded4:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0216dee0: .word data_027e0fe4
_0216dee0: .word gActorManager
_0216dee4: .word 0x434f4253
arm_func_end func_ov26_0216de8c
@@ -7099,7 +7099,7 @@ _02173010:
mov r1, #0
ldr r0, [r0]
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _021732b4 ; =data_027e0fe4
ldr r0, _021732b4 ; =gActorManager
mov r1, #0
ldr r0, [r0]
strb r1, [r0, #0x18]
@@ -7150,7 +7150,7 @@ _02173160:
mov r1, #1
ldr r0, [r0]
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _021732b4 ; =data_027e0fe4
ldr r0, _021732b4 ; =gActorManager
mov r2, #1
ldr r1, [r0]
ldr r0, _0217329c ; =data_027e0f64
@@ -7231,7 +7231,7 @@ _021732a4: .word 0x00001733
_021732a8: .word 0xfffff99a
_021732ac: .word gAdventureFlags
_021732b0: .word gPlayer
_021732b4: .word data_027e0fe4
_021732b4: .word gActorManager
_021732b8: .word data_027e0c68
_021732bc: .word gItemManager
_021732c0: .word data_027e0ffc
@@ -12412,7 +12412,7 @@ func_ov26_02176db0: ; 0x02176db0
cmp r4, r0
addeq sp, sp, #0x30
ldmeqia sp!, {r4, pc}
ldr r0, _02176e74 ; =data_027e0fe4
ldr r0, _02176e74 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -12431,7 +12431,7 @@ func_ov26_02176db0: ; 0x02176db0
.align 2, 0
_02176e6c: .word data_027e0fe8
_02176e70: .word 0x54415255
_02176e74: .word data_027e0fe4
_02176e74: .word gActorManager
arm_func_end func_ov26_02176db0
.global func_ov26_02176e78
@@ -12444,7 +12444,7 @@ func_ov26_02176e78: ; 0x02176e78
bne _02176f30
cmp r1, #0xb
blt _02176f30
ldr r0, _02176f38 ; =data_027e0fe4
ldr r0, _02176f38 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -12491,7 +12491,7 @@ _02176f30:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02176f38: .word data_027e0fe4
_02176f38: .word gActorManager
_02176f3c: .word 0x424c5354
_02176f40: .word 0x41525257
_02176f44: .word 0x424d524e
asm/ov27.inc
+1 -1
View File
@@ -105,7 +105,7 @@
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov27.s
+20 -20
View File
@@ -236,7 +236,7 @@ _0216d878:
add r2, r4, #0x48
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _0216da34 ; =data_027e0fe4
ldr r0, _0216da34 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -267,7 +267,7 @@ _0216da24: .word data_ov27_02178cfc
_0216da28: .word data_027e0ff0
_0216da2c: .word data_027e0fe8
_0216da30: .word 0x504c5344
_0216da34: .word data_027e0fe4
_0216da34: .word gActorManager
arm_func_end func_ov27_0216d810
.global func_ov27_0216da38
@@ -1336,12 +1336,12 @@ func_ov27_0216ea04: ; 0x0216ea04
mov r4, r0
cmp r1, #0
bne _0216ea64
ldr r1, _0216ea7c ; =data_027e0fe4
ldr r1, _0216ea7c ; =gActorManager
ldr r2, _0216ea80 ; =0x504c4c42
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0216ea7c ; =data_027e0fe4
ldr r0, _0216ea7c ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1364,7 +1364,7 @@ _0216ea70:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0216ea7c: .word data_027e0fe4
_0216ea7c: .word gActorManager
_0216ea80: .word 0x504c4c42
arm_func_end func_ov27_0216ea04
@@ -5168,7 +5168,7 @@ func_ov27_02171e10: ; 0x02171e10
ldr r0, [r4, #0x34]
cmp r0, r1
beq _02171eec
ldr r0, _02171f38 ; =data_027e0fe4
ldr r0, _02171f38 ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5194,7 +5194,7 @@ _02171f28: .word data_027e0fec
_02171f2c: .word data_027e0d0c
_02171f30: .word 0x0000099a
_02171f34: .word 0x00002710
_02171f38: .word data_027e0fe4
_02171f38: .word gActorManager
arm_func_end func_ov27_02171e10
.global func_ov27_02171f3c
@@ -6487,7 +6487,7 @@ func_ov27_02173124: ; 0x02173124
cmp r0, #0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, pc}
ldr r1, _021731d0 ; =data_027e0fe4
ldr r1, _021731d0 ; =gActorManager
ldr r2, _021731d4 ; =0x4c4e424b
ldr r1, [r1]
add r0, sp, #8
@@ -6496,7 +6496,7 @@ func_ov27_02173124: ; 0x02173124
mvn r0, #0
cmp r1, r0
beq _0217317c
ldr r0, _021731d0 ; =data_027e0fe4
ldr r0, _021731d0 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6507,7 +6507,7 @@ _0217317c:
cmp r0, #0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, pc}
ldr r1, _021731d0 ; =data_027e0fe4
ldr r1, _021731d0 ; =gActorManager
ldr r2, _021731d8 ; =0x50524c44
ldr r1, [r1]
add r0, sp, #0
@@ -6517,7 +6517,7 @@ _0217317c:
cmp r1, r0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, pc}
ldr r0, _021731d0 ; =data_027e0fe4
ldr r0, _021731d0 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6525,7 +6525,7 @@ _0217317c:
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_021731d0: .word data_027e0fe4
_021731d0: .word gActorManager
_021731d4: .word 0x4c4e424b
_021731d8: .word 0x50524c44
arm_func_end func_ov27_02173124
@@ -6868,7 +6868,7 @@ _02173650:
ldreqb r0, [r4, #0x5b3]
cmpeq r0, #0
bne _021736dc
ldr r1, _02173704 ; =data_027e0fe4
ldr r1, _02173704 ; =gActorManager
ldr r2, _02173708 ; =0x55424c4e
ldr r1, [r1]
add r0, sp, #0
@@ -6877,7 +6877,7 @@ _02173650:
mvn r0, #0
cmp r1, r0
beq _021736dc
ldr r0, _02173704 ; =data_027e0fe4
ldr r0, _02173704 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6906,7 +6906,7 @@ _021736f4: .word data_027e103c
_021736f8: .word gPlayer
_021736fc: .word data_027e077c
_02173700: .word gItemManager
_02173704: .word data_027e0fe4
_02173704: .word gActorManager
_02173708: .word 0x55424c4e
_0217370c: .word data_ov00_020eec68
arm_func_end func_ov27_02173590
@@ -7384,7 +7384,7 @@ func_ov27_02173ce4: ; 0x02173ce4
beq _02173d2c
b _02173d54
_02173d04:
ldr r1, _02173d6c ; =data_027e0fe4
ldr r1, _02173d6c ; =gActorManager
ldr r2, _02173d70 ; =0x50524c44
ldr r1, [r1]
add r0, sp, #8
@@ -7395,7 +7395,7 @@ _02173d04:
str r0, [r4, #0x184]
b _02173d60
_02173d2c:
ldr r1, _02173d6c ; =data_027e0fe4
ldr r1, _02173d6c ; =gActorManager
ldr r2, _02173d74 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
@@ -7414,7 +7414,7 @@ _02173d60:
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_02173d6c: .word data_027e0fe4
_02173d6c: .word gActorManager
_02173d70: .word 0x50524c44
_02173d74: .word 0x4e415649
arm_func_end func_ov27_02173ce4
@@ -12276,7 +12276,7 @@ func_ov27_02177e30: ; 0x02177e30
ldmeqia sp!, {r3, pc}
cmp r2, #0xb
blt _02177ec0
ldr r0, _02177ec8 ; =data_027e0fe4
ldr r0, _02177ec8 ; =gActorManager
mov r1, r2
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -12314,7 +12314,7 @@ _02177ec0:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_02177ec8: .word data_027e0fe4
_02177ec8: .word gActorManager
_02177ecc: .word 0x46534842
_02177ed0: .word 0x41525257
_02177ed4: .word 0x424d524e
asm/ov28.inc
+1 -1
View File
@@ -110,7 +110,7 @@
.extern data_027e0f94
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fec
.extern data_027e0ff0
.extern data_027e0ff8
asm/ov28.s
+10 -10
View File
@@ -3648,7 +3648,7 @@ func_ov28_021706b4: ; 0x021706b4
mov r4, r0
cmp r1, #0
bne _021706f0
ldr r1, _02170708 ; =data_027e0fe4
ldr r1, _02170708 ; =gActorManager
ldr r2, _0217070c ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
@@ -3667,7 +3667,7 @@ _021706fc:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_02170708: .word data_027e0fe4
_02170708: .word gActorManager
_0217070c: .word 0x4e415649
arm_func_end func_ov28_021706b4
@@ -10049,7 +10049,7 @@ func_ov28_02175748: ; 0x02175748
mov r4, r0
cmp r1, #0
bne _02175784
ldr r1, _0217579c ; =data_027e0fe4
ldr r1, _0217579c ; =gActorManager
ldr r2, _021757a0 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
@@ -10068,7 +10068,7 @@ _02175790:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0217579c: .word data_027e0fe4
_0217579c: .word gActorManager
_021757a0: .word 0x4e415649
arm_func_end func_ov28_02175748
@@ -12244,7 +12244,7 @@ func_ov28_021774c4: ; 0x021774c4
mov r4, r0
cmp r1, #0
bne _02177510
ldr r1, _02177528 ; =data_027e0fe4
ldr r1, _02177528 ; =gActorManager
ldr r2, _0217752c ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
@@ -12267,7 +12267,7 @@ _0217751c:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_02177528: .word data_027e0fe4
_02177528: .word gActorManager
_0217752c: .word 0x4e415649
arm_func_end func_ov28_021774c4
@@ -12477,7 +12477,7 @@ _02177798:
ldrneb r0, [r5, #0x1e8]
cmpne r0, #0
beq _021777fc
ldr r0, _021778b4 ; =data_027e0fe4
ldr r0, _021778b4 ; =gActorManager
add r1, r5, #0x184
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -12546,7 +12546,7 @@ _02177890:
.align 2, 0
_021778ac: .word data_027e0f94
_021778b0: .word 0x0000238e
_021778b4: .word data_027e0fe4
_021778b4: .word gActorManager
_021778b8: .word 0x00001555
arm_func_end func_ov28_021776f0
@@ -12770,7 +12770,7 @@ _02177b50: .word data_027e0764
func_ov28_02177b54: ; 0x02177b54
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #8
ldr r1, _02177b90 ; =data_027e0fe4
ldr r1, _02177b90 ; =gActorManager
mov r5, r0
ldr r4, [r1]
ldr r2, _02177b94 ; =0x46524253
@@ -12784,7 +12784,7 @@ func_ov28_02177b54: ; 0x02177b54
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02177b90: .word data_027e0fe4
_02177b90: .word gActorManager
_02177b94: .word 0x46524253
arm_func_end func_ov28_02177b54
asm/ov29.inc
+1 -1
View File
@@ -100,7 +100,7 @@
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
asm/ov29.s
+23 -23
View File
@@ -3224,7 +3224,7 @@ _02170140: .word data_ov29_02179ac8
arm_func_start func_ov29_02170144
func_ov29_02170144: ; 0x02170144
stmdb sp!, {r3, lr}
ldr r0, _02170174 ; =data_027e0fe4
ldr r0, _02170174 ; =gActorManager
ldr r3, _02170178 ; =data_ov29_02179b08
ldr r0, [r0]
add r1, sp, #0
@@ -3236,7 +3236,7 @@ func_ov29_02170144: ; 0x02170144
str r1, [r0, #0x20]
ldmia sp!, {r3, pc}
.align 2, 0
_02170174: .word data_027e0fe4
_02170174: .word gActorManager
_02170178: .word data_ov29_02179b08
_0217017c: .word data_ov29_0217a60c
arm_func_end func_ov29_02170144
@@ -3885,7 +3885,7 @@ func_ov29_021709c0: ; 0x021709c0
str r0, [r3, #0x20]
cmp r0, #3
bne _02170aa8
ldr r0, _02170ad0 ; =data_027e0fe4
ldr r0, _02170ad0 ; =gActorManager
ldr r4, _02170ad4 ; =data_ov29_02179b14
ldr r0, [r0]
add r1, sp, #0
@@ -3906,7 +3906,7 @@ _02170aa8:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02170acc: .word data_ov29_0217a60c
_02170ad0: .word data_027e0fe4
_02170ad0: .word gActorManager
_02170ad4: .word data_ov29_02179b14
arm_func_end func_ov29_021709c0
@@ -4817,7 +4817,7 @@ _0217172c:
cmp r0, #0
bne _0217172c
_02171744:
ldr r0, _02171768 ; =data_027e0fe4
ldr r0, _02171768 ; =gActorManager
ldr r3, _0217176c ; =data_ov29_02179c64
ldr r0, [r0]
add r1, sp, #0
@@ -4827,7 +4827,7 @@ _02171744:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02171764: .word data_ov29_0217bc30
_02171768: .word data_027e0fe4
_02171768: .word gActorManager
_0217176c: .word data_ov29_02179c64
arm_func_end func_ov29_02171714
@@ -5862,7 +5862,7 @@ func_ov29_02172494: ; 0x02172494
str r5, [r3, #4]
cmp ip, #0x1e
bge _02172590
ldr r0, _021725a0 ; =data_027e0fe4
ldr r0, _021725a0 ; =gActorManager
ldr r3, _021725a4 ; =data_ov29_02179c58
ldr r0, [r0]
add r1, sp, #4
@@ -5907,7 +5907,7 @@ _02172590:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0217259c: .word data_027e0764
_021725a0: .word data_027e0fe4
_021725a0: .word gActorManager
_021725a4: .word data_ov29_02179c58
_021725a8: .word data_027e0fe8
_021725ac: .word 0x464c414c
@@ -5940,7 +5940,7 @@ func_ov29_021725b0: ; 0x021725b0
str r5, [r3, #4]
cmp ip, #0x14
bge _021726ac
ldr r0, _021726bc ; =data_027e0fe4
ldr r0, _021726bc ; =gActorManager
ldr r3, _021726c0 ; =data_ov29_02179c58
ldr r0, [r0]
add r1, sp, #4
@@ -5986,7 +5986,7 @@ _021726ac:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_021726b8: .word data_027e0764
_021726bc: .word data_027e0fe4
_021726bc: .word gActorManager
_021726c0: .word data_ov29_02179c58
_021726c4: .word data_027e0fe8
_021726c8: .word 0x48415254
@@ -10548,7 +10548,7 @@ func_ov29_02176558: ; 0x02176558
cmp r0, #1
moveq r0, #1
ldmeqia sp!, {r4, pc}
ldr r0, _021765a8 ; =data_027e0fe4
ldr r0, _021765a8 ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -10561,7 +10561,7 @@ func_ov29_02176558: ; 0x02176558
ldmia sp!, {r4, pc}
.align 2, 0
_021765a4: .word data_027e0d38
_021765a8: .word data_027e0fe4
_021765a8: .word gActorManager
arm_func_end func_ov29_02176558
.global func_ov29_021765ac
@@ -10574,7 +10574,7 @@ func_ov29_021765ac: ; 0x021765ac
cmp r0, #1
moveq r0, #0
ldmeqia sp!, {r3, pc}
ldr r0, _021765ec ; =data_027e0fe4
ldr r0, _021765ec ; =gActorManager
mov r1, #0
ldr r0, [r0]
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -10584,7 +10584,7 @@ func_ov29_021765ac: ; 0x021765ac
ldmia sp!, {r3, pc}
.align 2, 0
_021765e8: .word data_027e0d38
_021765ec: .word data_027e0fe4
_021765ec: .word gActorManager
arm_func_end func_ov29_021765ac
.global func_ov29_021765f0
@@ -11064,7 +11064,7 @@ _02176b94:
mov r2, ip
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _02176c8c ; =data_027e0fe4
ldr r0, _02176c8c ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -11089,7 +11089,7 @@ _02176b94:
_02176c80: .word 0xfffffa66
_02176c84: .word data_027e0fe8
_02176c88: .word 0x474f3154
_02176c8c: .word data_027e0fe4
_02176c8c: .word gActorManager
_02176c90: .word data_027e0ffc
_02176c94: .word 0x0000043c
arm_func_end func_ov29_02176b38
@@ -11720,7 +11720,7 @@ _02177450:
ldr r0, [r0]
add r3, sp, #0x24
bl func_ov00_020c4048
ldr r0, _021778c0 ; =data_027e0fe4
ldr r0, _021778c0 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -11993,7 +11993,7 @@ _021778b0: .word data_ov29_0217bce4
_021778b4: .word data_ov29_0217bcf0
_021778b8: .word data_027e0fe8
_021778bc: .word 0x54535350
_021778c0: .word data_027e0fe4
_021778c0: .word gActorManager
_021778c4: .word data_ov29_0217bd02
_021778c8: .word 0x00007fff
_021778cc: .word data_02050f54
@@ -12960,7 +12960,7 @@ func_ov29_02178514: ; 0x02178514
mov r4, r0
cmp r1, #0
bne _02178550
ldr r1, _02178568 ; =data_027e0fe4
ldr r1, _02178568 ; =gActorManager
ldr r2, _0217856c ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
@@ -12979,7 +12979,7 @@ _0217855c:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_02178568: .word data_027e0fe4
_02178568: .word gActorManager
_0217856c: .word 0x4e415649
arm_func_end func_ov29_02178514
@@ -13024,12 +13024,12 @@ func_ov29_02178570: ; 0x02178570
str r1, [r4, #0x510]
add r0, r4, #0x500
strh r1, [r0, #0x20]
ldr r1, _02178668 ; =data_027e0fe4
ldr r1, _02178668 ; =gActorManager
ldr r2, _0217866c ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02178668 ; =data_027e0fe4
ldr r0, _02178668 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13049,7 +13049,7 @@ _02178658: .word data_ov29_02179444
_0217865c: .word func_ov29_021783c8
_02178660: .word 0x00000aab
_02178664: .word data_ov29_02179438
_02178668: .word data_027e0fe4
_02178668: .word gActorManager
_0217866c: .word 0x4e415649
arm_func_end func_ov29_02178570
asm/ov30.inc
+1 -1
View File
@@ -91,7 +91,7 @@
.extern data_027e0f94
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov30.s
+66 -66
View File
@@ -1519,7 +1519,7 @@ _0217d04c:
arm_func_start func_ov30_0217d054
func_ov30_0217d054: ; 0x0217d054
stmdb sp!, {r3, lr}
ldr r0, _0217d094 ; =data_027e0fe4
ldr r0, _0217d094 ; =gActorManager
mov r1, r2
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -1536,7 +1536,7 @@ _0217d08c:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0217d094: .word data_027e0fe4
_0217d094: .word gActorManager
_0217d098: .word 0x43525053
arm_func_end func_ov30_0217d054
@@ -3546,7 +3546,7 @@ _0217ec2c:
cmp r3, r0
blo _0217ec2c
ldr r1, [r4, #8]
ldr r0, _0217ecec ; =data_027e0fe4
ldr r0, _0217ecec ; =gActorManager
str r1, [sp, #8]
ldr r5, [r4, #0xc]
add r3, sp, #8
@@ -3562,7 +3562,7 @@ _0217ec2c:
mov r5, #0
cmp r0, #0
ble _0217eccc
ldr r8, _0217ecec ; =data_027e0fe4
ldr r8, _0217ecec ; =gActorManager
mov r6, r5
_0217ec8c:
ldr r1, [sp, #0x18]
@@ -3591,7 +3591,7 @@ _0217eccc:
.align 2, 0
_0217ece4: .word data_027e0f94
_0217ece8: .word data_ov30_02188b08
_0217ecec: .word data_027e0fe4
_0217ecec: .word gActorManager
arm_func_end func_ov30_0217ebbc
.global func_ov30_0217ecf0
@@ -4112,7 +4112,7 @@ _0217f3b8:
cmp r0, #0
ble _0217f43c
ldr r9, _0217f55c ; =data_027e10b4
ldr r8, _0217f560 ; =data_027e0fe4
ldr r8, _0217f560 ; =gActorManager
add r10, sp, #0x50
add r4, sp, #0
_0217f3e0:
@@ -4219,7 +4219,7 @@ _0217f550: .word data_ov00_020e8398
_0217f554: .word data_027e0ff0
_0217f558: .word data_027e0f94
_0217f55c: .word data_027e10b4
_0217f560: .word data_027e0fe4
_0217f560: .word gActorManager
arm_func_end func_ov30_0217f1c4
.global func_ov30_0217f564
@@ -7329,7 +7329,7 @@ func_ov30_021818b8: ; 0x021818b8
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r1, sp, #0x44
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r1, _021819e0 ; =data_027e0fe4
ldr r1, _021819e0 ; =gActorManager
ldr r2, _021819e4 ; =0x48415254
ldr r1, [r1]
add r0, sp, #8
@@ -7339,7 +7339,7 @@ func_ov30_021818b8: ; 0x021818b8
mvn r0, #0
cmp r1, r0
beq _02181944
ldr r0, _021819e0 ; =data_027e0fe4
ldr r0, _021819e0 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -7354,7 +7354,7 @@ func_ov30_021818b8: ; 0x021818b8
mov r0, r4
bl func_ov14_0213a3dc
_02181944:
ldr r7, _021819e0 ; =data_027e0fe4
ldr r7, _021819e0 ; =gActorManager
mov r4, #0
add r10, sp, #0
add r8, sp, #0x10
@@ -7396,7 +7396,7 @@ _021819cc:
add sp, sp, #0x54
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021819e0: .word data_027e0fe4
_021819e0: .word gActorManager
_021819e4: .word 0x48415254
_021819e8: .word data_ov30_021887d0
arm_func_end func_ov30_021818b8
@@ -8279,7 +8279,7 @@ func_ov30_021824cc: ; 0x021824cc
ldmia sp!, {r4, r5, pc}
_021825a0:
bl func_ov00_02081f4c
ldr r1, _0218262c ; =data_027e0fe4
ldr r1, _0218262c ; =gActorManager
ldr r2, _02182630 ; =0x424f4d42
ldr r1, [r1]
add r0, sp, #0x14
@@ -8289,7 +8289,7 @@ _021825a0:
mvn r0, #0
cmp r1, r0
beq _02182618
ldr r0, _0218262c ; =data_027e0fe4
ldr r0, _0218262c ; =gActorManager
add r1, sp, #0x14
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8315,7 +8315,7 @@ _02182618:
.align 2, 0
_02182624: .word 0x0000ffff
_02182628: .word gMapManager
_0218262c: .word data_027e0fe4
_0218262c: .word gActorManager
_02182630: .word 0x424f4d42
arm_func_end func_ov30_021824cc
@@ -8386,7 +8386,7 @@ _0218271c:
add r5, r5, #8
cmp r5, r0
blo _0218271c
ldr r0, _02182ac4 ; =data_027e0fe4
ldr r0, _02182ac4 ; =gActorManager
mov r3, #0
ldr r0, [r0]
add r6, sp, #0x74
@@ -8401,7 +8401,7 @@ _0218271c:
mov r5, #0
cmp r0, #0
ble _021827d4
ldr r7, _02182ac4 ; =data_027e0fe4
ldr r7, _02182ac4 ; =gActorManager
mov r6, r5
add r8, sp, #0x58
_02182778:
@@ -8620,7 +8620,7 @@ _02182ab4: .word 0x0000ffff
_02182ab8: .word gMapManager
_02182abc: .word _ZTV11FilterActor
_02182ac0: .word 0x424f4d42
_02182ac4: .word data_027e0fe4
_02182ac4: .word gActorManager
_02182ac8: .word data_02050f54
_02182acc: .word 0x43485334
_02182ad0: .word data_ov30_021887e4
@@ -9173,7 +9173,7 @@ _021830c8:
add r2, sp, #0x44
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _02183220 ; =data_027e0fe4
ldr r0, _02183220 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9195,7 +9195,7 @@ _02183118:
add r2, sp, #0x44
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _02183220 ; =data_027e0fe4
ldr r0, _02183220 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9236,7 +9236,7 @@ _021831b8:
add r2, sp, #0x44
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _02183220 ; =data_027e0fe4
ldr r0, _02183220 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9256,7 +9256,7 @@ _02183208:
.align 2, 0
_02183218: .word data_027e0fe8
_0218321c: .word 0x4e4b4559
_02183220: .word data_027e0fe4
_02183220: .word gActorManager
_02183224: .word 0x464f5243
_02183228: .word 0x43525953
arm_func_end func_ov30_02183018
@@ -9307,7 +9307,7 @@ _021832a8:
add r3, sp, #0xc
add r2, r4, #0x48
bl func_ov00_020c4048
ldr r0, _021833e0 ; =data_027e0fe4
ldr r0, _021833e0 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9326,7 +9326,7 @@ _021832f0:
add r3, sp, #0xc
add r2, r4, #0x48
bl func_ov00_020c4048
ldr r0, _021833e0 ; =data_027e0fe4
ldr r0, _021833e0 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9364,7 +9364,7 @@ _02183380:
add r3, sp, #0xc
add r2, r4, #0x48
bl func_ov00_020c4048
ldr r0, _021833e0 ; =data_027e0fe4
ldr r0, _021833e0 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9382,7 +9382,7 @@ _021833c8:
.align 2, 0
_021833d8: .word data_027e0fe8
_021833dc: .word 0x4e4b4559
_021833e0: .word data_027e0fe4
_021833e0: .word gActorManager
_021833e4: .word 0x464f5243
_021833e8: .word 0x43525953
arm_func_end func_ov30_0218322c
@@ -9458,7 +9458,7 @@ _021834e0:
add r7, r7, #8
cmp r7, r0
blo _021834e0
ldr r0, _0218380c ; =data_027e0fe4
ldr r0, _0218380c ; =gActorManager
add r1, sp, #0x274
ldr r0, [r0]
add r2, sp, #0x1e8
@@ -9467,7 +9467,7 @@ _021834e0:
mov r7, #0
cmp r0, #0
ble _0218358c
ldr r9, _0218380c ; =data_027e0fe4
ldr r9, _0218380c ; =gActorManager
mov r8, r7
add r5, sp, #0
_02183524:
@@ -9527,7 +9527,7 @@ _021835e4:
add r8, r8, #8
cmp r8, r0
blo _021835e4
ldr r0, _0218380c ; =data_027e0fe4
ldr r0, _0218380c ; =gActorManager
add r1, sp, #0x1a0
ldr r0, [r0]
add r2, sp, #0x114
@@ -9536,7 +9536,7 @@ _021835e4:
mov r7, #0
cmp r0, #0
ble _02183690
ldr r9, _0218380c ; =data_027e0fe4
ldr r9, _0218380c ; =gActorManager
mov r8, r7
add r5, sp, #0
_02183628:
@@ -9596,7 +9596,7 @@ _021836e8:
add r8, r8, #8
cmp r8, r0
blo _021836e8
ldr r0, _0218380c ; =data_027e0fe4
ldr r0, _0218380c ; =gActorManager
add r1, sp, #0xcc
ldr r0, [r0]
add r2, sp, #0x40
@@ -9605,7 +9605,7 @@ _021836e8:
mov r7, #0
cmp r0, #0
ble _02183788
ldr r9, _0218380c ; =data_027e0fe4
ldr r9, _0218380c ; =gActorManager
mov r8, r7
add r5, sp, #0
_0218372c:
@@ -9637,7 +9637,7 @@ _02183788:
cmp r6, #0
mov r5, #0
ble _021837f4
ldr r7, _0218380c ; =data_027e0fe4
ldr r7, _0218380c ; =gActorManager
add r8, sp, #0
_0218379c:
ldr r0, [r7]
@@ -9671,7 +9671,7 @@ _021837f4:
_02183800: .word 0x43485334
_02183804: .word _ZTV11FilterActor
_02183808: .word 0x464f5243
_0218380c: .word data_027e0fe4
_0218380c: .word gActorManager
_02183810: .word 0x43525953
_02183814: .word 0x4e4b4559
arm_func_end func_ov30_021833ec
@@ -9680,7 +9680,7 @@ _02183814: .word 0x4e4b4559
arm_func_start func_ov30_02183818
func_ov30_02183818: ; 0x02183818
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _021838f4 ; =data_027e0fe4
ldr r2, _021838f4 ; =gActorManager
mov r5, r0
add r1, r5, #0x84
ldr r0, [r2]
@@ -9742,7 +9742,7 @@ _021838ec:
mov r0, #0
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021838f4: .word data_027e0fe4
_021838f4: .word gActorManager
_021838f8: .word 0x4e4b4559
_021838fc: .word 0x464f5243
_02183900: .word 0x43525953
@@ -9752,7 +9752,7 @@ _02183900: .word 0x43525953
arm_func_start func_ov30_02183904
func_ov30_02183904: ; 0x02183904
stmdb sp!, {r3, r4, r5, lr}
ldr r3, _02183964 ; =data_027e0fe4
ldr r3, _02183964 ; =gActorManager
add r2, r0, #0x84
ldr r0, [r3]
mov r5, r1
@@ -9777,7 +9777,7 @@ _0218395c:
mov r0, #0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02183964: .word data_027e0fe4
_02183964: .word gActorManager
arm_func_end func_ov30_02183904
.global func_ov30_02183968
@@ -9894,7 +9894,7 @@ _02183ab0:
cmp r4, r0
blo _02183ab0
ldr r1, [r6, #8]
ldr r0, _02183b88 ; =data_027e0fe4
ldr r0, _02183b88 ; =gActorManager
str r1, [sp, #0xc]
ldr r4, [r6, #0xc]
add r3, sp, #0xc
@@ -9912,7 +9912,7 @@ _02183ab0:
cmpgt r0, #0
ble _02183b78
ldr r8, _02183b8c ; =0x00002aaa
ldr r7, _02183b88 ; =data_027e0fe4
ldr r7, _02183b88 ; =gActorManager
mov r5, r4
mov r9, #0x2800
_02183b1c:
@@ -9946,7 +9946,7 @@ _02183b78:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02183b84: .word data_ov30_02188b08
_02183b88: .word data_027e0fe4
_02183b88: .word gActorManager
_02183b8c: .word 0x00002aaa
arm_func_end func_ov30_02183a78
@@ -9974,7 +9974,7 @@ _02183bc8:
cmp r4, r0
blo _02183bc8
ldr r1, [r6, #8]
ldr r0, _02183ca0 ; =data_027e0fe4
ldr r0, _02183ca0 ; =gActorManager
str r1, [sp, #0xc]
ldr r4, [r6, #0xc]
add r3, sp, #0xc
@@ -9992,7 +9992,7 @@ _02183bc8:
cmpgt r0, #0
ble _02183c90
ldr r8, _02183ca4 ; =0x00002aaa
ldr r7, _02183ca0 ; =data_027e0fe4
ldr r7, _02183ca0 ; =gActorManager
mov r5, r4
mov r9, #0x2800
_02183c34:
@@ -10026,7 +10026,7 @@ _02183c90:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_02183c9c: .word data_ov30_02188b08
_02183ca0: .word data_027e0fe4
_02183ca0: .word gActorManager
_02183ca4: .word 0x00002aaa
arm_func_end func_ov30_02183b90
@@ -10468,7 +10468,7 @@ func_ov30_0218411c: ; 0x0218411c
sub r7, r8, #0x80000001
cmp r0, #0
ble _021841ec
ldr r4, _02184300 ; =data_027e0fe4
ldr r4, _02184300 ; =gActorManager
mov r9, r8
add r11, sp, #0
_02184170:
@@ -10578,7 +10578,7 @@ _021842d4:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021842fc: .word gPlayerLink
_02184300: .word data_027e0fe4
_02184300: .word gActorManager
_02184304: .word data_ov00_020eec68
_02184308: .word gMapManager
_0218430c: .word data_ov00_020eec9c
@@ -10744,7 +10744,7 @@ _02184404:
str r0, [sp, #0xc]
ldr r0, [r2, #4]
str r0, [sp, #0x10]
ldr r0, _0218454c ; =data_027e0fe4
ldr r0, _0218454c ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
add r4, r0, #0
@@ -10906,7 +10906,7 @@ _02184546:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
_0218454c: .word data_027e0fe4
_0218454c: .word gActorManager
_02184550: .word 0x43485352
thumb_func_end func_ov30_021843ec
@@ -10995,7 +10995,7 @@ _02184564:
ldr r1, [r5]
ldr r0, [r0]
blx func_ov00_020c4048
ldr r0, _0218463c ; =data_027e0fe4
ldr r0, _0218463c ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -11027,7 +11027,7 @@ _02184626:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_02184638: .word data_027e0fe8
_0218463c: .word data_027e0fe4
_0218463c: .word gActorManager
thumb_func_end func_ov30_02184554
.global func_ov30_02184640
@@ -11095,7 +11095,7 @@ _021846b0:
ldr r0, [r1, #4]
add r1, sp, #0x10
str r0, [sp, #0x14]
ldr r0, _02184730 ; =data_027e0fe4
ldr r0, _02184730 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, _02184720 ; =0x000012a4
@@ -11146,7 +11146,7 @@ _02184720: .word 0x000012a4
_02184724: .word 0x00001024
_02184728: .word func_ov30_02187f08
_0218472c: .word 0x000012a8
_02184730: .word data_027e0fe4
_02184730: .word gActorManager
_02184734: .word 0x000008a4
thumb_func_end func_ov30_02184640
@@ -11328,7 +11328,7 @@ _021848f4:
add r3, r3, #8
cmp r3, r0
blo _021848f4
ldr r0, _02185250 ; =data_027e0fe4
ldr r0, _02185250 ; =gActorManager
add r1, sp, #0x24
ldr r0, [r0]
add r2, sp, #0x530
@@ -11341,7 +11341,7 @@ _021848f4:
ble _021849cc
ldr r9, [sp, #0x18]
ldr r11, _02185254 ; =gMapManager
ldr r5, _02185250 ; =data_027e0fe4
ldr r5, _02185250 ; =gActorManager
_02184940:
ldr r1, [sp, #0x530]
ldr r0, [r5]
@@ -11415,7 +11415,7 @@ _02184a34:
add r3, r3, #8
cmp r3, r0
blo _02184a34
ldr r0, _02185250 ; =data_027e0fe4
ldr r0, _02185250 ; =gActorManager
add r2, sp, #0x400
ldr r0, [r0]
add r1, sp, #0x1c
@@ -11429,7 +11429,7 @@ _02184a34:
ble _02184b10
ldr r9, [sp, #0x14]
ldr r11, _02185254 ; =gMapManager
ldr r5, _02185250 ; =data_027e0fe4
ldr r5, _02185250 ; =gActorManager
_02184a84:
ldr r1, [sp, #0x4a4]
ldr r0, [r5]
@@ -11515,7 +11515,7 @@ _02184ba8:
add r7, r7, #8
cmp r7, r0
blo _02184ba8
ldr r0, _02185250 ; =data_027e0fe4
ldr r0, _02185250 ; =gActorManager
add r1, sp, #0x400
ldr r0, [r0]
add r1, r1, #0x5c
@@ -11529,7 +11529,7 @@ _02184ba8:
ble _02184c84
ldr r9, [sp, #0x10]
ldr r11, _02185254 ; =gMapManager
ldr r5, _02185250 ; =data_027e0fe4
ldr r5, _02185250 ; =gActorManager
_02184bf8:
ldr r1, [sp, #0x3d0]
ldr r0, [r5]
@@ -11614,7 +11614,7 @@ _02184d18:
add r7, r7, #8
cmp r7, r0
blo _02184d18
ldr r0, _02185250 ; =data_027e0fe4
ldr r0, _02185250 ; =gActorManager
add r1, sp, #0x388
ldr r0, [r0]
add r2, sp, #0x2fc
@@ -11627,7 +11627,7 @@ _02184d18:
ble _02184df0
ldr r9, [sp, #0xc]
ldr r11, _02185254 ; =gMapManager
ldr r5, _02185250 ; =data_027e0fe4
ldr r5, _02185250 ; =gActorManager
_02184d64:
ldr r1, [sp, #0x2fc]
ldr r0, [r5]
@@ -11712,7 +11712,7 @@ _02184e84:
add r7, r7, #8
cmp r7, r0
blo _02184e84
ldr r0, _02185250 ; =data_027e0fe4
ldr r0, _02185250 ; =gActorManager
add r1, sp, #0x2b4
ldr r0, [r0]
add r2, sp, #0x228
@@ -11725,7 +11725,7 @@ _02184e84:
ble _02184f50
ldr r9, [sp, #8]
ldr r5, _02185254 ; =gMapManager
ldr r6, _02185250 ; =data_027e0fe4
ldr r6, _02185250 ; =gActorManager
mov r11, r7
_02184ed4:
ldr r1, [sp, #0x228]
@@ -11807,7 +11807,7 @@ _02184fe4:
add r7, r7, #8
cmp r7, r0
blo _02184fe4
ldr r0, _02185250 ; =data_027e0fe4
ldr r0, _02185250 ; =gActorManager
add r1, sp, #0x1e0
ldr r0, [r0]
add r2, sp, #0x154
@@ -11820,7 +11820,7 @@ _02184fe4:
ble _021850b0
ldr r9, [sp, #4]
ldr r5, _02185254 ; =gMapManager
ldr r6, _02185250 ; =data_027e0fe4
ldr r6, _02185250 ; =gActorManager
mov r11, r7
_02185034:
ldr r1, [sp, #0x154]
@@ -11902,7 +11902,7 @@ _02185144:
add r7, r7, #8
cmp r7, r0
blo _02185144
ldr r0, _02185250 ; =data_027e0fe4
ldr r0, _02185250 ; =gActorManager
add r1, sp, #0x10c
ldr r0, [r0]
add r2, sp, #0x80
@@ -11915,7 +11915,7 @@ _02185144:
ble _02185210
ldr r9, [sp]
ldr r5, _02185254 ; =gMapManager
ldr r6, _02185250 ; =data_027e0fe4
ldr r6, _02185250 ; =gActorManager
mov r11, r7
_02185194:
ldr r1, [sp, #0x80]
@@ -11971,7 +11971,7 @@ _02185240:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218524c: .word data_ov30_02188b08
_02185250: .word data_027e0fe4
_02185250: .word gActorManager
_02185254: .word gMapManager
_02185258: .word _ZTV11FilterActor
_0218525c: .word 0x57544352
asm/ov31.inc
+1 -1
View File
@@ -78,7 +78,7 @@
.extern data_027e0f94
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov31.s
+9 -9
View File
@@ -1263,28 +1263,28 @@ _0217cdc8:
.global func_ov31_0217cdd8
arm_func_start func_ov31_0217cdd8
func_ov31_0217cdd8: ; 0x0217cdd8
ldr r2, _0217cdf0 ; =data_027e0fe4
ldr r2, _0217cdf0 ; =gActorManager
add r3, r0, #0x70
ldr ip, _0217cdf4 ; =_ZN12ActorManager8GetActorEP8ActorRef
ldr r0, [r2]
add r1, r3, r1, lsl #3
bx ip
.align 2, 0
_0217cdf0: .word data_027e0fe4
_0217cdf0: .word gActorManager
_0217cdf4: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end func_ov31_0217cdd8
.global func_ov31_0217cdf8
arm_func_start func_ov31_0217cdf8
func_ov31_0217cdf8: ; 0x0217cdf8
ldr r2, _0217ce10 ; =data_027e0fe4
ldr r2, _0217ce10 ; =gActorManager
add r3, r0, #0x70
ldr ip, _0217ce14 ; =_ZN12ActorManager8GetActorEP8ActorRef
ldr r0, [r2]
add r1, r3, r1, lsl #3
bx ip
.align 2, 0
_0217ce10: .word data_027e0fe4
_0217ce10: .word gActorManager
_0217ce14: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end func_ov31_0217cdf8
@@ -6650,7 +6650,7 @@ func_ov31_02180ac8: ; 0x02180ac8
add r0, r4, #0x1d8
bl func_ov14_02145a74
ldr r1, _02180bb4 ; =data_ov31_02181ad4
ldr r0, _02180bb8 ; =data_027e0fe4
ldr r0, _02180bb8 ; =gActorManager
str r1, [r4, #0x408]
ldr r0, [r0]
ldrb r0, [r0, #0x29]
@@ -6707,7 +6707,7 @@ _02180b90:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02180bb4: .word data_ov31_02181ad4
_02180bb8: .word data_027e0fe4
_02180bb8: .word gActorManager
_02180bbc: .word data_ov31_02181ac8
_02180bc0: .word data_027e0dbc
_02180bc4: .word data_ov31_02181abc
@@ -6806,7 +6806,7 @@ _02180cf8: ; jump table
b _02180d70 ; case 3
b _02180d78 ; case 4
_02180d0c:
ldr r0, _02180dd4 ; =data_027e0fe4
ldr r0, _02180dd4 ; =gActorManager
ldr r0, [r0]
ldrb r0, [r0, #0x29]
cmp r0, #0
@@ -6838,7 +6838,7 @@ _02180d70:
mov r0, #0xa
ldmia sp!, {r3, pc}
_02180d78:
ldr r0, _02180dd4 ; =data_027e0fe4
ldr r0, _02180dd4 ; =gActorManager
ldr r0, [r0]
ldrb r0, [r0, #0x29]
cmp r0, #0
@@ -6864,7 +6864,7 @@ _02180dcc:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_02180dd4: .word data_027e0fe4
_02180dd4: .word gActorManager
_02180dd8: .word gAdventureFlags
arm_func_end func_ov31_02180ce8
asm/ov32.inc
+1 -1
View File
@@ -100,7 +100,7 @@
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov32.s
+11 -11
View File
@@ -2920,7 +2920,7 @@ func_ov32_0217e10c: ; 0x0217e10c
add r2, r4, #0x48
add r3, sp, #8
bl func_ov00_020c4048
ldr r0, _0217e268 ; =data_027e0fe4
ldr r0, _0217e268 ; =gActorManager
add r1, r4, #0xec
ldr r0, [r0]
add r1, r1, #0x400
@@ -2936,7 +2936,7 @@ _0217e258: .word data_027e0f6c
_0217e25c: .word data_ov32_02185738
_0217e260: .word data_027e0fe8
_0217e264: .word 0x49434848
_0217e268: .word data_027e0fe4
_0217e268: .word gActorManager
arm_func_end func_ov32_0217e10c
.global func_ov32_0217e26c
@@ -4940,7 +4940,7 @@ _0217fbcc:
strb r0, [r4, #0x1a2]
mov r0, r4
bl func_ov32_0217fca0
ldr r1, _0217fc88 ; =data_027e0fe4
ldr r1, _0217fc88 ; =gActorManager
str r0, [r4, #0x404]
ldr r0, [r1]
add r1, r4, #0x34
@@ -4985,7 +4985,7 @@ _0217fbcc:
ldmia sp!, {r4, pc}
.align 2, 0
_0217fc84: .word 0x0000270f
_0217fc88: .word data_027e0fe4
_0217fc88: .word gActorManager
arm_func_end func_ov32_0217fb90
.global func_ov32_0217fc8c
@@ -7768,7 +7768,7 @@ func_ov32_021822c0: ; 0x021822c0
mov r0, #1
ldmia sp!, {r4, pc}
_021822fc:
ldr r0, _02182380 ; =data_027e0fe4
ldr r0, _02182380 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -7806,7 +7806,7 @@ _02182378:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02182380: .word data_027e0fe4
_02182380: .word gActorManager
_02182384: .word 0x424c5354
_02182388: .word 0x41525257
_0218238c: .word 0x424d524e
@@ -10250,7 +10250,7 @@ _02184398: .word data_ov00_020e9370
func_ov32_0218439c: ; 0x0218439c
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x84
ldr r1, _0218453c ; =data_027e0fe4
ldr r1, _0218453c ; =gActorManager
mov r2, #0
mov r4, r0
add r3, sp, #0x70
@@ -10276,7 +10276,7 @@ func_ov32_0218439c: ; 0x0218439c
movgt r0, #0
ldmgtia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r4, #8]
ldr r0, _0218453c ; =data_027e0fe4
ldr r0, _0218453c ; =gActorManager
str r1, [sp, #0x44]
ldr r3, [r4, #0xc]
ldr r0, [r0]
@@ -10353,7 +10353,7 @@ func_ov32_0218439c: ; 0x0218439c
add sp, sp, #0x84
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218453c: .word data_027e0fe4
_0218453c: .word gActorManager
_02184540: .word _ZTV11FilterActor
_02184544: .word 0x42454530
_02184548: .word data_02050f54
@@ -10593,7 +10593,7 @@ func_ov32_0218477c: ; 0x0218477c
ldr r2, _0218487c ; =data_027e0d0c
str r0, [r4, #0x164]
ldr r1, [r2]
ldr r0, _02184884 ; =data_027e0fe4
ldr r0, _02184884 ; =gActorManager
str r1, [r4, #0x60]
ldr r3, [r2, #4]
add r1, r4, #0x34
@@ -10613,7 +10613,7 @@ func_ov32_0218477c: ; 0x0218477c
_02184878: .word 0x00000666
_0218487c: .word data_027e0d0c
_02184880: .word data_027e0fec
_02184884: .word data_027e0fe4
_02184884: .word gActorManager
arm_func_end func_ov32_0218477c
.global func_ov32_02184888
asm/ov33.inc
+1 -1
View File
@@ -77,7 +77,7 @@
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov33.s
+6 -6
View File
@@ -2141,12 +2141,12 @@ func_ov33_0217d8c0: ; 0x0217d8c0
ldr r0, [r0]
bl func_ov05_02103fb4
bl func_ov33_0217dae4
ldr r1, _0217d930 ; =data_027e0fe4
ldr r1, _0217d930 ; =gActorManager
ldr r2, _0217d934 ; =0x4d524547
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217d930 ; =data_027e0fe4
ldr r0, _0217d930 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2164,7 +2164,7 @@ func_ov33_0217d8c0: ; 0x0217d8c0
ldmia sp!, {r3, pc}
.align 2, 0
_0217d92c: .word data_027e103c
_0217d930: .word data_027e0fe4
_0217d930: .word gActorManager
_0217d934: .word 0x4d524547
_0217d938: .word 0x04001000
arm_func_end func_ov33_0217d8c0
@@ -2174,12 +2174,12 @@ _0217d938: .word 0x04001000
func_ov33_0217d93c: ; 0x0217d93c
stmdb sp!, {r3, lr}
sub sp, sp, #8
ldr r1, _0217d974 ; =data_027e0fe4
ldr r1, _0217d974 ; =gActorManager
ldr r2, _0217d978 ; =0x4d524547
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217d974 ; =data_027e0fe4
ldr r0, _0217d974 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2187,7 +2187,7 @@ func_ov33_0217d93c: ; 0x0217d93c
add sp, sp, #8
ldmia sp!, {r3, pc}
.align 2, 0
_0217d974: .word data_027e0fe4
_0217d974: .word gActorManager
_0217d978: .word 0x4d524547
arm_func_end func_ov33_0217d93c
asm/ov34.inc
+1 -1
View File
@@ -77,7 +77,7 @@
.extern data_027e0f94
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
asm/ov34.s
+3 -3
View File
@@ -1233,12 +1233,12 @@ func_ov34_0217ce2c: ; 0x0217ce2c
cmp r0, #0
addeq sp, sp, #8
ldmeqia sp!, {r4, pc}
ldr r1, _0217cea8 ; =data_027e0fe4
ldr r1, _0217cea8 ; =gActorManager
ldr r2, _0217ceac ; =0x54534e4d
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217cea8 ; =data_027e0fe4
ldr r0, _0217cea8 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1258,7 +1258,7 @@ func_ov34_0217ce2c: ; 0x0217ce2c
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0217cea8: .word data_027e0fe4
_0217cea8: .word gActorManager
_0217ceac: .word 0x54534e4d
arm_func_end func_ov34_0217ce2c
asm/ov35.inc
+1 -1
View File
@@ -99,7 +99,7 @@
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff4
asm/ov35.s
+26 -26
View File
@@ -174,7 +174,7 @@ func_ov35_0217bf7c: ; 0x0217bf7c
ldr r1, _0217c090 ; =data_ov35_0218598c
mov r6, r0
mov r4, #0
ldr r8, _0217c094 ; =data_027e0fe4
ldr r8, _0217c094 ; =gActorManager
str r1, [r6]
add r5, r6, #0x238
mov r9, r4
@@ -244,7 +244,7 @@ _0217bfdc:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0217c090: .word data_ov35_0218598c
_0217c094: .word data_027e0fe4
_0217c094: .word gActorManager
_0217c098: .word func_ov00_020a9aac
_0217c09c: .word func_ov00_020a95a4
_0217c0a0: .word func_ov35_0217bf4c
@@ -257,7 +257,7 @@ func_ov35_0217c0a4: ; 0x0217c0a4
ldr r1, _0217c1c0 ; =data_ov35_0218598c
mov r6, r0
mov r4, #0
ldr r8, _0217c1c4 ; =data_027e0fe4
ldr r8, _0217c1c4 ; =gActorManager
str r1, [r6]
add r5, r6, #0x238
mov r9, r4
@@ -329,7 +329,7 @@ _0217c104:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0217c1c0: .word data_ov35_0218598c
_0217c1c4: .word data_027e0fe4
_0217c1c4: .word gActorManager
_0217c1c8: .word func_ov00_020a9aac
_0217c1cc: .word func_ov00_020a95a4
_0217c1d0: .word func_ov35_0217bf4c
@@ -340,7 +340,7 @@ _0217c1d0: .word func_ov35_0217bf4c
func_ov35_0217c1d4: ; 0x0217c1d4
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
ldr r1, _0217c498 ; =data_027e0fe4
ldr r1, _0217c498 ; =gActorManager
mov r10, r0
ldr r0, [r1]
add r1, r10, #0x34
@@ -456,7 +456,7 @@ _0217c290:
str r1, [sp, #0x28]
ldr r1, [r10, #0xc]
ldr r5, _0217c4b8 ; =0x52594448
ldr r8, _0217c498 ; =data_027e0fe4
ldr r8, _0217c498 ; =gActorManager
ldr r9, _0217c4bc ; =data_027e0fe8
mov r7, #0
str r1, [sp, #0x2c]
@@ -519,7 +519,7 @@ _0217c44c:
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217c498: .word data_027e0fe4
_0217c498: .word gActorManager
_0217c49c: .word 0xfffffe66
_0217c4a0: .word 0x000004cd
_0217c4a4: .word data_027e0d0c
@@ -869,7 +869,7 @@ _0217c958:
ldr r1, [r1, #0x238]
cmp r1, r0
beq _0217c998
ldr r0, _0217ca80 ; =data_027e0fe4
ldr r0, _0217ca80 ; =gActorManager
add r1, r7, #0x238
ldr r0, [r0]
add r1, r1, r2, lsl #3
@@ -942,7 +942,7 @@ _0217ca70: .word 0x000001bd
_0217ca74: .word 0x41525257
_0217ca78: .word 0xfffffd9a
_0217ca7c: .word 0x00000bb8
_0217ca80: .word data_027e0fe4
_0217ca80: .word gActorManager
arm_func_end func_ov35_0217c718
.global func_ov35_0217ca84
@@ -1088,7 +1088,7 @@ _0217cc74: .word 0x0000018d
func_ov35_0217cc78: ; 0x0217cc78
stmdb sp!, {r4, r5, r6, r7, r8, lr}
mov r6, r0
ldr r7, _0217cce4 ; =data_027e0fe4
ldr r7, _0217cce4 ; =gActorManager
add r4, r6, #0x238
mov r5, #0
mvn r8, #0
@@ -1117,7 +1117,7 @@ _0217ccc8:
strb r0, [r6, #0x550]
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217cce4: .word data_027e0fe4
_0217cce4: .word gActorManager
arm_func_end func_ov35_0217cc78
.global func_ov35_0217cce8
@@ -2157,7 +2157,7 @@ func_ov35_0217da38: ; 0x0217da38
mvn r0, #0
cmp r1, r0
beq _0217da78
ldr r0, _0217dab8 ; =data_027e0fe4
ldr r0, _0217dab8 ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2183,7 +2183,7 @@ _0217da78:
ldmia sp!, {r4, pc}
.align 2, 0
_0217dab4: .word data_ov35_02185a70
_0217dab8: .word data_027e0fe4
_0217dab8: .word gActorManager
_0217dabc: .word func_ov00_020b7d74
arm_func_end func_ov35_0217da38
@@ -2198,7 +2198,7 @@ func_ov35_0217dac0: ; 0x0217dac0
mvn r0, #0
cmp r1, r0
beq _0217db00
ldr r0, _0217db48 ; =data_027e0fe4
ldr r0, _0217db48 ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2226,7 +2226,7 @@ _0217db00:
ldmia sp!, {r4, pc}
.align 2, 0
_0217db44: .word data_ov35_02185a70
_0217db48: .word data_027e0fe4
_0217db48: .word gActorManager
_0217db4c: .word func_ov00_020b7d74
arm_func_end func_ov35_0217dac0
@@ -2293,7 +2293,7 @@ func_ov35_0217db50: ; 0x0217db50
mvn r0, #0
cmp r1, r0
beq _0217dc68
ldr r0, _0217dc78 ; =data_027e0fe4
ldr r0, _0217dc78 ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2309,7 +2309,7 @@ _0217dc68:
.align 2, 0
_0217dc70: .word 0x0000099a
_0217dc74: .word 0xfffffccd
_0217dc78: .word data_027e0fe4
_0217dc78: .word gActorManager
arm_func_end func_ov35_0217db50
.global func_ov35_0217dc7c
@@ -2324,7 +2324,7 @@ func_ov35_0217dc7c: ; 0x0217dc7c
mvnne r0, #0
cmpne r1, r0
beq _0217dcdc
ldr r0, _0217dcec ; =data_027e0fe4
ldr r0, _0217dcec ; =gActorManager
add r1, r5, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2345,7 +2345,7 @@ _0217dcdc:
bl func_ov00_020cad30
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217dcec: .word data_027e0fe4
_0217dcec: .word gActorManager
arm_func_end func_ov35_0217dc7c
.global func_ov35_0217dcf0
@@ -2359,7 +2359,7 @@ func_ov35_0217dcf0: ; 0x0217dcf0
sub r0, r4, #1
cmp r1, r0
beq _0217dd30
ldr r0, _0217e2c0 ; =data_027e0fe4
ldr r0, _0217e2c0 ; =gActorManager
add r1, r5, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2745,7 +2745,7 @@ _0217e2ac:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0217e2c0: .word data_027e0fe4
_0217e2c0: .word gActorManager
_0217e2c4: .word data_027e0d0c
_0217e2c8: .word gPlayerLink
_0217e2cc: .word data_027e0f94
@@ -3673,7 +3673,7 @@ _0217ee08:
add r2, r4, #0x48
add r3, sp, #0x10
bl func_ov00_020c4048
ldr r0, _0217f054 ; =data_027e0fe4
ldr r0, _0217f054 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3749,7 +3749,7 @@ _0217ef90:
add r3, sp, #0x10
add r2, r4, #0x48
bl func_ov00_020c4048
ldr r0, _0217f054 ; =data_027e0fe4
ldr r0, _0217f054 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3764,7 +3764,7 @@ _0217f044: .word gAdventureFlags
_0217f048: .word 0x00001333
_0217f04c: .word data_027e0fe8
_0217f050: .word 0x52594453
_0217f054: .word data_027e0fe4
_0217f054: .word gActorManager
_0217f058: .word 0x0000ffff
_0217f05c: .word data_ov35_0218536c
_0217f060: .word 0x00001610
@@ -10146,7 +10146,7 @@ func_ov35_021849b4: ; 0x021849b4
arm_func_start func_ov35_021849dc
func_ov35_021849dc: ; 0x021849dc
stmdb sp!, {r4, lr}
ldr r1, _02184a94 ; =data_027e0fe4
ldr r1, _02184a94 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x34
@@ -10192,7 +10192,7 @@ func_ov35_021849dc: ; 0x021849dc
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_02184a94: .word data_027e0fe4
_02184a94: .word gActorManager
_02184a98: .word data_027e0d0c
_02184a9c: .word 0x00000666
_02184aa0: .word data_027e0fec
asm/ov36.inc
+1 -1
View File
@@ -86,7 +86,7 @@
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
asm/ov36.s
+22 -22
View File
@@ -1652,7 +1652,7 @@ func_ov36_0217d2a0: ; 0x0217d2a0
mvn r0, #0
cmp r1, r0
beq _0217d368
ldr r0, _0217d68c ; =data_027e0fe4
ldr r0, _0217d68c ; =gActorManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1861,7 +1861,7 @@ _0217d56c:
_0217d680: .word gAdventureFlags
_0217d684: .word data_027e0fe8
_0217d688: .word 0x4c4f4e44
_0217d68c: .word data_027e0fe4
_0217d68c: .word gActorManager
_0217d690: .word data_027e0d0c
_0217d694: .word 0x00000b33
_0217d698: .word 0x0000199a
@@ -2727,7 +2727,7 @@ _0217e2a4:
ldr r3, [r3, #0x7c]
blx r3
_0217e2dc:
ldr r1, _0217e3d4 ; =data_027e0fe4
ldr r1, _0217e3d4 ; =gActorManager
ldr r2, _0217e3d8 ; =0x504c444d
ldr r1, [r1]
add r0, sp, #0x18
@@ -2736,7 +2736,7 @@ _0217e2dc:
mvn r0, #0
cmp r1, r0
beq _0217e314
ldr r0, _0217e3d4 ; =data_027e0fe4
ldr r0, _0217e3d4 ; =gActorManager
add r1, sp, #0x18
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2754,14 +2754,14 @@ _0217e314:
ldrh r1, [r5, #0x24]
add r0, sp, #8
bl func_ov36_0217c14c
ldr r0, _0217e3d4 ; =data_027e0fe4
ldr r0, _0217e3d4 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
add r2, sp, #0x2c
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
cmp r0, #0
beq _0217e37c
ldr r0, _0217e3d4 ; =data_027e0fe4
ldr r0, _0217e3d4 ; =gActorManager
ldr r1, [sp, #0x2c]
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2792,7 +2792,7 @@ _0217e3c4: .word 0x00000112
_0217e3c8: .word data_027e0ffc
_0217e3cc: .word 0x000002c2
_0217e3d0: .word gAdventureFlags
_0217e3d4: .word data_027e0fe4
_0217e3d4: .word gActorManager
_0217e3d8: .word 0x504c444d
_0217e3dc: .word 0x0000199a
arm_func_end func_ov36_0217decc
@@ -3190,7 +3190,7 @@ _0217e934:
mvn r0, #0
cmp r1, r0
beq _0217e970
ldr r0, _0217eb40 ; =data_027e0fe4
ldr r0, _0217eb40 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3319,7 +3319,7 @@ _0217eacc:
_0217eb34: .word 0x00000337
_0217eb38: .word 0x00000112
_0217eb3c: .word gPlayerLink
_0217eb40: .word data_027e0fe4
_0217eb40: .word gActorManager
_0217eb44: .word 0x504c444d
_0217eb48: .word 0x0000219a
_0217eb4c: .word gMapManager
@@ -4074,7 +4074,7 @@ func_ov36_0217f4f4: ; 0x0217f4f4
str r3, [sp, #0x74]
str r2, [sp, #0x78]
bl func_ov36_0217f400
ldr r0, _0217f96c ; =data_027e0fe4
ldr r0, _0217f96c ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
add r2, sp, #0x70
@@ -4083,7 +4083,7 @@ func_ov36_0217f4f4: ; 0x0217f4f4
mov r0, r6
cmp r1, r0
beq _0217f608
ldr r0, _0217f96c ; =data_027e0fe4
ldr r0, _0217f96c ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4349,7 +4349,7 @@ _0217f940:
add sp, sp, #0x7c
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0217f96c: .word data_027e0fe4
_0217f96c: .word gActorManager
_0217f970: .word data_027e0f64
_0217f974: .word data_027e0ffc
_0217f978: .word 0x000002cd
@@ -5916,7 +5916,7 @@ _02180f44:
mvn r0, #0
cmp r1, r0
beq _02181000
ldr r0, _0218102c ; =data_027e0fe4
ldr r0, _0218102c ; =gActorManager
add r1, r5, #0x18
ldr r0, [r0]
add r1, r1, #0x800
@@ -5972,7 +5972,7 @@ _02181000:
_02181020: .word 0x00000ccd
_02181024: .word data_027e0ffc
_02181028: .word 0x000002c1
_0218102c: .word data_027e0fe4
_0218102c: .word gActorManager
_02181030: .word data_02050f54
arm_func_end func_ov36_02180e24
@@ -8516,7 +8516,7 @@ func_ov36_02183504: ; 0x02183504
mvn r0, #0
cmp r1, r0
bne _0218354c
ldr r1, _02183a08 ; =data_027e0fe4
ldr r1, _02183a08 ; =gActorManager
ldr r2, _02183a0c ; =0x424d5459
ldr r1, [r1]
add r0, sp, #8
@@ -8528,7 +8528,7 @@ func_ov36_02183504: ; 0x02183504
str r0, [r5, #0x814]
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218354c:
ldr r0, _02183a08 ; =data_027e0fe4
ldr r0, _02183a08 ; =gActorManager
add r1, r5, #0x810
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -8837,7 +8837,7 @@ _021839f4:
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02183a08: .word data_027e0fe4
_02183a08: .word gActorManager
_02183a0c: .word 0x424d5459
_02183a10: .word data_02050f54
_02183a14: .word data_027e0f64
@@ -9926,7 +9926,7 @@ func_ov36_02184938: ; 0x02184938
mov r4, r0
cmp r1, #0
bne _021849c4
ldr r1, _021849dc ; =data_027e0fe4
ldr r1, _021849dc ; =gActorManager
ldr r2, _021849e0 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #8
@@ -9943,7 +9943,7 @@ func_ov36_02184938: ; 0x02184938
str r1, [sp, #0x14]
str r2, [sp, #0x18]
bl func_ov36_021848fc
ldr r0, _021849dc ; =data_027e0fe4
ldr r0, _021849dc ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
add r2, sp, #0x10
@@ -9965,7 +9965,7 @@ _021849d0:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021849dc: .word data_027e0fe4
_021849dc: .word gActorManager
_021849e0: .word 0x4e415649
arm_func_end func_ov36_02184938
@@ -12000,7 +12000,7 @@ _021865a4:
bl func_ov00_020b7e6c
add r0, r5, #0x170
bl func_ov00_020b7e6c
ldr r0, _02186640 ; =data_027e0fe4
ldr r0, _02186640 ; =gActorManager
add r1, r5, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -12034,7 +12034,7 @@ _02186620:
.align 2, 0
_02186638: .word data_027e0e58
_0218663c: .word 0x00000333
_02186640: .word data_027e0fe4
_02186640: .word gActorManager
_02186644: .word data_ov36_02186ba8
arm_func_end func_ov36_021862b8
asm/ov37.inc
+1 -1
View File
@@ -86,7 +86,7 @@
.extern data_027e0fa0
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
asm/ov37.s
+32 -32
View File
@@ -912,7 +912,7 @@ func_ov37_0217c924: ; 0x0217c924
mov r4, #0
rsb r11, r0, #0
_0217c978:
ldr r0, _0217cbe4 ; =data_027e0fe4
ldr r0, _0217cbe4 ; =gActorManager
mov r1, r6
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1006,7 +1006,7 @@ _0217caac:
rsb r4, r0, #0
mov r11, #7
_0217cadc:
ldr r0, _0217cbe4 ; =data_027e0fe4
ldr r0, _0217cbe4 ; =gActorManager
mov r1, r7
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1076,7 +1076,7 @@ _0217cbc0:
.align 2, 0
_0217cbdc: .word 0x00007fff
_0217cbe0: .word data_027e0d0c
_0217cbe4: .word data_027e0fe4
_0217cbe4: .word gActorManager
_0217cbe8: .word data_ov37_02187dcc
_0217cbec: .word data_027e0f94
arm_func_end func_ov37_0217c924
@@ -4237,7 +4237,7 @@ func_ov37_0217f8a4: ; 0x0217f8a4
stmdb sp!, {r3, r4, r5, r6, r7, lr}
add r0, r0, #0x29c
mov r6, #0
ldr r4, _0217f8e4 ; =data_027e0fe4
ldr r4, _0217f8e4 ; =gActorManager
add r7, r0, #0x2c00
mov r5, r6
_0217f8bc:
@@ -4252,7 +4252,7 @@ _0217f8bc:
blt _0217f8bc
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0217f8e4: .word data_027e0fe4
_0217f8e4: .word gActorManager
arm_func_end func_ov37_0217f8a4
.global func_ov37_0217f8e8
@@ -4306,7 +4306,7 @@ func_ov37_0217f980: ; 0x0217f980
stmdb sp!, {r3, r4, r5, r6, r7, lr}
add r0, r0, #0x334
mov r6, #0
ldr r4, _0217f9c0 ; =data_027e0fe4
ldr r4, _0217f9c0 ; =gActorManager
add r7, r0, #0x2c00
mov r5, r6
_0217f998:
@@ -4321,7 +4321,7 @@ _0217f998:
blt _0217f998
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0217f9c0: .word data_027e0fe4
_0217f9c0: .word gActorManager
arm_func_end func_ov37_0217f980
.global func_ov37_0217f9c4
@@ -4352,7 +4352,7 @@ func_ov37_0217f9c4: ; 0x0217f9c4
add r3, sp, #0xc
add r2, r4, #0x48
bl func_ov00_020c4048
ldr r0, _0217fa88 ; =data_027e0fe4
ldr r0, _0217fa88 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4366,7 +4366,7 @@ func_ov37_0217f9c4: ; 0x0217f9c4
add r2, r4, #0x48
add r3, sp, #0xc
bl func_ov00_020c4048
ldr r0, _0217fa88 ; =data_027e0fe4
ldr r0, _0217fa88 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4377,7 +4377,7 @@ func_ov37_0217f9c4: ; 0x0217f9c4
.align 2, 0
_0217fa80: .word data_027e0fe8
_0217fa84: .word 0x57534246
_0217fa88: .word data_027e0fe4
_0217fa88: .word gActorManager
arm_func_end func_ov37_0217f9c4
.global func_ov37_0217fa8c
@@ -4428,7 +4428,7 @@ func_ov37_0217fab8: ; 0x0217fab8
mov r2, ip
add r3, sp, #0x10
bl func_ov00_020c4048
ldr r0, _0217fba8 ; =data_027e0fe4
ldr r0, _0217fba8 ; =gActorManager
add r1, r4, #0x2ec
ldr r0, [r0]
add r1, r1, #0x2c00
@@ -4462,14 +4462,14 @@ _0217fb80:
.align 2, 0
_0217fba0: .word data_027e0fe8
_0217fba4: .word 0x57534248
_0217fba8: .word data_027e0fe4
_0217fba8: .word gActorManager
arm_func_end func_ov37_0217fab8
.global func_ov37_0217fbac
arm_func_start func_ov37_0217fbac
func_ov37_0217fbac: ; 0x0217fbac
stmdb sp!, {r3, lr}
ldr r2, _0217fbd4 ; =data_027e0fe4
ldr r2, _0217fbd4 ; =gActorManager
add r1, r0, #0x2ec
ldr r0, [r2]
add r1, r1, #0x2c00
@@ -4479,7 +4479,7 @@ func_ov37_0217fbac: ; 0x0217fbac
strneb r1, [r0, #0x118]
ldmia sp!, {r3, pc}
.align 2, 0
_0217fbd4: .word data_027e0fe4
_0217fbd4: .word gActorManager
arm_func_end func_ov37_0217fbac
.global func_ov37_0217fbd8
@@ -4513,7 +4513,7 @@ func_ov37_0217fbd8: ; 0x0217fbd8
mov r2, r6
add r3, sp, #0x10
bl func_ov00_020c4048
ldr r0, _0217fcb4 ; =data_027e0fe4
ldr r0, _0217fcb4 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4542,7 +4542,7 @@ _0217fc6c:
.align 2, 0
_0217fcac: .word data_027e0fe8
_0217fcb0: .word 0x57534242
_0217fcb4: .word data_027e0fe4
_0217fcb4: .word gActorManager
_0217fcb8: .word data_027e0e58
_0217fcbc: .word 0x00001001
_0217fcc0: .word data_027e0ffc
@@ -11816,7 +11816,7 @@ func_ov37_02186184: ; 0x02186184
bl func_ov00_020bbbb8
b _02186200
_021861b4:
ldr r0, _0218620c ; =data_027e0fe4
ldr r0, _0218620c ; =gActorManager
mov r1, r2
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -11840,7 +11840,7 @@ _02186200:
ldmia sp!, {r4, pc}
.align 2, 0
_02186208: .word gPlayerLink
_0218620c: .word data_027e0fe4
_0218620c: .word gActorManager
_02186210: .word 0x424b4559
_02186214: .word 0x43525953
_02186218: .word 0x464f5243
@@ -11908,7 +11908,7 @@ func_ov37_021862d0: ; 0x021862d0
stmdb sp!, {r4, lr}
ldr r1, _02186380 ; =data_ov37_02188f88
mov r4, r0
ldr r0, _02186384 ; =data_027e0fe4
ldr r0, _02186384 ; =gActorManager
str r1, [r4]
add r1, r4, #4
ldr r0, [r0]
@@ -11952,7 +11952,7 @@ _02186300:
ldmia sp!, {r4, pc}
.align 2, 0
_02186380: .word data_ov37_02188f88
_02186384: .word data_027e0fe4
_02186384: .word gActorManager
_02186388: .word data_027e0f6c
_0218638c: .word func_ov00_020b7d74
arm_func_end func_ov37_021862d0
@@ -11963,7 +11963,7 @@ func_ov37_02186390: ; 0x02186390
stmdb sp!, {r4, lr}
ldr r1, _02186448 ; =data_ov37_02188f88
mov r4, r0
ldr r0, _0218644c ; =data_027e0fe4
ldr r0, _0218644c ; =gActorManager
str r1, [r4]
add r1, r4, #4
ldr r0, [r0]
@@ -12009,7 +12009,7 @@ _021863c0:
ldmia sp!, {r4, pc}
.align 2, 0
_02186448: .word data_ov37_02188f88
_0218644c: .word data_027e0fe4
_0218644c: .word gActorManager
_02186450: .word data_027e0f6c
_02186454: .word func_ov00_020b7d74
arm_func_end func_ov37_02186390
@@ -12100,7 +12100,7 @@ func_ov37_02186458: ; 0x02186458
add r3, sp, #0x14
add r2, r4, #0x48
bl func_ov00_020c4048
ldr r0, _0218666c ; =data_027e0fe4
ldr r0, _0218666c ; =gActorManager
add r1, r4, #4
ldr r0, [r0]
add r1, r1, #0x400
@@ -12151,7 +12151,7 @@ _0218665c: .word data_ov37_02188f00
_02186660: .word data_027e0f6c
_02186664: .word data_027e0fe8
_02186668: .word 0x57534243
_0218666c: .word data_027e0fe4
_0218666c: .word gActorManager
_02186670: .word gMapManager
arm_func_end func_ov37_02186458
@@ -12239,7 +12239,7 @@ func_ov37_02186720: ; 0x02186720
addgt sp, sp, #0xa4
movgt r0, #0
ldmgtia sp!, {r3, r4, r5, r6, pc}
ldr r0, _02186850 ; =data_027e0fe4
ldr r0, _02186850 ; =gActorManager
add r1, r4, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -12299,7 +12299,7 @@ func_ov37_02186720: ; 0x02186720
add sp, sp, #0xa4
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02186850: .word data_027e0fe4
_02186850: .word gActorManager
_02186854: .word 0x0000ffff
_02186858: .word gMapManager
arm_func_end func_ov37_02186720
@@ -12970,7 +12970,7 @@ _021870d0:
str r0, [r5, #0x20c]
mov r0, r5
bl func_ov37_02187c34
ldr r0, _02187744 ; =data_027e0fe4
ldr r0, _02187744 ; =gActorManager
add r1, r5, #4
ldr r0, [r0]
add r1, r1, #0x400
@@ -13379,7 +13379,7 @@ _021876bc:
bl func_ov37_02186d3c
cmp r0, #0
beq _02187730
ldr r0, _02187744 ; =data_027e0fe4
ldr r0, _02187744 ; =gActorManager
add r1, r5, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13393,7 +13393,7 @@ _021876bc:
_02187700:
mov r0, r5
bl func_ov37_02186700
ldr r0, _02187744 ; =data_027e0fe4
ldr r0, _02187744 ; =gActorManager
add r1, r5, #0x34
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13410,7 +13410,7 @@ _02187730:
add sp, sp, #0x50
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02187744: .word data_027e0fe4
_02187744: .word gActorManager
_02187748: .word gPlayerLink
_0218774c: .word data_027e0f94
_02187750: .word 0x424d524e
@@ -13479,7 +13479,7 @@ func_ov37_021877c0: ; 0x021877c0
mov r2, r6
add r3, sp, #0x1c
bl func_ov00_020c4048
ldr r0, _021878a0 ; =data_027e0fe4
ldr r0, _021878a0 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13509,7 +13509,7 @@ _0218786c:
.align 2, 0
_02187898: .word data_027e0fe8
_0218789c: .word 0x57534242
_021878a0: .word data_027e0fe4
_021878a0: .word gActorManager
_021878a4: .word data_027e0e58
_021878a8: .word 0x00001001
arm_func_end func_ov37_021877c0
asm/ov38.inc
+1 -1
View File
@@ -85,7 +85,7 @@
.extern data_027e0f94
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
asm/ov38.s
+31 -31
View File
@@ -158,12 +158,12 @@ func_ov38_0217bf40: ; 0x0217bf40
func_ov38_0217bf48: ; 0x0217bf48
stmdb sp!, {r3, lr}
sub sp, sp, #0x18
ldr r1, _0217c030 ; =data_027e0fe4
ldr r1, _0217c030 ; =gActorManager
ldr r2, _0217c034 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c030 ; =data_027e0fe4
ldr r0, _0217c030 ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -174,12 +174,12 @@ func_ov38_0217bf48: ; 0x0217bf48
add r0, r0, #0x300
strh r2, [r0, #0xc4]
strh r2, [r0, #0xc6]
ldr r1, _0217c030 ; =data_027e0fe4
ldr r1, _0217c030 ; =gActorManager
ldr r2, _0217c03c ; =0x57534e56
ldr r1, [r1]
add r0, sp, #8
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c030 ; =data_027e0fe4
ldr r0, _0217c030 ; =gActorManager
ldr r3, [sp, #8]
ldr r2, [sp, #0xc]
ldr r0, [r0]
@@ -189,7 +189,7 @@ func_ov38_0217bf48: ; 0x0217bf48
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #1
strb r1, [r0, #0x28d]
ldr r1, _0217c030 ; =data_027e0fe4
ldr r1, _0217c030 ; =gActorManager
ldr r2, _0217c040 ; =0x46434e56
ldr r1, [r1]
add r0, sp, #0
@@ -197,7 +197,7 @@ func_ov38_0217bf48: ; 0x0217bf48
ldr r0, [sp, #4]
ldr r1, [sp]
str r0, [sp, #0x14]
ldr r0, _0217c030 ; =data_027e0fe4
ldr r0, _0217c030 ; =gActorManager
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
@@ -215,7 +215,7 @@ func_ov38_0217bf48: ; 0x0217bf48
add sp, sp, #0x18
ldmia sp!, {r3, pc}
.align 2, 0
_0217c030: .word data_027e0fe4
_0217c030: .word gActorManager
_0217c034: .word 0x4e415649
_0217c038: .word 0x00004a52
_0217c03c: .word 0x57534e56
@@ -230,24 +230,24 @@ _0217c04c: .word data_ov38_021891e0
func_ov38_0217c050: ; 0x0217c050
stmdb sp!, {r3, lr}
sub sp, sp, #0x18
ldr r1, _0217c128 ; =data_027e0fe4
ldr r1, _0217c128 ; =gActorManager
ldr r2, _0217c12c ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c128 ; =data_027e0fe4
ldr r0, _0217c128 ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
strb r1, [r0, #0x3c1]
ldr r1, _0217c128 ; =data_027e0fe4
ldr r1, _0217c128 ; =gActorManager
ldr r2, _0217c130 ; =0x57534e56
ldr r1, [r1]
add r0, sp, #8
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c128 ; =data_027e0fe4
ldr r0, _0217c128 ; =gActorManager
ldr r3, [sp, #8]
ldr r2, [sp, #0xc]
ldr r0, [r0]
@@ -257,7 +257,7 @@ func_ov38_0217c050: ; 0x0217c050
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
ldr r1, _0217c128 ; =data_027e0fe4
ldr r1, _0217c128 ; =gActorManager
ldr r2, _0217c134 ; =0x46434e56
ldr r1, [r1]
add r0, sp, #0
@@ -265,7 +265,7 @@ func_ov38_0217c050: ; 0x0217c050
ldr r0, [sp, #4]
ldr r1, [sp]
str r0, [sp, #0x14]
ldr r0, _0217c128 ; =data_027e0fe4
ldr r0, _0217c128 ; =gActorManager
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
@@ -283,7 +283,7 @@ func_ov38_0217c050: ; 0x0217c050
add sp, sp, #0x18
ldmia sp!, {r3, pc}
.align 2, 0
_0217c128: .word data_027e0fe4
_0217c128: .word gActorManager
_0217c12c: .word 0x4e415649
_0217c130: .word 0x57534e56
_0217c134: .word 0x46434e56
@@ -1564,7 +1564,7 @@ _0217cff0:
add r6, sp, #0x18
ldr r5, _0217d548 ; =data_ov38_02189224
ldr r4, _0217d54c ; =data_027e0fe8
ldr r11, _0217d550 ; =data_027e0fe4
ldr r11, _0217d550 ; =gActorManager
b _0217d360
_0217d30c:
mov r0, r8
@@ -1638,22 +1638,22 @@ _0217d360:
add r0, r10, #0x2c8
mov r1, #0
bl func_ov38_0217be04
ldr r1, _0217d550 ; =data_027e0fe4
ldr r1, _0217d550 ; =gActorManager
ldr r2, _0217d55c ; =0x42524d31
ldr r1, [r1]
add r0, sp, #0xc
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217d550 ; =data_027e0fe4
ldr r0, _0217d550 ; =gActorManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r10, #0xff4]
ldr r1, _0217d550 ; =data_027e0fe4
ldr r1, _0217d550 ; =gActorManager
ldr r2, _0217d560 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #4
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217d550 ; =data_027e0fe4
ldr r0, _0217d550 ; =gActorManager
ldr r3, [sp, #4]
ldr r2, [sp, #8]
ldr r0, [r0]
@@ -1714,7 +1714,7 @@ _0217d540: .word data_02050f54
_0217d544: .word data_027e01b8
_0217d548: .word data_ov38_02189224
_0217d54c: .word data_027e0fe8
_0217d550: .word data_027e0fe4
_0217d550: .word gActorManager
_0217d554: .word 0x474f3145
_0217d558: .word 0x000014cd
_0217d55c: .word 0x42524d31
@@ -9402,7 +9402,7 @@ func_ov38_02184120: ; 0x02184120
add r2, r4, #0x48
mov r3, #2
bl func_ov00_0207c1b0
ldr r0, _021841dc ; =data_027e0fe4
ldr r0, _021841dc ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9413,7 +9413,7 @@ _021841cc: .word data_027e0fe8
_021841d0: .word 0x474f3154
_021841d4: .word data_027e0e58
_021841d8: .word 0x00001037
_021841dc: .word data_027e0fe4
_021841dc: .word gActorManager
arm_func_end func_ov38_02184120
.global func_ov38_021841e0
@@ -9440,7 +9440,7 @@ func_ov38_021841e0: ; 0x021841e0
add r3, sp, #0xc
add r2, r4, #0x48
bl func_ov00_020c4048
ldr r0, _02184258 ; =data_027e0fe4
ldr r0, _02184258 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9450,7 +9450,7 @@ func_ov38_021841e0: ; 0x021841e0
.align 2, 0
_02184250: .word data_027e0fe8
_02184254: .word 0x474f3150
_02184258: .word data_027e0fe4
_02184258: .word gActorManager
arm_func_end func_ov38_021841e0
.global func_ov38_0218425c
@@ -9638,7 +9638,7 @@ _0218446c:
ldr r0, [r0]
add r2, sp, #0x4c
bl func_ov00_020c4048
ldr r0, _02184570 ; =data_027e0fe4
ldr r0, _02184570 ; =gActorManager
add r1, sp, #0x20
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -9660,7 +9660,7 @@ _02184560: .word data_ov20_021793cc ; data_ov22_021793cc, data_ov23_021793cc, da
_02184564: .word data_027e0764
_02184568: .word data_027e0fe8
_0218456c: .word 0x474f3154
_02184570: .word data_027e0fe4
_02184570: .word gActorManager
arm_func_end func_ov38_0218425c
.global func_ov38_02184574
@@ -10032,7 +10032,7 @@ func_ov38_02184a18: ; 0x02184a18
add r3, sp, #0x28
add r2, r2, #0xc00
bl func_ov00_020c4048
ldr r0, _02184ba0 ; =data_027e0fe4
ldr r0, _02184ba0 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -10095,7 +10095,7 @@ func_ov38_02184a18: ; 0x02184a18
.align 2, 0
_02184b98: .word data_027e0fe8
_02184b9c: .word 0x4c4f4e44
_02184ba0: .word data_027e0fe4
_02184ba0: .word gActorManager
_02184ba4: .word data_027e0d0c
_02184ba8: .word 0x0000119a
arm_func_end func_ov38_02184a18
@@ -13773,12 +13773,12 @@ func_ov38_021880d8: ; 0x021880d8
mov r4, r0
strh r3, [r2, #0x20]
str r1, [r2, #0x28]
ldr r0, _0218818c ; =data_027e0fe4
ldr r0, _0218818c ; =gActorManager
ldr r2, _02188190 ; =0x4e564d4d
ldr r1, [r0]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0218818c ; =data_027e0fe4
ldr r0, _0218818c ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -13810,7 +13810,7 @@ func_ov38_021880d8: ; 0x021880d8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02188188: .word data_ov38_02189438
_0218818c: .word data_027e0fe4
_0218818c: .word gActorManager
_02188190: .word 0x4e564d4d
_02188194: .word 0xfffff99a
_02188198: .word data_ov38_021890f8
asm/ov39.inc
+1 -1
View File
@@ -88,7 +88,7 @@
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
asm/ov39.s
+19 -19
View File
@@ -40,12 +40,12 @@ func_ov39_0217bdc8: ; 0x0217bdc8
mov r4, r0
ldr r0, [r4, #8]
bl func_ov39_0217fcbc
ldr r1, _0217bf0c ; =data_027e0fe4
ldr r1, _0217bf0c ; =gActorManager
ldr r2, _0217bf10 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217bf0c ; =data_027e0fe4
ldr r0, _0217bf0c ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -56,7 +56,7 @@ func_ov39_0217bdc8: ; 0x0217bdc8
add r0, r0, #0x300
strh r2, [r0, #0xc4]
strh r2, [r0, #0xc6]
ldr r1, _0217bf0c ; =data_027e0fe4
ldr r1, _0217bf0c ; =gActorManager
ldr r2, _0217bf18 ; =0x57534e56
ldr r1, [r1]
add r0, sp, #8
@@ -64,14 +64,14 @@ func_ov39_0217bdc8: ; 0x0217bdc8
ldr r0, [sp, #0xc]
ldr r1, [sp, #8]
str r0, [sp, #0x14]
ldr r0, _0217bf0c ; =data_027e0fe4
ldr r0, _0217bf0c ; =gActorManager
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #1
strb r1, [r0, #0x28d]
ldr r1, _0217bf0c ; =data_027e0fe4
ldr r1, _0217bf0c ; =gActorManager
ldr r2, _0217bf1c ; =0x46434e56
ldr r1, [r1]
add r0, sp, #0
@@ -79,7 +79,7 @@ func_ov39_0217bdc8: ; 0x0217bdc8
ldr r0, [sp, #4]
ldr r1, [sp]
str r0, [sp, #0x14]
ldr r0, _0217bf0c ; =data_027e0fe4
ldr r0, _0217bf0c ; =gActorManager
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
@@ -120,7 +120,7 @@ _0217bed4:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_0217bf0c: .word data_027e0fe4
_0217bf0c: .word gActorManager
_0217bf10: .word 0x4e415649
_0217bf14: .word 0x00004a52
_0217bf18: .word 0x57534e56
@@ -136,25 +136,25 @@ _0217bf2c: .word data_ov00_020eec68
func_ov39_0217bf30: ; 0x0217bf30
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _0217c01c ; =data_027e0fe4
ldr r1, _0217c01c ; =gActorManager
mov r4, r0
ldr r1, [r1]
ldr r2, _0217c020 ; =0x4e415649
add r0, sp, #0x10
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c01c ; =data_027e0fe4
ldr r0, _0217c01c ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
strb r1, [r0, #0x3c1]
ldr r1, _0217c01c ; =data_027e0fe4
ldr r1, _0217c01c ; =gActorManager
ldr r2, _0217c024 ; =0x57534e56
ldr r1, [r1]
add r0, sp, #8
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c01c ; =data_027e0fe4
ldr r0, _0217c01c ; =gActorManager
ldr r1, [sp, #8]
ldr r2, [sp, #0xc]
str r1, [sp, #0x10]
@@ -164,7 +164,7 @@ func_ov39_0217bf30: ; 0x0217bf30
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
ldr r1, _0217c01c ; =data_027e0fe4
ldr r1, _0217c01c ; =gActorManager
ldr r2, _0217c028 ; =0x46434e56
ldr r1, [r1]
add r0, sp, #0
@@ -172,7 +172,7 @@ func_ov39_0217bf30: ; 0x0217bf30
ldr r0, [sp, #4]
ldr r1, [sp]
str r0, [sp, #0x14]
ldr r0, _0217c01c ; =data_027e0fe4
ldr r0, _0217c01c ; =gActorManager
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
@@ -194,7 +194,7 @@ func_ov39_0217bf30: ; 0x0217bf30
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_0217c01c: .word data_027e0fe4
_0217c01c: .word gActorManager
_0217c020: .word 0x4e415649
_0217c024: .word 0x57534e56
_0217c028: .word 0x46434e56
@@ -1701,7 +1701,7 @@ func_ov39_0217d210: ; 0x0217d210
mvn r0, #0
cmp r1, r0
beq _0217d46c
ldr r0, _0217d530 ; =data_027e0fe4
ldr r0, _0217d530 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1757,7 +1757,7 @@ _0217d520: .word data_ov29_0217a4ac
_0217d524: .word data_ov39_02186c08
_0217d528: .word data_027e0fe8
_0217d52c: .word 0x4c4f4e44
_0217d530: .word data_027e0fe4
_0217d530: .word gActorManager
arm_func_end func_ov39_0217d210
.global func_ov39_0217d534
@@ -1787,12 +1787,12 @@ func_ov39_0217d534: ; 0x0217d534
add r2, r4, #0x268
str r3, [r4, #0x1b0]
bl func_01ff9bf8
ldr r1, _0217d5cc ; =data_027e0fe4
ldr r1, _0217d5cc ; =gActorManager
ldr r2, _0217d5d0 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217d5cc ; =data_027e0fe4
ldr r0, _0217d5cc ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1802,7 +1802,7 @@ func_ov39_0217d534: ; 0x0217d534
.align 2, 0
_0217d5c4: .word gMapManager
_0217d5c8: .word data_027e0f94
_0217d5cc: .word data_027e0fe4
_0217d5cc: .word gActorManager
_0217d5d0: .word 0x4e415649
arm_func_end func_ov39_0217d534
asm/ov40.inc
+1 -1
View File
@@ -98,7 +98,7 @@
.extern data_027e0fc4
.extern data_027e0fcc
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov40.s
+19 -19
View File
@@ -4835,7 +4835,7 @@ _0217fae8:
_0217fb0c:
mov r0, #0
strb r0, [r5, #0xd6]
ldr r0, _0217fbcc ; =data_027e0fe4
ldr r0, _0217fbcc ; =gActorManager
strb r1, [r5, #0xd7]
ldr r1, [r0]
add r0, sp, #4
@@ -4869,7 +4869,7 @@ _0217fb0c:
add r3, sp, #0xc
bl func_ov00_020c4048
_0217fb98:
ldr r0, _0217fbcc ; =data_027e0fe4
ldr r0, _0217fbcc ; =gActorManager
add r1, r5, #0xdc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4883,7 +4883,7 @@ _0217fbbc: .word 0x444d4b53
_0217fbc0: .word 0x444d5350
_0217fbc4: .word 0x444d4847
_0217fbc8: .word data_027e0fe8
_0217fbcc: .word data_027e0fe4
_0217fbcc: .word gActorManager
arm_func_end func_ov40_0217fa44
.global func_ov40_0217fbd0
@@ -4893,7 +4893,7 @@ func_ov40_0217fbd0: ; 0x0217fbd0
ldrb r1, [r0, #0xd6]
cmp r1, #0
ldmeqia sp!, {r3, pc}
ldr r2, _0217fc00 ; =data_027e0fe4
ldr r2, _0217fc00 ; =gActorManager
add r1, r0, #0xdc
ldr r0, [r2]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4902,7 +4902,7 @@ func_ov40_0217fbd0: ; 0x0217fbd0
strneb r1, [r0, #0x118]
ldmia sp!, {r3, pc}
.align 2, 0
_0217fc00: .word data_027e0fe4
_0217fc00: .word gActorManager
arm_func_end func_ov40_0217fbd0
.global func_ov40_0217fc04
@@ -4990,7 +4990,7 @@ _0217fd10: .word 0x00000126
func_ov40_0217fd14: ; 0x0217fd14
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0x7c
ldr r1, _0217fe00 ; =data_027e0fe4
ldr r1, _0217fe00 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0xdc
@@ -5048,7 +5048,7 @@ func_ov40_0217fd14: ; 0x0217fd14
add sp, sp, #0x7c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0217fe00: .word data_027e0fe4
_0217fe00: .word gActorManager
arm_func_end func_ov40_0217fd14
.global func_ov40_0217fe04
@@ -5060,7 +5060,7 @@ func_ov40_0217fe04: ; 0x0217fe04
ldrb r0, [r4, #0xd7]
cmp r0, #0
beq _0217fe38
ldr r0, _0217fe70 ; =data_027e0fe4
ldr r0, _0217fe70 ; =gActorManager
add r1, r4, #0xdc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5083,7 +5083,7 @@ _0217fe38:
strb r0, [r4, #0xd5]
ldmia sp!, {r4, pc}
.align 2, 0
_0217fe70: .word data_027e0fe4
_0217fe70: .word gActorManager
arm_func_end func_ov40_0217fe04
.global func_ov40_0217fe74
@@ -5095,7 +5095,7 @@ func_ov40_0217fe74: ; 0x0217fe74
cmp r2, #0
mvneq r0, #0
ldmeqia sp!, {r4, pc}
ldr r2, _0217febc ; =data_027e0fe4
ldr r2, _0217febc ; =gActorManager
add r1, r0, #0xdc
ldr r0, [r2]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5108,7 +5108,7 @@ func_ov40_0217fe74: ; 0x0217fe74
blx r2
ldmia sp!, {r4, pc}
.align 2, 0
_0217febc: .word data_027e0fe4
_0217febc: .word gActorManager
arm_func_end func_ov40_0217fe74
.global func_ov40_0217fec0
@@ -5124,7 +5124,7 @@ func_ov40_0217fec0: ; 0x0217fec0
cmp r5, #0
movlt r0, #0
ldmltia sp!, {r3, r4, r5, pc}
ldr r2, _0217ff1c ; =data_027e0fe4
ldr r2, _0217ff1c ; =gActorManager
add r1, r0, #0xdc
ldr r0, [r2]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5138,7 +5138,7 @@ func_ov40_0217fec0: ; 0x0217fec0
blx r3
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217ff1c: .word data_027e0fe4
_0217ff1c: .word gActorManager
arm_func_end func_ov40_0217fec0
.global func_ov40_0217ff20
@@ -5151,7 +5151,7 @@ func_ov40_0217ff20: ; 0x0217ff20
cmp r3, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r2, _0217ff70 ; =data_027e0fe4
ldr r2, _0217ff70 ; =gActorManager
add r1, r0, #0xdc
ldr r0, [r2]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5165,7 +5165,7 @@ func_ov40_0217ff20: ; 0x0217ff20
blx r3
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217ff70: .word data_027e0fe4
_0217ff70: .word gActorManager
arm_func_end func_ov40_0217ff20
.global func_ov40_0217ff74
@@ -5175,7 +5175,7 @@ func_ov40_0217ff74: ; 0x0217ff74
sub sp, sp, #0x7c
mov r4, r0
bl func_ov40_0217fa44
ldr r0, _0218005c ; =data_027e0fe4
ldr r0, _0218005c ; =gActorManager
add r1, r4, #0xdc
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5230,14 +5230,14 @@ func_ov40_0217ff74: ; 0x0217ff74
add sp, sp, #0x7c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0218005c: .word data_027e0fe4
_0218005c: .word gActorManager
arm_func_end func_ov40_0217ff74
.global func_ov40_02180060
arm_func_start func_ov40_02180060
func_ov40_02180060: ; 0x02180060
stmdb sp!, {r4, lr}
ldr r1, _02180098 ; =data_027e0fe4
ldr r1, _02180098 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0xdc
@@ -5252,7 +5252,7 @@ _0218008c:
bl func_ov40_0217fbd0
ldmia sp!, {r4, pc}
.align 2, 0
_02180098: .word data_027e0fe4
_02180098: .word gActorManager
arm_func_end func_ov40_02180060
.global func_ov40_0218009c
asm/ov41.inc
+1 -1
View File
@@ -89,7 +89,7 @@
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov41.s
+15 -15
View File
@@ -377,13 +377,13 @@ func_ov41_02189a14: ; 0x02189a14
beq _02189ac0
b _02189ae8
_02189a34:
ldr r1, _02189b00 ; =data_027e0fe4
ldr r1, _02189b00 ; =gActorManager
ldr r2, _02189b04 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x18
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #0x18]
ldr r1, _02189b00 ; =data_027e0fe4
ldr r1, _02189b00 ; =gActorManager
str r0, [r4, #0x180]
ldr r2, [sp, #0x1c]
add r0, sp, #8
@@ -398,7 +398,7 @@ _02189a34:
str r1, [sp, #0x1c]
cmp r2, r0
bne _02189aac
ldr r1, _02189b00 ; =data_027e0fe4
ldr r1, _02189b00 ; =gActorManager
ldr r2, _02189b0c ; =0x4c4e4232
ldr r1, [r1]
add r0, sp, #0
@@ -414,7 +414,7 @@ _02189aac:
str r0, [r4, #0x18c]
b _02189af4
_02189ac0:
ldr r1, _02189b00 ; =data_027e0fe4
ldr r1, _02189b00 ; =gActorManager
ldr r2, _02189b04 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
@@ -433,7 +433,7 @@ _02189af4:
add sp, sp, #0x20
ldmia sp!, {r4, pc}
.align 2, 0
_02189b00: .word data_027e0fe4
_02189b00: .word gActorManager
_02189b04: .word 0x4e415649
_02189b08: .word 0x4c4e424b
_02189b0c: .word 0x4c4e4232
@@ -881,7 +881,7 @@ _0218a060: .word func_ov41_02189cc0
func_ov41_0218a064: ; 0x0218a064
stmdb sp!, {r4, lr}
sub sp, sp, #8
ldr r1, _0218a0a0 ; =data_027e0fe4
ldr r1, _0218a0a0 ; =gActorManager
mov r4, r0
ldr r1, [r1]
ldr r2, _0218a0a4 ; =0x4e415649
@@ -895,7 +895,7 @@ func_ov41_0218a064: ; 0x0218a064
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0218a0a0: .word data_027e0fe4
_0218a0a0: .word gActorManager
_0218a0a4: .word 0x4e415649
arm_func_end func_ov41_0218a064
@@ -3212,7 +3212,7 @@ _0218be3c:
addeq r8, r8, #0x5000
addeq r6, r6, #0x2800
_0218be84:
ldr r0, _0218bf0c ; =data_027e0fe4
ldr r0, _0218bf0c ; =gActorManager
mov r1, r9
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3248,7 +3248,7 @@ _0218bef4:
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218bf0c: .word data_027e0fe4
_0218bf0c: .word gActorManager
_0218bf10: .word data_027e0e58
_0218bf14: .word data_027e0ffc
_0218bf18: .word 0x00000482
@@ -3384,7 +3384,7 @@ _0218c0d8: .word 0x4f53574f
arm_func_start func_ov41_0218c0dc
func_ov41_0218c0dc: ; 0x0218c0dc
stmdb sp!, {r4, r5, r6, lr}
ldr r4, _0218c118 ; =data_027e0fe4
ldr r4, _0218c118 ; =gActorManager
add r6, r0, #0x470
mov r5, #0
_0218c0ec:
@@ -3401,7 +3401,7 @@ _0218c104:
blt _0218c0ec
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0218c118: .word data_027e0fe4
_0218c118: .word gActorManager
arm_func_end func_ov41_0218c0dc
.global func_ov41_0218c11c
@@ -3531,7 +3531,7 @@ func_ov41_0218c204: ; 0x0218c204
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0218c3b0
ldr r0, _0218c3cc ; =data_027e0fe4
ldr r0, _0218c3cc ; =gActorManager
add r1, r4, #0x530
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3611,7 +3611,7 @@ _0218c3bc: .word data_027e0f94
_0218c3c0: .word gPlayerLink
_0218c3c4: .word 0x0000319a
_0218c3c8: .word gAdventureFlags
_0218c3cc: .word data_027e0fe4
_0218c3cc: .word gActorManager
_0218c3d0: .word data_02050f54
arm_func_end func_ov41_0218c204
@@ -4006,7 +4006,7 @@ func_ov41_0218c834: ; 0x0218c834
ldrne r0, [r2, #0x40]
add r1, r6, #0x74
strne r0, [r6, #0x478]
ldr r0, _0218cbe8 ; =data_027e0fe4
ldr r0, _0218cbe8 ; =gActorManager
add r1, r1, #0x400
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4220,7 +4220,7 @@ _0218cbd0:
_0218cbdc: .word data_027e0f68
_0218cbe0: .word gAdventureFlags
_0218cbe4: .word gPlayerLink
_0218cbe8: .word data_027e0fe4
_0218cbe8: .word gActorManager
_0218cbec: .word gMapManager
_0218cbf0: .word data_02050f54
_0218cbf4: .word 0x4b4f4b4f
asm/ov42.inc
+1 -1
View File
@@ -69,7 +69,7 @@
.extern data_027e0fb8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov42.s
+11 -11
View File
@@ -496,7 +496,7 @@ func_ov42_02189b84: ; 0x02189b84
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
mov r8, #0
ldr r5, _02189ccc ; =data_027e0fe4
ldr r5, _02189ccc ; =gActorManager
add r9, r4, #0x10
mov r7, r8
mvn r6, #0
@@ -514,7 +514,7 @@ _02189ba0:
add r9, r9, #8
blt _02189ba0
mov r8, #0
ldr r5, _02189ccc ; =data_027e0fe4
ldr r5, _02189ccc ; =gActorManager
add r9, r4, #0x28
mov r7, r8
mvn r6, #0
@@ -579,7 +579,7 @@ _02189c88:
strb r1, [r0, #0x24]
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02189ccc: .word data_027e0fe4
_02189ccc: .word gActorManager
_02189cd0: .word gItemManager
_02189cd4: .word data_027e0fb8
_02189cd8: .word data_027e0f64
@@ -804,7 +804,7 @@ _02189f54:
cmp r0, #4
blt _02189f54
mov r7, #0
ldr r4, _0218a058 ; =data_027e0fe4
ldr r4, _0218a058 ; =gActorManager
add r9, r10, #0x28
mov r6, r7
mov r11, #3
@@ -830,7 +830,7 @@ _02189fe4:
cmp r7, #3
add r9, r9, #8
blt _02189fc0
ldr r0, _0218a058 ; =data_027e0fe4
ldr r0, _0218a058 ; =gActorManager
add r1, r10, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -851,7 +851,7 @@ _0218a034:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218a054: .word data_027e0764
_0218a058: .word data_027e0fe4
_0218a058: .word gActorManager
arm_func_end func_ov42_02189efc
.global func_ov42_0218a05c
@@ -1324,7 +1324,7 @@ func_ov42_0218a63c: ; 0x0218a63c
cmp r7, #0
mov r4, #0
ble _0218a6c8
ldr r10, _0218a730 ; =data_027e0fe4
ldr r10, _0218a730 ; =gActorManager
add r5, r9, #0x28
_0218a678:
ldr r0, [r10]
@@ -1354,7 +1354,7 @@ _0218a6c8:
mov r5, #0
cmp r8, #0
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r4, _0218a730 ; =data_027e0fe4
ldr r4, _0218a730 ; =gActorManager
add r7, r9, #0x10
_0218a6dc:
ldr r0, [r4]
@@ -1382,7 +1382,7 @@ _0218a71c:
blt _0218a6dc
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_0218a730: .word data_027e0fe4
_0218a730: .word gActorManager
arm_func_end func_ov42_0218a63c
.global func_ov42_0218a734
@@ -3828,7 +3828,7 @@ func_ov42_0218c644: ; 0x0218c644
mvn r0, #0
cmp r1, r0
ldmeqia sp!, {r4, pc}
ldr r0, _0218c68c ; =data_027e0fe4
ldr r0, _0218c68c ; =gActorManager
add r1, r4, #0x15c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3841,7 +3841,7 @@ func_ov42_0218c644: ; 0x0218c644
str r0, [r4, #0x160]
ldmia sp!, {r4, pc}
.align 2, 0
_0218c68c: .word data_027e0fe4
_0218c68c: .word gActorManager
arm_func_end func_ov42_0218c644
.global func_ov42_0218c690
asm/ov43.inc
+1 -1
View File
@@ -70,7 +70,7 @@
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov43.s
+28 -28
View File
@@ -286,7 +286,7 @@ func_ov43_02189904: ; 0x02189904
sub sp, sp, #8
mov r4, r0
ldr r1, _0218999c ; =data_ov43_0218d888
ldr r0, _021899a0 ; =data_027e0fe4
ldr r0, _021899a0 ; =gActorManager
str r1, [r4]
ldr r1, [r0]
ldr r2, _021899a4 ; =0x504c4c42
@@ -296,7 +296,7 @@ func_ov43_02189904: ; 0x02189904
mvn r0, #0
cmp r1, r0
beq _0218995c
ldr r0, _021899a0 ; =data_027e0fe4
ldr r0, _021899a0 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -323,7 +323,7 @@ _0218995c:
ldmia sp!, {r4, pc}
.align 2, 0
_0218999c: .word data_ov43_0218d888
_021899a0: .word data_027e0fe4
_021899a0: .word gActorManager
_021899a4: .word 0x504c4c42
_021899a8: .word func_ov00_020b7d74
arm_func_end func_ov43_02189904
@@ -335,7 +335,7 @@ func_ov43_021899ac: ; 0x021899ac
sub sp, sp, #8
mov r4, r0
ldr r1, _02189a4c ; =data_ov43_0218d888
ldr r0, _02189a50 ; =data_027e0fe4
ldr r0, _02189a50 ; =gActorManager
str r1, [r4]
ldr r1, [r0]
ldr r2, _02189a54 ; =0x504c4c42
@@ -345,7 +345,7 @@ func_ov43_021899ac: ; 0x021899ac
mvn r0, #0
cmp r1, r0
beq _02189a04
ldr r0, _02189a50 ; =data_027e0fe4
ldr r0, _02189a50 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -374,7 +374,7 @@ _02189a04:
ldmia sp!, {r4, pc}
.align 2, 0
_02189a4c: .word data_ov43_0218d888
_02189a50: .word data_027e0fe4
_02189a50: .word gActorManager
_02189a54: .word 0x504c4c42
_02189a58: .word func_ov00_020b7d74
arm_func_end func_ov43_021899ac
@@ -386,7 +386,7 @@ func_ov43_02189a5c: ; 0x02189a5c
sub sp, sp, #8
mov r4, r0
ldr r1, _02189af4 ; =data_ov43_0218d888
ldr r0, _02189af8 ; =data_027e0fe4
ldr r0, _02189af8 ; =gActorManager
str r1, [r4]
ldr r1, [r0]
ldr r2, _02189afc ; =0x504c4c42
@@ -396,7 +396,7 @@ func_ov43_02189a5c: ; 0x02189a5c
mvn r0, #0
cmp r1, r0
beq _02189ab4
ldr r0, _02189af8 ; =data_027e0fe4
ldr r0, _02189af8 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -423,7 +423,7 @@ _02189ab4:
ldmia sp!, {r4, pc}
.align 2, 0
_02189af4: .word data_ov43_0218d888
_02189af8: .word data_027e0fe4
_02189af8: .word gActorManager
_02189afc: .word 0x504c4c42
_02189b00: .word func_ov00_020b7d74
arm_func_end func_ov43_02189a5c
@@ -742,7 +742,7 @@ _02189ebc:
add r1, r1, #8
cmp r1, r0
blo _02189ebc
ldr r0, _02189f94 ; =data_027e0fe4
ldr r0, _02189f94 ; =gActorManager
mov r7, #0
ldr lr, _02189f98 ; =_ZTV11FilterActor
add r5, sp, #0x40
@@ -773,7 +773,7 @@ _02189ebc:
cmpgt r0, #0
addle sp, sp, #0xd4
ldmleia sp!, {r3, r4, r5, r6, r7, r8, pc}
ldr r7, _02189f94 ; =data_027e0fe4
ldr r7, _02189f94 ; =gActorManager
mov r5, r4
_02189f54:
ldr r1, [sp]
@@ -794,7 +794,7 @@ _02189f78:
add sp, sp, #0xd4
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_02189f94: .word data_027e0fe4
_02189f94: .word gActorManager
_02189f98: .word _ZTV11FilterActor
_02189f9c: .word 0x50424c4e
arm_func_end func_ov43_02189ea4
@@ -814,7 +814,7 @@ _02189fb8:
add r1, r1, #8
cmp r1, r0
blo _02189fb8
ldr r0, _0218a0ec ; =data_027e0fe4
ldr r0, _0218a0ec ; =gActorManager
mov r4, #0
ldr ip, _0218a0f0 ; =_ZTV11FilterActor
add r6, sp, #0x40
@@ -844,7 +844,7 @@ _02189fb8:
movgt r5, r4
cmpgt r0, #0
ble _0218a080
ldr r8, _0218a0ec ; =data_027e0fe4
ldr r8, _0218a0ec ; =gActorManager
mov r6, r5
_0218a04c:
ldr r1, [sp]
@@ -893,7 +893,7 @@ _0218a0dc:
add sp, sp, #0xd4
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_0218a0ec: .word data_027e0fe4
_0218a0ec: .word gActorManager
_0218a0f0: .word _ZTV11FilterActor
_0218a0f4: .word 0x50424c4e
_0218a0f8: .word data_027e0ffc
@@ -2575,7 +2575,7 @@ func_ov43_0218b720: ; 0x0218b720
cmp r0, #2
addhs sp, sp, #8
ldmhsia sp!, {r4, pc}
ldr r1, _0218b7b0 ; =data_027e0fe4
ldr r1, _0218b7b0 ; =gActorManager
ldr r2, _0218b7b4 ; =0x50574253
ldr r1, [r1]
add r0, sp, #0
@@ -2585,7 +2585,7 @@ func_ov43_0218b720: ; 0x0218b720
cmp r1, r0
addeq sp, sp, #8
ldmeqia sp!, {r4, pc}
ldr r0, _0218b7b0 ; =data_027e0fe4
ldr r0, _0218b7b0 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2605,7 +2605,7 @@ func_ov43_0218b720: ; 0x0218b720
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_0218b7b0: .word data_027e0fe4
_0218b7b0: .word gActorManager
_0218b7b4: .word 0x50574253
arm_func_end func_ov43_0218b720
@@ -2650,7 +2650,7 @@ _0218b820:
ldr r0, [r5, #0x3bc]
cmp r0, #0
bne _0218b910
ldr r1, _0218ba14 ; =data_027e0fe4
ldr r1, _0218ba14 ; =gActorManager
ldr r2, _0218ba18 ; =0x50574253
ldr r1, [r1]
add r0, sp, #8
@@ -2659,7 +2659,7 @@ _0218b820:
mvn r0, #0
cmp r1, r0
beq _0218b8c8
ldr r0, _0218ba14 ; =data_027e0fe4
ldr r0, _0218ba14 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2684,7 +2684,7 @@ _0218b820:
strne r0, [r5, #0x214]
b _0218b9fc
_0218b8c8:
ldr r1, _0218ba14 ; =data_027e0fe4
ldr r1, _0218ba14 ; =gActorManager
ldr r2, _0218ba1c ; =0x504c444d
ldr r1, [r1]
add r0, sp, #0
@@ -2696,7 +2696,7 @@ _0218b8c8:
str r1, [sp, #0xc]
cmp r2, r0
beq _0218b9fc
ldr r0, _0218ba14 ; =data_027e0fe4
ldr r0, _0218ba14 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2776,7 +2776,7 @@ _0218b9fc:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0218ba10: .word 0x0000ffff
_0218ba14: .word data_027e0fe4
_0218ba14: .word gActorManager
_0218ba18: .word 0x50574253
_0218ba1c: .word 0x504c444d
_0218ba20: .word data_027e0d0c
@@ -2819,7 +2819,7 @@ _0218ba78:
mvn r0, #0
cmp r1, r0
beq _0218bb0c
ldr r0, _0218c97c ; =data_027e0fe4
ldr r0, _0218c97c ; =gActorManager
add r1, r4, #0x3c4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2982,7 +2982,7 @@ _0218bcfc:
mvn r0, #0
cmp r1, r0
beq _0218bd3c
ldr r0, _0218c97c ; =data_027e0fe4
ldr r0, _0218c97c ; =gActorManager
add r1, r4, #0x3c4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -3834,7 +3834,7 @@ _0218c970:
add sp, sp, #0x150
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0218c97c: .word data_027e0fe4
_0218c97c: .word gActorManager
_0218c980: .word 0x0000ffff
_0218c984: .word data_027e0fe8
_0218c988: .word 0x50425a4b
@@ -4381,7 +4381,7 @@ _0218d0e4:
cmp r1, r0
addeq sp, sp, #0x1c
ldmeqia sp!, {r3, r4, pc}
ldr r0, _0218d198 ; =data_027e0fe4
ldr r0, _0218d198 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -4423,7 +4423,7 @@ _0218d168:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218d198: .word data_027e0fe4
_0218d198: .word gActorManager
_0218d19c: .word 0x504c444d
_0218d1a0: .word gPlayerLink
_0218d1a4: .word data_ov00_020eec9c
asm/ov44.inc
+1 -1
View File
@@ -71,7 +71,7 @@
.extern gMapManager
.extern data_027e0f94
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
asm/ov44.s
+42 -42
View File
@@ -1019,7 +1019,7 @@ _0218a19c: .word 0x00000119
arm_func_start func_ov44_0218a1a0
func_ov44_0218a1a0: ; 0x0218a1a0
stmdb sp!, {r4, lr}
ldr r1, _0218a1c8 ; =data_027e0fe4
ldr r1, _0218a1c8 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x318
@@ -1029,7 +1029,7 @@ func_ov44_0218a1a0: ; 0x0218a1a0
str r0, [r4, #0x74]
ldmia sp!, {r4, pc}
.align 2, 0
_0218a1c8: .word data_027e0fe4
_0218a1c8: .word gActorManager
arm_func_end func_ov44_0218a1a0
.global func_ov44_0218a1cc
@@ -1037,7 +1037,7 @@ _0218a1c8: .word data_027e0fe4
func_ov44_0218a1cc: ; 0x0218a1cc
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr r1, _0218a290 ; =data_027e0fe4
ldr r1, _0218a290 ; =gActorManager
mov r5, r0
ldr r0, [r1]
add r1, r5, #0x318
@@ -1091,14 +1091,14 @@ _0218a26c:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0218a290: .word data_027e0fe4
_0218a290: .word gActorManager
arm_func_end func_ov44_0218a1cc
.global func_ov44_0218a294
arm_func_start func_ov44_0218a294
func_ov44_0218a294: ; 0x0218a294
stmdb sp!, {r4, lr}
ldr r1, _0218a2cc ; =data_027e0fe4
ldr r1, _0218a2cc ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x318
@@ -1112,7 +1112,7 @@ func_ov44_0218a294: ; 0x0218a294
movge r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_0218a2cc: .word data_027e0fe4
_0218a2cc: .word gActorManager
arm_func_end func_ov44_0218a294
.global func_ov44_0218a2d0
@@ -1301,7 +1301,7 @@ _0218a4a4:
str ip, [r2, #4]
add r1, r5, #0xa
str r1, [r4, #0x13c]
ldr r0, _0218a600 ; =data_027e0fe4
ldr r0, _0218a600 ; =gActorManager
add r1, r4, #0x318
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1340,14 +1340,14 @@ _0218a564:
mov r0, r4
str r2, [r1, #0x10]
bl func_ov44_0218a1a0
ldr r0, _0218a600 ; =data_027e0fe4
ldr r0, _0218a600 ; =gActorManager
add r1, r4, #0x320
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r5, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, pc}
ldr r0, _0218a600 ; =data_027e0fe4
ldr r0, _0218a600 ; =gActorManager
add r1, r4, #0x318
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1373,7 +1373,7 @@ _0218a5f4:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0218a5fc: .word data_027e0764
_0218a600: .word data_027e0fe4
_0218a600: .word gActorManager
arm_func_end func_ov44_0218a468
.global func_ov44_0218a604
@@ -1413,7 +1413,7 @@ _0218a66c: ; jump table
b _0218a868 ; case 2
b _0218a8a8 ; case 3
_0218a67c:
ldr r0, _0218a8f8 ; =data_027e0fe4
ldr r0, _0218a8f8 ; =gActorManager
add r1, r4, #0x318
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1517,7 +1517,7 @@ _0218a7fc:
bl func_ov44_0218a3fc
cmp r0, #0
beq _0218a8ec
ldr r1, _0218a8f8 ; =data_027e0fe4
ldr r1, _0218a8f8 ; =gActorManager
ldr r2, _0218a904 ; =0x52415448
ldr r1, [r1]
add r0, sp, #0
@@ -1550,7 +1550,7 @@ _0218a868:
ldr r1, [r4, #0x138]
cmp r1, r0, asr #12
ble _0218a8ec
ldr r0, _0218a8f8 ; =data_027e0fe4
ldr r0, _0218a8f8 ; =gActorManager
add r1, r4, #0x318
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1565,7 +1565,7 @@ _0218a8a8:
bl func_ov44_0218a294
cmp r0, #0
beq _0218a8ec
ldr r0, _0218a8f8 ; =data_027e0fe4
ldr r0, _0218a8f8 ; =gActorManager
add r1, r4, #0x320
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1582,7 +1582,7 @@ _0218a8ec:
add sp, sp, #0x20
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0218a8f8: .word data_027e0fe4
_0218a8f8: .word gActorManager
_0218a8fc: .word data_027e0764
_0218a900: .word data_027e0f94
_0218a904: .word 0x52415448
@@ -2165,7 +2165,7 @@ func_ov44_0218af88: ; 0x0218af88
ldr r1, _0218b034 ; =0x4e4b4559
mov r2, r5
bl func_ov00_020c4048
ldr r0, _0218b038 ; =data_027e0fe4
ldr r0, _0218b038 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2177,7 +2177,7 @@ func_ov44_0218af88: ; 0x0218af88
.align 2, 0
_0218b030: .word data_027e0fe8
_0218b034: .word 0x4e4b4559
_0218b038: .word data_027e0fe4
_0218b038: .word gActorManager
arm_func_end func_ov44_0218af88
.global func_ov44_0218b03c
@@ -5474,7 +5474,7 @@ _0218d720: .word func_ov44_0218d658
func_ov44_0218d724: ; 0x0218d724
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _0218d7c8 ; =data_027e0fe4
ldr r1, _0218d7c8 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x318
@@ -5518,7 +5518,7 @@ _0218d7b4:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_0218d7c8: .word data_027e0fe4
_0218d7c8: .word gActorManager
arm_func_end func_ov44_0218d724
.global func_ov44_0218d7cc
@@ -5535,7 +5535,7 @@ _0218d7d4: .word func_ov44_0218d658
func_ov44_0218d7d8: ; 0x0218d7d8
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _0218d874 ; =data_027e0fe4
ldr r1, _0218d874 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x318
@@ -5577,7 +5577,7 @@ _0218d868:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218d874: .word data_027e0fe4
_0218d874: .word gActorManager
_0218d878: .word 0x0000019a
arm_func_end func_ov44_0218d7d8
@@ -5586,7 +5586,7 @@ _0218d878: .word 0x0000019a
func_ov44_0218d87c: ; 0x0218d87c
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _0218d8d8 ; =data_027e0fe4
ldr r1, _0218d8d8 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x318
@@ -5608,7 +5608,7 @@ func_ov44_0218d87c: ; 0x0218d87c
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218d8d8: .word data_027e0fe4
_0218d8d8: .word gActorManager
arm_func_end func_ov44_0218d87c
.global func_ov44_0218d8dc
@@ -5624,7 +5624,7 @@ _0218d8e4: .word func_ov44_0218d658
arm_func_start func_ov44_0218d8e8
func_ov44_0218d8e8: ; 0x0218d8e8
stmdb sp!, {r4, lr}
ldr r1, _0218d914 ; =data_027e0fe4
ldr r1, _0218d914 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x318
@@ -5635,7 +5635,7 @@ func_ov44_0218d8e8: ; 0x0218d8e8
bl func_ov00_020ce284
ldmia sp!, {r4, pc}
.align 2, 0
_0218d914: .word data_027e0fe4
_0218d914: .word gActorManager
_0218d918: .word 0x00000666
arm_func_end func_ov44_0218d8e8
@@ -5643,7 +5643,7 @@ _0218d918: .word 0x00000666
arm_func_start func_ov44_0218d91c
func_ov44_0218d91c: ; 0x0218d91c
stmdb sp!, {r4, lr}
ldr r1, _0218d944 ; =data_027e0fe4
ldr r1, _0218d944 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r4, #0x318
@@ -5653,14 +5653,14 @@ func_ov44_0218d91c: ; 0x0218d91c
str r0, [r4, #0x74]
ldmia sp!, {r4, pc}
.align 2, 0
_0218d944: .word data_027e0fe4
_0218d944: .word gActorManager
arm_func_end func_ov44_0218d91c
.global func_ov44_0218d948
arm_func_start func_ov44_0218d948
func_ov44_0218d948: ; 0x0218d948
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _0218d984 ; =data_027e0fe4
ldr r1, _0218d984 ; =gActorManager
mov r5, r0
ldr r0, [r1]
add r1, r5, #0x318
@@ -5675,7 +5675,7 @@ func_ov44_0218d948: ; 0x0218d948
bl func_ov44_0218e6b4
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0218d984: .word data_027e0fe4
_0218d984: .word gActorManager
arm_func_end func_ov44_0218d948
.global func_ov44_0218d988
@@ -5867,14 +5867,14 @@ _0218dbe4:
_0218dbf8:
str r2, [r4, #0x12c]
bl func_ov44_0218d91c
ldr r0, _0218dd68 ; =data_027e0fe4
ldr r0, _0218dd68 ; =gActorManager
add r1, r4, #0x320
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r5, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, r5, r6, pc}
ldr r0, _0218dd68 ; =data_027e0fe4
ldr r0, _0218dd68 ; =gActorManager
add r1, r4, #0x318
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5919,7 +5919,7 @@ _0218dc74:
str r6, [r1, #4]
add r1, r5, #0xa
str r1, [r4, #0x13c]
ldr r0, _0218dd68 ; =data_027e0fe4
ldr r0, _0218dd68 ; =gActorManager
add r1, r4, #0x320
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5951,7 +5951,7 @@ _0218dcf4:
str r5, [r1, #4]
add r1, ip, #0xa
str r1, [r4, #0x13c]
ldr r0, _0218dd68 ; =data_027e0fe4
ldr r0, _0218dd68 ; =gActorManager
add r1, r4, #0x318
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -5962,7 +5962,7 @@ _0218dd5c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0218dd64: .word data_027e0764
_0218dd68: .word data_027e0fe4
_0218dd68: .word gActorManager
arm_func_end func_ov44_0218da70
.global func_ov44_0218dd6c
@@ -6012,7 +6012,7 @@ _0218ddf4:
ldr r0, [r4, #0x13c]
cmp r1, r0
blt _0218e180
ldr r1, _0218e18c ; =data_027e0fe4
ldr r1, _0218e18c ; =gActorManager
ldr r2, _0218e190 ; =0x52415448
ldr r1, [r1]
add r0, sp, #0
@@ -6161,7 +6161,7 @@ _0218e018:
ldr r1, [r4, #0x138]
cmp r1, r0, asr #12
ble _0218e180
ldr r0, _0218e18c ; =data_027e0fe4
ldr r0, _0218e18c ; =gActorManager
add r1, r4, #0x318
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6202,7 +6202,7 @@ _0218e0bc:
bl func_ov44_0218da70
b _0218e180
_0218e0cc:
ldr r0, _0218e18c ; =data_027e0fe4
ldr r0, _0218e18c ; =gActorManager
add r1, r4, #0x318
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -6253,7 +6253,7 @@ _0218e180:
add sp, sp, #0x14
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0218e18c: .word data_027e0fe4
_0218e18c: .word gActorManager
_0218e190: .word 0x52415448
_0218e194: .word data_027e0764
_0218e198: .word 0x00000266
@@ -6560,7 +6560,7 @@ _0218e4ec:
add r1, sp, #0x38
mvn r3, #0
ldr r5, _0218e590 ; =0x5053424c
ldr r0, _0218e594 ; =data_027e0fe4
ldr r0, _0218e594 ; =gActorManager
str r5, [sp, #8]
str ip, [sp, #4]
str r3, [sp, #0xc]
@@ -6598,7 +6598,7 @@ _0218e4ec:
_0218e588: .word gMapManager
_0218e58c: .word _ZTV11FilterActor
_0218e590: .word 0x5053424c
_0218e594: .word data_027e0fe4
_0218e594: .word gActorManager
arm_func_end func_ov44_0218e4a0
.global func_ov44_0218e598
@@ -6616,7 +6616,7 @@ _0218e5b0:
add r2, r2, #8
cmp r2, r0
blo _0218e5b0
ldr r0, _0218e6a4 ; =data_027e0fe4
ldr r0, _0218e6a4 ; =gActorManager
mov lr, #0
ldr r7, _0218e6a8 ; =_ZTV11FilterActor
add ip, sp, #0x40
@@ -6674,7 +6674,7 @@ _0218e684:
add sp, sp, #0x154
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_0218e6a4: .word data_027e0fe4
_0218e6a4: .word gActorManager
_0218e6a8: .word _ZTV11FilterActor
_0218e6ac: .word 0x52415448
_0218e6b0: .word data_027e0764
asm/ov46.inc
+1 -1
View File
@@ -79,7 +79,7 @@
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov46.s
+11 -11
View File
@@ -370,7 +370,7 @@ func_ov46_021904c4: ; 0x021904c4
beq _0219050c
b _02190568
_021904e4:
ldr r1, _02190580 ; =data_027e0fe4
ldr r1, _02190580 ; =gActorManager
ldr r2, _02190584 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
@@ -381,13 +381,13 @@ _021904e4:
str r0, [r4, #0x184]
b _02190574
_0219050c:
ldr r1, _02190580 ; =data_027e0fe4
ldr r1, _02190580 ; =gActorManager
ldr r2, _02190584 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #8
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #8]
ldr r1, _02190580 ; =data_027e0fe4
ldr r1, _02190580 ; =gActorManager
str r0, [r4, #0x180]
ldr r2, [sp, #0xc]
add r0, sp, #0
@@ -413,7 +413,7 @@ _02190574:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_02190580: .word data_027e0fe4
_02190580: .word gActorManager
_02190584: .word 0x4e415649
_02190588: .word 0x53574f4e
arm_func_end func_ov46_021904c4
@@ -1496,7 +1496,7 @@ _0219131c: ; jump table
b _02191384 ; case 2
b _02191398 ; case 3
_0219132c:
ldr r0, _021913b0 ; =data_027e0fe4
ldr r0, _021913b0 ; =gActorManager
mov r1, #1
strb r1, [r4, #0x4d5]
ldr r1, [r0]
@@ -1504,7 +1504,7 @@ _0219132c:
add r0, sp, #0
add r3, r4, #0x48
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
ldr r0, _021913b0 ; =data_027e0fe4
ldr r0, _021913b0 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1534,7 +1534,7 @@ _021913a4:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_021913b0: .word data_027e0fe4
_021913b0: .word gActorManager
_021913b4: .word 0x414e4353
arm_func_end func_ov46_021912f4
@@ -1909,7 +1909,7 @@ func_ov46_02191884: ; 0x02191884
beq _021918cc
b _02191928
_021918a4:
ldr r1, _02191940 ; =data_027e0fe4
ldr r1, _02191940 ; =gActorManager
ldr r2, _02191944 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
@@ -1920,13 +1920,13 @@ _021918a4:
str r0, [r4, #0x184]
b _02191934
_021918cc:
ldr r1, _02191940 ; =data_027e0fe4
ldr r1, _02191940 ; =gActorManager
ldr r2, _02191944 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #8
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #8]
ldr r1, _02191940 ; =data_027e0fe4
ldr r1, _02191940 ; =gActorManager
str r0, [r4, #0x180]
ldr r2, [sp, #0xc]
add r0, sp, #0
@@ -1952,7 +1952,7 @@ _02191934:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_02191940: .word data_027e0fe4
_02191940: .word gActorManager
_02191944: .word 0x4e415649
_02191948: .word 0x53574f4e
arm_func_end func_ov46_02191884
asm/ov48.inc
+1 -1
View File
@@ -138,7 +138,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
asm/ov48.s
+9 -9
View File
@@ -1356,7 +1356,7 @@ func_ov48_02190e80: ; 0x02190e80
ldr r0, [r0]
add r3, sp, #0x1c
blx func_ov00_020c4048
ldr r0, _02190f68 ; =data_027e0fe4
ldr r0, _02190f68 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -1396,7 +1396,7 @@ _02190f58: .word data_ov48_02194d50
_02190f5c: .word 0x00000534
_02190f60: .word 0x424d5345
_02190f64: .word data_027e0fe8
_02190f68: .word data_027e0fe4
_02190f68: .word gActorManager
thumb_func_end func_ov48_02190e80
.global func_ov48_02190f6c
@@ -2595,7 +2595,7 @@ _02191ed2:
add r3, sp, #0x58
ldr r0, [r0]
blx func_ov00_020c4048
ldr r0, _02192054 ; =data_027e0fe4
ldr r0, _02192054 ; =gActorManager
add r1, sp, #0x20
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -2756,7 +2756,7 @@ _02192044: .word 0x000004b4
_02192048: .word 0x000004ac
_0219204c: .word 0x54414c42
_02192050: .word data_027e0fe8
_02192054: .word data_027e0fe4
_02192054: .word gActorManager
_02192058: .word 0x0000052c
_0219205c: .word 0x00000666
thumb_func_end func_ov48_02191e10
@@ -4847,7 +4847,7 @@ _02193bd4:
add r6, r6, #8
cmp r6, r0
blo _02193bd4
ldr r0, _02193f40 ; =data_027e0fe4
ldr r0, _02193f40 ; =gActorManager
add r1, sp, #0x224
ldr r0, [r0]
add r2, sp, #0x198
@@ -4856,7 +4856,7 @@ _02193bd4:
mov r5, #0
cmp r0, #0
ble _02193d10
ldr r11, _02193f40 ; =data_027e0fe4
ldr r11, _02193f40 ; =gActorManager
mov r9, r5
add r4, sp, #0x84
_02193c18:
@@ -4954,7 +4954,7 @@ _02193d68:
add r6, r6, #8
cmp r6, r0
blo _02193d68
ldr r0, _02193f40 ; =data_027e0fe4
ldr r0, _02193f40 ; =gActorManager
add r1, sp, #0x150
ldr r0, [r0]
add r2, sp, #0xc4
@@ -4967,7 +4967,7 @@ _02193d68:
add r4, sp, #0x74
mov r11, #1
_02193dac:
ldr r0, _02193f40 ; =data_027e0fe4
ldr r0, _02193f40 ; =gActorManager
ldr r1, [sp, #0xc4]
ldr r0, [r0]
add r1, r1, r9
@@ -5078,7 +5078,7 @@ _02193f30: .word 0x000004cd
_02193f34: .word data_ov48_02194688
_02193f38: .word _ZTV11FilterActor
_02193f3c: .word 0x424f4d42
_02193f40: .word data_027e0fe4
_02193f40: .word gActorManager
_02193f44: .word 0x424d5459
arm_func_end func_ov48_02193658
asm/ov50.inc
+1 -1
View File
@@ -84,7 +84,7 @@
.extern data_027e0fac
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fec
.extern data_027e0ffc
.extern data_ov00_020e2dd8

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