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

Merge branch 'main' into map-manager

Browse Source
This commit is contained in:
Aetias
2024-04-21 12:18:19 +02:00
parent 806b46854f 72a752995e
commit eea3400f08
107 changed files with 75379 additions and 75074 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/main/Actor/ActorType.inc
+1
View File
@@ -0,0 +1 @@
#pragma once
asm/main/Actor/ActorType.s
+120
View File
@@ -0,0 +1,120 @@
.include "main/Actor/ActorType.inc"
.include "macros/function.inc"
.text
.global _ZN9ActorTypeC1EjPFP5ActorvEPv
arm_func_start _ZN9ActorTypeC1EjPFP5ActorvEPv
_ZN9ActorTypeC1EjPFP5ActorvEPv: ; 0x0203e784
stmdb sp!, {r4, lr}
mov r4, r0
stmia r4, {r1, r2, r3}
mov r1, #0
str r1, [r4, #0xc]
str r1, [r4, #0x10]
bl _ZN9ActorType8RegisterEv
ldr r1, _0203e7b0 ; =sActorTypeList
mov r0, r4
str r4, [r1, #4]
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end _ZN9ActorTypeC1EjPFP5ActorvEPv
_0203e7b0: .word sActorTypeList
.global _ZN9ActorTypeD1Ev
arm_func_start _ZN9ActorTypeD1Ev
_ZN9ActorTypeD1Ev: ; 0x0203e7b4
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN9ActorType10UnregisterEv
mov r0, r4
ldmia sp!, {r4, pc}
arm_func_end _ZN9ActorTypeD1Ev
.global _ZN9ActorType13func_0203e7c8Ev
arm_func_start _ZN9ActorType13func_0203e7c8Ev
_ZN9ActorType13func_0203e7c8Ev: ; 0x0203e7c8
stmdb sp!, {r3, lr}
ldr r0, [r0, #8]
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, pc}
blx r0
ldmia sp!, {r3, pc}
arm_func_end _ZN9ActorType13func_0203e7c8Ev
.global _ZN9ActorType8RegisterEv
arm_func_start _ZN9ActorType8RegisterEv
_ZN9ActorType8RegisterEv: ; 0x0203e7e4
ldr r1, _0203e810 ; =sActorTypeList
ldr r2, _0203e814 ; =sActorTypeList
ldr r1, [r1]
cmp r1, #0
beq _0203e808
_0203e7f8:
add r2, r1, #0x10
ldr r1, [r1, #0x10]
cmp r1, #0
bne _0203e7f8
_0203e808:
str r0, [r2]
bx lr
.align 2, 0
arm_func_end _ZN9ActorType8RegisterEv
_0203e810: .word sActorTypeList
_0203e814: .word sActorTypeList
.global _ZN9ActorType10UnregisterEv
arm_func_start _ZN9ActorType10UnregisterEv
_ZN9ActorType10UnregisterEv: ; 0x0203e818
ldr r1, _0203e860 ; =sActorTypeList
ldr r2, _0203e864 ; =sActorTypeList
ldr r1, [r1]
mov r3, #0
cmp r1, #0
beq _0203e84c
_0203e830:
cmp r1, r0
beq _0203e84c
mov r3, r2
add r2, r1, #0x10
ldr r1, [r1, #0x10]
cmp r1, #0
bne _0203e830
_0203e84c:
cmp r3, #0
ldrne r1, [r0, #0x10]
ldrne r0, [r3]
strne r1, [r0, #0x10]
bx lr
.align 2, 0
arm_func_end _ZN9ActorType10UnregisterEv
_0203e860: .word sActorTypeList
_0203e864: .word sActorTypeList
.global _ZN9ActorType4FindEj
arm_func_start _ZN9ActorType4FindEj
_ZN9ActorType4FindEj: ; 0x0203e868
ldr r1, _0203e89c ; =sActorTypeList
ldr r2, [r1]
cmp r2, #0
beq _0203e894
_0203e878:
ldr r1, [r2]
cmp r0, r1
moveq r0, r2
bxeq lr
ldr r2, [r2, #0x10]
cmp r2, #0
bne _0203e878
_0203e894:
mov r0, #0
bx lr
.align 2, 0
arm_func_end _ZN9ActorType4FindEj
_0203e89c: .word sActorTypeList
.bss
.global sActorTypeList
sActorTypeList:
.space 0x8
asm/main/main_02000000.inc
+66 -19
View File
@@ -14,8 +14,14 @@
.extern _ZN14AdventureFlags6ExistsEv
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZNK11ItemManager7HasItemEi
.extern __global_destructor_chain
.extern __register_global_object
.extern data_02056fd0
.extern data_020570d0
.extern data_020691a0
.extern data_02075da0
.extern data_02075dac
.extern data_02075ebc
.extern data_02076d88
.extern data_027e0000
.extern data_027e0004
.extern data_027e0014
@@ -289,19 +295,62 @@
.extern func_01ffe468
.extern func_01fffcd8
.extern func_01ffff08
.extern func_0204f8f4
.extern func_0204faa4
.extern func_0204fb00
.extern func_0204fba0
.extern func_0204fbc0
.extern func_0204fbf0
.extern func_0204fc20
.extern func_0204fc68
.extern func_0204fcb4
.extern func_0203e8a0
.extern func_0203ebe0
.extern func_0203ebf8
.extern func_0203ec34
.extern func_0203ec4c
.extern func_0203ee48
.extern func_0203ee80
.extern func_0203eeb0
.extern func_0203ef30
.extern func_0203ef78
.extern func_0203efd8
.extern func_0203f020
.extern func_0203f0d8
.extern func_0203f378
.extern func_0203f3a8
.extern func_0203f5dc
.extern func_0203f904
.extern func_0203f974
.extern func_0203f9b8
.extern func_0203fa54
.extern func_0203fa80
.extern func_0203fb18
.extern func_0203fb58
.extern func_0203fb70
.extern func_0203fc30
.extern func_0203fc78
.extern func_0203fe00
.extern func_0203fe60
.extern func_020400cc
.extern func_02040acc
.extern func_02041894
.extern func_020418d8
.extern func_0204193c
.extern func_0204198c
.extern func_020419d0
.extern func_02041c90
.extern func_02041ca8
.extern func_02041ddc
.extern func_02041e34
.extern func_02041e7c
.extern func_02041ea8
.extern func_02041ed0
.extern func_02041f68
.extern func_02041f98
.extern func_02041fa4
.extern func_02041fb0
.extern func_02042584
.extern func_020425b4
.extern func_02042f68
.extern func_0204f48c
.extern func_0204f558
.extern func_0204f614
.extern func_0204f754
.extern func_0204f7b0
.extern func_0204fd14
.extern func_0204fed8
.extern func_020508c4
.extern func_02050a20
.extern func_ov00_02078b40
.extern func_ov00_02078b88
.extern func_ov00_02078ffc
@@ -332,11 +381,7 @@
.extern func_ov00_02086044
.extern func_ov00_02087d98
.extern func_ov00_02089068
.extern func_ov00_02089a2c
.extern func_ov00_02089a84
.extern func_ov00_0208b180
.extern func_ov00_0208cae8
.extern func_ov00_0208caf8
.extern func_ov00_0209d728
.extern func_ov00_0209d90c
.extern func_ov00_020a5e9c
@@ -365,11 +410,8 @@
.extern func_ov00_020cfe40
.extern func_ov00_020cfea8
.extern func_ov00_020d02bc
.extern func_ov00_020d033c
.extern func_ov00_020d03c4
.extern func_ov00_020d0460
.extern func_ov00_020d0490
.extern func_ov00_020d0504
.extern func_ov00_020d054c
.extern func_ov00_020d0594
.extern func_ov00_020d060c
@@ -436,3 +478,8 @@
.extern gHeap
.extern gItemManager
.extern gOverlayManager
.extern gpBuildDate
.extern strcat
.extern strcpy
.extern strlen
.extern strncpy
asm/main/main_02000000.s
+2 -73852
View File
File diff suppressed because it is too large Load Diff
asm/main/main_0203e8a0.inc
+148
View File
@@ -0,0 +1,148 @@
#pragma once
.extern Divide
.extern FastDivide
.extern WaitByLoop
.extern _ZN9SysObjectdlEPv
.extern __global_destructor_chain
.extern data_02000b88
.extern data_02063220
.extern data_027e02a0
.extern data_027e0618
.extern data_027e0c38
.extern data_027e0c54
.extern data_027e0cbc
.extern data_027e0d38
.extern data_027e0d78
.extern data_027e0f64
.extern data_ov00_020eec9c
.extern func_01ff8000
.extern func_01ffe468
.extern func_02000950
.extern func_02000b60
.extern func_02000c60
.extern func_02000f78
.extern func_020010c8
.extern func_02001154
.extern func_02001194
.extern func_020011d0
.extern func_02001534
.extern func_020016e8
.extern func_02001cc0
.extern func_02001d58
.extern func_02001dfc
.extern func_02001e98
.extern func_02001f24
.extern func_02002488
.extern func_02002774
.extern func_02002bac
.extern func_02002bb8
.extern func_02002bf4
.extern func_02002c14
.extern func_0200301c
.extern func_02004ce0
.extern func_02004d00
.extern func_0200753c
.extern func_020078c0
.extern func_020078f4
.extern func_02007938
.extern func_02007a44
.extern func_02007ad8
.extern func_02007d8c
.extern func_02008a50
.extern func_02008b04
.extern func_02008b50
.extern func_02008b74
.extern func_0200b4b4
.extern func_0200c224
.extern func_0200c3f4
.extern func_0200c424
.extern func_0200c454
.extern func_0200c6fc
.extern func_0200c718
.extern func_0200c76c
.extern func_0200d5e4
.extern func_0200d880
.extern func_0200d8d0
.extern func_0200d938
.extern func_0200da78
.extern func_0200e044
.extern func_0200e0c8
.extern func_0200e160
.extern func_0200e288
.extern func_0200e2a4
.extern func_0200e2c0
.extern func_0200e2e4
.extern func_0200e2fc
.extern func_0200e5f8
.extern func_0200ee4c
.extern func_0200ee60
.extern func_0200eebc
.extern func_0200f248
.extern func_02017374
.extern func_020174d0
.extern func_02029a00
.extern func_0202e99c
.extern func_0202e9bc
.extern func_0202ea18
.extern func_0202f52c
.extern func_020304d4
.extern func_0203068c
.extern func_02032fa4
.extern func_02033e70
.extern func_02038b40
.extern func_02039208
.extern func_0203a30c
.extern func_0203c5dc
.extern func_0203d358
.extern func_0203d800
.extern func_0203de24
.extern func_0203e2e8
.extern func_0204f8f4
.extern func_0204faa4
.extern func_0204fb00
.extern func_0204fba0
.extern func_0204fbc0
.extern func_0204fbf0
.extern func_0204fc20
.extern func_0204fc68
.extern func_0204fcb4
.extern func_020508c4
.extern func_02050a20
.extern func_02050ca0
.extern func_02050cb4
.extern func_02050ce0
.extern func_02050d0c
.extern func_02050d20
.extern func_02050d34
.extern func_02050d48
.extern func_02050d5c
.extern func_02050d70
.extern func_02050d88
.extern func_02050d9c
.extern func_02050db8
.extern func_02050dcc
.extern func_02050de0
.extern func_02050df4
.extern func_02050e10
.extern func_02050e24
.extern func_02050e38
.extern func_02050e64
.extern func_02050e90
.extern func_02050ea4
.extern func_02050eb8
.extern func_02050ee4
.extern func_02050f00
.extern func_02050f40
.extern func_ov00_02078b88
.extern func_ov00_02089a2c
.extern func_ov00_02089a84
.extern func_ov00_0208cae8
.extern func_ov00_0208caf8
.extern func_ov00_020d02bc
.extern func_ov00_020d033c
.extern func_ov00_020d03c4
.extern func_ov00_020d0490
.extern func_ov00_020d0504
.extern func_ov00_020d054c
.extern func_ov00_020d77e4
.extern gOverlayManager
asm/main/main_0203e8a0.s
+73743
View File
File diff suppressed because it is too large Load Diff
asm/ov00/Player/LinkStateInteract.inc
+4 -4
View File
@@ -1,6 +1,7 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
@@ -35,6 +36,9 @@
.extern _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
.extern _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor
.extern _ZN13PlayerControl9SetUnk_80Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor4KillEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern data_02050f54
@@ -56,10 +60,6 @@
.extern func_020350b4
.extern func_020351b8
.extern func_ov00_020ba458
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor4KillEv
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern func_ov00_020d7a84
.extern func_ov00_020d7b20
.extern func_ov04_0210ab88
asm/ov00/ov00_0207af9c.inc
+2 -2
View File
@@ -63,6 +63,8 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
@@ -247,8 +249,6 @@
.extern func_020350b4
.extern func_0203516c
.extern func_020351b8
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02040464
asm/ov00/ov00_0207af9c.s
+9 -9
View File
@@ -38610,9 +38610,9 @@ func_ov00_020df678: ; 0x020df678
ldr r1, _020df6a8 ; =0x53574f42
ldr r2, _020df6ac ; =func_ov00_0208fa70
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020df6a4 ; =data_ov00_020ecd70
ldr r1, _020df6b0 ; =func_0203e7b4
ldr r1, _020df6b0 ; =_ZN9ActorTypeD1Ev
ldr r2, _020df6b4 ; =data_ov00_020ecd64
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -38621,7 +38621,7 @@ func_ov00_020df678: ; 0x020df678
_020df6a4: .word data_ov00_020ecd70
_020df6a8: .word 0x53574f42
_020df6ac: .word func_ov00_0208fa70
_020df6b0: .word func_0203e7b4
_020df6b0: .word _ZN9ActorTypeD1Ev
_020df6b4: .word data_ov00_020ecd64
.global func_ov00_020df6b8
@@ -38632,9 +38632,9 @@ func_ov00_020df6b8: ; 0x020df6b8
ldr r1, _020df6e8 ; =0x53574453
ldr r2, _020df6ec ; =func_ov00_020903a8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020df6e4 ; =data_ov00_020ecd90
ldr r1, _020df6f0 ; =func_0203e7b4
ldr r1, _020df6f0 ; =_ZN9ActorTypeD1Ev
ldr r2, _020df6f4 ; =data_ov00_020ecd84
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -38643,7 +38643,7 @@ func_ov00_020df6b8: ; 0x020df6b8
_020df6e4: .word data_ov00_020ecd90
_020df6e8: .word 0x53574453
_020df6ec: .word func_ov00_020903a8
_020df6f0: .word func_0203e7b4
_020df6f0: .word _ZN9ActorTypeD1Ev
_020df6f4: .word data_ov00_020ecd84
.global func_ov00_020df6f8
@@ -38654,9 +38654,9 @@ func_ov00_020df6f8: ; 0x020df6f8
ldr r1, _020df728 ; =0x45564943
ldr r2, _020df72c ; =func_ov00_020904f4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020df724 ; =data_ov00_020ecdb0
ldr r1, _020df730 ; =func_0203e7b4
ldr r1, _020df730 ; =_ZN9ActorTypeD1Ev
ldr r2, _020df734 ; =data_ov00_020ecda4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -38665,7 +38665,7 @@ func_ov00_020df6f8: ; 0x020df6f8
_020df724: .word data_ov00_020ecdb0
_020df728: .word 0x45564943
_020df72c: .word func_ov00_020904f4
_020df730: .word func_0203e7b4
_020df730: .word _ZN9ActorTypeD1Ev
_020df734: .word data_ov00_020ecda4
.global func_ov00_020df738
asm/ov00/ov00_020980f4.inc
+2 -2
View File
@@ -56,6 +56,8 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
@@ -170,8 +172,6 @@
.extern func_0202ea50
.extern func_0203005c
.extern func_0203010c
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0203fe60
asm/ov00/ov00_020980f4.s
+6 -6
View File
@@ -21964,9 +21964,9 @@ func_ov00_020e105c: ; 0x020e105c
ldr r1, _020e108c ; =0x43414d41
ldr r2, _020e1090 ; =func_ov00_0209e8b8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1088 ; =data_ov00_020ee0f4
ldr r1, _020e1094 ; =func_0203e7b4
ldr r1, _020e1094 ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1098 ; =data_ov00_020ee0e8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -21975,7 +21975,7 @@ func_ov00_020e105c: ; 0x020e105c
_020e1088: .word data_ov00_020ee0f4
_020e108c: .word 0x43414d41
_020e1090: .word func_ov00_0209e8b8
_020e1094: .word func_0203e7b4
_020e1094: .word _ZN9ActorTypeD1Ev
_020e1098: .word data_ov00_020ee0e8
.global func_ov00_020e109c
@@ -22006,9 +22006,9 @@ func_ov00_020e10d4: ; 0x020e10d4
ldr r1, _020e1104 ; =0x5357524e
ldr r2, _020e1108 ; =func_ov00_020a1c98
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1100 ; =data_ov00_020ee128
ldr r1, _020e110c ; =func_0203e7b4
ldr r1, _020e110c ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1110 ; =data_ov00_020ee11c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -22017,7 +22017,7 @@ func_ov00_020e10d4: ; 0x020e10d4
_020e1100: .word data_ov00_020ee128
_020e1104: .word 0x5357524e
_020e1108: .word func_ov00_020a1c98
_020e110c: .word func_0203e7b4
_020e110c: .word _ZN9ActorTypeD1Ev
_020e1110: .word data_ov00_020ee11c
.global func_ov00_020e1114
asm/ov00/ov00_020b1498.inc
+2 -2
View File
@@ -121,6 +121,8 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager16GetEquippedFairyEv
@@ -280,8 +282,6 @@
.extern func_020386b8
.extern func_020386c4
.extern func_020386cc
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_02078b40
asm/ov00/ov00_020b1498.s
+15 -15
View File
@@ -21526,9 +21526,9 @@ func_ov00_020e1250: ; 0x020e1250
ldr r1, _020e1280 ; =0x45464f42
ldr r2, _020e1284 ; =func_ov00_020a5ef8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e127c ; =data_ov00_020ee184
ldr r1, _020e1288 ; =func_0203e7b4
ldr r1, _020e1288 ; =_ZN9ActorTypeD1Ev
ldr r2, _020e128c ; =data_ov00_020ee178
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -21537,7 +21537,7 @@ func_ov00_020e1250: ; 0x020e1250
_020e127c: .word data_ov00_020ee184
_020e1280: .word 0x45464f42
_020e1284: .word func_ov00_020a5ef8
_020e1288: .word func_0203e7b4
_020e1288: .word _ZN9ActorTypeD1Ev
_020e128c: .word data_ov00_020ee178
.global func_ov00_020e1290
@@ -21572,9 +21572,9 @@ func_ov00_020e12d8: ; 0x020e12d8
ldr r1, _020e1320 ; =0x4e415649
ldr r2, _020e1324 ; =func_ov00_020b80e0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e131c ; =data_ov00_020ee1ac
ldr r1, _020e1328 ; =func_0203e7b4
ldr r1, _020e1328 ; =_ZN9ActorTypeD1Ev
ldr r2, _020e132c ; =data_ov00_020ee1a0
bl __register_global_object
ldr r0, _020e1330 ; =data_ov00_020ee1cc
@@ -21589,7 +21589,7 @@ func_ov00_020e12d8: ; 0x020e12d8
_020e131c: .word data_ov00_020ee1ac
_020e1320: .word 0x4e415649
_020e1324: .word func_ov00_020b80e0
_020e1328: .word func_0203e7b4
_020e1328: .word _ZN9ActorTypeD1Ev
_020e132c: .word data_ov00_020ee1a0
_020e1330: .word data_ov00_020ee1cc
_020e1334: .word func_ov00_020b8134
@@ -21603,9 +21603,9 @@ func_ov00_020e133c: ; 0x020e133c
ldr r1, _020e136c ; =0x46434e56
ldr r2, _020e1370 ; =func_ov00_020b862c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1368 ; =data_ov00_020ee1e4
ldr r1, _020e1374 ; =func_0203e7b4
ldr r1, _020e1374 ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1378 ; =data_ov00_020ee1d8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -21614,7 +21614,7 @@ func_ov00_020e133c: ; 0x020e133c
_020e1368: .word data_ov00_020ee1e4
_020e136c: .word 0x46434e56
_020e1370: .word func_ov00_020b862c
_020e1374: .word func_0203e7b4
_020e1374: .word _ZN9ActorTypeD1Ev
_020e1378: .word data_ov00_020ee1d8
.global func_ov00_020e137c
@@ -22117,9 +22117,9 @@ func_ov00_020e1b14: ; 0x020e1b14
ldr r1, _020e1b44 ; =0x41434f42
ldr r2, _020e1b48 ; =func_ov00_020be198
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1b40 ; =data_ov00_020ee568
ldr r1, _020e1b4c ; =func_0203e7b4
ldr r1, _020e1b4c ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1b50 ; =data_ov00_020ee55c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -22128,7 +22128,7 @@ func_ov00_020e1b14: ; 0x020e1b14
_020e1b40: .word data_ov00_020ee568
_020e1b44: .word 0x41434f42
_020e1b48: .word func_ov00_020be198
_020e1b4c: .word func_0203e7b4
_020e1b4c: .word _ZN9ActorTypeD1Ev
_020e1b50: .word data_ov00_020ee55c
.global func_ov00_020e1b54
@@ -22139,9 +22139,9 @@ func_ov00_020e1b54: ; 0x020e1b54
ldr r1, _020e1b84 ; =0x57534e56
ldr r2, _020e1b88 ; =func_ov00_020c0b64
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1b80 ; =data_ov00_020ee59c
ldr r1, _020e1b8c ; =func_0203e7b4
ldr r1, _020e1b8c ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1b90 ; =data_ov00_020ee590
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -22150,7 +22150,7 @@ func_ov00_020e1b54: ; 0x020e1b54
_020e1b80: .word data_ov00_020ee59c
_020e1b84: .word 0x57534e56
_020e1b88: .word func_ov00_020c0b64
_020e1b8c: .word func_0203e7b4
_020e1b8c: .word _ZN9ActorTypeD1Ev
_020e1b90: .word data_ov00_020ee590
.section .ctor, 4, 1, 4
asm/ov00/ov00_020c3e54.inc
+3 -3
View File
@@ -87,6 +87,9 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorType4FindEj
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
@@ -476,9 +479,6 @@
.extern func_0203e0c8
.extern func_0203e1b0
.extern func_0203e284
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203e868
.extern func_0203efd8
.extern func_0203f378
.extern func_02042f74
asm/ov00/ov00_020c3e54.s
+22 -22
View File
@@ -194,7 +194,7 @@ func_ov00_020c401c: ; 0x020c401c
stmdb sp!, {r4, lr}
mov r0, r1
mov r4, #0
bl func_0203e868
bl _ZN9ActorType4FindEj
cmp r0, #0
beq _020c4040
ldr r0, [r0, #4]
@@ -28406,9 +28406,9 @@ func_ov00_020e1b94: ; 0x020e1b94
ldr r1, _020e1bc4 ; =0x45465756
ldr r2, _020e1bc8 ; =func_ov00_020c96a4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1bc0 ; =data_ov00_020ee5bc
ldr r1, _020e1bcc ; =func_0203e7b4
ldr r1, _020e1bcc ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1bd0 ; =data_ov00_020ee5b0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -28417,7 +28417,7 @@ func_ov00_020e1b94: ; 0x020e1b94
_020e1bc0: .word data_ov00_020ee5bc
_020e1bc4: .word 0x45465756
_020e1bc8: .word func_ov00_020c96a4
_020e1bcc: .word func_0203e7b4
_020e1bcc: .word _ZN9ActorTypeD1Ev
_020e1bd0: .word data_ov00_020ee5b0
.global func_ov00_020e1bd4
@@ -28428,9 +28428,9 @@ func_ov00_020e1bd4: ; 0x020e1bd4
ldr r1, _020e1c04 ; =0x45465250
ldr r2, _020e1c08 ; =func_ov00_020c9ca4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1c00 ; =data_ov00_020ee5dc
ldr r1, _020e1c0c ; =func_0203e7b4
ldr r1, _020e1c0c ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1c10 ; =data_ov00_020ee5d0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -28439,7 +28439,7 @@ func_ov00_020e1bd4: ; 0x020e1bd4
_020e1c00: .word data_ov00_020ee5dc
_020e1c04: .word 0x45465250
_020e1c08: .word func_ov00_020c9ca4
_020e1c0c: .word func_0203e7b4
_020e1c0c: .word _ZN9ActorTypeD1Ev
_020e1c10: .word data_ov00_020ee5d0
.global func_ov00_020e1c14
@@ -28450,9 +28450,9 @@ func_ov00_020e1c14: ; 0x020e1c14
ldr r1, _020e1c44 ; =0x4c4f4e44
ldr r2, _020e1c48 ; =func_ov00_020ca20c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1c40 ; =data_ov00_020ee5fc
ldr r1, _020e1c4c ; =func_0203e7b4
ldr r1, _020e1c4c ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1c50 ; =data_ov00_020ee5f0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -28461,7 +28461,7 @@ func_ov00_020e1c14: ; 0x020e1c14
_020e1c40: .word data_ov00_020ee5fc
_020e1c44: .word 0x4c4f4e44
_020e1c48: .word func_ov00_020ca20c
_020e1c4c: .word func_0203e7b4
_020e1c4c: .word _ZN9ActorTypeD1Ev
_020e1c50: .word data_ov00_020ee5f0
.global func_ov00_020e1c54
@@ -28498,9 +28498,9 @@ func_ov00_020e1c8c: ; 0x020e1c8c
ldr r1, _020e1cbc ; =0x4d534741
ldr r2, _020e1cc0 ; =func_ov00_020d3020
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1cb8 ; =data_ov00_020ee61c
ldr r1, _020e1cc4 ; =func_0203e7b4
ldr r1, _020e1cc4 ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1cc8 ; =data_ov00_020ee610
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -28509,7 +28509,7 @@ func_ov00_020e1c8c: ; 0x020e1c8c
_020e1cb8: .word data_ov00_020ee61c
_020e1cbc: .word 0x4d534741
_020e1cc0: .word func_ov00_020d3020
_020e1cc4: .word func_0203e7b4
_020e1cc4: .word _ZN9ActorTypeD1Ev
_020e1cc8: .word data_ov00_020ee610
.global func_ov00_020e1ccc
@@ -28520,9 +28520,9 @@ func_ov00_020e1ccc: ; 0x020e1ccc
ldr r1, _020e1cfc ; =0x464d5347
ldr r2, _020e1d00 ; =func_ov00_020d32e4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1cf8 ; =data_ov00_020ee63c
ldr r1, _020e1d04 ; =func_0203e7b4
ldr r1, _020e1d04 ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1d08 ; =data_ov00_020ee630
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -28531,7 +28531,7 @@ func_ov00_020e1ccc: ; 0x020e1ccc
_020e1cf8: .word data_ov00_020ee63c
_020e1cfc: .word 0x464d5347
_020e1d00: .word func_ov00_020d32e4
_020e1d04: .word func_0203e7b4
_020e1d04: .word _ZN9ActorTypeD1Ev
_020e1d08: .word data_ov00_020ee630
.global func_ov00_020e1d0c
@@ -28542,9 +28542,9 @@ func_ov00_020e1d0c: ; 0x020e1d0c
ldr r1, _020e1d3c ; =0x4e4d5347
ldr r2, _020e1d40 ; =func_ov00_020d3fc8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1d38 ; =data_ov00_020ee65c
ldr r1, _020e1d44 ; =func_0203e7b4
ldr r1, _020e1d44 ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1d48 ; =data_ov00_020ee650
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -28553,7 +28553,7 @@ func_ov00_020e1d0c: ; 0x020e1d0c
_020e1d38: .word data_ov00_020ee65c
_020e1d3c: .word 0x4e4d5347
_020e1d40: .word func_ov00_020d3fc8
_020e1d44: .word func_0203e7b4
_020e1d44: .word _ZN9ActorTypeD1Ev
_020e1d48: .word data_ov00_020ee650
.global func_ov00_020e1d4c
@@ -28599,9 +28599,9 @@ func_ov00_020e1da8: ; 0x020e1da8
ldr r1, _020e1dd8 ; =0x4546524c
ldr r2, _020e1ddc ; =func_ov00_020d5284
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020e1dd4 ; =data_ov00_020ee6d4
ldr r1, _020e1de0 ; =func_0203e7b4
ldr r1, _020e1de0 ; =_ZN9ActorTypeD1Ev
ldr r2, _020e1de4 ; =data_ov00_020ee6c8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -28610,7 +28610,7 @@ func_ov00_020e1da8: ; 0x020e1da8
_020e1dd4: .word data_ov00_020ee6d4
_020e1dd8: .word 0x4546524c
_020e1ddc: .word func_ov00_020d5284
_020e1de0: .word func_0203e7b4
_020e1de0: .word _ZN9ActorTypeD1Ev
_020e1de4: .word data_ov00_020ee6c8
.global func_ov00_020e1de8
asm/ov03.inc
+2 -2
View File
@@ -221,8 +221,8 @@
.extern func_0203d77c
.extern func_0203d7b8
.extern func_0203d7e0
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eadc
.extern func_0203eba8
.extern func_0203ebc8
asm/ov03.s
+3 -3
View File
@@ -43041,9 +43041,9 @@ func_ov03_020fff54: ; 0x020fff54
ldr r1, _020fff84 ; =0x4d544354
ldr r2, _020fff88 ; =func_ov03_020fb41c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _020fff80 ; =data_ov03_02100a98
ldr r1, _020fff8c ; =func_0203e7b4
ldr r1, _020fff8c ; =_ZN9ActorTypeD1Ev
ldr r2, _020fff90 ; =data_ov03_02100a8c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -43052,7 +43052,7 @@ func_ov03_020fff54: ; 0x020fff54
_020fff80: .word data_ov03_02100a98
_020fff84: .word 0x4d544354
_020fff88: .word func_ov03_020fb41c - 1
_020fff8c: .word func_0203e7b4
_020fff8c: .word _ZN9ActorTypeD1Ev
_020fff90: .word data_ov03_02100a8c
.global func_ov03_020fff94
asm/ov04.inc
+19 -19
View File
@@ -13,10 +13,29 @@
.extern _ZN12TouchControlC2Ev
.extern _ZN12TouchGestureC2Ev
.extern _ZN13PlayerControl18func_ov00_020aef30Ev
.extern _ZN14AdventureFlags12Get_FlagsUnkEi
.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
.extern _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2
.extern _ZN14AdventureFlags15Get_FlagsUnk_34Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_38Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_40Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_42Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_44Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_49Ei
.extern _ZN14AdventureFlags18func_ov00_02097674Ev
.extern _ZN14AdventureFlags18func_ov00_02097684Ev
.extern _ZN14AdventureFlags18func_ov00_020976c8Ev
.extern _ZN14AdventureFlags18func_ov00_02097a44Eii
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags4LoadEv
.extern _ZN14OverlayManager4LoadEjj
.extern _ZN14OverlayManager6UnloadEj
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorType13func_0203e7c8Ev
.extern _ZN9ActorType4FindEj
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad538Ei
@@ -351,8 +370,6 @@
.extern func_0203d6d8
.extern func_0203d730
.extern func_0203dc74
.extern func_0203e7c8
.extern func_0203e868
.extern func_0203f904
.extern func_02043594
.extern func_020435b4
@@ -457,23 +474,6 @@
.extern func_ov00_02097240
.extern func_ov00_020972e0
.extern func_ov00_02097354
.extern _ZN14AdventureFlags18func_ov00_02097674Ev
.extern _ZN14AdventureFlags18func_ov00_02097684Ev
.extern _ZN14AdventureFlags4LoadEv
.extern _ZN14AdventureFlags18func_ov00_020976c8Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_ov00_02097a44Eii
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags15Get_FlagsUnk_49Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_42Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_40Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_38Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_34Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_44Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
.extern _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2
.extern _ZN14AdventureFlags12Get_FlagsUnkEi
.extern func_ov00_020985c4
.extern func_ov00_02098618
.extern func_ov00_02098b90
asm/ov04.s
+2 -2
View File
@@ -9722,7 +9722,7 @@ func_ov04_021057b4: ; 0x021057b4
add r7, sp, #0x10
_021057e6:
ldr r0, [r7]
blx func_0203e868
blx _ZN9ActorType4FindEj
cmp r0, #0
beq _02105804
ldr r1, [r0, #8]
@@ -9732,7 +9732,7 @@ _021057e6:
blx func_ov00_020c42ec
b _0210580a
_021057fe:
blx func_0203e7c8
blx _ZN9ActorType13func_0203e7c8Ev
b _0210580a
_02105804:
ldr r0, [r7]
asm/ov06.inc
+1 -1
View File
@@ -1,5 +1,6 @@
#pragma once
.extern Divide
.extern _ZN10ActorRupee5gTypeE
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02068e7c
@@ -93,7 +94,6 @@
.extern data_ov14_0215b1a0
.extern data_ov14_0215b1c0
.extern data_ov14_0215b1e0
.extern _ZN10ActorRupee5gTypeE
.extern data_ov14_0215b220
.extern data_ov14_0215b240
.extern data_ov14_0215b258
asm/ov12.inc
+2 -2
View File
@@ -75,6 +75,8 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
@@ -297,8 +299,6 @@
.extern func_020385b8
.extern func_02038b40
.extern func_0203d77c
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0203f904
asm/ov12.s
+18 -18
View File
@@ -44951,9 +44951,9 @@ func_ov12_021354cc: ; 0x021354cc
ldr r1, _02135638 ; =0x42544348
ldr r2, _0213563c ; =func_ov12_021136f0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02135634 ; =data_ov12_02137c74
ldr r1, _02135640 ; =func_0203e7b4
ldr r1, _02135640 ; =_ZN9ActorTypeD1Ev
ldr r2, _02135644 ; =data_ov12_02137c68
bl __register_global_object
ldr r3, _02135648 ; =data_ov12_02137c68
@@ -45040,7 +45040,7 @@ func_ov12_021354cc: ; 0x021354cc
_02135634: .word data_ov12_02137c74
_02135638: .word 0x42544348
_0213563c: .word func_ov12_021136f0
_02135640: .word func_0203e7b4
_02135640: .word _ZN9ActorTypeD1Ev
_02135644: .word data_ov12_02137c68
_02135648: .word data_ov12_02137c68
_0213564c: .word data_ov12_02137cd0
@@ -45101,9 +45101,9 @@ func_ov12_021356e0: ; 0x021356e0
ldr r1, _02135710 ; =0x42545246
ldr r2, _02135714 ; =func_ov12_02129668
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0213570c ; =data_ov12_0213dc94
ldr r1, _02135718 ; =func_0203e7b4
ldr r1, _02135718 ; =_ZN9ActorTypeD1Ev
ldr r2, _0213571c ; =data_ov12_0213dc88
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -45112,7 +45112,7 @@ func_ov12_021356e0: ; 0x021356e0
_0213570c: .word data_ov12_0213dc94
_02135710: .word 0x42545246
_02135714: .word func_ov12_02129668
_02135718: .word func_0203e7b4
_02135718: .word _ZN9ActorTypeD1Ev
_0213571c: .word data_ov12_0213dc88
.global func_ov12_02135720
@@ -45123,9 +45123,9 @@ func_ov12_02135720: ; 0x02135720
ldr r1, _02135794 ; =0x42544954
ldr r2, _02135798 ; =func_ov12_0212c734
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02135790 ; =data_ov12_0213dcbc
ldr r1, _0213579c ; =func_0203e7b4
ldr r1, _0213579c ; =_ZN9ActorTypeD1Ev
ldr r2, _021357a0 ; =data_ov12_0213dcb0
bl __register_global_object
ldr ip, _021357a4 ; =func_ov12_0212d87c
@@ -45151,7 +45151,7 @@ func_ov12_02135720: ; 0x02135720
_02135790: .word data_ov12_0213dcbc
_02135794: .word 0x42544954
_02135798: .word func_ov12_0212c734
_0213579c: .word func_0203e7b4
_0213579c: .word _ZN9ActorTypeD1Ev
_021357a0: .word data_ov12_0213dcb0
_021357a4: .word func_ov12_0212d87c
_021357a8: .word data_ov12_0213dcdc
@@ -45169,9 +45169,9 @@ func_ov12_021357c0: ; 0x021357c0
ldr r1, _0213580c ; =0x4254444c
ldr r2, _02135810 ; =func_ov12_0212e1f8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02135808 ; =data_ov12_0213dd1c
ldr r1, _02135814 ; =func_0203e7b4
ldr r1, _02135814 ; =_ZN9ActorTypeD1Ev
ldr r2, _02135818 ; =data_ov12_0213dd10
bl __register_global_object
ldr r0, _0213581c ; =data_ov12_0213dd3c
@@ -45187,7 +45187,7 @@ func_ov12_021357c0: ; 0x021357c0
_02135808: .word data_ov12_0213dd1c
_0213580c: .word 0x4254444c
_02135810: .word func_ov12_0212e1f8
_02135814: .word func_0203e7b4
_02135814: .word _ZN9ActorTypeD1Ev
_02135818: .word data_ov12_0213dd10
_0213581c: .word data_ov12_0213dd3c
_02135820: .word func_ov12_0212f2e8
@@ -45221,9 +45221,9 @@ func_ov12_02135860: ; 0x02135860
ldr r1, _02135890 ; =0x42544443
ldr r2, _02135894 ; =func_ov12_02130834
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0213588c ; =data_ov12_0213dd78
ldr r1, _02135898 ; =func_0203e7b4
ldr r1, _02135898 ; =_ZN9ActorTypeD1Ev
ldr r2, _0213589c ; =data_ov12_0213dd6c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -45232,7 +45232,7 @@ func_ov12_02135860: ; 0x02135860
_0213588c: .word data_ov12_0213dd78
_02135890: .word 0x42544443
_02135894: .word func_ov12_02130834
_02135898: .word func_0203e7b4
_02135898: .word _ZN9ActorTypeD1Ev
_0213589c: .word data_ov12_0213dd6c
.global func_ov12_021358a0
@@ -45243,9 +45243,9 @@ func_ov12_021358a0: ; 0x021358a0
ldr r1, _021358d0 ; =0x434d5347
ldr r2, _021358d4 ; =func_ov12_02131fa0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021358cc ; =data_ov12_0213dd9c
ldr r1, _021358d8 ; =func_0203e7b4
ldr r1, _021358d8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021358dc ; =data_ov12_0213dd90
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -45254,7 +45254,7 @@ func_ov12_021358a0: ; 0x021358a0
_021358cc: .word data_ov12_0213dd9c
_021358d0: .word 0x434d5347
_021358d4: .word func_ov12_02131fa0
_021358d8: .word func_0203e7b4
_021358d8: .word _ZN9ActorTypeD1Ev
_021358dc: .word data_ov12_0213dd90
.global func_ov12_021358e0
asm/ov13.inc
+2 -2
View File
@@ -70,8 +70,6 @@
.extern func_020400f4
.extern func_02040100
.extern func_02040464
.extern strcpy
.extern strcat
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_0207a294
@@ -113,3 +111,5 @@
.extern func_ov01_020f802c
.extern func_ov01_020f8434
.extern func_ov01_020f8500
.extern strcat
.extern strcpy
asm/ov14/Actor/ActorRupee.inc
+2 -2
View File
@@ -60,8 +60,8 @@
.extern func_01ff9bc4
.extern func_01fffd04
.extern func_0202bc38
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern __register_global_object
.extern func_ov00_0207a13c
.extern func_ov00_0207a1c8
asm/ov14/Actor/ActorRupee.s
+3 -3
View File
@@ -740,9 +740,9 @@ func_ov14_0215517c: ; 0x0215517c
ldr r1, _021551c0 ; =0x52555059
ldr r2, _021551c4 ; =_ZN10ActorRupee6CreateEv
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021551bc ; =_ZN10ActorRupee5gTypeE
ldr r1, _021551c8 ; =func_0203e7b4
ldr r1, _021551c8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021551cc ; =_ZN10ActorRupee9gResourceE
bl __register_global_object
ldr r2, _021551d0 ; =0x000003bb
@@ -756,7 +756,7 @@ func_ov14_0215517c: ; 0x0215517c
_021551bc: .word _ZN10ActorRupee5gTypeE
_021551c0: .word 0x52555059
_021551c4: .word _ZN10ActorRupee6CreateEv
_021551c8: .word func_0203e7b4
_021551c8: .word _ZN9ActorTypeD1Ev
_021551cc: .word _ZN10ActorRupee9gResourceE
_021551d0: .word 0x000003bb
_021551d4: .word data_ov14_021589b4
asm/ov14/ov14_0211f640.inc
+2 -2
View File
@@ -95,6 +95,8 @@
.extern _ZN5Actor9IsGrabbedEv
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager15GetEquippedItemEv
@@ -224,8 +226,6 @@
.extern func_020351b8
.extern func_02036edc
.extern func_020370d0
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204366c
asm/ov14/ov14_0211f640.s
+62 -62
View File
@@ -34411,9 +34411,9 @@ func_ov14_021541ec: ; 0x021541ec
ldr r1, _02154238 ; =0x41525257
ldr r2, _0215423c ; =func_ov14_0211fd50
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154234 ; =data_ov14_0215abcc
ldr r1, _02154240 ; =func_0203e7b4
ldr r1, _02154240 ; =_ZN9ActorTypeD1Ev
ldr r2, _02154244 ; =data_ov14_0215abc0
bl __register_global_object
ldr r0, _02154248 ; =data_ov14_0215abec
@@ -34429,7 +34429,7 @@ func_ov14_021541ec: ; 0x021541ec
_02154234: .word data_ov14_0215abcc
_02154238: .word 0x41525257
_0215423c: .word func_ov14_0211fd50 - 1
_02154240: .word func_0203e7b4
_02154240: .word _ZN9ActorTypeD1Ev
_02154244: .word data_ov14_0215abc0
_02154248: .word data_ov14_0215abec
_0215424c: .word func_ov14_021213c8 - 1
@@ -34443,9 +34443,9 @@ func_ov14_02154254: ; 0x02154254
ldr r1, _02154284 ; =0x424c5354
ldr r2, _02154288 ; =func_ov14_021213dc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154280 ; =data_ov14_0215ac08
ldr r1, _0215428c ; =func_0203e7b4
ldr r1, _0215428c ; =_ZN9ActorTypeD1Ev
ldr r2, _02154290 ; =data_ov14_0215abfc
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -34454,7 +34454,7 @@ func_ov14_02154254: ; 0x02154254
_02154280: .word data_ov14_0215ac08
_02154284: .word 0x424c5354
_02154288: .word func_ov14_021213dc - 1
_0215428c: .word func_0203e7b4
_0215428c: .word _ZN9ActorTypeD1Ev
_02154290: .word data_ov14_0215abfc
.global func_ov14_02154294
@@ -34465,9 +34465,9 @@ func_ov14_02154294: ; 0x02154294
ldr r1, _021542d8 ; =0x424f4d42
ldr r2, _021542dc ; =func_ov14_02121aa4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021542d4 ; =data_ov14_0215ac28
ldr r1, _021542e0 ; =func_0203e7b4
ldr r1, _021542e0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021542e4 ; =data_ov14_0215ac1c
bl __register_global_object
ldr r2, _021542e8 ; =0x00002199
@@ -34481,7 +34481,7 @@ func_ov14_02154294: ; 0x02154294
_021542d4: .word data_ov14_0215ac28
_021542d8: .word 0x424f4d42
_021542dc: .word func_ov14_02121aa4 - 1
_021542e0: .word func_0203e7b4
_021542e0: .word _ZN9ActorTypeD1Ev
_021542e4: .word data_ov14_0215ac1c
_021542e8: .word 0x00002199
_021542ec: .word data_ov14_02155b9c
@@ -34495,9 +34495,9 @@ func_ov14_021542f4: ; 0x021542f4
ldr r1, _02154324 ; =0x424d524e
ldr r2, _02154328 ; =func_ov14_02123078
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154320 ; =data_ov14_0215ac68
ldr r1, _0215432c ; =func_0203e7b4
ldr r1, _0215432c ; =_ZN9ActorTypeD1Ev
ldr r2, _02154330 ; =data_ov14_0215ac5c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -34506,7 +34506,7 @@ func_ov14_021542f4: ; 0x021542f4
_02154320: .word data_ov14_0215ac68
_02154324: .word 0x424d524e
_02154328: .word func_ov14_02123078 - 1
_0215432c: .word func_0203e7b4
_0215432c: .word _ZN9ActorTypeD1Ev
_02154330: .word data_ov14_0215ac5c
.global func_ov14_02154334
@@ -34517,9 +34517,9 @@ func_ov14_02154334: ; 0x02154334
ldr r1, _02154364 ; =0x524f5045
ldr r2, _02154368 ; =func_ov14_021237fc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154360 ; =data_ov14_0215ac88
ldr r1, _0215436c ; =func_0203e7b4
ldr r1, _0215436c ; =_ZN9ActorTypeD1Ev
ldr r2, _02154370 ; =data_ov14_0215ac7c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -34528,7 +34528,7 @@ func_ov14_02154334: ; 0x02154334
_02154360: .word data_ov14_0215ac88
_02154364: .word 0x524f5045
_02154368: .word func_ov14_021237fc - 1
_0215436c: .word func_0203e7b4
_0215436c: .word _ZN9ActorTypeD1Ev
_02154370: .word data_ov14_0215ac7c
.global func_ov14_02154374
@@ -34539,9 +34539,9 @@ func_ov14_02154374: ; 0x02154374
ldr r1, _021543d4 ; =0x424d5459
ldr r2, _021543d8 ; =func_ov14_02124004
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021543d0 ; =data_ov14_0215aca8
ldr r1, _021543dc ; =func_0203e7b4
ldr r1, _021543dc ; =_ZN9ActorTypeD1Ev
ldr r2, _021543e0 ; =data_ov14_0215ac9c
bl __register_global_object
ldr r0, _021543e4 ; =data_ov14_0215acc8
@@ -34562,7 +34562,7 @@ func_ov14_02154374: ; 0x02154374
_021543d0: .word data_ov14_0215aca8
_021543d4: .word 0x424d5459
_021543d8: .word func_ov14_02124004 - 1
_021543dc: .word func_0203e7b4
_021543dc: .word _ZN9ActorTypeD1Ev
_021543e0: .word data_ov14_0215ac9c
_021543e4: .word data_ov14_0215acc8
_021543e8: .word data_ov14_02155fb0
@@ -35301,45 +35301,45 @@ func_ov14_02154c14: ; 0x02154c14
ldr r1, _02154cd4 ; =0x464c424d
ldr r2, _02154cd8 ; =func_ov14_02134e24
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154cd0 ; =data_ov14_0215afa0
ldr r1, _02154cdc ; =func_0203e7b4
ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev
ldr r2, _02154ce0 ; =data_ov14_0215af94
bl __register_global_object
ldr r0, _02154ce4 ; =data_ov14_0215afc0
ldr r1, _02154ce8 ; =0x464c4254
ldr r2, _02154cec ; =func_ov14_02134e54
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154ce4 ; =data_ov14_0215afc0
ldr r1, _02154cdc ; =func_0203e7b4
ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev
ldr r2, _02154cf0 ; =data_ov14_0215afb4
bl __register_global_object
ldr r0, _02154cf4 ; =data_ov14_0215afe0
ldr r1, _02154cf8 ; =0x464c414c
ldr r2, _02154cfc ; =func_ov14_02134e84
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154cf4 ; =data_ov14_0215afe0
ldr r1, _02154cdc ; =func_0203e7b4
ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev
ldr r2, _02154d00 ; =data_ov14_0215afd4
bl __register_global_object
ldr r0, _02154d04 ; =data_ov14_0215b000
ldr r1, _02154d08 ; =0x464c544d
ldr r2, _02154d0c ; =func_ov14_02134eb4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154d04 ; =data_ov14_0215b000
ldr r1, _02154cdc ; =func_0203e7b4
ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev
ldr r2, _02154d10 ; =data_ov14_0215aff4
bl __register_global_object
ldr r0, _02154d14 ; =data_ov14_0215b020
ldr r1, _02154d18 ; =0x4c53544d
ldr r2, _02154d1c ; =func_ov14_02134ee4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154d14 ; =data_ov14_0215b020
ldr r1, _02154cdc ; =func_0203e7b4
ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev
ldr r2, _02154d20 ; =data_ov14_0215b014
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35348,7 +35348,7 @@ func_ov14_02154c14: ; 0x02154c14
_02154cd0: .word data_ov14_0215afa0
_02154cd4: .word 0x464c424d
_02154cd8: .word func_ov14_02134e24 - 1
_02154cdc: .word func_0203e7b4
_02154cdc: .word _ZN9ActorTypeD1Ev
_02154ce0: .word data_ov14_0215af94
_02154ce4: .word data_ov14_0215afc0
_02154ce8: .word 0x464c4254
@@ -35375,9 +35375,9 @@ func_ov14_02154d24: ; 0x02154d24
ldr r1, _02154e9c ; =0x5053424c
ldr r2, _02154ea0 ; =func_ov14_02135940
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154e98 ; =data_ov14_0215b040
ldr r1, _02154ea4 ; =func_0203e7b4
ldr r1, _02154ea4 ; =_ZN9ActorTypeD1Ev
ldr r2, _02154ea8 ; =data_ov14_0215b034
bl __register_global_object
mov r0, #0x800
@@ -35468,7 +35468,7 @@ func_ov14_02154d24: ; 0x02154d24
_02154e98: .word data_ov14_0215b040
_02154e9c: .word 0x5053424c
_02154ea0: .word func_ov14_02135940 - 1
_02154ea4: .word func_0203e7b4
_02154ea4: .word _ZN9ActorTypeD1Ev
_02154ea8: .word data_ov14_0215b034
_02154eac: .word data_ov14_02157d70
_02154eb0: .word 0x00000548
@@ -35499,9 +35499,9 @@ func_ov14_02154efc: ; 0x02154efc
ldr r1, _02154f2c ; =0x57424c4b
ldr r2, _02154f30 ; =func_ov14_021368c8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154f28 ; =data_ov14_0215b0c0
ldr r1, _02154f34 ; =func_0203e7b4
ldr r1, _02154f34 ; =_ZN9ActorTypeD1Ev
ldr r2, _02154f38 ; =data_ov14_0215b0b4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35510,7 +35510,7 @@ func_ov14_02154efc: ; 0x02154efc
_02154f28: .word data_ov14_0215b0c0
_02154f2c: .word 0x57424c4b
_02154f30: .word func_ov14_021368c8 - 1
_02154f34: .word func_0203e7b4
_02154f34: .word _ZN9ActorTypeD1Ev
_02154f38: .word data_ov14_0215b0b4
.global func_ov14_02154f3c
@@ -35521,9 +35521,9 @@ func_ov14_02154f3c: ; 0x02154f3c
ldr r1, _02154f6c ; =0x44475447
ldr r2, _02154f70 ; =func_ov14_02138298
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154f68 ; =data_ov14_0215b0e0
ldr r1, _02154f74 ; =func_0203e7b4
ldr r1, _02154f74 ; =_ZN9ActorTypeD1Ev
ldr r2, _02154f78 ; =data_ov14_0215b0d4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35532,7 +35532,7 @@ func_ov14_02154f3c: ; 0x02154f3c
_02154f68: .word data_ov14_0215b0e0
_02154f6c: .word 0x44475447
_02154f70: .word func_ov14_02138298 - 1
_02154f74: .word func_0203e7b4
_02154f74: .word _ZN9ActorTypeD1Ev
_02154f78: .word data_ov14_0215b0d4
.global func_ov14_02154f7c
@@ -35543,9 +35543,9 @@ func_ov14_02154f7c: ; 0x02154f7c
ldr r1, _02154fac ; =0x54415255
ldr r2, _02154fb0 ; =func_ov14_02138e10
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154fa8 ; =data_ov14_0215b100
ldr r1, _02154fb4 ; =func_0203e7b4
ldr r1, _02154fb4 ; =_ZN9ActorTypeD1Ev
ldr r2, _02154fb8 ; =data_ov14_0215b0f4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35554,7 +35554,7 @@ func_ov14_02154f7c: ; 0x02154f7c
_02154fa8: .word data_ov14_0215b100
_02154fac: .word 0x54415255
_02154fb0: .word func_ov14_02138e10 - 1
_02154fb4: .word func_0203e7b4
_02154fb4: .word _ZN9ActorTypeD1Ev
_02154fb8: .word data_ov14_0215b0f4
.global func_ov14_02154fbc
@@ -35565,9 +35565,9 @@ func_ov14_02154fbc: ; 0x02154fbc
ldr r1, _02154fec ; =0x53544e45
ldr r2, _02154ff0 ; =func_ov14_021390f0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02154fe8 ; =data_ov14_0215b120
ldr r1, _02154ff4 ; =func_0203e7b4
ldr r1, _02154ff4 ; =_ZN9ActorTypeD1Ev
ldr r2, _02154ff8 ; =data_ov14_0215b114
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35576,7 +35576,7 @@ func_ov14_02154fbc: ; 0x02154fbc
_02154fe8: .word data_ov14_0215b120
_02154fec: .word 0x53544e45
_02154ff0: .word func_ov14_021390f0 - 1
_02154ff4: .word func_0203e7b4
_02154ff4: .word _ZN9ActorTypeD1Ev
_02154ff8: .word data_ov14_0215b114
.global func_ov14_02154ffc
@@ -35587,9 +35587,9 @@ func_ov14_02154ffc: ; 0x02154ffc
ldr r1, _0215502c ; =0x54535542
ldr r2, _02155030 ; =func_ov14_02139380
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155028 ; =data_ov14_0215b140
ldr r1, _02155034 ; =func_0203e7b4
ldr r1, _02155034 ; =_ZN9ActorTypeD1Ev
ldr r2, _02155038 ; =data_ov14_0215b134
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35598,7 +35598,7 @@ func_ov14_02154ffc: ; 0x02154ffc
_02155028: .word data_ov14_0215b140
_0215502c: .word 0x54535542
_02155030: .word func_ov14_02139380 - 1
_02155034: .word func_0203e7b4
_02155034: .word _ZN9ActorTypeD1Ev
_02155038: .word data_ov14_0215b134
.global func_ov14_0215503c
@@ -35609,9 +35609,9 @@ func_ov14_0215503c: ; 0x0215503c
ldr r1, _0215506c ; =0x54534248
ldr r2, _02155070 ; =func_ov14_0213979c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155068 ; =data_ov14_0215b160
ldr r1, _02155074 ; =func_0203e7b4
ldr r1, _02155074 ; =_ZN9ActorTypeD1Ev
ldr r2, _02155078 ; =data_ov14_0215b154
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35620,7 +35620,7 @@ func_ov14_0215503c: ; 0x0215503c
_02155068: .word data_ov14_0215b160
_0215506c: .word 0x54534248
_02155070: .word func_ov14_0213979c - 1
_02155074: .word func_0203e7b4
_02155074: .word _ZN9ActorTypeD1Ev
_02155078: .word data_ov14_0215b154
.global func_ov14_0215507c
@@ -35631,9 +35631,9 @@ func_ov14_0215507c: ; 0x0215507c
ldr r1, _021550ac ; =0x454e4745
ldr r2, _021550b0 ; =func_ov14_02139904
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021550a8 ; =data_ov14_0215b180
ldr r1, _021550b4 ; =func_0203e7b4
ldr r1, _021550b4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021550b8 ; =data_ov14_0215b174
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35642,7 +35642,7 @@ func_ov14_0215507c: ; 0x0215507c
_021550a8: .word data_ov14_0215b180
_021550ac: .word 0x454e4745
_021550b0: .word func_ov14_02139904 - 1
_021550b4: .word func_0203e7b4
_021550b4: .word _ZN9ActorTypeD1Ev
_021550b8: .word data_ov14_0215b174
.global func_ov14_021550bc
@@ -35653,9 +35653,9 @@ func_ov14_021550bc: ; 0x021550bc
ldr r1, _021550ec ; =0x49544745
ldr r2, _021550f0 ; =func_ov14_02139e54
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021550e8 ; =data_ov14_0215b1a0
ldr r1, _021550f4 ; =func_0203e7b4
ldr r1, _021550f4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021550f8 ; =data_ov14_0215b194
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35664,7 +35664,7 @@ func_ov14_021550bc: ; 0x021550bc
_021550e8: .word data_ov14_0215b1a0
_021550ec: .word 0x49544745
_021550f0: .word func_ov14_02139e54 - 1
_021550f4: .word func_0203e7b4
_021550f4: .word _ZN9ActorTypeD1Ev
_021550f8: .word data_ov14_0215b194
.global func_ov14_021550fc
@@ -35675,9 +35675,9 @@ func_ov14_021550fc: ; 0x021550fc
ldr r1, _0215512c ; =0x48415254
ldr r2, _02155130 ; =func_ov14_0213a2a0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155128 ; =data_ov14_0215b1c0
ldr r1, _02155134 ; =func_0203e7b4
ldr r1, _02155134 ; =_ZN9ActorTypeD1Ev
ldr r2, _02155138 ; =data_ov14_0215b1b4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35686,7 +35686,7 @@ func_ov14_021550fc: ; 0x021550fc
_02155128: .word data_ov14_0215b1c0
_0215512c: .word 0x48415254
_02155130: .word func_ov14_0213a2a0 - 1
_02155134: .word func_0203e7b4
_02155134: .word _ZN9ActorTypeD1Ev
_02155138: .word data_ov14_0215b1b4
.global func_ov14_0215513c
@@ -35697,9 +35697,9 @@ func_ov14_0215513c: ; 0x0215513c
ldr r1, _0215516c ; =0x544d4150
ldr r2, _02155170 ; =func_ov14_0213a99c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155168 ; =data_ov14_0215b1e0
ldr r1, _02155174 ; =func_0203e7b4
ldr r1, _02155174 ; =_ZN9ActorTypeD1Ev
ldr r2, _02155178 ; =data_ov14_0215b1d4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -35708,7 +35708,7 @@ func_ov14_0215513c: ; 0x0215513c
_02155168: .word data_ov14_0215b1e0
_0215516c: .word 0x544d4150
_02155170: .word func_ov14_0213a99c - 1
_02155174: .word func_0203e7b4
_02155174: .word _ZN9ActorTypeD1Ev
_02155178: .word data_ov14_0215b1d4
.section .ctor, 4, 1, 4
asm/ov14/ov14_0213b778.inc
+2 -2
View File
@@ -289,8 +289,8 @@
.extern func_020386c4
.extern func_020386cc
.extern func_0203d7e0
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eb0c
.extern func_0203eba8
.extern func_0203ebc8
asm/ov14/ov14_0213b778.s
+26 -26
View File
@@ -32155,9 +32155,9 @@ func_ov14_021551d8: ; 0x021551d8
ldr r1, _02155208 ; =0x4452554d
ldr r2, _0215520c ; =func_ov14_0213b9a8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155204 ; =data_ov14_0215b220
ldr r1, _02155210 ; =func_0203e7b4
ldr r1, _02155210 ; =_ZN9ActorTypeD1Ev
ldr r2, _02155214 ; =data_ov14_0215b214
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -32166,7 +32166,7 @@ func_ov14_021551d8: ; 0x021551d8
_02155204: .word data_ov14_0215b220
_02155208: .word 0x4452554d
_0215520c: .word func_ov14_0213b9a8
_02155210: .word func_0203e7b4
_02155210: .word _ZN9ActorTypeD1Ev
_02155214: .word data_ov14_0215b214
.global func_ov14_02155218
@@ -32272,9 +32272,9 @@ func_ov14_0215531c: ; 0x0215531c
ldr r1, _02155374 ; =0x5342454d
ldr r2, _02155378 ; =func_ov14_02146198
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155370 ; =data_ov14_0215b28c
ldr r1, _0215537c ; =func_0203e7b4
ldr r1, _0215537c ; =_ZN9ActorTypeD1Ev
ldr r2, _02155380 ; =data_ov14_0215b280
bl __register_global_object
ldr r0, _02155384 ; =data_ov14_0215b2ac
@@ -32293,7 +32293,7 @@ func_ov14_0215531c: ; 0x0215531c
_02155370: .word data_ov14_0215b28c
_02155374: .word 0x5342454d
_02155378: .word func_ov14_02146198
_0215537c: .word func_0203e7b4
_0215537c: .word _ZN9ActorTypeD1Ev
_02155380: .word data_ov14_0215b280
_02155384: .word data_ov14_0215b2ac
_02155388: .word data_ov14_02159720
@@ -32334,9 +32334,9 @@ func_ov14_021553e4: ; 0x021553e4
ldr r1, _02155414 ; =0x524d5447
ldr r2, _02155418 ; =func_ov14_02148698
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155410 ; =data_ov14_0215b2d0
ldr r1, _0215541c ; =func_0203e7b4
ldr r1, _0215541c ; =_ZN9ActorTypeD1Ev
ldr r2, _02155420 ; =data_ov14_0215b2c4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -32345,7 +32345,7 @@ func_ov14_021553e4: ; 0x021553e4
_02155410: .word data_ov14_0215b2d0
_02155414: .word 0x524d5447
_02155418: .word func_ov14_02148698
_0215541c: .word func_0203e7b4
_0215541c: .word _ZN9ActorTypeD1Ev
_02155420: .word data_ov14_0215b2c4
.global func_ov14_02155424
@@ -32376,18 +32376,18 @@ func_ov14_0215545c: ; 0x0215545c
ldr r1, _021554b0 ; =0x4e434d41
ldr r2, _021554b4 ; =func_ov14_0214ab30
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021554ac ; =data_ov14_0215b304
ldr r1, _021554b8 ; =func_0203e7b4
ldr r1, _021554b8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021554bc ; =data_ov14_0215b2f8
bl __register_global_object
ldr r0, _021554c0 ; =data_ov14_0215b324
ldr r1, _021554c4 ; =0x4e434d32
ldr r2, _021554c8 ; =func_ov14_0214ab60
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021554c0 ; =data_ov14_0215b324
ldr r1, _021554b8 ; =func_0203e7b4
ldr r1, _021554b8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021554cc ; =data_ov14_0215b318
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -32396,7 +32396,7 @@ func_ov14_0215545c: ; 0x0215545c
_021554ac: .word data_ov14_0215b304
_021554b0: .word 0x4e434d41
_021554b4: .word func_ov14_0214ab30
_021554b8: .word func_0203e7b4
_021554b8: .word _ZN9ActorTypeD1Ev
_021554bc: .word data_ov14_0215b2f8
_021554c0: .word data_ov14_0215b324
_021554c4: .word 0x4e434d32
@@ -32411,9 +32411,9 @@ func_ov14_021554d0: ; 0x021554d0
ldr r1, _02155500 ; =0x564f4341
ldr r2, _02155504 ; =func_ov14_0214bed8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021554fc ; =data_ov14_0215b344
ldr r1, _02155508 ; =func_0203e7b4
ldr r1, _02155508 ; =_ZN9ActorTypeD1Ev
ldr r2, _0215550c ; =data_ov14_0215b338
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -32422,7 +32422,7 @@ func_ov14_021554d0: ; 0x021554d0
_021554fc: .word data_ov14_0215b344
_02155500: .word 0x564f4341
_02155504: .word func_ov14_0214bed8
_02155508: .word func_0203e7b4
_02155508: .word _ZN9ActorTypeD1Ev
_0215550c: .word data_ov14_0215b338
.global func_ov14_02155510
@@ -32453,9 +32453,9 @@ func_ov14_02155548: ; 0x02155548
ldr r1, _02155578 ; =0x45564152
ldr r2, _0215557c ; =func_ov14_0214c9c0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155574 ; =data_ov14_0215b378
ldr r1, _02155580 ; =func_0203e7b4
ldr r1, _02155580 ; =_ZN9ActorTypeD1Ev
ldr r2, _02155584 ; =data_ov14_0215b36c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -32464,7 +32464,7 @@ func_ov14_02155548: ; 0x02155548
_02155574: .word data_ov14_0215b378
_02155578: .word 0x45564152
_0215557c: .word func_ov14_0214c9c0
_02155580: .word func_0203e7b4
_02155580: .word _ZN9ActorTypeD1Ev
_02155584: .word data_ov14_0215b36c
.global func_ov14_02155588
@@ -32600,9 +32600,9 @@ func_ov14_021556ec: ; 0x021556ec
ldr r1, _0215571c ; =0x41544152
ldr r2, _02155720 ; =func_ov14_0214fa74
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02155718 ; =data_ov14_0215b410
ldr r1, _02155724 ; =func_0203e7b4
ldr r1, _02155724 ; =_ZN9ActorTypeD1Ev
ldr r2, _02155728 ; =data_ov14_0215b404
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -32611,7 +32611,7 @@ func_ov14_021556ec: ; 0x021556ec
_02155718: .word data_ov14_0215b410
_0215571c: .word 0x41544152
_02155720: .word func_ov14_0214fa74
_02155724: .word func_0203e7b4
_02155724: .word _ZN9ActorTypeD1Ev
_02155728: .word data_ov14_0215b404
.global func_ov14_0215572c
@@ -32662,9 +32662,9 @@ func_ov14_0215579c: ; 0x0215579c
ldr r1, _021557cc ; =0x42524d54
ldr r2, _021557d0 ; =func_ov14_0215130c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021557c8 ; =data_ov14_0215b458
ldr r1, _021557d4 ; =func_0203e7b4
ldr r1, _021557d4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021557d8 ; =data_ov14_0215b44c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -32673,7 +32673,7 @@ func_ov14_0215579c: ; 0x0215579c
_021557c8: .word data_ov14_0215b458
_021557cc: .word 0x42524d54
_021557d0: .word func_ov14_0215130c
_021557d4: .word func_0203e7b4
_021557d4: .word _ZN9ActorTypeD1Ev
_021557d8: .word data_ov14_0215b44c
.global func_ov14_021557dc
asm/ov15.inc
+2 -2
View File
@@ -377,8 +377,8 @@
.extern func_02036da8
.extern func_020370d0
.extern func_0203d7e0
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f68
asm/ov15.s
+152 -152
View File
@@ -124990,9 +124990,9 @@ func_ov15_02187408: ; 0x02187408
ldr r1, _02187438 ; =0x534e4745
ldr r2, _0218743c ; =func_ov15_02121a94
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187434 ; =data_ov15_0218ec64
ldr r1, _02187440 ; =func_0203e7b4
ldr r1, _02187440 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187444 ; =data_ov15_0218ec58
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125001,7 +125001,7 @@ func_ov15_02187408: ; 0x02187408
_02187434: .word data_ov15_0218ec64
_02187438: .word 0x534e4745
_0218743c: .word func_ov15_02121a94
_02187440: .word func_0203e7b4
_02187440: .word _ZN9ActorTypeD1Ev
_02187444: .word data_ov15_0218ec58
.global func_ov15_02187448
@@ -125012,9 +125012,9 @@ func_ov15_02187448: ; 0x02187448
ldr r1, _02187478 ; =0x534e4741
ldr r2, _0218747c ; =func_ov15_021220b4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187474 ; =data_ov15_0218ec84
ldr r1, _02187480 ; =func_0203e7b4
ldr r1, _02187480 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187484 ; =data_ov15_0218ec78
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125023,7 +125023,7 @@ func_ov15_02187448: ; 0x02187448
_02187474: .word data_ov15_0218ec84
_02187478: .word 0x534e4741
_0218747c: .word func_ov15_021220b4
_02187480: .word func_0203e7b4
_02187480: .word _ZN9ActorTypeD1Ev
_02187484: .word data_ov15_0218ec78
.global func_ov15_02187488
@@ -125034,9 +125034,9 @@ func_ov15_02187488: ; 0x02187488
ldr r1, _021874b8 ; =0x53454f43
ldr r2, _021874bc ; =func_ov15_02123bec
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021874b4 ; =data_ov15_0218eca8
ldr r1, _021874c0 ; =func_0203e7b4
ldr r1, _021874c0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021874c4 ; =data_ov15_0218ec9c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125045,7 +125045,7 @@ func_ov15_02187488: ; 0x02187488
_021874b4: .word data_ov15_0218eca8
_021874b8: .word 0x53454f43
_021874bc: .word func_ov15_02123bec
_021874c0: .word func_0203e7b4
_021874c0: .word _ZN9ActorTypeD1Ev
_021874c4: .word data_ov15_0218ec9c
.global func_ov15_021874c8
@@ -125056,9 +125056,9 @@ func_ov15_021874c8: ; 0x021874c8
ldr r1, _0218752c ; =0x53454b45
ldr r2, _02187530 ; =func_ov15_02125388
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187528 ; =data_ov15_0218ecc8
ldr r1, _02187534 ; =func_0203e7b4
ldr r1, _02187534 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187538 ; =data_ov15_0218ecbc
bl __register_global_object
ldr r0, _0218753c ; =0x00000333
@@ -125080,7 +125080,7 @@ func_ov15_021874c8: ; 0x021874c8
_02187528: .word data_ov15_0218ecc8
_0218752c: .word 0x53454b45
_02187530: .word func_ov15_02125388
_02187534: .word func_0203e7b4
_02187534: .word _ZN9ActorTypeD1Ev
_02187538: .word data_ov15_0218ecbc
_0218753c: .word 0x00000333
_02187540: .word data_ov15_02189898
@@ -125385,9 +125385,9 @@ func_ov15_02187884: ; 0x02187884
ldr r1, _021878d8 ; =0x50534950
ldr r2, _021878dc ; =func_ov15_0212c734
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021878d4 ; =data_ov15_0218ee24
ldr r1, _021878e0 ; =func_0203e7b4
ldr r1, _021878e0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021878e4 ; =data_ov15_0218ee18
bl __register_global_object
ldr r2, _021878e8 ; =0x0000f660
@@ -125405,7 +125405,7 @@ func_ov15_02187884: ; 0x02187884
_021878d4: .word data_ov15_0218ee24
_021878d8: .word 0x50534950
_021878dc: .word func_ov15_0212c734
_021878e0: .word func_0203e7b4
_021878e0: .word _ZN9ActorTypeD1Ev
_021878e4: .word data_ov15_0218ee18
_021878e8: .word 0x0000f660
_021878ec: .word data_ov15_0218a464
@@ -125420,9 +125420,9 @@ func_ov15_021878f8: ; 0x021878f8
ldr r1, _02187928 ; =0x47534950
ldr r2, _0218792c ; =func_ov15_0212f398
ldr r3, _02187930 ; =func_ov15_0212f36c
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187924 ; =data_ov15_0218ee44
ldr r1, _02187934 ; =func_0203e7b4
ldr r1, _02187934 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187938 ; =data_ov15_0218ee38
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125432,7 +125432,7 @@ _02187924: .word data_ov15_0218ee44
_02187928: .word 0x47534950
_0218792c: .word func_ov15_0212f398
_02187930: .word func_ov15_0212f36c
_02187934: .word func_0203e7b4
_02187934: .word _ZN9ActorTypeD1Ev
_02187938: .word data_ov15_0218ee38
.global func_ov15_0218793c
@@ -125443,9 +125443,9 @@ func_ov15_0218793c: ; 0x0218793c
ldr r1, _02187978 ; =0x53544e44
ldr r2, _0218797c ; =func_ov15_0213296c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187974 ; =data_ov15_0218ee64
ldr r1, _02187980 ; =func_0203e7b4
ldr r1, _02187980 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187984 ; =data_ov15_0218ee58
bl __register_global_object
ldr r0, _02187988 ; =data_ov15_0218a6e0
@@ -125457,7 +125457,7 @@ func_ov15_0218793c: ; 0x0218793c
_02187974: .word data_ov15_0218ee64
_02187978: .word 0x53544e44
_0218797c: .word func_ov15_0213296c
_02187980: .word func_0203e7b4
_02187980: .word _ZN9ActorTypeD1Ev
_02187984: .word data_ov15_0218ee58
_02187988: .word data_ov15_0218a6e0
@@ -125469,9 +125469,9 @@ func_ov15_0218798c: ; 0x0218798c
ldr r1, _021879bc ; =0x434e424c
ldr r2, _021879c0 ; =func_ov15_02134040
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021879b8 ; =data_ov15_0218ee84
ldr r1, _021879c4 ; =func_0203e7b4
ldr r1, _021879c4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021879c8 ; =data_ov15_0218ee78
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125480,7 +125480,7 @@ func_ov15_0218798c: ; 0x0218798c
_021879b8: .word data_ov15_0218ee84
_021879bc: .word 0x434e424c
_021879c0: .word func_ov15_02134040
_021879c4: .word func_0203e7b4
_021879c4: .word _ZN9ActorTypeD1Ev
_021879c8: .word data_ov15_0218ee78
.global func_ov15_021879cc
@@ -125530,9 +125530,9 @@ func_ov15_02187a38: ; 0x02187a38
ldr r1, _02187a68 ; =0x53504b4e
ldr r2, _02187a6c ; =func_ov15_0213a634
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187a64 ; =data_ov15_0218eee8
ldr r1, _02187a70 ; =func_0203e7b4
ldr r1, _02187a70 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187a74 ; =data_ov15_0218eedc
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125541,7 +125541,7 @@ func_ov15_02187a38: ; 0x02187a38
_02187a64: .word data_ov15_0218eee8
_02187a68: .word 0x53504b4e
_02187a6c: .word func_ov15_0213a634
_02187a70: .word func_0203e7b4
_02187a70: .word _ZN9ActorTypeD1Ev
_02187a74: .word data_ov15_0218eedc
.global func_ov15_02187a78
@@ -125552,9 +125552,9 @@ func_ov15_02187a78: ; 0x02187a78
ldr r1, _02187aa8 ; =0x4b4d4d45
ldr r2, _02187aac ; =func_ov15_0213b2dc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187aa4 ; =data_ov15_0218ef08
ldr r1, _02187ab0 ; =func_0203e7b4
ldr r1, _02187ab0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187ab4 ; =data_ov15_0218eefc
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125563,7 +125563,7 @@ func_ov15_02187a78: ; 0x02187a78
_02187aa4: .word data_ov15_0218ef08
_02187aa8: .word 0x4b4d4d45
_02187aac: .word func_ov15_0213b2dc
_02187ab0: .word func_0203e7b4
_02187ab0: .word _ZN9ActorTypeD1Ev
_02187ab4: .word data_ov15_0218eefc
.global func_ov15_02187ab8
@@ -125575,9 +125575,9 @@ func_ov15_02187ab8: ; 0x02187ab8
ldr r1, _02187b1c ; =0x53504b4c
ldr r2, _02187b20 ; =func_ov15_0213e400
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187b18 ; =data_ov15_0218ef2c
ldr r1, _02187b24 ; =func_0203e7b4
ldr r1, _02187b24 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187b28 ; =data_ov15_0218ef20
bl __register_global_object
ldr r3, _02187b2c ; =data_ov15_0218ae88
@@ -125598,7 +125598,7 @@ func_ov15_02187ab8: ; 0x02187ab8
_02187b18: .word data_ov15_0218ef2c
_02187b1c: .word 0x53504b4c
_02187b20: .word func_ov15_0213e400
_02187b24: .word func_0203e7b4
_02187b24: .word _ZN9ActorTypeD1Ev
_02187b28: .word data_ov15_0218ef20
_02187b2c: .word data_ov15_0218ae88
_02187b30: .word 0x000024cd
@@ -125614,9 +125614,9 @@ func_ov15_02187b40: ; 0x02187b40
ldr r1, _02187b70 ; =0x53504b48
ldr r2, _02187b74 ; =func_ov15_02141064
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187b6c ; =data_ov15_0218ef58
ldr r1, _02187b78 ; =func_0203e7b4
ldr r1, _02187b78 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187b7c ; =data_ov15_0218ef4c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125625,7 +125625,7 @@ func_ov15_02187b40: ; 0x02187b40
_02187b6c: .word data_ov15_0218ef58
_02187b70: .word 0x53504b48
_02187b74: .word func_ov15_02141064
_02187b78: .word func_0203e7b4
_02187b78: .word _ZN9ActorTypeD1Ev
_02187b7c: .word data_ov15_0218ef4c
.global func_ov15_02187b80
@@ -125671,9 +125671,9 @@ func_ov15_02187bf4: ; 0x02187bf4
ldr r1, _02187c24 ; =0x46534152
ldr r2, _02187c28 ; =func_ov15_02145ea0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187c20 ; =data_ov15_0218efe8
ldr r1, _02187c2c ; =func_0203e7b4
ldr r1, _02187c2c ; =_ZN9ActorTypeD1Ev
ldr r2, _02187c30 ; =data_ov15_0218efdc
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125682,7 +125682,7 @@ func_ov15_02187bf4: ; 0x02187bf4
_02187c20: .word data_ov15_0218efe8
_02187c24: .word 0x46534152
_02187c28: .word func_ov15_02145ea0
_02187c2c: .word func_0203e7b4
_02187c2c: .word _ZN9ActorTypeD1Ev
_02187c30: .word data_ov15_0218efdc
.global func_ov15_02187c34
@@ -125693,9 +125693,9 @@ func_ov15_02187c34: ; 0x02187c34
ldr r1, _02187c64 ; =0x534c4152
ldr r2, _02187c68 ; =func_ov15_02146010
ldr r3, _02187c6c ; =func_ov15_02145fe0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187c60 ; =data_ov15_0218f40c
ldr r1, _02187c70 ; =func_0203e7b4
ldr r1, _02187c70 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187c74 ; =data_ov15_0218f400
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125705,7 +125705,7 @@ _02187c60: .word data_ov15_0218f40c
_02187c64: .word 0x534c4152
_02187c68: .word func_ov15_02146010
_02187c6c: .word func_ov15_02145fe0
_02187c70: .word func_0203e7b4
_02187c70: .word _ZN9ActorTypeD1Ev
_02187c74: .word data_ov15_0218f400
.global func_ov15_02187c78
@@ -125716,9 +125716,9 @@ func_ov15_02187c78: ; 0x02187c78
ldr r1, _02187cf0 ; =0x534c5452
ldr r2, _02187cf4 ; =func_ov15_02146614
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187cec ; =data_ov15_0218f4fc
ldr r1, _02187cf8 ; =func_0203e7b4
ldr r1, _02187cf8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187cfc ; =data_ov15_0218f4f0
bl __register_global_object
ldr ip, _02187d00 ; =0x00000666
@@ -125745,7 +125745,7 @@ func_ov15_02187c78: ; 0x02187c78
_02187cec: .word data_ov15_0218f4fc
_02187cf0: .word 0x534c5452
_02187cf4: .word func_ov15_02146614
_02187cf8: .word func_0203e7b4
_02187cf8: .word _ZN9ActorTypeD1Ev
_02187cfc: .word data_ov15_0218f4f0
_02187d00: .word 0x00000666
_02187d04: .word data_ov15_0218b3e0
@@ -125784,9 +125784,9 @@ func_ov15_02187d58: ; 0x02187d58
ldr r1, _02187d88 ; =0x534c4653
ldr r2, _02187d8c ; =func_ov15_02146f4c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187d84 ; =data_ov15_0218f548
ldr r1, _02187d90 ; =func_0203e7b4
ldr r1, _02187d90 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187d94 ; =data_ov15_0218f53c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125795,7 +125795,7 @@ func_ov15_02187d58: ; 0x02187d58
_02187d84: .word data_ov15_0218f548
_02187d88: .word 0x534c4653
_02187d8c: .word func_ov15_02146f4c
_02187d90: .word func_0203e7b4
_02187d90: .word _ZN9ActorTypeD1Ev
_02187d94: .word data_ov15_0218f53c
.global func_ov15_02187d98
@@ -125932,9 +125932,9 @@ func_ov15_02187f48: ; 0x02187f48
ldr r1, _02187f78 ; =0x53525059
ldr r2, _02187f7c ; =func_ov15_0214d258
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187f74 ; =data_ov15_0218f5f8
ldr r1, _02187f80 ; =func_0203e7b4
ldr r1, _02187f80 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187f84 ; =data_ov15_0218f5ec
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125943,7 +125943,7 @@ func_ov15_02187f48: ; 0x02187f48
_02187f74: .word data_ov15_0218f5f8
_02187f78: .word 0x53525059
_02187f7c: .word func_ov15_0214d258
_02187f80: .word func_0203e7b4
_02187f80: .word _ZN9ActorTypeD1Ev
_02187f84: .word data_ov15_0218f5ec
.global func_ov15_02187f88
@@ -125954,9 +125954,9 @@ func_ov15_02187f88: ; 0x02187f88
ldr r1, _02187fb8 ; =0x53485254
ldr r2, _02187fbc ; =func_ov15_0214d518
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187fb4 ; =data_ov15_0218f618
ldr r1, _02187fc0 ; =func_0203e7b4
ldr r1, _02187fc0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02187fc4 ; =data_ov15_0218f60c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125965,7 +125965,7 @@ func_ov15_02187f88: ; 0x02187f88
_02187fb4: .word data_ov15_0218f618
_02187fb8: .word 0x53485254
_02187fbc: .word func_ov15_0214d518
_02187fc0: .word func_0203e7b4
_02187fc0: .word _ZN9ActorTypeD1Ev
_02187fc4: .word data_ov15_0218f60c
.global func_ov15_02187fc8
@@ -125976,9 +125976,9 @@ func_ov15_02187fc8: ; 0x02187fc8
ldr r1, _02187ff8 ; =0x43424c53
ldr r2, _02187ffc ; =func_ov15_0214d754
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02187ff4 ; =data_ov15_0218f638
ldr r1, _02188000 ; =func_0203e7b4
ldr r1, _02188000 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188004 ; =data_ov15_0218f62c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -125987,7 +125987,7 @@ func_ov15_02187fc8: ; 0x02187fc8
_02187ff4: .word data_ov15_0218f638
_02187ff8: .word 0x43424c53
_02187ffc: .word func_ov15_0214d754
_02188000: .word func_0203e7b4
_02188000: .word _ZN9ActorTypeD1Ev
_02188004: .word data_ov15_0218f62c
.global func_ov15_02188008
@@ -126035,9 +126035,9 @@ func_ov15_02188084: ; 0x02188084
ldr r1, _021880b4 ; =0x47534d47
ldr r2, _021880b8 ; =func_ov15_0214ee58
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021880b0 ; =data_ov15_0218f674
ldr r1, _021880bc ; =func_0203e7b4
ldr r1, _021880bc ; =_ZN9ActorTypeD1Ev
ldr r2, _021880c0 ; =data_ov15_0218f668
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126046,7 +126046,7 @@ func_ov15_02188084: ; 0x02188084
_021880b0: .word data_ov15_0218f674
_021880b4: .word 0x47534d47
_021880b8: .word func_ov15_0214ee58
_021880bc: .word func_0203e7b4
_021880bc: .word _ZN9ActorTypeD1Ev
_021880c0: .word data_ov15_0218f668
.global func_ov15_021880c4
@@ -126057,9 +126057,9 @@ func_ov15_021880c4: ; 0x021880c4
ldr r1, _021880f4 ; =0x54534950
ldr r2, _021880f8 ; =func_ov15_0214ffc8
ldr r3, _021880fc ; =func_ov15_0214ff48
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021880f0 ; =data_ov15_0218f694
ldr r1, _02188100 ; =func_0203e7b4
ldr r1, _02188100 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188104 ; =data_ov15_0218f688
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126069,7 +126069,7 @@ _021880f0: .word data_ov15_0218f694
_021880f4: .word 0x54534950
_021880f8: .word func_ov15_0214ffc8
_021880fc: .word func_ov15_0214ff48
_02188100: .word func_0203e7b4
_02188100: .word _ZN9ActorTypeD1Ev
_02188104: .word data_ov15_0218f688
.global func_ov15_02188108
@@ -126080,9 +126080,9 @@ func_ov15_02188108: ; 0x02188108
ldr r1, _02188138 ; =0x4b4d4741
ldr r2, _0218813c ; =func_ov15_02151720
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188134 ; =data_ov15_0218f6b4
ldr r1, _02188140 ; =func_0203e7b4
ldr r1, _02188140 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188144 ; =data_ov15_0218f6a8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126091,7 +126091,7 @@ func_ov15_02188108: ; 0x02188108
_02188134: .word data_ov15_0218f6b4
_02188138: .word 0x4b4d4741
_0218813c: .word func_ov15_02151720
_02188140: .word func_0203e7b4
_02188140: .word _ZN9ActorTypeD1Ev
_02188144: .word data_ov15_0218f6a8
.global func_ov15_02188148
@@ -126102,9 +126102,9 @@ func_ov15_02188148: ; 0x02188148
ldr r1, _021881b4 ; =0x42554949
ldr r2, _021881b8 ; =func_ov15_02155680
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021881b0 ; =data_ov15_0218f6e0
ldr r1, _021881bc ; =func_0203e7b4
ldr r1, _021881bc ; =_ZN9ActorTypeD1Ev
ldr r2, _021881c0 ; =data_ov15_0218f6d4
bl __register_global_object
ldr r0, _021881c4 ; =data_027e0d0c
@@ -126128,7 +126128,7 @@ func_ov15_02188148: ; 0x02188148
_021881b0: .word data_ov15_0218f6e0
_021881b4: .word 0x42554949
_021881b8: .word func_ov15_02155680
_021881bc: .word func_0203e7b4
_021881bc: .word _ZN9ActorTypeD1Ev
_021881c0: .word data_ov15_0218f6d4
_021881c4: .word data_027e0d0c
_021881c8: .word data_ov15_0218c0e4
@@ -126144,9 +126144,9 @@ func_ov15_021881d8: ; 0x021881d8
ldr r1, _02188248 ; =0x53524f50
ldr r2, _0218824c ; =func_ov15_02157610
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188244 ; =data_ov15_0218f70c
ldr r1, _02188250 ; =func_0203e7b4
ldr r1, _02188250 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188254 ; =data_ov15_0218f700
bl __register_global_object
ldr r0, _02188258 ; =data_027e0d0c
@@ -126171,7 +126171,7 @@ func_ov15_021881d8: ; 0x021881d8
_02188244: .word data_ov15_0218f70c
_02188248: .word 0x53524f50
_0218824c: .word func_ov15_02157610
_02188250: .word func_0203e7b4
_02188250: .word _ZN9ActorTypeD1Ev
_02188254: .word data_ov15_0218f700
_02188258: .word data_027e0d0c
_0218825c: .word data_ov15_0218c1d8
@@ -126188,9 +126188,9 @@ func_ov15_02188270: ; 0x02188270
ldr r1, _021882a0 ; =0x47594d47
ldr r2, _021882a4 ; =func_ov15_02157d10
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218829c ; =data_ov15_0218f738
ldr r1, _021882a8 ; =func_0203e7b4
ldr r1, _021882a8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021882ac ; =data_ov15_0218f72c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126199,7 +126199,7 @@ func_ov15_02188270: ; 0x02188270
_0218829c: .word data_ov15_0218f738
_021882a0: .word 0x47594d47
_021882a4: .word func_ov15_02157d10
_021882a8: .word func_0203e7b4
_021882a8: .word _ZN9ActorTypeD1Ev
_021882ac: .word data_ov15_0218f72c
.global func_ov15_021882b0
@@ -126210,9 +126210,9 @@ func_ov15_021882b0: ; 0x021882b0
ldr r1, _021882f0 ; =0x47595247
ldr r2, _021882f4 ; =func_ov15_02158574
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021882ec ; =data_ov15_0218f758
ldr r1, _021882f8 ; =func_0203e7b4
ldr r1, _021882f8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021882fc ; =data_ov15_0218f74c
bl __register_global_object
ldr r0, _02188300 ; =data_ov15_0218c384
@@ -126225,7 +126225,7 @@ func_ov15_021882b0: ; 0x021882b0
_021882ec: .word data_ov15_0218f758
_021882f0: .word 0x47595247
_021882f4: .word func_ov15_02158574
_021882f8: .word func_0203e7b4
_021882f8: .word _ZN9ActorTypeD1Ev
_021882fc: .word data_ov15_0218f74c
_02188300: .word data_ov15_0218c384
@@ -126237,9 +126237,9 @@ func_ov15_02188304: ; 0x02188304
ldr r1, _02188348 ; =0x4647474e
ldr r2, _0218834c ; =func_ov15_0215a318
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188344 ; =data_ov15_0218f778
ldr r1, _02188350 ; =func_0203e7b4
ldr r1, _02188350 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188354 ; =data_ov15_0218f76c
bl __register_global_object
mov r2, #0x44
@@ -126253,7 +126253,7 @@ func_ov15_02188304: ; 0x02188304
_02188344: .word data_ov15_0218f778
_02188348: .word 0x4647474e
_0218834c: .word func_ov15_0215a318
_02188350: .word func_0203e7b4
_02188350: .word _ZN9ActorTypeD1Ev
_02188354: .word data_ov15_0218f76c
_02188358: .word data_ov15_0218c478
@@ -126265,9 +126265,9 @@ func_ov15_0218835c: ; 0x0218835c
ldr r1, _0218838c ; =0x43435447
ldr r2, _02188390 ; =func_ov15_0215bb3c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188388 ; =data_ov15_0218f798
ldr r1, _02188394 ; =func_0203e7b4
ldr r1, _02188394 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188398 ; =data_ov15_0218f78c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126276,7 +126276,7 @@ func_ov15_0218835c: ; 0x0218835c
_02188388: .word data_ov15_0218f798
_0218838c: .word 0x43435447
_02188390: .word func_ov15_0215bb3c
_02188394: .word func_0203e7b4
_02188394: .word _ZN9ActorTypeD1Ev
_02188398: .word data_ov15_0218f78c
.global func_ov15_0218839c
@@ -126367,9 +126367,9 @@ func_ov15_0218847c: ; 0x0218847c
ldr r1, _021884d4 ; =0x47464953
ldr r2, _021884d8 ; =func_ov15_0215d708
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021884d0 ; =data_ov15_0218f808
ldr r1, _021884dc ; =func_0203e7b4
ldr r1, _021884dc ; =_ZN9ActorTypeD1Ev
ldr r2, _021884e0 ; =data_ov15_0218f7fc
bl __register_global_object
mov r1, #8
@@ -126388,7 +126388,7 @@ func_ov15_0218847c: ; 0x0218847c
_021884d0: .word data_ov15_0218f808
_021884d4: .word 0x47464953
_021884d8: .word func_ov15_0215d708
_021884dc: .word func_0203e7b4
_021884dc: .word _ZN9ActorTypeD1Ev
_021884e0: .word data_ov15_0218f7fc
_021884e4: .word 0x00001f4d
_021884e8: .word data_ov15_0218c8b0
@@ -126403,9 +126403,9 @@ func_ov15_021884f4: ; 0x021884f4
ldr r1, _02188524 ; =0x46474d47
ldr r2, _02188528 ; =func_ov15_02160448
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188520 ; =data_ov15_0218f868
ldr r1, _0218852c ; =func_0203e7b4
ldr r1, _0218852c ; =_ZN9ActorTypeD1Ev
ldr r2, _02188530 ; =data_ov15_0218f85c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126414,7 +126414,7 @@ func_ov15_021884f4: ; 0x021884f4
_02188520: .word data_ov15_0218f868
_02188524: .word 0x46474d47
_02188528: .word func_ov15_02160448
_0218852c: .word func_0203e7b4
_0218852c: .word _ZN9ActorTypeD1Ev
_02188530: .word data_ov15_0218f85c
.global func_ov15_02188534
@@ -126425,9 +126425,9 @@ func_ov15_02188534: ; 0x02188534
ldr r1, _02188564 ; =0x444e5043
ldr r2, _02188568 ; =func_ov15_021605d0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188560 ; =data_ov15_0218f888
ldr r1, _0218856c ; =func_0203e7b4
ldr r1, _0218856c ; =_ZN9ActorTypeD1Ev
ldr r2, _02188570 ; =data_ov15_0218f87c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126436,7 +126436,7 @@ func_ov15_02188534: ; 0x02188534
_02188560: .word data_ov15_0218f888
_02188564: .word 0x444e5043
_02188568: .word func_ov15_021605d0
_0218856c: .word func_0203e7b4
_0218856c: .word _ZN9ActorTypeD1Ev
_02188570: .word data_ov15_0218f87c
.global func_ov15_02188574
@@ -126447,9 +126447,9 @@ func_ov15_02188574: ; 0x02188574
ldr r1, _021885a4 ; =0x504c5350
ldr r2, _021885a8 ; =func_ov15_0216196c
ldr r3, _021885ac ; =func_ov15_02161920
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021885a0 ; =data_ov15_0218f8a8
ldr r1, _021885b0 ; =func_0203e7b4
ldr r1, _021885b0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021885b4 ; =data_ov15_0218f89c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126459,7 +126459,7 @@ _021885a0: .word data_ov15_0218f8a8
_021885a4: .word 0x504c5350
_021885a8: .word func_ov15_0216196c
_021885ac: .word func_ov15_02161920
_021885b0: .word func_0203e7b4
_021885b0: .word _ZN9ActorTypeD1Ev
_021885b4: .word data_ov15_0218f89c
.global func_ov15_021885b8
@@ -126470,9 +126470,9 @@ func_ov15_021885b8: ; 0x021885b8
ldr r1, _021885e8 ; =0x544f5044
ldr r2, _021885ec ; =func_ov15_02165fc8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021885e4 ; =data_ov15_0218f8dc
ldr r1, _021885f0 ; =func_0203e7b4
ldr r1, _021885f0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021885f4 ; =data_ov15_0218f8d0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126481,7 +126481,7 @@ func_ov15_021885b8: ; 0x021885b8
_021885e4: .word data_ov15_0218f8dc
_021885e8: .word 0x544f5044
_021885ec: .word func_ov15_02165fc8
_021885f0: .word func_0203e7b4
_021885f0: .word _ZN9ActorTypeD1Ev
_021885f4: .word data_ov15_0218f8d0
.global func_ov15_021885f8
@@ -126532,9 +126532,9 @@ func_ov15_02188668: ; 0x02188668
ldr r1, _02188698 ; =0x424a4653
ldr r2, _0218869c ; =func_ov15_02166ad4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188694 ; =data_ov15_0218f924
ldr r1, _021886a0 ; =func_0203e7b4
ldr r1, _021886a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021886a4 ; =data_ov15_0218f918
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126543,7 +126543,7 @@ func_ov15_02188668: ; 0x02188668
_02188694: .word data_ov15_0218f924
_02188698: .word 0x424a4653
_0218869c: .word func_ov15_02166ad4
_021886a0: .word func_0203e7b4
_021886a0: .word _ZN9ActorTypeD1Ev
_021886a4: .word data_ov15_0218f918
.global func_ov15_021886a8
@@ -126554,9 +126554,9 @@ func_ov15_021886a8: ; 0x021886a8
ldr r1, _021886fc ; =0x464c5052
ldr r2, _02188700 ; =func_ov15_0216771c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021886f8 ; =data_ov15_0218f944
ldr r1, _02188704 ; =func_0203e7b4
ldr r1, _02188704 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188708 ; =data_ov15_0218f938
bl __register_global_object
mov r0, #0x8000
@@ -126574,7 +126574,7 @@ func_ov15_021886a8: ; 0x021886a8
_021886f8: .word data_ov15_0218f944
_021886fc: .word 0x464c5052
_02188700: .word func_ov15_0216771c
_02188704: .word func_0203e7b4
_02188704: .word _ZN9ActorTypeD1Ev
_02188708: .word data_ov15_0218f938
_0218870c: .word data_ov15_0218d094
_02188710: .word 0x00156400
@@ -126588,9 +126588,9 @@ func_ov15_02188718: ; 0x02188718
ldr r1, _02188748 ; =0x49434247
ldr r2, _0218874c ; =func_ov15_0216901c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188744 ; =data_ov15_0218f964
ldr r1, _02188750 ; =func_0203e7b4
ldr r1, _02188750 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188754 ; =data_ov15_0218f958
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126599,7 +126599,7 @@ func_ov15_02188718: ; 0x02188718
_02188744: .word data_ov15_0218f964
_02188748: .word 0x49434247
_0218874c: .word func_ov15_0216901c
_02188750: .word func_0203e7b4
_02188750: .word _ZN9ActorTypeD1Ev
_02188754: .word data_ov15_0218f958
.global func_ov15_02188758
@@ -126610,18 +126610,18 @@ func_ov15_02188758: ; 0x02188758
ldr r1, _021887ac ; =0x534d5453
ldr r2, _021887b0 ; =func_ov15_0216abe8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021887a8 ; =data_ov15_0218f984
ldr r1, _021887b4 ; =func_0203e7b4
ldr r1, _021887b4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021887b8 ; =data_ov15_0218f978
bl __register_global_object
ldr r0, _021887bc ; =data_ov15_0218f9a4
ldr r1, _021887c0 ; =0x534d544c
ldr r2, _021887c4 ; =func_ov15_0216ac18
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021887bc ; =data_ov15_0218f9a4
ldr r1, _021887b4 ; =func_0203e7b4
ldr r1, _021887b4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021887c8 ; =data_ov15_0218f998
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126630,7 +126630,7 @@ func_ov15_02188758: ; 0x02188758
_021887a8: .word data_ov15_0218f984
_021887ac: .word 0x534d5453
_021887b0: .word func_ov15_0216abe8
_021887b4: .word func_0203e7b4
_021887b4: .word _ZN9ActorTypeD1Ev
_021887b8: .word data_ov15_0218f978
_021887bc: .word data_ov15_0218f9a4
_021887c0: .word 0x534d544c
@@ -126645,9 +126645,9 @@ func_ov15_021887cc: ; 0x021887cc
ldr r1, _02188844 ; =0x534c4f43
ldr r2, _02188848 ; =func_ov15_0216be78
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188840 ; =data_ov15_0218f9c4
ldr r1, _0218884c ; =func_0203e7b4
ldr r1, _0218884c ; =_ZN9ActorTypeD1Ev
ldr r2, _02188850 ; =data_ov15_0218f9b8
bl __register_global_object
ldr r0, _02188854 ; =data_ov15_0218f9e4
@@ -126674,7 +126674,7 @@ func_ov15_021887cc: ; 0x021887cc
_02188840: .word data_ov15_0218f9c4
_02188844: .word 0x534c4f43
_02188848: .word func_ov15_0216be78
_0218884c: .word func_0203e7b4
_0218884c: .word _ZN9ActorTypeD1Ev
_02188850: .word data_ov15_0218f9b8
_02188854: .word data_ov15_0218f9e4
_02188858: .word func_ov00_020a95a4
@@ -126694,9 +126694,9 @@ func_ov15_02188878: ; 0x02188878
ldr r1, _021888a8 ; =0x534e4156
ldr r2, _021888ac ; =func_ov15_0216ee14
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021888a4 ; =data_ov15_0218fadc
ldr r1, _021888b0 ; =func_0203e7b4
ldr r1, _021888b0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021888b4 ; =data_ov15_0218fad0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126705,7 +126705,7 @@ func_ov15_02188878: ; 0x02188878
_021888a4: .word data_ov15_0218fadc
_021888a8: .word 0x534e4156
_021888ac: .word func_ov15_0216ee14
_021888b0: .word func_0203e7b4
_021888b0: .word _ZN9ActorTypeD1Ev
_021888b4: .word data_ov15_0218fad0
.global func_ov15_021888b8
@@ -126716,9 +126716,9 @@ func_ov15_021888b8: ; 0x021888b8
ldr r1, _021888e8 ; =0x53424f53
ldr r2, _021888ec ; =func_ov15_0216f470
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021888e4 ; =data_ov15_0218fafc
ldr r1, _021888f0 ; =func_0203e7b4
ldr r1, _021888f0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021888f4 ; =data_ov15_0218faf0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126727,7 +126727,7 @@ func_ov15_021888b8: ; 0x021888b8
_021888e4: .word data_ov15_0218fafc
_021888e8: .word 0x53424f53
_021888ec: .word func_ov15_0216f470
_021888f0: .word func_0203e7b4
_021888f0: .word _ZN9ActorTypeD1Ev
_021888f4: .word data_ov15_0218faf0
.global func_ov15_021888f8
@@ -126738,9 +126738,9 @@ func_ov15_021888f8: ; 0x021888f8
ldr r1, _02188928 ; =0x53424559
ldr r2, _0218892c ; =func_ov15_02173738
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188924 ; =data_ov15_0218fb1c
ldr r1, _02188930 ; =func_0203e7b4
ldr r1, _02188930 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188934 ; =data_ov15_0218fb10
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126749,7 +126749,7 @@ func_ov15_021888f8: ; 0x021888f8
_02188924: .word data_ov15_0218fb1c
_02188928: .word 0x53424559
_0218892c: .word func_ov15_02173738
_02188930: .word func_0203e7b4
_02188930: .word _ZN9ActorTypeD1Ev
_02188934: .word data_ov15_0218fb10
.global func_ov15_02188938
@@ -126760,9 +126760,9 @@ func_ov15_02188938: ; 0x02188938
ldr r1, _02188968 ; =0x534c5444
ldr r2, _0218896c ; =func_ov15_02174060
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188964 ; =data_ov15_0218fb3c
ldr r1, _02188970 ; =func_0203e7b4
ldr r1, _02188970 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188974 ; =data_ov15_0218fb30
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -126771,7 +126771,7 @@ func_ov15_02188938: ; 0x02188938
_02188964: .word data_ov15_0218fb3c
_02188968: .word 0x534c5444
_0218896c: .word func_ov15_02174060
_02188970: .word func_0203e7b4
_02188970: .word _ZN9ActorTypeD1Ev
_02188974: .word data_ov15_0218fb30
.global func_ov15_02188978
@@ -126782,9 +126782,9 @@ func_ov15_02188978: ; 0x02188978
ldr r1, _02188a1c ; =0x534c5250
ldr r2, _02188a20 ; =func_ov15_021742ac
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188a18 ; =data_ov15_0218fb5c
ldr r1, _02188a24 ; =func_0203e7b4
ldr r1, _02188a24 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188a28 ; =data_ov15_0218fb50
bl __register_global_object
ldr r3, _02188a2c ; =data_ov15_0218dc64
@@ -126822,7 +126822,7 @@ func_ov15_02188978: ; 0x02188978
_02188a18: .word data_ov15_0218fb5c
_02188a1c: .word 0x534c5250
_02188a20: .word func_ov15_021742ac
_02188a24: .word func_0203e7b4
_02188a24: .word _ZN9ActorTypeD1Ev
_02188a28: .word data_ov15_0218fb50
_02188a2c: .word data_ov15_0218dc64
_02188a30: .word data_ov15_0218dc94
@@ -126843,9 +126843,9 @@ func_ov15_02188a54: ; 0x02188a54
ldr r1, _02188b14 ; =0x474f4332
ldr r2, _02188b18 ; =func_ov15_021773a8
ldr r3, _02188b1c ; =func_ov15_02177330
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188b10 ; =data_ov15_021902a0
ldr r1, _02188b20 ; =func_0203e7b4
ldr r1, _02188b20 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188b24 ; =data_ov15_02190294
bl __register_global_object
ldr r0, _02188b28 ; =0x00000ccd
@@ -126891,7 +126891,7 @@ _02188b10: .word data_ov15_021902a0
_02188b14: .word 0x474f4332
_02188b18: .word func_ov15_021773a8
_02188b1c: .word func_ov15_02177330
_02188b20: .word func_0203e7b4
_02188b20: .word _ZN9ActorTypeD1Ev
_02188b24: .word data_ov15_02190294
_02188b28: .word 0x00000ccd
_02188b2c: .word data_ov15_0218ddc4
@@ -126914,9 +126914,9 @@ func_ov15_02188b58: ; 0x02188b58
ldr r1, _02188df0 ; =0x474f3245
ldr r2, _02188df4 ; =func_ov15_0217ab9c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188dec ; =data_ov15_021902e4
ldr r1, _02188df8 ; =func_0203e7b4
ldr r1, _02188df8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188dfc ; =data_ov15_021902d8
bl __register_global_object
ldr lr, _02188e00 ; =0x00001ccd
@@ -127079,7 +127079,7 @@ func_ov15_02188b58: ; 0x02188b58
_02188dec: .word data_ov15_021902e4
_02188df0: .word 0x474f3245
_02188df4: .word func_ov15_0217ab9c
_02188df8: .word func_0203e7b4
_02188df8: .word _ZN9ActorTypeD1Ev
_02188dfc: .word data_ov15_021902d8
_02188e00: .word 0x00001ccd
_02188e04: .word data_ov15_0218df6c
@@ -127138,9 +127138,9 @@ func_ov15_02188ec0: ; 0x02188ec0
ldr r1, _02188ef0 ; =0x474f3242
ldr r2, _02188ef4 ; =func_ov15_0217c02c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188eec ; =data_ov15_021903b8
ldr r1, _02188ef8 ; =func_0203e7b4
ldr r1, _02188ef8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188efc ; =data_ov15_021903ac
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -127149,7 +127149,7 @@ func_ov15_02188ec0: ; 0x02188ec0
_02188eec: .word data_ov15_021903b8
_02188ef0: .word 0x474f3242
_02188ef4: .word func_ov15_0217c02c
_02188ef8: .word func_0203e7b4
_02188ef8: .word _ZN9ActorTypeD1Ev
_02188efc: .word data_ov15_021903ac
.global func_ov15_02188f00
@@ -127160,9 +127160,9 @@ func_ov15_02188f00: ; 0x02188f00
ldr r1, _02188f30 ; =0x534c5243
ldr r2, _02188f34 ; =func_ov15_0217d690
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188f2c ; =data_ov15_021903d8
ldr r1, _02188f38 ; =func_0203e7b4
ldr r1, _02188f38 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188f3c ; =data_ov15_021903cc
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -127171,7 +127171,7 @@ func_ov15_02188f00: ; 0x02188f00
_02188f2c: .word data_ov15_021903d8
_02188f30: .word 0x534c5243
_02188f34: .word func_ov15_0217d690
_02188f38: .word func_0203e7b4
_02188f38: .word _ZN9ActorTypeD1Ev
_02188f3c: .word data_ov15_021903cc
.global func_ov15_02188f40
@@ -127182,9 +127182,9 @@ func_ov15_02188f40: ; 0x02188f40
ldr r1, _02188f70 ; =0x534c5347
ldr r2, _02188f74 ; =func_ov15_0217db44
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188f6c ; =data_ov15_021903f8
ldr r1, _02188f78 ; =func_0203e7b4
ldr r1, _02188f78 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188f7c ; =data_ov15_021903ec
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -127193,7 +127193,7 @@ func_ov15_02188f40: ; 0x02188f40
_02188f6c: .word data_ov15_021903f8
_02188f70: .word 0x534c5347
_02188f74: .word func_ov15_0217db44
_02188f78: .word func_0203e7b4
_02188f78: .word _ZN9ActorTypeD1Ev
_02188f7c: .word data_ov15_021903ec
.global func_ov15_02188f80
@@ -127369,9 +127369,9 @@ func_ov15_021891fc: ; 0x021891fc
ldr r1, _02189240 ; =0x4852434e
ldr r2, _02189244 ; =func_ov15_0217f800
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218923c ; =data_ov15_02190424
ldr r1, _02189248 ; =func_0203e7b4
ldr r1, _02189248 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218924c ; =data_ov15_02190418
bl __register_global_object
ldr r2, _02189250 ; =0x00009998
@@ -127385,7 +127385,7 @@ func_ov15_021891fc: ; 0x021891fc
_0218923c: .word data_ov15_02190424
_02189240: .word 0x4852434e
_02189244: .word func_ov15_0217f800
_02189248: .word func_0203e7b4
_02189248: .word _ZN9ActorTypeD1Ev
_0218924c: .word data_ov15_02190418
_02189250: .word 0x00009998
_02189254: .word data_ov15_0218e8c8
@@ -127399,9 +127399,9 @@ func_ov15_0218925c: ; 0x0218925c
ldr r1, _0218928c ; =0x4653524c
ldr r2, _02189290 ; =func_ov15_02183b94
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02189288 ; =data_ov15_02190444
ldr r1, _02189294 ; =func_0203e7b4
ldr r1, _02189294 ; =_ZN9ActorTypeD1Ev
ldr r2, _02189298 ; =data_ov15_02190438
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -127410,7 +127410,7 @@ func_ov15_0218925c: ; 0x0218925c
_02189288: .word data_ov15_02190444
_0218928c: .word 0x4653524c
_02189290: .word func_ov15_02183b94
_02189294: .word func_0203e7b4
_02189294: .word _ZN9ActorTypeD1Ev
_02189298: .word data_ov15_02190438
.global func_ov15_0218929c
asm/ov17.inc
+2 -2
View File
@@ -186,8 +186,8 @@
.extern func_020349cc
.extern func_02034bc8
.extern func_02034cc4
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
asm/ov17.s
+18 -18
View File
@@ -20258,9 +20258,9 @@ func_ov17_0216b378: ; 0x0216b378
ldr r1, _0216b3a8 ; =0x424b4559
ldr r2, _0216b3ac ; =func_ov17_0215cef4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216b3a4 ; =data_ov17_0216ceec
ldr r1, _0216b3b0 ; =func_0203e7b4
ldr r1, _0216b3b0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216b3b4 ; =data_ov17_0216cee0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20269,7 +20269,7 @@ func_ov17_0216b378: ; 0x0216b378
_0216b3a4: .word data_ov17_0216ceec
_0216b3a8: .word 0x424b4559
_0216b3ac: .word func_ov17_0215cef4
_0216b3b0: .word func_0203e7b4
_0216b3b0: .word _ZN9ActorTypeD1Ev
_0216b3b4: .word data_ov17_0216cee0
.global func_ov17_0216b3b8
@@ -20280,9 +20280,9 @@ func_ov17_0216b3b8: ; 0x0216b3b8
ldr r1, _0216b3e8 ; =0x464f5243
ldr r2, _0216b3ec ; =func_ov17_0215e1c0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216b3e4 ; =data_ov17_0216cf0c
ldr r1, _0216b3f0 ; =func_0203e7b4
ldr r1, _0216b3f0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216b3f4 ; =data_ov17_0216cf00
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20291,7 +20291,7 @@ func_ov17_0216b3b8: ; 0x0216b3b8
_0216b3e4: .word data_ov17_0216cf0c
_0216b3e8: .word 0x464f5243
_0216b3ec: .word func_ov17_0215e1c0
_0216b3f0: .word func_0203e7b4
_0216b3f0: .word _ZN9ActorTypeD1Ev
_0216b3f4: .word data_ov17_0216cf00
.global func_ov17_0216b3f8
@@ -20302,9 +20302,9 @@ func_ov17_0216b3f8: ; 0x0216b3f8
ldr r1, _0216b428 ; =0x43525953
ldr r2, _0216b42c ; =func_ov17_0215f068
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216b424 ; =data_ov17_0216cf2c
ldr r1, _0216b430 ; =func_0203e7b4
ldr r1, _0216b430 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216b434 ; =data_ov17_0216cf20
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20313,7 +20313,7 @@ func_ov17_0216b3f8: ; 0x0216b3f8
_0216b424: .word data_ov17_0216cf2c
_0216b428: .word 0x43525953
_0216b42c: .word func_ov17_0215f068
_0216b430: .word func_0203e7b4
_0216b430: .word _ZN9ActorTypeD1Ev
_0216b434: .word data_ov17_0216cf20
.global func_ov17_0216b438
@@ -20340,9 +20340,9 @@ func_ov17_0216b460: ; 0x0216b460
ldr r1, _0216b490 ; =0x4e4b4559
ldr r2, _0216b494 ; =func_ov17_02160730
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216b48c ; =data_ov17_0216cf4c
ldr r1, _0216b498 ; =func_0203e7b4
ldr r1, _0216b498 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216b49c ; =data_ov17_0216cf40
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20351,7 +20351,7 @@ func_ov17_0216b460: ; 0x0216b460
_0216b48c: .word data_ov17_0216cf4c
_0216b490: .word 0x4e4b4559
_0216b494: .word func_ov17_02160730
_0216b498: .word func_0203e7b4
_0216b498: .word _ZN9ActorTypeD1Ev
_0216b49c: .word data_ov17_0216cf40
.global func_ov17_0216b4a0
@@ -20592,9 +20592,9 @@ func_ov17_0216b748: ; 0x0216b748
ldr r1, _0216b778 ; =0x5750484c
ldr r2, _0216b77c ; =func_ov17_02165404
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216b774 ; =data_ov17_0216d044
ldr r1, _0216b780 ; =func_0203e7b4
ldr r1, _0216b780 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216b784 ; =data_ov17_0216d038
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20603,7 +20603,7 @@ func_ov17_0216b748: ; 0x0216b748
_0216b774: .word data_ov17_0216d044
_0216b778: .word 0x5750484c
_0216b77c: .word func_ov17_02165404
_0216b780: .word func_0203e7b4
_0216b780: .word _ZN9ActorTypeD1Ev
_0216b784: .word data_ov17_0216d038
.global func_ov17_0216b788
@@ -20614,9 +20614,9 @@ func_ov17_0216b788: ; 0x0216b788
ldr r1, _0216b7b8 ; =0x52464c52
ldr r2, _0216b7bc ; =func_ov17_02166420
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216b7b4 ; =data_ov17_0216d064
ldr r1, _0216b7c0 ; =func_0203e7b4
ldr r1, _0216b7c0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216b7c4 ; =data_ov17_0216d058
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20625,7 +20625,7 @@ func_ov17_0216b788: ; 0x0216b788
_0216b7b4: .word data_ov17_0216d064
_0216b7b8: .word 0x52464c52
_0216b7bc: .word func_ov17_02166420
_0216b7c0: .word func_0203e7b4
_0216b7c0: .word _ZN9ActorTypeD1Ev
_0216b7c4: .word data_ov17_0216d058
.global func_ov17_0216b7c8
asm/ov18.inc
+2 -2
View File
@@ -203,8 +203,8 @@
.extern func_0203d1b4
.extern func_0203d7e0
.extern func_0203e2e8
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02043594
asm/ov18.s
+15 -15
View File
@@ -20171,9 +20171,9 @@ func_ov18_0216b780: ; 0x0216b780
ldr r1, _0216b870 ; =0x414e4353
ldr r2, _0216b874 ; =func_ov18_0215cf60
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216b86c ; =data_ov18_0216d44c
ldr r1, _0216b878 ; =func_0203e7b4
ldr r1, _0216b878 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216b87c ; =data_ov18_0216d440
bl __register_global_object
ldr r1, _0216b880 ; =0x0000023d
@@ -20230,7 +20230,7 @@ func_ov18_0216b780: ; 0x0216b780
_0216b86c: .word data_ov18_0216d44c
_0216b870: .word 0x414e4353
_0216b874: .word func_ov18_0215cf60
_0216b878: .word func_0203e7b4
_0216b878: .word _ZN9ActorTypeD1Ev
_0216b87c: .word data_ov18_0216d440
_0216b880: .word 0x0000023d
_0216b884: .word data_ov18_0216c25c
@@ -20748,9 +20748,9 @@ func_ov18_0216bed4: ; 0x0216bed4
ldr r1, _0216bf04 ; =0x504f5354
ldr r2, _0216bf08 ; =func_ov18_02164bbc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216bf00 ; =data_ov18_0216d5f0
ldr r1, _0216bf0c ; =func_0203e7b4
ldr r1, _0216bf0c ; =_ZN9ActorTypeD1Ev
ldr r2, _0216bf10 ; =data_ov18_0216d5e4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20759,7 +20759,7 @@ func_ov18_0216bed4: ; 0x0216bed4
_0216bf00: .word data_ov18_0216d5f0
_0216bf04: .word 0x504f5354
_0216bf08: .word func_ov18_02164bbc
_0216bf0c: .word func_0203e7b4
_0216bf0c: .word _ZN9ActorTypeD1Ev
_0216bf10: .word data_ov18_0216d5e4
.global func_ov18_0216bf14
@@ -20770,9 +20770,9 @@ func_ov18_0216bf14: ; 0x0216bf14
ldr r1, _0216bf44 ; =0x5053544d
ldr r2, _0216bf48 ; =func_ov18_02165b3c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216bf40 ; =data_ov18_0216d610
ldr r1, _0216bf4c ; =func_0203e7b4
ldr r1, _0216bf4c ; =_ZN9ActorTypeD1Ev
ldr r2, _0216bf50 ; =data_ov18_0216d604
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20781,7 +20781,7 @@ func_ov18_0216bf14: ; 0x0216bf14
_0216bf40: .word data_ov18_0216d610
_0216bf44: .word 0x5053544d
_0216bf48: .word func_ov18_02165b3c
_0216bf4c: .word func_0203e7b4
_0216bf4c: .word _ZN9ActorTypeD1Ev
_0216bf50: .word data_ov18_0216d604
.global func_ov18_0216bf54
@@ -20812,9 +20812,9 @@ func_ov18_0216bf8c: ; 0x0216bf8c
ldr r1, _0216bfe8 ; =0x43534546
ldr r2, _0216bfec ; =func_ov18_02168f84
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216bfe4 ; =data_ov18_0216d654
ldr r1, _0216bff0 ; =func_0203e7b4
ldr r1, _0216bff0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216bff4 ; =data_ov18_0216d648
bl __register_global_object
mov r1, #0
@@ -20834,7 +20834,7 @@ func_ov18_0216bf8c: ; 0x0216bf8c
_0216bfe4: .word data_ov18_0216d654
_0216bfe8: .word 0x43534546
_0216bfec: .word func_ov18_02168f84
_0216bff0: .word func_0203e7b4
_0216bff0: .word _ZN9ActorTypeD1Ev
_0216bff4: .word data_ov18_0216d648
_0216bff8: .word data_ov18_0216d254
_0216bffc: .word 0xfffff99a
@@ -20850,9 +20850,9 @@ func_ov18_0216c00c: ; 0x0216c00c
ldr r1, _0216c03c ; =0x48534b42
ldr r2, _0216c040 ; =func_ov18_0216a0e0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0216c038 ; =data_ov18_0216d684
ldr r1, _0216c044 ; =func_0203e7b4
ldr r1, _0216c044 ; =_ZN9ActorTypeD1Ev
ldr r2, _0216c048 ; =data_ov18_0216d678
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -20861,7 +20861,7 @@ func_ov18_0216c00c: ; 0x0216c00c
_0216c038: .word data_ov18_0216d684
_0216c03c: .word 0x48534b42
_0216c040: .word func_ov18_0216a0e0
_0216c044: .word func_0203e7b4
_0216c044: .word _ZN9ActorTypeD1Ev
_0216c048: .word data_ov18_0216d678
.section .ctor, 4, 1, 4
asm/ov19.inc
+10 -10
View File
@@ -18,6 +18,13 @@
.extern _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN13PlayerControl18func_ov00_020aeef8Ev
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -82,9 +89,12 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_02051254
.extern data_027e0764
@@ -157,14 +167,11 @@
.extern func_0203611c
.extern func_02036770
.extern func_020370d0
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f74
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207b2f0
@@ -231,13 +238,6 @@
.extern func_ov00_02093a3c
.extern func_ov00_02093a4c
.extern func_ov00_02094824
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209cbd4
asm/ov19.s
+18 -18
View File
@@ -10590,9 +10590,9 @@ func_ov19_02175f04: ; 0x02175f04
ldr r1, _02176000 ; =0x57425353
ldr r2, _02176004 ; =func_ov19_0216d6a0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02175ffc ; =data_ov19_02176e8c
ldr r1, _02176008 ; =func_0203e7b4
ldr r1, _02176008 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217600c ; =data_ov19_02176e80
bl __register_global_object
mov r2, #0
@@ -10651,7 +10651,7 @@ func_ov19_02175f04: ; 0x02175f04
_02175ffc: .word data_ov19_02176e8c
_02176000: .word 0x57425353
_02176004: .word func_ov19_0216d6a0
_02176008: .word func_0203e7b4
_02176008: .word _ZN9ActorTypeD1Ev
_0217600c: .word data_ov19_02176e80
_02176010: .word 0x00001333
_02176014: .word data_ov19_02176340
@@ -10666,9 +10666,9 @@ func_ov19_02176020: ; 0x02176020
ldr r1, _02176050 ; =0x57425341
ldr r2, _02176054 ; =func_ov19_02171614
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217604c ; =data_ov19_02176ebc
ldr r1, _02176058 ; =func_0203e7b4
ldr r1, _02176058 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217605c ; =data_ov19_02176eb0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -10677,7 +10677,7 @@ func_ov19_02176020: ; 0x02176020
_0217604c: .word data_ov19_02176ebc
_02176050: .word 0x57425341
_02176054: .word func_ov19_02171614
_02176058: .word func_0203e7b4
_02176058: .word _ZN9ActorTypeD1Ev
_0217605c: .word data_ov19_02176eb0
.global func_ov19_02176060
@@ -10688,9 +10688,9 @@ func_ov19_02176060: ; 0x02176060
ldr r1, _02176090 ; =0x57425354
ldr r2, _02176094 ; =func_ov19_02171fb0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217608c ; =data_ov19_021775bc
ldr r1, _02176098 ; =func_0203e7b4
ldr r1, _02176098 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217609c ; =data_ov19_021775b0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -10699,7 +10699,7 @@ func_ov19_02176060: ; 0x02176060
_0217608c: .word data_ov19_021775bc
_02176090: .word 0x57425354
_02176094: .word func_ov19_02171fb0
_02176098: .word func_0203e7b4
_02176098: .word _ZN9ActorTypeD1Ev
_0217609c: .word data_ov19_021775b0
.global func_ov19_021760a0
@@ -10710,9 +10710,9 @@ func_ov19_021760a0: ; 0x021760a0
ldr r1, _021760d0 ; =0x574e4152
ldr r2, _021760d4 ; =func_ov19_021724b4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021760cc ; =data_ov19_021775dc
ldr r1, _021760d8 ; =func_0203e7b4
ldr r1, _021760d8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021760dc ; =data_ov19_021775d0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -10721,7 +10721,7 @@ func_ov19_021760a0: ; 0x021760a0
_021760cc: .word data_ov19_021775dc
_021760d0: .word 0x574e4152
_021760d4: .word func_ov19_021724b4
_021760d8: .word func_0203e7b4
_021760d8: .word _ZN9ActorTypeD1Ev
_021760dc: .word data_ov19_021775d0
.global func_ov19_021760e0
@@ -10793,9 +10793,9 @@ func_ov19_02176188: ; 0x02176188
ldr r1, _02176278 ; =0x4d4c4457
ldr r2, _0217627c ; =func_ov19_02174078
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02176274 ; =data_ov19_02177638
ldr r1, _02176280 ; =func_0203e7b4
ldr r1, _02176280 ; =_ZN9ActorTypeD1Ev
ldr r2, _02176284 ; =data_ov19_0217762c
bl __register_global_object
mov r0, #6
@@ -10851,7 +10851,7 @@ func_ov19_02176188: ; 0x02176188
_02176274: .word data_ov19_02177638
_02176278: .word 0x4d4c4457
_0217627c: .word func_ov19_02174078
_02176280: .word func_0203e7b4
_02176280: .word _ZN9ActorTypeD1Ev
_02176284: .word data_ov19_0217762c
_02176288: .word data_ov19_02176b88
_0217628c: .word func_ov00_020cceec
@@ -10865,9 +10865,9 @@ func_ov19_02176294: ; 0x02176294
ldr r1, _021762c4 ; =0x45465357
ldr r2, _021762c8 ; =func_ov19_021756c4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021762c0 ; =data_ov19_02177664
ldr r1, _021762cc ; =func_0203e7b4
ldr r1, _021762cc ; =_ZN9ActorTypeD1Ev
ldr r2, _021762d0 ; =data_ov19_02177658
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -10876,7 +10876,7 @@ func_ov19_02176294: ; 0x02176294
_021762c0: .word data_ov19_02177664
_021762c4: .word 0x45465357
_021762c8: .word func_ov19_021756c4
_021762cc: .word func_0203e7b4
_021762cc: .word _ZN9ActorTypeD1Ev
_021762d0: .word data_ov19_02177658
.section .ctor, 4, 1, 4
asm/ov20.inc
+2 -2
View File
@@ -146,8 +146,8 @@
.extern func_02036770
.extern func_02036edc
.extern func_020370d0
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f68
asm/ov20.s
+42 -42
View File
@@ -12750,9 +12750,9 @@ func_ov20_02177af4: ; 0x02177af4
ldr r1, _02177bf4 ; =0x46425353
ldr r2, _02177bf8 ; =func_ov20_0216d6a0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02177bf0 ; =data_ov20_0217950c
ldr r1, _02177bfc ; =func_0203e7b4
ldr r1, _02177bfc ; =_ZN9ActorTypeD1Ev
ldr r2, _02177c00 ; =data_ov20_02179500
bl __register_global_object
mov r3, #0
@@ -12812,7 +12812,7 @@ func_ov20_02177af4: ; 0x02177af4
_02177bf0: .word data_ov20_0217950c
_02177bf4: .word 0x46425353
_02177bf8: .word func_ov20_0216d6a0
_02177bfc: .word func_0203e7b4
_02177bfc: .word _ZN9ActorTypeD1Ev
_02177c00: .word data_ov20_02179500
_02177c04: .word 0x00001b33
_02177c08: .word 0x00001555
@@ -12829,9 +12829,9 @@ func_ov20_02177c18: ; 0x02177c18
ldr r1, _02177d04 ; =0x46425331
ldr r2, _02177d08 ; =func_ov20_02170108
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02177d00 ; =data_ov20_02179538
ldr r1, _02177d0c ; =func_0203e7b4
ldr r1, _02177d0c ; =_ZN9ActorTypeD1Ev
ldr r2, _02177d10 ; =data_ov20_0217952c
bl __register_global_object
mov r3, #0
@@ -12886,7 +12886,7 @@ func_ov20_02177c18: ; 0x02177c18
_02177d00: .word data_ov20_02179538
_02177d04: .word 0x46425331
_02177d08: .word func_ov20_02170108
_02177d0c: .word func_0203e7b4
_02177d0c: .word _ZN9ActorTypeD1Ev
_02177d10: .word data_ov20_0217952c
_02177d14: .word 0x000004cd
_02177d18: .word data_ov20_021784c4
@@ -12901,9 +12901,9 @@ func_ov20_02177d24: ; 0x02177d24
ldr r1, _02177d54 ; =0x46425334
ldr r2, _02177d58 ; =func_ov20_0217176c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02177d50 ; =data_ov20_02179564
ldr r1, _02177d5c ; =func_0203e7b4
ldr r1, _02177d5c ; =_ZN9ActorTypeD1Ev
ldr r2, _02177d60 ; =data_ov20_02179558
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -12912,7 +12912,7 @@ func_ov20_02177d24: ; 0x02177d24
_02177d50: .word data_ov20_02179564
_02177d54: .word 0x46425334
_02177d58: .word func_ov20_0217176c
_02177d5c: .word func_0203e7b4
_02177d5c: .word _ZN9ActorTypeD1Ev
_02177d60: .word data_ov20_02179558
.global func_ov20_02177d64
@@ -12923,9 +12923,9 @@ func_ov20_02177d64: ; 0x02177d64
ldr r1, _02177d94 ; =0x564c5230
ldr r2, _02177d98 ; =func_ov20_02171c58
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02177d90 ; =data_ov20_02179584
ldr r1, _02177d9c ; =func_0203e7b4
ldr r1, _02177d9c ; =_ZN9ActorTypeD1Ev
ldr r2, _02177da0 ; =data_ov20_02179578
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -12934,7 +12934,7 @@ func_ov20_02177d64: ; 0x02177d64
_02177d90: .word data_ov20_02179584
_02177d94: .word 0x564c5230
_02177d98: .word func_ov20_02171c58
_02177d9c: .word func_0203e7b4
_02177d9c: .word _ZN9ActorTypeD1Ev
_02177da0: .word data_ov20_02179578
.global func_ov20_02177da4
@@ -12945,9 +12945,9 @@ func_ov20_02177da4: ; 0x02177da4
ldr r1, _02177dd4 ; =0x564c5247
ldr r2, _02177dd8 ; =func_ov20_021726dc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02177dd0 ; =data_ov20_021795a4
ldr r1, _02177ddc ; =func_0203e7b4
ldr r1, _02177ddc ; =_ZN9ActorTypeD1Ev
ldr r2, _02177de0 ; =data_ov20_02179598
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -12956,7 +12956,7 @@ func_ov20_02177da4: ; 0x02177da4
_02177dd0: .word data_ov20_021795a4
_02177dd4: .word 0x564c5247
_02177dd8: .word func_ov20_021726dc
_02177ddc: .word func_0203e7b4
_02177ddc: .word _ZN9ActorTypeD1Ev
_02177de0: .word data_ov20_02179598
.global func_ov20_02177de4
@@ -13043,9 +13043,9 @@ func_ov20_02177efc: ; 0x02177efc
ldr r1, _02177f2c ; =0x4346544c
ldr r2, _02177f30 ; =func_ov20_02173958
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02177f28 ; =data_ov20_021795e4
ldr r1, _02177f34 ; =func_0203e7b4
ldr r1, _02177f34 ; =_ZN9ActorTypeD1Ev
ldr r2, _02177f38 ; =data_ov20_021795d8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13054,7 +13054,7 @@ func_ov20_02177efc: ; 0x02177efc
_02177f28: .word data_ov20_021795e4
_02177f2c: .word 0x4346544c
_02177f30: .word func_ov20_02173958
_02177f34: .word func_0203e7b4
_02177f34: .word _ZN9ActorTypeD1Ev
_02177f38: .word data_ov20_021795d8
.global func_ov20_02177f3c
@@ -13065,9 +13065,9 @@ func_ov20_02177f3c: ; 0x02177f3c
ldr r1, _02177f6c ; =0x564c4352
ldr r2, _02177f70 ; =func_ov20_02174110
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02177f68 ; =data_ov20_02179604
ldr r1, _02177f74 ; =func_0203e7b4
ldr r1, _02177f74 ; =_ZN9ActorTypeD1Ev
ldr r2, _02177f78 ; =data_ov20_021795f8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13076,7 +13076,7 @@ func_ov20_02177f3c: ; 0x02177f3c
_02177f68: .word data_ov20_02179604
_02177f6c: .word 0x564c4352
_02177f70: .word func_ov20_02174110
_02177f74: .word func_0203e7b4
_02177f74: .word _ZN9ActorTypeD1Ev
_02177f78: .word data_ov20_021795f8
.global func_ov20_02177f7c
@@ -13088,9 +13088,9 @@ func_ov20_02177f7c: ; 0x02177f7c
ldr r1, _02178084 ; =0x54454b54
ldr r2, _02178088 ; =func_ov20_02174314
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178080 ; =data_ov20_02179624
ldr r1, _0217808c ; =func_0203e7b4
ldr r1, _0217808c ; =_ZN9ActorTypeD1Ev
ldr r2, _02178090 ; =data_ov20_02179618
bl __register_global_object
mov r3, #1
@@ -13152,7 +13152,7 @@ func_ov20_02177f7c: ; 0x02177f7c
_02178080: .word data_ov20_02179624
_02178084: .word 0x54454b54
_02178088: .word func_ov20_02174314
_0217808c: .word func_0203e7b4
_0217808c: .word _ZN9ActorTypeD1Ev
_02178090: .word data_ov20_02179618
_02178094: .word 0x00001b33
_02178098: .word 0x00001555
@@ -13188,9 +13188,9 @@ func_ov20_021780e0: ; 0x021780e0
ldr r1, _02178110 ; =0x564c4344
ldr r2, _02178114 ; =func_ov20_021758f4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217810c ; =data_ov20_02179664
ldr r1, _02178118 ; =func_0203e7b4
ldr r1, _02178118 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217811c ; =data_ov20_02179658
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13199,7 +13199,7 @@ func_ov20_021780e0: ; 0x021780e0
_0217810c: .word data_ov20_02179664
_02178110: .word 0x564c4344
_02178114: .word func_ov20_021758f4
_02178118: .word func_0203e7b4
_02178118: .word _ZN9ActorTypeD1Ev
_0217811c: .word data_ov20_02179658
.global func_ov20_02178120
@@ -13210,9 +13210,9 @@ func_ov20_02178120: ; 0x02178120
ldr r1, _02178150 ; =0x42524d46
ldr r2, _02178154 ; =func_ov20_02175fb8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217814c ; =data_ov20_02179684
ldr r1, _02178158 ; =func_0203e7b4
ldr r1, _02178158 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217815c ; =data_ov20_02179678
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13221,7 +13221,7 @@ func_ov20_02178120: ; 0x02178120
_0217814c: .word data_ov20_02179684
_02178150: .word 0x42524d46
_02178154: .word func_ov20_02175fb8
_02178158: .word func_0203e7b4
_02178158: .word _ZN9ActorTypeD1Ev
_0217815c: .word data_ov20_02179678
.global func_ov20_02178160
@@ -13232,9 +13232,9 @@ func_ov20_02178160: ; 0x02178160
ldr r1, _02178190 ; =0x4b415349
ldr r2, _02178194 ; =func_ov20_0217611c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217818c ; =data_ov20_021796a4
ldr r1, _02178198 ; =func_0203e7b4
ldr r1, _02178198 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217819c ; =data_ov20_02179698
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13243,7 +13243,7 @@ func_ov20_02178160: ; 0x02178160
_0217818c: .word data_ov20_021796a4
_02178190: .word 0x4b415349
_02178194: .word func_ov20_0217611c
_02178198: .word func_0203e7b4
_02178198: .word _ZN9ActorTypeD1Ev
_0217819c: .word data_ov20_02179698
.global func_ov20_021781a0
@@ -13254,9 +13254,9 @@ func_ov20_021781a0: ; 0x021781a0
ldr r1, _021781d0 ; =0x524d4654
ldr r2, _021781d4 ; =func_ov20_02176874
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021781cc ; =data_ov20_021796c4
ldr r1, _021781d8 ; =func_0203e7b4
ldr r1, _021781d8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021781dc ; =data_ov20_021796b8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13265,7 +13265,7 @@ func_ov20_021781a0: ; 0x021781a0
_021781cc: .word data_ov20_021796c4
_021781d0: .word 0x524d4654
_021781d4: .word func_ov20_02176874
_021781d8: .word func_0203e7b4
_021781d8: .word _ZN9ActorTypeD1Ev
_021781dc: .word data_ov20_021796b8
.global func_ov20_021781e0
@@ -13276,9 +13276,9 @@ func_ov20_021781e0: ; 0x021781e0
ldr r1, _02178210 ; =0x4c415641
ldr r2, _02178214 ; =func_ov20_02176e00
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217820c ; =data_ov20_021796e4
ldr r1, _02178218 ; =func_0203e7b4
ldr r1, _02178218 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217821c ; =data_ov20_021796d8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13287,7 +13287,7 @@ func_ov20_021781e0: ; 0x021781e0
_0217820c: .word data_ov20_021796e4
_02178210: .word 0x4c415641
_02178214: .word func_ov20_02176e00
_02178218: .word func_0203e7b4
_02178218: .word _ZN9ActorTypeD1Ev
_0217821c: .word data_ov20_021796d8
.global func_ov20_02178220
@@ -13318,9 +13318,9 @@ func_ov20_02178258: ; 0x02178258
ldr r1, _02178288 ; =0x4546574c
ldr r2, _0217828c ; =func_ov20_021775d0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178284 ; =data_ov20_02179718
ldr r1, _02178290 ; =func_0203e7b4
ldr r1, _02178290 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178294 ; =data_ov20_0217970c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13329,7 +13329,7 @@ func_ov20_02178258: ; 0x02178258
_02178284: .word data_ov20_02179718
_02178288: .word 0x4546574c
_0217828c: .word func_ov20_021775d0
_02178290: .word func_0203e7b4
_02178290: .word _ZN9ActorTypeD1Ev
_02178294: .word data_ov20_0217970c
.section .ctor, 4, 1, 4
asm/ov21.inc
+3 -3
View File
@@ -57,9 +57,12 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_027e0764
.extern data_027e077c
@@ -109,12 +112,9 @@
.extern func_0202bc10
.extern func_0202e310
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_020791dc
.extern func_ov00_020792a0
.extern func_ov00_020793b8
asm/ov21.s
+20 -20
View File
@@ -4476,9 +4476,9 @@ func_ov21_02170d24: ; 0x02170d24
ldr r1, _02170d54 ; =0x504c5356
ldr r2, _02170d58 ; =func_ov21_0216dae0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02170d50 ; =data_ov21_02171b00
ldr r1, _02170d5c ; =func_0203e7b4
ldr r1, _02170d5c ; =_ZN9ActorTypeD1Ev
ldr r2, _02170d60 ; =data_ov21_02171af4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -4487,7 +4487,7 @@ func_ov21_02170d24: ; 0x02170d24
_02170d50: .word data_ov21_02171b00
_02170d54: .word 0x504c5356
_02170d58: .word func_ov21_0216dae0
_02170d5c: .word func_0203e7b4
_02170d5c: .word _ZN9ActorTypeD1Ev
_02170d60: .word data_ov21_02171af4
.global func_ov21_02170d64
@@ -4498,45 +4498,45 @@ func_ov21_02170d64: ; 0x02170d64
ldr r1, _02170e24 ; =0x434d4d4c
ldr r2, _02170e28 ; =func_ov21_0216ece8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02170e20 ; =data_ov21_02171b20
ldr r1, _02170e2c ; =func_0203e7b4
ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev
ldr r2, _02170e30 ; =data_ov21_02171b14
bl __register_global_object
ldr r0, _02170e34 ; =data_ov21_02171b40
ldr r1, _02170e38 ; =0x434d4d53
ldr r2, _02170e3c ; =func_ov21_0216ed74
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02170e34 ; =data_ov21_02171b40
ldr r1, _02170e2c ; =func_0203e7b4
ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev
ldr r2, _02170e40 ; =data_ov21_02171b34
bl __register_global_object
ldr r0, _02170e44 ; =data_ov21_02171b60
ldr r1, _02170e48 ; =0x43434c44
ldr r2, _02170e4c ; =func_ov21_0216edf0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02170e44 ; =data_ov21_02171b60
ldr r1, _02170e2c ; =func_0203e7b4
ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev
ldr r2, _02170e50 ; =data_ov21_02171b54
bl __register_global_object
ldr r0, _02170e54 ; =data_ov21_02171b80
ldr r1, _02170e58 ; =0x43534f4e
ldr r2, _02170e5c ; =func_ov21_0216eed8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02170e54 ; =data_ov21_02171b80
ldr r1, _02170e2c ; =func_0203e7b4
ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev
ldr r2, _02170e60 ; =data_ov21_02171b74
bl __register_global_object
ldr r0, _02170e64 ; =data_ov21_02171ba0
ldr r1, _02170e68 ; =0x43574946
ldr r2, _02170e6c ; =func_ov21_0216ef54
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02170e64 ; =data_ov21_02171ba0
ldr r1, _02170e2c ; =func_0203e7b4
ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev
ldr r2, _02170e70 ; =data_ov21_02171b94
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -4545,7 +4545,7 @@ func_ov21_02170d64: ; 0x02170d64
_02170e20: .word data_ov21_02171b20
_02170e24: .word 0x434d4d4c
_02170e28: .word func_ov21_0216ece8
_02170e2c: .word func_0203e7b4
_02170e2c: .word _ZN9ActorTypeD1Ev
_02170e30: .word data_ov21_02171b14
_02170e34: .word data_ov21_02171b40
_02170e38: .word 0x434d4d53
@@ -4572,9 +4572,9 @@ func_ov21_02170e74: ; 0x02170e74
ldr r1, _02170ea4 ; =0x50464c52
ldr r2, _02170ea8 ; =func_ov21_0216f100
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02170ea0 ; =data_ov21_02171bc0
ldr r1, _02170eac ; =func_0203e7b4
ldr r1, _02170eac ; =_ZN9ActorTypeD1Ev
ldr r2, _02170eb0 ; =data_ov21_02171bb4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -4583,7 +4583,7 @@ func_ov21_02170e74: ; 0x02170e74
_02170ea0: .word data_ov21_02171bc0
_02170ea4: .word 0x50464c52
_02170ea8: .word func_ov21_0216f100
_02170eac: .word func_0203e7b4
_02170eac: .word _ZN9ActorTypeD1Ev
_02170eb0: .word data_ov21_02171bb4
.global func_ov21_02170eb4
@@ -4614,9 +4614,9 @@ func_ov21_02170eec: ; 0x02170eec
ldr r1, _02170f1c ; =0x5352574c
ldr r2, _02170f20 ; =func_ov21_02170714
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02170f18 ; =data_ov21_02171c8c
ldr r1, _02170f24 ; =func_0203e7b4
ldr r1, _02170f24 ; =_ZN9ActorTypeD1Ev
ldr r2, _02170f28 ; =data_ov21_02171c80
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -4625,7 +4625,7 @@ func_ov21_02170eec: ; 0x02170eec
_02170f18: .word data_ov21_02171c8c
_02170f1c: .word 0x5352574c
_02170f20: .word func_ov21_02170714
_02170f24: .word func_0203e7b4
_02170f24: .word _ZN9ActorTypeD1Ev
_02170f28: .word data_ov21_02171c80
.global func_ov21_02170f2c
asm/ov22.inc
+9 -9
View File
@@ -11,6 +11,12 @@
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase18func_ov00_020a8954EbPi
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags3GetEj
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -71,8 +77,11 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_027e0764
@@ -151,13 +160,10 @@
.extern func_0202e310
.extern func_0202e544
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern func_ov00_0207a1c8
@@ -239,12 +245,6 @@
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a6110
asm/ov22.s
+36 -36
View File
@@ -14307,9 +14307,9 @@ func_ov22_021789c8: ; 0x021789c8
ldr r1, _021789f8 ; =0x424c4152
ldr r2, _021789fc ; =func_ov22_0216d6a0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021789f4 ; =data_ov22_0217a40c
ldr r1, _02178a00 ; =func_0203e7b4
ldr r1, _02178a00 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178a04 ; =data_ov22_0217a400
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14318,7 +14318,7 @@ func_ov22_021789c8: ; 0x021789c8
_021789f4: .word data_ov22_0217a40c
_021789f8: .word 0x424c4152
_021789fc: .word func_ov22_0216d6a0
_02178a00: .word func_0203e7b4
_02178a00: .word _ZN9ActorTypeD1Ev
_02178a04: .word data_ov22_0217a400
.global func_ov22_02178a08
@@ -14370,27 +14370,27 @@ func_ov22_02178a78: ; 0x02178a78
ldr r1, _02178b30 ; =0x534e574d
ldr r2, _02178b34 ; =func_ov22_0216f2d4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178b2c ; =data_ov22_0217a454
ldr r1, _02178b38 ; =func_0203e7b4
ldr r1, _02178b38 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178b3c ; =data_ov22_0217a448
bl __register_global_object
ldr r0, _02178b40 ; =data_ov22_0217a474
ldr r1, _02178b44 ; =0x534e4d42
ldr r2, _02178b48 ; =func_ov22_0216f308
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178b40 ; =data_ov22_0217a474
ldr r1, _02178b38 ; =func_0203e7b4
ldr r1, _02178b38 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178b4c ; =data_ov22_0217a468
bl __register_global_object
ldr r0, _02178b50 ; =data_ov22_0217a494
ldr r1, _02178b54 ; =0x534e4d59
ldr r2, _02178b58 ; =func_ov22_0216f33c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178b50 ; =data_ov22_0217a494
ldr r1, _02178b38 ; =func_0203e7b4
ldr r1, _02178b38 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178b5c ; =data_ov22_0217a488
bl __register_global_object
ldr r1, _02178b60 ; =data_02057200
@@ -14414,7 +14414,7 @@ func_ov22_02178a78: ; 0x02178a78
_02178b2c: .word data_ov22_0217a454
_02178b30: .word 0x534e574d
_02178b34: .word func_ov22_0216f2d4
_02178b38: .word func_0203e7b4
_02178b38: .word _ZN9ActorTypeD1Ev
_02178b3c: .word data_ov22_0217a448
_02178b40: .word data_ov22_0217a474
_02178b44: .word 0x534e4d42
@@ -14436,9 +14436,9 @@ func_ov22_02178b68: ; 0x02178b68
ldr r1, _02178c74 ; =0x59455449
ldr r2, _02178c78 ; =func_ov22_021713bc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178c70 ; =data_ov22_0217a4b4
ldr r1, _02178c7c ; =func_0203e7b4
ldr r1, _02178c7c ; =_ZN9ActorTypeD1Ev
ldr r2, _02178c80 ; =data_ov22_0217a4a8
bl __register_global_object
mov ip, #1
@@ -14501,7 +14501,7 @@ func_ov22_02178b68: ; 0x02178b68
_02178c70: .word data_ov22_0217a4b4
_02178c74: .word 0x59455449
_02178c78: .word func_ov22_021713bc
_02178c7c: .word func_0203e7b4
_02178c7c: .word _ZN9ActorTypeD1Ev
_02178c80: .word data_ov22_0217a4a8
_02178c84: .word 0x00000b33
_02178c88: .word 0x00001555
@@ -14517,9 +14517,9 @@ func_ov22_02178c98: ; 0x02178c98
ldr r1, _02178cc8 ; =0x48504c50
ldr r2, _02178ccc ; =func_ov22_02173758
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178cc4 ; =data_ov22_0217a4e0
ldr r1, _02178cd0 ; =func_0203e7b4
ldr r1, _02178cd0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178cd4 ; =data_ov22_0217a4d4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14528,7 +14528,7 @@ func_ov22_02178c98: ; 0x02178c98
_02178cc4: .word data_ov22_0217a4e0
_02178cc8: .word 0x48504c50
_02178ccc: .word func_ov22_02173758
_02178cd0: .word func_0203e7b4
_02178cd0: .word _ZN9ActorTypeD1Ev
_02178cd4: .word data_ov22_0217a4d4
.global func_ov22_02178cd8
@@ -14539,9 +14539,9 @@ func_ov22_02178cd8: ; 0x02178cd8
ldr r1, _02178d08 ; =0x484c4d4b
ldr r2, _02178d0c ; =func_ov22_021748a0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178d04 ; =data_ov22_0217a500
ldr r1, _02178d10 ; =func_0203e7b4
ldr r1, _02178d10 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178d14 ; =data_ov22_0217a4f4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14550,7 +14550,7 @@ func_ov22_02178cd8: ; 0x02178cd8
_02178d04: .word data_ov22_0217a500
_02178d08: .word 0x484c4d4b
_02178d0c: .word func_ov22_021748a0
_02178d10: .word func_0203e7b4
_02178d10: .word _ZN9ActorTypeD1Ev
_02178d14: .word data_ov22_0217a4f4
.global func_ov22_02178d18
@@ -14561,9 +14561,9 @@ func_ov22_02178d18: ; 0x02178d18
ldr r1, _02178d48 ; =0x49434645
ldr r2, _02178d4c ; =func_ov22_02174dbc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178d44 ; =data_ov22_0217a520
ldr r1, _02178d50 ; =func_0203e7b4
ldr r1, _02178d50 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178d54 ; =data_ov22_0217a514
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14572,7 +14572,7 @@ func_ov22_02178d18: ; 0x02178d18
_02178d44: .word data_ov22_0217a520
_02178d48: .word 0x49434645
_02178d4c: .word func_ov22_02174dbc
_02178d50: .word func_0203e7b4
_02178d50: .word _ZN9ActorTypeD1Ev
_02178d54: .word data_ov22_0217a514
.global func_ov22_02178d58
@@ -14603,9 +14603,9 @@ func_ov22_02178d90: ; 0x02178d90
ldr r1, _02178dc0 ; =0x534e4546
ldr r2, _02178dc4 ; =func_ov22_0217562c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178dbc ; =data_ov22_0217a554
ldr r1, _02178dc8 ; =func_0203e7b4
ldr r1, _02178dc8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178dcc ; =data_ov22_0217a548
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14614,7 +14614,7 @@ func_ov22_02178d90: ; 0x02178d90
_02178dbc: .word data_ov22_0217a554
_02178dc0: .word 0x534e4546
_02178dc4: .word func_ov22_0217562c
_02178dc8: .word func_0203e7b4
_02178dc8: .word _ZN9ActorTypeD1Ev
_02178dcc: .word data_ov22_0217a548
.global func_ov22_02178dd0
@@ -14625,9 +14625,9 @@ func_ov22_02178dd0: ; 0x02178dd0
ldr r1, _02178e00 ; =0x42524d49
ldr r2, _02178e04 ; =func_ov22_02175a78
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178dfc ; =data_ov22_0217a578
ldr r1, _02178e08 ; =func_0203e7b4
ldr r1, _02178e08 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178e0c ; =data_ov22_0217a56c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14636,7 +14636,7 @@ func_ov22_02178dd0: ; 0x02178dd0
_02178dfc: .word data_ov22_0217a578
_02178e00: .word 0x42524d49
_02178e04: .word func_ov22_02175a78
_02178e08: .word func_0203e7b4
_02178e08: .word _ZN9ActorTypeD1Ev
_02178e0c: .word data_ov22_0217a56c
.global func_ov22_02178e10
@@ -14688,9 +14688,9 @@ func_ov22_02178e80: ; 0x02178e80
ldr r1, _02178ef8 ; =0x54534e4d
ldr r2, _02178efc ; =func_ov22_021769d4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178ef4 ; =data_ov22_0217a5c0
ldr r1, _02178f00 ; =func_0203e7b4
ldr r1, _02178f00 ; =_ZN9ActorTypeD1Ev
ldr r2, _02178f04 ; =data_ov22_0217a5b4
bl __register_global_object
ldr r1, _02178f08 ; =data_02057200
@@ -14716,7 +14716,7 @@ func_ov22_02178e80: ; 0x02178e80
_02178ef4: .word data_ov22_0217a5c0
_02178ef8: .word 0x54534e4d
_02178efc: .word func_ov22_021769d4
_02178f00: .word func_0203e7b4
_02178f00: .word _ZN9ActorTypeD1Ev
_02178f04: .word data_ov22_0217a5b4
_02178f08: .word data_02057200
_02178f0c: .word data_ov22_02179d5c
@@ -14769,18 +14769,18 @@ func_ov22_02178f80: ; 0x02178f80
ldr r1, _02178fd4 ; =0x59455457
ldr r2, _02178fd8 ; =func_ov22_021782d8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178fd0 ; =data_ov22_0217a60c
ldr r1, _02178fdc ; =func_0203e7b4
ldr r1, _02178fdc ; =_ZN9ActorTypeD1Ev
ldr r2, _02178fe0 ; =data_ov22_0217a600
bl __register_global_object
ldr r0, _02178fe4 ; =data_ov22_0217a62c
ldr r1, _02178fe8 ; =0x59455442
ldr r2, _02178fec ; =func_ov22_02178308
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178fe4 ; =data_ov22_0217a62c
ldr r1, _02178fdc ; =func_0203e7b4
ldr r1, _02178fdc ; =_ZN9ActorTypeD1Ev
ldr r2, _02178ff0 ; =data_ov22_0217a620
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14789,7 +14789,7 @@ func_ov22_02178f80: ; 0x02178f80
_02178fd0: .word data_ov22_0217a60c
_02178fd4: .word 0x59455457
_02178fd8: .word func_ov22_021782d8
_02178fdc: .word func_0203e7b4
_02178fdc: .word _ZN9ActorTypeD1Ev
_02178fe0: .word data_ov22_0217a600
_02178fe4: .word data_ov22_0217a62c
_02178fe8: .word 0x59455442
asm/ov23.inc
+11 -11
View File
@@ -29,6 +29,14 @@
.extern _ZN13PlayerControl14GetFollowActorEv
.extern _ZN13PlayerControl18func_ov00_020b034cEv
.extern _ZN13PlayerControl9SetUnk_80Ev
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
@@ -90,9 +98,12 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02057200
@@ -195,13 +206,10 @@
.extern func_02036ce4
.extern func_020385b8
.extern func_0203d7e0
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_02079470
.extern func_ov00_0207977c
.extern func_ov00_02079eb4
@@ -284,14 +292,6 @@
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_020965c0
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a41e4
asm/ov23.s
+29 -29
View File
@@ -15208,45 +15208,45 @@ func_ov23_02179698: ; 0x02179698
str r4, [sp]
str lr, [sp, #4]
str lr, [ip, #0x8c]
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179798 ; =data_ov23_0217ab6c
ldr r1, _021797a4 ; =func_0203e7b4
ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021797a8 ; =data_ov23_0217ab60
bl __register_global_object
ldr r0, _021797ac ; =data_ov23_0217ab8c
ldr r1, _021797b0 ; =0x47524e57
ldr r2, _021797b4 ; =func_ov23_0216e818
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021797ac ; =data_ov23_0217ab8c
ldr r1, _021797a4 ; =func_0203e7b4
ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021797b8 ; =data_ov23_0217ab80
bl __register_global_object
ldr r0, _021797bc ; =data_ov23_0217abac
ldr r1, _021797c0 ; =0x47524e43
ldr r2, _021797c4 ; =func_ov23_0216e848
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021797bc ; =data_ov23_0217abac
ldr r1, _021797a4 ; =func_0203e7b4
ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021797c8 ; =data_ov23_0217aba0
bl __register_global_object
ldr r0, _021797cc ; =data_ov23_0217abcc
ldr r1, _021797d0 ; =0x47524342
ldr r2, _021797d4 ; =func_ov23_0216e878
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021797cc ; =data_ov23_0217abcc
ldr r1, _021797a4 ; =func_0203e7b4
ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021797d8 ; =data_ov23_0217abc0
bl __register_global_object
ldr r0, _021797dc ; =data_ov23_0217abec
ldr r1, _021797e0 ; =0x47524d47
ldr r2, _021797e4 ; =func_ov23_0216e8a8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021797dc ; =data_ov23_0217abec
ldr r1, _021797a4 ; =func_0203e7b4
ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021797e8 ; =data_ov23_0217abe0
bl __register_global_object
add sp, sp, #8
@@ -15258,7 +15258,7 @@ _02179794: .word data_ov23_02179d20
_02179798: .word data_ov23_0217ab6c
_0217979c: .word 0x47524e4d
_021797a0: .word func_ov23_0216e7e8
_021797a4: .word func_0203e7b4
_021797a4: .word _ZN9ActorTypeD1Ev
_021797a8: .word data_ov23_0217ab60
_021797ac: .word data_ov23_0217ab8c
_021797b0: .word 0x47524e57
@@ -15285,9 +15285,9 @@ func_ov23_021797ec: ; 0x021797ec
ldr r1, _02179834 ; =0x47524e45
ldr r2, _02179838 ; =func_ov23_0216e8d8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179830 ; =data_ov23_0217ac0c
ldr r1, _0217983c ; =func_0203e7b4
ldr r1, _0217983c ; =_ZN9ActorTypeD1Ev
ldr r2, _02179840 ; =data_ov23_0217ac00
bl __register_global_object
ldr r1, _02179844 ; =data_02057200
@@ -15302,7 +15302,7 @@ func_ov23_021797ec: ; 0x021797ec
_02179830: .word data_ov23_0217ac0c
_02179834: .word 0x47524e45
_02179838: .word func_ov23_0216e8d8
_0217983c: .word func_0203e7b4
_0217983c: .word _ZN9ActorTypeD1Ev
_02179840: .word data_ov23_0217ac00
_02179844: .word data_02057200
_02179848: .word data_ov23_02179ed8
@@ -15316,9 +15316,9 @@ func_ov23_0217984c: ; 0x0217984c
ldr r1, _02179958 ; =0x414d4f53
ldr r2, _0217995c ; =func_ov23_0216f0c4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179954 ; =data_ov23_0217ac2c
ldr r1, _02179960 ; =func_0203e7b4
ldr r1, _02179960 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179964 ; =data_ov23_0217ac20
bl __register_global_object
mov ip, #1
@@ -15381,7 +15381,7 @@ func_ov23_0217984c: ; 0x0217984c
_02179954: .word data_ov23_0217ac2c
_02179958: .word 0x414d4f53
_0217995c: .word func_ov23_0216f0c4
_02179960: .word func_0203e7b4
_02179960: .word _ZN9ActorTypeD1Ev
_02179964: .word data_ov23_0217ac20
_02179968: .word 0x00001333
_0217996c: .word data_ov23_0217a030
@@ -15410,9 +15410,9 @@ func_ov23_02179998: ; 0x02179998
ldr r1, _021799c8 ; =0x50534241
ldr r2, _021799cc ; =func_ov23_021721e0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799c4 ; =data_ov23_0217ac6c
ldr r1, _021799d0 ; =func_0203e7b4
ldr r1, _021799d0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021799d4 ; =data_ov23_0217ac60
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15421,7 +15421,7 @@ func_ov23_02179998: ; 0x02179998
_021799c4: .word data_ov23_0217ac6c
_021799c8: .word 0x50534241
_021799cc: .word func_ov23_021721e0
_021799d0: .word func_0203e7b4
_021799d0: .word _ZN9ActorTypeD1Ev
_021799d4: .word data_ov23_0217ac60
.global func_ov23_021799d8
@@ -15433,9 +15433,9 @@ func_ov23_021799d8: ; 0x021799d8
ldr r1, _02179ae4 ; =0x484e4b53
ldr r2, _02179ae8 ; =func_ov23_02172534
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179ae0 ; =data_ov23_0217ac8c
ldr r1, _02179aec ; =func_0203e7b4
ldr r1, _02179aec ; =_ZN9ActorTypeD1Ev
ldr r2, _02179af0 ; =data_ov23_0217ac80
bl __register_global_object
mov ip, #1
@@ -15498,7 +15498,7 @@ func_ov23_021799d8: ; 0x021799d8
_02179ae0: .word data_ov23_0217ac8c
_02179ae4: .word 0x484e4b53
_02179ae8: .word func_ov23_02172534
_02179aec: .word func_0203e7b4
_02179aec: .word _ZN9ActorTypeD1Ev
_02179af0: .word data_ov23_0217ac80
_02179af4: .word 0x0000099a
_02179af8: .word 0x00000b33
@@ -15514,9 +15514,9 @@ func_ov23_02179b08: ; 0x02179b08
ldr r1, _02179b38 ; =0x504c444d
ldr r2, _02179b3c ; =func_ov23_02174ef4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179b34 ; =data_ov23_0217acb8
ldr r1, _02179b40 ; =func_0203e7b4
ldr r1, _02179b40 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179b44 ; =data_ov23_0217acac
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15525,7 +15525,7 @@ func_ov23_02179b08: ; 0x02179b08
_02179b34: .word data_ov23_0217acb8
_02179b38: .word 0x504c444d
_02179b3c: .word func_ov23_02174ef4
_02179b40: .word func_0203e7b4
_02179b40: .word _ZN9ActorTypeD1Ev
_02179b44: .word data_ov23_0217acac
.global func_ov23_02179b48
@@ -15592,9 +15592,9 @@ func_ov23_02179bf8: ; 0x02179bf8
ldr r1, _02179c28 ; =0x42524d50
ldr r2, _02179c2c ; =func_ov23_02176d88
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179c24 ; =data_ov23_0217ad28
ldr r1, _02179c30 ; =func_0203e7b4
ldr r1, _02179c30 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179c34 ; =data_ov23_0217ad1c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15603,7 +15603,7 @@ func_ov23_02179bf8: ; 0x02179bf8
_02179c24: .word data_ov23_0217ad28
_02179c28: .word 0x42524d50
_02179c2c: .word func_ov23_02176d88
_02179c30: .word func_0203e7b4
_02179c30: .word _ZN9ActorTypeD1Ev
_02179c34: .word data_ov23_0217ad1c
.global func_ov23_02179c38
asm/ov24.inc
+2 -2
View File
@@ -149,8 +149,8 @@
.extern func_0202bbbc
.extern func_0202e310
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
asm/ov24.s
+29 -29
View File
@@ -15015,9 +15015,9 @@ func_ov24_02179608: ; 0x02179608
ldr r1, _021796f8 ; =0x574c4354
ldr r2, _021796fc ; =func_ov24_0216dd60
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021796f4 ; =data_ov24_0217af80
ldr r1, _02179700 ; =func_0203e7b4
ldr r1, _02179700 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179704 ; =data_ov24_0217af74
bl __register_global_object
ldr r3, _02179708 ; =data_ov24_021791d4
@@ -15074,7 +15074,7 @@ func_ov24_02179608: ; 0x02179608
_021796f4: .word data_ov24_0217af80
_021796f8: .word 0x574c4354
_021796fc: .word func_ov24_0216dd60
_02179700: .word func_0203e7b4
_02179700: .word _ZN9ActorTypeD1Ev
_02179704: .word data_ov24_0217af74
_02179708: .word data_ov24_021791d4
_0217970c: .word 0x00001333
@@ -15088,18 +15088,18 @@ func_ov24_02179714: ; 0x02179714
ldr r1, _02179768 ; =0x4350534b
ldr r2, _0217976c ; =func_ov24_0216e8f8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179764 ; =data_ov24_0217afa0
ldr r1, _02179770 ; =func_0203e7b4
ldr r1, _02179770 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179774 ; =data_ov24_0217af94
bl __register_global_object
ldr r0, _02179778 ; =data_ov24_0217afc0
ldr r1, _0217977c ; =0x4d55544f
ldr r2, _02179780 ; =func_ov24_0216e92c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179778 ; =data_ov24_0217afc0
ldr r1, _02179770 ; =func_0203e7b4
ldr r1, _02179770 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179784 ; =data_ov24_0217afb4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15108,7 +15108,7 @@ func_ov24_02179714: ; 0x02179714
_02179764: .word data_ov24_0217afa0
_02179768: .word 0x4350534b
_0217976c: .word func_ov24_0216e8f8
_02179770: .word func_0203e7b4
_02179770: .word _ZN9ActorTypeD1Ev
_02179774: .word data_ov24_0217af94
_02179778: .word data_ov24_0217afc0
_0217977c: .word 0x4d55544f
@@ -15144,9 +15144,9 @@ func_ov24_021797c0: ; 0x021797c0
ldr r1, _02179850 ; =0x504d4554
ldr r2, _02179854 ; =func_ov24_0216fd70
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217984c ; =data_ov24_0217aff4
ldr r1, _02179858 ; =func_0203e7b4
ldr r1, _02179858 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217985c ; =data_ov24_0217afe8
bl __register_global_object
ldr r1, _02179860 ; =data_02057200
@@ -15178,7 +15178,7 @@ func_ov24_021797c0: ; 0x021797c0
_0217984c: .word data_ov24_0217aff4
_02179850: .word 0x504d4554
_02179854: .word func_ov24_0216fd70
_02179858: .word func_0203e7b4
_02179858: .word _ZN9ActorTypeD1Ev
_0217985c: .word data_ov24_0217afe8
_02179860: .word data_02057200
_02179864: .word data_ov24_0217a1a8
@@ -15192,9 +15192,9 @@ func_ov24_02179868: ; 0x02179868
ldr r1, _02179958 ; =0x53544c46
ldr r2, _0217995c ; =func_ov24_02171210
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179954 ; =data_ov24_0217b014
ldr r1, _02179960 ; =func_0203e7b4
ldr r1, _02179960 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179964 ; =data_ov24_0217b008
bl __register_global_object
mov r1, #1
@@ -15250,7 +15250,7 @@ func_ov24_02179868: ; 0x02179868
_02179954: .word data_ov24_0217b014
_02179958: .word 0x53544c46
_0217995c: .word func_ov24_02171210
_02179960: .word func_0203e7b4
_02179960: .word _ZN9ActorTypeD1Ev
_02179964: .word data_ov24_0217b008
_02179968: .word data_ov24_0217a38c
_0217996c: .word func_ov00_020cceec
@@ -15265,9 +15265,9 @@ func_ov24_02179974: ; 0x02179974
ldr r1, _02179a6c ; =0x53544c50
ldr r2, _02179a70 ; =func_ov24_02172f1c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179a68 ; =data_ov24_0217b040
ldr r1, _02179a74 ; =func_0203e7b4
ldr r1, _02179a74 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a78 ; =data_ov24_0217b034
bl __register_global_object
mov r1, #1
@@ -15325,7 +15325,7 @@ func_ov24_02179974: ; 0x02179974
_02179a68: .word data_ov24_0217b040
_02179a6c: .word 0x53544c50
_02179a70: .word func_ov24_02172f1c
_02179a74: .word func_0203e7b4
_02179a74: .word _ZN9ActorTypeD1Ev
_02179a78: .word data_ov24_0217b034
_02179a7c: .word 0x00001555
_02179a80: .word data_ov24_0217a52c
@@ -15341,9 +15341,9 @@ func_ov24_02179a8c: ; 0x02179a8c
ldr r1, _02179b84 ; =0x53544c57
ldr r2, _02179b88 ; =func_ov24_02173db8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179b80 ; =data_ov24_0217b06c
ldr r1, _02179b8c ; =func_0203e7b4
ldr r1, _02179b8c ; =_ZN9ActorTypeD1Ev
ldr r2, _02179b90 ; =data_ov24_0217b060
bl __register_global_object
mov r1, #1
@@ -15401,7 +15401,7 @@ func_ov24_02179a8c: ; 0x02179a8c
_02179b80: .word data_ov24_0217b06c
_02179b84: .word 0x53544c57
_02179b88: .word func_ov24_02173db8
_02179b8c: .word func_0203e7b4
_02179b8c: .word _ZN9ActorTypeD1Ev
_02179b90: .word data_ov24_0217b060
_02179b94: .word 0x00001555
_02179b98: .word data_ov24_0217a70c
@@ -15417,9 +15417,9 @@ func_ov24_02179ba4: ; 0x02179ba4
ldr r1, _02179c9c ; =0x53544c48
ldr r2, _02179ca0 ; =func_ov24_02176558
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179c98 ; =data_ov24_0217b098
ldr r1, _02179ca4 ; =func_0203e7b4
ldr r1, _02179ca4 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179ca8 ; =data_ov24_0217b08c
bl __register_global_object
mov r3, #0
@@ -15477,7 +15477,7 @@ func_ov24_02179ba4: ; 0x02179ba4
_02179c98: .word data_ov24_0217b098
_02179c9c: .word 0x53544c48
_02179ca0: .word func_ov24_02176558
_02179ca4: .word func_0203e7b4
_02179ca4: .word _ZN9ActorTypeD1Ev
_02179ca8: .word data_ov24_0217b08c
_02179cac: .word 0x000004cd
_02179cb0: .word data_ov24_0217a908
@@ -15492,9 +15492,9 @@ func_ov24_02179cbc: ; 0x02179cbc
ldr r1, _02179cec ; =0x53544c42
ldr r2, _02179cf0 ; =func_ov24_0217735c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179ce8 ; =data_ov24_0217b0c4
ldr r1, _02179cf4 ; =func_0203e7b4
ldr r1, _02179cf4 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179cf8 ; =data_ov24_0217b0b8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15503,7 +15503,7 @@ func_ov24_02179cbc: ; 0x02179cbc
_02179ce8: .word data_ov24_0217b0c4
_02179cec: .word 0x53544c42
_02179cf0: .word func_ov24_0217735c
_02179cf4: .word func_0203e7b4
_02179cf4: .word _ZN9ActorTypeD1Ev
_02179cf8: .word data_ov24_0217b0b8
.global func_ov24_02179cfc
@@ -15554,9 +15554,9 @@ func_ov24_02179d6c: ; 0x02179d6c
ldr r1, _02179d9c ; =0x42524d57
ldr r2, _02179da0 ; =func_ov24_021786b0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179d98 ; =data_ov24_0217b120
ldr r1, _02179da4 ; =func_0203e7b4
ldr r1, _02179da4 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179da8 ; =data_ov24_0217b114
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15565,7 +15565,7 @@ func_ov24_02179d6c: ; 0x02179d6c
_02179d98: .word data_ov24_0217b120
_02179d9c: .word 0x42524d57
_02179da0: .word func_ov24_021786b0
_02179da4: .word func_0203e7b4
_02179da4: .word _ZN9ActorTypeD1Ev
_02179da8: .word data_ov24_0217b114
.global func_ov24_02179dac
asm/ov25.inc
+12 -12
View File
@@ -5,6 +5,15 @@
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_020980acEv
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
@@ -72,10 +81,13 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_027e0178
.extern data_027e0764
@@ -147,14 +159,11 @@
.extern func_02036ce4
.extern func_02036da8
.extern func_020370d0
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f68
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207b2f0
.extern func_ov00_0207c1b0
@@ -207,15 +216,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_020980acEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a956c
asm/ov25.s
+30 -30
View File
@@ -14695,9 +14695,9 @@ func_ov25_02179680: ; 0x02179680
ldr r1, _02179764 ; =0x43425330
ldr r2, _02179768 ; =func_ov25_0216dcd8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179760 ; =data_ov25_0217a88c
ldr r1, _0217976c ; =func_0203e7b4
ldr r1, _0217976c ; =_ZN9ActorTypeD1Ev
ldr r2, _02179770 ; =data_ov25_0217a880
bl __register_global_object
mov r3, #0
@@ -14750,7 +14750,7 @@ func_ov25_02179680: ; 0x02179680
_02179760: .word data_ov25_0217a88c
_02179764: .word 0x43425330
_02179768: .word func_ov25_0216dcd8
_0217976c: .word func_0203e7b4
_0217976c: .word _ZN9ActorTypeD1Ev
_02179770: .word data_ov25_0217a880
_02179774: .word 0x00000b33
_02179778: .word data_ov25_02179be0
@@ -14765,9 +14765,9 @@ func_ov25_02179784: ; 0x02179784
ldr r1, _021797b4 ; =0x43425332
ldr r2, _021797b8 ; =func_ov25_02171bfc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021797b0 ; =data_ov25_0217a8bc
ldr r1, _021797bc ; =func_0203e7b4
ldr r1, _021797bc ; =_ZN9ActorTypeD1Ev
ldr r2, _021797c0 ; =data_ov25_0217a8b0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14776,7 +14776,7 @@ func_ov25_02179784: ; 0x02179784
_021797b0: .word data_ov25_0217a8bc
_021797b4: .word 0x43425332
_021797b8: .word func_ov25_02171bfc
_021797bc: .word func_0203e7b4
_021797bc: .word _ZN9ActorTypeD1Ev
_021797c0: .word data_ov25_0217a8b0
.global func_ov25_021797c4
@@ -14787,9 +14787,9 @@ func_ov25_021797c4: ; 0x021797c4
ldr r1, _021797f4 ; =0x43425331
ldr r2, _021797f8 ; =func_ov25_02172978
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021797f0 ; =data_ov25_0217a8dc
ldr r1, _021797fc ; =func_0203e7b4
ldr r1, _021797fc ; =_ZN9ActorTypeD1Ev
ldr r2, _02179800 ; =data_ov25_0217a8d0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14798,7 +14798,7 @@ func_ov25_021797c4: ; 0x021797c4
_021797f0: .word data_ov25_0217a8dc
_021797f4: .word 0x43425331
_021797f8: .word func_ov25_02172978
_021797fc: .word func_0203e7b4
_021797fc: .word _ZN9ActorTypeD1Ev
_02179800: .word data_ov25_0217a8d0
.global func_ov25_02179804
@@ -14809,9 +14809,9 @@ func_ov25_02179804: ; 0x02179804
ldr r1, _02179834 ; =0x43425333
ldr r2, _02179838 ; =func_ov25_02175a80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179830 ; =data_ov25_0217a8fc
ldr r1, _0217983c ; =func_0203e7b4
ldr r1, _0217983c ; =_ZN9ActorTypeD1Ev
ldr r2, _02179840 ; =data_ov25_0217a8f0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14820,7 +14820,7 @@ func_ov25_02179804: ; 0x02179804
_02179830: .word data_ov25_0217a8fc
_02179834: .word 0x43425333
_02179838: .word func_ov25_02175a80
_0217983c: .word func_0203e7b4
_0217983c: .word _ZN9ActorTypeD1Ev
_02179840: .word data_ov25_0217a8f0
.global func_ov25_02179844
@@ -14831,9 +14831,9 @@ func_ov25_02179844: ; 0x02179844
ldr r1, _02179874 ; =0x43425334
ldr r2, _02179878 ; =func_ov25_021769e8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179870 ; =data_ov25_0217a91c
ldr r1, _0217987c ; =func_0203e7b4
ldr r1, _0217987c ; =_ZN9ActorTypeD1Ev
ldr r2, _02179880 ; =data_ov25_0217a910
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14842,7 +14842,7 @@ func_ov25_02179844: ; 0x02179844
_02179870: .word data_ov25_0217a91c
_02179874: .word 0x43425334
_02179878: .word func_ov25_021769e8
_0217987c: .word func_0203e7b4
_0217987c: .word _ZN9ActorTypeD1Ev
_02179880: .word data_ov25_0217a910
.global func_ov25_02179884
@@ -14874,9 +14874,9 @@ func_ov25_021798bc: ; 0x021798bc
ldr r1, _021799ac ; =0x45475354
ldr r2, _021799b0 ; =func_ov25_0217736c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799a8 ; =data_ov25_0217a950
ldr r1, _021799b4 ; =func_0203e7b4
ldr r1, _021799b4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021799b8 ; =data_ov25_0217a944
bl __register_global_object
mov r1, #1
@@ -14932,7 +14932,7 @@ func_ov25_021798bc: ; 0x021798bc
_021799a8: .word data_ov25_0217a950
_021799ac: .word 0x45475354
_021799b0: .word func_ov25_0217736c
_021799b4: .word func_0203e7b4
_021799b4: .word _ZN9ActorTypeD1Ev
_021799b8: .word data_ov25_0217a944
_021799bc: .word 0x00001b33
_021799c0: .word data_ov25_0217a238
@@ -14947,9 +14947,9 @@ func_ov25_021799cc: ; 0x021799cc
ldr r1, _021799fc ; =0x47534642
ldr r2, _02179a00 ; =func_ov25_02177d64
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799f8 ; =data_ov25_0217a97c
ldr r1, _02179a04 ; =func_0203e7b4
ldr r1, _02179a04 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a08 ; =data_ov25_0217a970
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14958,7 +14958,7 @@ func_ov25_021799cc: ; 0x021799cc
_021799f8: .word data_ov25_0217a97c
_021799fc: .word 0x47534642
_02179a00: .word func_ov25_02177d64
_02179a04: .word func_0203e7b4
_02179a04: .word _ZN9ActorTypeD1Ev
_02179a08: .word data_ov25_0217a970
.global func_ov25_02179a0c
@@ -14969,9 +14969,9 @@ func_ov25_02179a0c: ; 0x02179a0c
ldr r1, _02179a3c ; =0x42524d47
ldr r2, _02179a40 ; =func_ov25_02178588
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179a38 ; =data_ov25_0217a9b0
ldr r1, _02179a44 ; =func_0203e7b4
ldr r1, _02179a44 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a48 ; =data_ov25_0217a9a4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14980,7 +14980,7 @@ func_ov25_02179a0c: ; 0x02179a0c
_02179a38: .word data_ov25_0217a9b0
_02179a3c: .word 0x42524d47
_02179a40: .word func_ov25_02178588
_02179a44: .word func_0203e7b4
_02179a44: .word _ZN9ActorTypeD1Ev
_02179a48: .word data_ov25_0217a9a4
.global func_ov25_02179a4c
@@ -14991,9 +14991,9 @@ func_ov25_02179a4c: ; 0x02179a4c
ldr r1, _02179a7c ; =0x4753574c
ldr r2, _02179a80 ; =func_ov25_02178800
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179a78 ; =data_ov25_0217a9d0
ldr r1, _02179a84 ; =func_0203e7b4
ldr r1, _02179a84 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a88 ; =data_ov25_0217a9c4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15002,7 +15002,7 @@ func_ov25_02179a4c: ; 0x02179a4c
_02179a78: .word data_ov25_0217a9d0
_02179a7c: .word 0x4753574c
_02179a80: .word func_ov25_02178800
_02179a84: .word func_0203e7b4
_02179a84: .word _ZN9ActorTypeD1Ev
_02179a88: .word data_ov25_0217a9c4
.global func_ov25_02179a8c
@@ -15014,9 +15014,9 @@ func_ov25_02179a8c: ; 0x02179a8c
ldr r1, _02179b7c ; =0x53504452
ldr r2, _02179b80 ; =func_ov25_021789e0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179b78 ; =data_ov25_0217a9f0
ldr r1, _02179b84 ; =func_0203e7b4
ldr r1, _02179b84 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179b88 ; =data_ov25_0217a9e4
bl __register_global_object
mov r1, #1
@@ -15072,7 +15072,7 @@ func_ov25_02179a8c: ; 0x02179a8c
_02179b78: .word data_ov25_0217a9f0
_02179b7c: .word 0x53504452
_02179b80: .word func_ov25_021789e0
_02179b84: .word func_0203e7b4
_02179b84: .word _ZN9ActorTypeD1Ev
_02179b88: .word data_ov25_0217a9e4
_02179b8c: .word data_ov25_0217a680
_02179b90: .word func_ov00_020cceec
asm/ov26.inc
+2 -2
View File
@@ -196,8 +196,8 @@
.extern func_020352d8
.extern func_02035370
.extern func_020370d0
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0203fe60
asm/ov26.s
+37 -37
View File
@@ -16217,108 +16217,108 @@ func_ov26_021797dc: ; 0x021797dc
ldr r1, _02179998 ; =0x434d414e
ldr r2, _0217999c ; =func_ov26_0216d780
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179994 ; =data_ov26_0217b2cc
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021799a4 ; =data_ov26_0217b2c0
bl __register_global_object
ldr r0, _021799a8 ; =data_ov26_0217b2ec
ldr r1, _021799ac ; =0x434d4e42
ldr r2, _021799b0 ; =func_ov26_0216d7c0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799a8 ; =data_ov26_0217b2ec
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021799b4 ; =data_ov26_0217b2e0
bl __register_global_object
ldr r0, _021799b8 ; =data_ov26_0217b30c
ldr r1, _021799bc ; =0x43574d4e
ldr r2, _021799c0 ; =func_ov26_0216d800
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799b8 ; =data_ov26_0217b30c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021799c4 ; =data_ov26_0217b300
bl __register_global_object
ldr r0, _021799c8 ; =data_ov26_0217b32c
ldr r1, _021799cc ; =0x43574d42
ldr r2, _021799d0 ; =func_ov26_0216d840
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799c8 ; =data_ov26_0217b32c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021799d4 ; =data_ov26_0217b320
bl __register_global_object
ldr r0, _021799d8 ; =data_ov26_0217b34c
ldr r1, _021799dc ; =0x43574d43
ldr r2, _021799e0 ; =func_ov26_0216d880
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799d8 ; =data_ov26_0217b34c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021799e4 ; =data_ov26_0217b340
bl __register_global_object
ldr r0, _021799e8 ; =data_ov26_0217b36c
ldr r1, _021799ec ; =0x434f4d41
ldr r2, _021799f0 ; =func_ov26_0216d8c0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799e8 ; =data_ov26_0217b36c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021799f4 ; =data_ov26_0217b360
bl __register_global_object
ldr r0, _021799f8 ; =data_ov26_0217b38c
ldr r1, _021799fc ; =0x434f4d42
ldr r2, _02179a00 ; =func_ov26_0216d900
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021799f8 ; =data_ov26_0217b38c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a04 ; =data_ov26_0217b380
bl __register_global_object
ldr r0, _02179a08 ; =data_ov26_0217b3ac
ldr r1, _02179a0c ; =0x434d4547
ldr r2, _02179a10 ; =func_ov26_0216d940
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179a08 ; =data_ov26_0217b3ac
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a14 ; =data_ov26_0217b3a0
bl __register_global_object
ldr r0, _02179a18 ; =data_ov26_0217b3cc
ldr r1, _02179a1c ; =0x434d4e43
ldr r2, _02179a20 ; =func_ov26_0216dabc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179a18 ; =data_ov26_0217b3cc
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a24 ; =data_ov26_0217b3c0
bl __register_global_object
ldr r0, _02179a28 ; =data_ov26_0217b3ec
ldr r1, _02179a2c ; =0x434f4153
ldr r2, _02179a30 ; =func_ov26_0216dba0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179a28 ; =data_ov26_0217b3ec
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a34 ; =data_ov26_0217b3e0
bl __register_global_object
ldr r0, _02179a38 ; =data_ov26_0217b40c
ldr r1, _02179a3c ; =0x434f4253
ldr r2, _02179a40 ; =func_ov26_0216dbe0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179a38 ; =data_ov26_0217b40c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a44 ; =data_ov26_0217b400
bl __register_global_object
ldr r0, _02179a48 ; =data_ov26_0217b42c
ldr r1, _02179a4c ; =0x424d5354
ldr r2, _02179a50 ; =func_ov26_0216dd64
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179a48 ; =data_ov26_0217b42c
ldr r1, _021799a0 ; =func_0203e7b4
ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179a54 ; =data_ov26_0217b420
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16327,7 +16327,7 @@ func_ov26_021797dc: ; 0x021797dc
_02179994: .word data_ov26_0217b2cc
_02179998: .word 0x434d414e
_0217999c: .word func_ov26_0216d780
_021799a0: .word func_0203e7b4
_021799a0: .word _ZN9ActorTypeD1Ev
_021799a4: .word data_ov26_0217b2c0
_021799a8: .word data_ov26_0217b2ec
_021799ac: .word 0x434d4e42
@@ -16403,9 +16403,9 @@ func_ov26_02179a90: ; 0x02179a90
ldr r1, _02179b8c ; =0x57544352
ldr r2, _02179b90 ; =func_ov26_0216f58c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179b88 ; =data_ov26_0217b460
ldr r1, _02179b94 ; =func_0203e7b4
ldr r1, _02179b94 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179b98 ; =data_ov26_0217b454
bl __register_global_object
mov r2, #0
@@ -16464,7 +16464,7 @@ func_ov26_02179a90: ; 0x02179a90
_02179b88: .word data_ov26_0217b460
_02179b8c: .word 0x57544352
_02179b90: .word func_ov26_0216f58c
_02179b94: .word func_0203e7b4
_02179b94: .word _ZN9ActorTypeD1Ev
_02179b98: .word data_ov26_0217b454
_02179b9c: .word 0x00001b33
_02179ba0: .word data_ov26_0217a67c
@@ -16642,9 +16642,9 @@ func_ov26_02179d90: ; 0x02179d90
ldr r1, _02179dcc ; =0x48474f4a
ldr r2, _02179dd0 ; =func_ov26_021779dc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179dc8 ; =data_ov26_0217b534
ldr r1, _02179dd4 ; =func_0203e7b4
ldr r1, _02179dd4 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179dd8 ; =data_ov26_0217b528
bl __register_global_object
ldr r1, _02179ddc ; =0x000005b6
@@ -16656,7 +16656,7 @@ func_ov26_02179d90: ; 0x02179d90
_02179dc8: .word data_ov26_0217b534
_02179dcc: .word 0x48474f4a
_02179dd0: .word func_ov26_021779dc
_02179dd4: .word func_0203e7b4
_02179dd4: .word _ZN9ActorTypeD1Ev
_02179dd8: .word data_ov26_0217b528
_02179ddc: .word 0x000005b6
_02179de0: .word data_ov26_0217aea4
@@ -16669,9 +16669,9 @@ func_ov26_02179de4: ; 0x02179de4
ldr r1, _02179f18 ; =0x42454143
ldr r2, _02179f1c ; =func_ov26_02177c08
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179f14 ; =data_ov26_0217b554
ldr r1, _02179f20 ; =func_0203e7b4
ldr r1, _02179f20 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179f24 ; =data_ov26_0217b548
bl __register_global_object
ldr r1, _02179f28 ; =data_ov26_0217af64
@@ -16745,7 +16745,7 @@ func_ov26_02179de4: ; 0x02179de4
_02179f14: .word data_ov26_0217b554
_02179f18: .word 0x42454143
_02179f1c: .word func_ov26_02177c08
_02179f20: .word func_0203e7b4
_02179f20: .word _ZN9ActorTypeD1Ev
_02179f24: .word data_ov26_0217b548
_02179f28: .word data_ov26_0217af64
_02179f2c: .word data_ov26_0217af66
@@ -16774,9 +16774,9 @@ func_ov26_02179f70: ; 0x02179f70
ldr r1, _02179fa0 ; =0x4d445441
ldr r2, _02179fa4 ; =func_ov26_021780d4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179f9c ; =data_ov26_0217b574
ldr r1, _02179fa8 ; =func_0203e7b4
ldr r1, _02179fa8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179fac ; =data_ov26_0217b568
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16785,7 +16785,7 @@ func_ov26_02179f70: ; 0x02179f70
_02179f9c: .word data_ov26_0217b574
_02179fa0: .word 0x4d445441
_02179fa4: .word func_ov26_021780d4
_02179fa8: .word func_0203e7b4
_02179fa8: .word _ZN9ActorTypeD1Ev
_02179fac: .word data_ov26_0217b568
.global func_ov26_02179fb0
asm/ov27.inc
+9 -9
View File
@@ -4,6 +4,12 @@
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
@@ -62,11 +68,14 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetUnk_098Ej
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZNK11ItemManager19GetMaxTreasureCountEv
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_027e0618
@@ -153,13 +162,10 @@
.extern func_02035370
.extern func_02036ce4
.extern func_0203d7e0
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_0207ba90
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
@@ -206,12 +212,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
asm/ov27.s
+21 -21
View File
@@ -14194,9 +14194,9 @@ func_ov27_0217913c: ; 0x0217913c
ldr r1, _02179178 ; =0x50524c44
ldr r2, _0217917c ; =func_ov27_0216d6a0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179174 ; =data_ov27_0217a0cc
ldr r1, _02179180 ; =func_0203e7b4
ldr r1, _02179180 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179184 ; =data_ov27_0217a0c0
bl __register_global_object
ldr r1, _02179188 ; =0x0000019b
@@ -14208,7 +14208,7 @@ func_ov27_0217913c: ; 0x0217913c
_02179174: .word data_ov27_0217a0cc
_02179178: .word 0x50524c44
_0217917c: .word func_ov27_0216d6a0
_02179180: .word func_0203e7b4
_02179180: .word _ZN9ActorTypeD1Ev
_02179184: .word data_ov27_0217a0c0
_02179188: .word 0x0000019b
_0217918c: .word data_ov27_021794c0
@@ -14221,9 +14221,9 @@ func_ov27_02179190: ; 0x02179190
ldr r1, _021791c0 ; =0x504c5344
ldr r2, _021791c4 ; =func_ov27_02171d0c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021791bc ; =data_ov27_0217a0ec
ldr r1, _021791c8 ; =func_0203e7b4
ldr r1, _021791c8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021791cc ; =data_ov27_0217a0e0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14232,7 +14232,7 @@ func_ov27_02179190: ; 0x02179190
_021791bc: .word data_ov27_0217a0ec
_021791c0: .word 0x504c5344
_021791c4: .word func_ov27_02171d0c
_021791c8: .word func_0203e7b4
_021791c8: .word _ZN9ActorTypeD1Ev
_021791cc: .word data_ov27_0217a0e0
.global func_ov27_021791d0
@@ -14243,9 +14243,9 @@ func_ov27_021791d0: ; 0x021791d0
ldr r1, _02179200 ; =0x504c4c42
ldr r2, _02179204 ; =func_ov27_02172d14
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021791fc ; =data_ov27_0217a10c
ldr r1, _02179208 ; =func_0203e7b4
ldr r1, _02179208 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217920c ; =data_ov27_0217a100
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14254,7 +14254,7 @@ func_ov27_021791d0: ; 0x021791d0
_021791fc: .word data_ov27_0217a10c
_02179200: .word 0x504c4c42
_02179204: .word func_ov27_02172d14
_02179208: .word func_0203e7b4
_02179208: .word _ZN9ActorTypeD1Ev
_0217920c: .word data_ov27_0217a100
.global func_ov27_02179210
@@ -14266,9 +14266,9 @@ func_ov27_02179210: ; 0x02179210
ldr r1, _02179288 ; =0x574e4452
ldr r2, _0217928c ; =func_ov27_02174014
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179284 ; =data_ov27_0217a12c
ldr r1, _02179290 ; =func_0203e7b4
ldr r1, _02179290 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179294 ; =data_ov27_0217a120
bl __register_global_object
ldr r1, _02179298 ; =data_02057200
@@ -14294,7 +14294,7 @@ func_ov27_02179210: ; 0x02179210
_02179284: .word data_ov27_0217a12c
_02179288: .word 0x574e4452
_0217928c: .word func_ov27_02174014
_02179290: .word func_0203e7b4
_02179290: .word _ZN9ActorTypeD1Ev
_02179294: .word data_ov27_0217a120
_02179298: .word data_02057200
_0217929c: .word data_ov27_021798ec
@@ -14307,9 +14307,9 @@ func_ov27_021792a0: ; 0x021792a0
ldr r1, _021792d0 ; =0x46534d4e
ldr r2, _021792d4 ; =func_ov27_02174a94
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021792cc ; =data_ov27_0217a14c
ldr r1, _021792d8 ; =func_0203e7b4
ldr r1, _021792d8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021792dc ; =data_ov27_0217a140
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14318,7 +14318,7 @@ func_ov27_021792a0: ; 0x021792a0
_021792cc: .word data_ov27_0217a14c
_021792d0: .word 0x46534d4e
_021792d4: .word func_ov27_02174a94
_021792d8: .word func_0203e7b4
_021792d8: .word _ZN9ActorTypeD1Ev
_021792dc: .word data_ov27_0217a140
.global func_ov27_021792e0
@@ -14330,9 +14330,9 @@ func_ov27_021792e0: ; 0x021792e0
ldr r1, _021793a0 ; =0x464c4e4b
ldr r2, _021793a4 ; =func_ov27_02174d6c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217939c ; =data_ov27_0217a16c
ldr r1, _021793a8 ; =func_0203e7b4
ldr r1, _021793a8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021793ac ; =data_ov27_0217a160
bl __register_global_object
ldr r1, _021793b0 ; =data_02057200
@@ -14376,7 +14376,7 @@ func_ov27_021792e0: ; 0x021792e0
_0217939c: .word data_ov27_0217a16c
_021793a0: .word 0x464c4e4b
_021793a4: .word func_ov27_02174d6c
_021793a8: .word func_0203e7b4
_021793a8: .word _ZN9ActorTypeD1Ev
_021793ac: .word data_ov27_0217a160
_021793b0: .word data_02057200
_021793b4: .word data_ov27_02179bc4
@@ -14391,9 +14391,9 @@ func_ov27_021793bc: ; 0x021793bc
ldr r1, _02179424 ; =0x47444d4e
ldr r2, _02179428 ; =func_ov27_02177ca4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179420 ; =data_ov27_0217a18c
ldr r1, _0217942c ; =func_0203e7b4
ldr r1, _0217942c ; =_ZN9ActorTypeD1Ev
ldr r2, _02179430 ; =data_ov27_0217a180
bl __register_global_object
ldr r1, _02179434 ; =data_02057200
@@ -14415,7 +14415,7 @@ func_ov27_021793bc: ; 0x021793bc
_02179420: .word data_ov27_0217a18c
_02179424: .word 0x47444d4e
_02179428: .word func_ov27_02177ca4
_0217942c: .word func_0203e7b4
_0217942c: .word _ZN9ActorTypeD1Ev
_02179430: .word data_ov27_0217a180
_02179434: .word data_02057200
_02179438: .word data_ov27_02179e6c
asm/ov28.inc
+11 -11
View File
@@ -2,6 +2,14 @@
.extern Approach_thunk
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
@@ -62,12 +70,15 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetUnk_098Ej
.extern _ZNK11ItemManager13GetFairyLevelEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern data_02051054
.extern data_02051154
@@ -149,13 +160,10 @@
.extern func_020368f4
.extern func_02036ce4
.extern func_020370d0
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
@@ -219,14 +227,6 @@
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a956c
asm/ov28.s
+36 -36
View File
@@ -13871,9 +13871,9 @@ func_ov28_02178504: ; 0x02178504
ldr r1, _02178534 ; =0x534d544e
ldr r2, _02178538 ; =func_ov28_0216d6a0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178530 ; =data_ov28_02179b0c
ldr r1, _0217853c ; =func_0203e7b4
ldr r1, _0217853c ; =_ZN9ActorTypeD1Ev
ldr r2, _02178540 ; =data_ov28_02179b00
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13882,7 +13882,7 @@ func_ov28_02178504: ; 0x02178504
_02178530: .word data_ov28_02179b0c
_02178534: .word 0x534d544e
_02178538: .word func_ov28_0216d6a0
_0217853c: .word func_0203e7b4
_0217853c: .word _ZN9ActorTypeD1Ev
_02178540: .word data_ov28_02179b00
.global func_ov28_02178544
@@ -13893,36 +13893,36 @@ func_ov28_02178544: ; 0x02178544
ldr r1, _021785e0 ; =0x43485342
ldr r2, _021785e4 ; =func_ov28_0216fd0c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021785dc ; =data_ov28_02179b30
ldr r1, _021785e8 ; =func_0203e7b4
ldr r1, _021785e8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021785ec ; =data_ov28_02179b24
bl __register_global_object
ldr r0, _021785f0 ; =data_ov28_02179b50
ldr r1, _021785f4 ; =0x4d4e5254
ldr r2, _021785f8 ; =func_ov28_02170008
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021785f0 ; =data_ov28_02179b50
ldr r1, _021785e8 ; =func_0203e7b4
ldr r1, _021785e8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021785fc ; =data_ov28_02179b44
bl __register_global_object
ldr r0, _02178600 ; =data_ov28_02179b70
ldr r1, _02178604 ; =0x46554a49
ldr r2, _02178608 ; =func_ov28_02170434
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178600 ; =data_ov28_02179b70
ldr r1, _021785e8 ; =func_0203e7b4
ldr r1, _021785e8 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217860c ; =data_ov28_02179b64
bl __register_global_object
ldr r0, _02178610 ; =data_ov28_02179b90
ldr r1, _02178614 ; =0x43484d54
ldr r2, _02178618 ; =func_ov28_02170644
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178610 ; =data_ov28_02179b90
ldr r1, _021785e8 ; =func_0203e7b4
ldr r1, _021785e8 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217861c ; =data_ov28_02179b84
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13931,7 +13931,7 @@ func_ov28_02178544: ; 0x02178544
_021785dc: .word data_ov28_02179b30
_021785e0: .word 0x43485342
_021785e4: .word func_ov28_0216fd0c
_021785e8: .word func_0203e7b4
_021785e8: .word _ZN9ActorTypeD1Ev
_021785ec: .word data_ov28_02179b24
_021785f0: .word data_ov28_02179b50
_021785f4: .word 0x4d4e5254
@@ -13954,9 +13954,9 @@ func_ov28_02178620: ; 0x02178620
ldr r1, _02178650 ; =0x4d4d4944
ldr r2, _02178654 ; =func_ov28_021707a4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217864c ; =data_ov28_02179bb0
ldr r1, _02178658 ; =func_0203e7b4
ldr r1, _02178658 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217865c ; =data_ov28_02179ba4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -13965,7 +13965,7 @@ func_ov28_02178620: ; 0x02178620
_0217864c: .word data_ov28_02179bb0
_02178650: .word 0x4d4d4944
_02178654: .word func_ov28_021707a4
_02178658: .word func_0203e7b4
_02178658: .word _ZN9ActorTypeD1Ev
_0217865c: .word data_ov28_02179ba4
.global func_ov28_02178660
@@ -14016,9 +14016,9 @@ func_ov28_021786d0: ; 0x021786d0
ldr r1, _02178700 ; =0x53505350
ldr r2, _02178704 ; =func_ov28_0217267c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021786fc ; =data_ov28_02179bf8
ldr r1, _02178708 ; =func_0203e7b4
ldr r1, _02178708 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217870c ; =data_ov28_02179bec
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14027,7 +14027,7 @@ func_ov28_021786d0: ; 0x021786d0
_021786fc: .word data_ov28_02179bf8
_02178700: .word 0x53505350
_02178704: .word func_ov28_0217267c
_02178708: .word func_0203e7b4
_02178708: .word _ZN9ActorTypeD1Ev
_0217870c: .word data_ov28_02179bec
.global func_ov28_02178710
@@ -14038,9 +14038,9 @@ func_ov28_02178710: ; 0x02178710
ldr r1, _02178740 ; =0x5354474e
ldr r2, _02178744 ; =func_ov28_02172f34
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217873c ; =data_ov28_02179c18
ldr r1, _02178748 ; =func_0203e7b4
ldr r1, _02178748 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217874c ; =data_ov28_02179c0c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14049,7 +14049,7 @@ func_ov28_02178710: ; 0x02178710
_0217873c: .word data_ov28_02179c18
_02178740: .word 0x5354474e
_02178744: .word func_ov28_02172f34
_02178748: .word func_0203e7b4
_02178748: .word _ZN9ActorTypeD1Ev
_0217874c: .word data_ov28_02179c0c
.global func_ov28_02178750
@@ -14060,9 +14060,9 @@ func_ov28_02178750: ; 0x02178750
ldr r1, _02178780 ; =0x53544754
ldr r2, _02178784 ; =func_ov28_02173cd0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217877c ; =data_ov28_02179c3c
ldr r1, _02178788 ; =func_0203e7b4
ldr r1, _02178788 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217878c ; =data_ov28_02179c30
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14071,7 +14071,7 @@ func_ov28_02178750: ; 0x02178750
_0217877c: .word data_ov28_02179c3c
_02178780: .word 0x53544754
_02178784: .word func_ov28_02173cd0
_02178788: .word func_0203e7b4
_02178788: .word _ZN9ActorTypeD1Ev
_0217878c: .word data_ov28_02179c30
.global func_ov28_02178790
@@ -14082,9 +14082,9 @@ func_ov28_02178790: ; 0x02178790
ldr r1, _021787c0 ; =0x53545357
ldr r2, _021787c4 ; =func_ov28_02174c0c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021787bc ; =data_ov28_02179c60
ldr r1, _021787c8 ; =func_0203e7b4
ldr r1, _021787c8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021787cc ; =data_ov28_02179c54
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14093,7 +14093,7 @@ func_ov28_02178790: ; 0x02178790
_021787bc: .word data_ov28_02179c60
_021787c0: .word 0x53545357
_021787c4: .word func_ov28_02174c0c
_021787c8: .word func_0203e7b4
_021787c8: .word _ZN9ActorTypeD1Ev
_021787cc: .word data_ov28_02179c54
.global func_ov28_021787d0
@@ -14104,9 +14104,9 @@ func_ov28_021787d0: ; 0x021787d0
ldr r1, _02178800 ; =0x5341555a
ldr r2, _02178804 ; =func_ov28_021754b0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021787fc ; =data_ov28_02179c84
ldr r1, _02178808 ; =func_0203e7b4
ldr r1, _02178808 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217880c ; =data_ov28_02179c78
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14115,7 +14115,7 @@ func_ov28_021787d0: ; 0x021787d0
_021787fc: .word data_ov28_02179c84
_02178800: .word 0x5341555a
_02178804: .word func_ov28_021754b0
_02178808: .word func_0203e7b4
_02178808: .word _ZN9ActorTypeD1Ev
_0217880c: .word data_ov28_02179c78
.global func_ov28_02178810
@@ -14126,9 +14126,9 @@ func_ov28_02178810: ; 0x02178810
ldr r1, _02178840 ; =0x46524253
ldr r2, _02178844 ; =func_ov28_02176d8c
ldr r3, _02178848 ; =func_ov28_02176d80
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217883c ; =data_ov28_02179ca4
ldr r1, _0217884c ; =func_0203e7b4
ldr r1, _0217884c ; =_ZN9ActorTypeD1Ev
ldr r2, _02178850 ; =data_ov28_02179c98
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14138,7 +14138,7 @@ _0217883c: .word data_ov28_02179ca4
_02178840: .word 0x46524253
_02178844: .word func_ov28_02176d8c
_02178848: .word func_ov28_02176d80
_0217884c: .word func_0203e7b4
_0217884c: .word _ZN9ActorTypeD1Ev
_02178850: .word data_ov28_02179c98
.global func_ov28_02178854
@@ -14149,9 +14149,9 @@ func_ov28_02178854: ; 0x02178854
ldr r1, _02178884 ; =0x46524348
ldr r2, _02178888 ; =func_ov28_02177900
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02178880 ; =data_ov28_02179cc4
ldr r1, _0217888c ; =func_0203e7b4
ldr r1, _0217888c ; =_ZN9ActorTypeD1Ev
ldr r2, _02178890 ; =data_ov28_02179cb8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14160,7 +14160,7 @@ func_ov28_02178854: ; 0x02178854
_02178880: .word data_ov28_02179cc4
_02178884: .word 0x46524348
_02178888: .word func_ov28_02177900
_0217888c: .word func_0203e7b4
_0217888c: .word _ZN9ActorTypeD1Ev
_02178890: .word data_ov28_02179cb8
.section .ctor, 4, 1, 4
asm/ov29.inc
+5 -5
View File
@@ -6,6 +6,7 @@
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
@@ -58,8 +59,11 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02051354
.extern data_02052f54
@@ -81,7 +85,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern gAdventureFlags
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -169,13 +172,10 @@
.extern func_02036770
.extern func_02036ce4
.extern func_02036d6c
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
@@ -235,7 +235,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern func_ov00_020a5e9c
.extern func_ov00_020a61ac
.extern func_ov00_020a9588
@@ -390,5 +389,6 @@
.extern func_ov38_02182e3c
.extern func_ov38_021854e4
.extern func_ov38_02185720
.extern gAdventureFlags
.extern gItemManager
.extern strcpy
asm/ov29.s
+27 -27
View File
@@ -14280,9 +14280,9 @@ func_ov29_021794dc: ; 0x021794dc
ldr r1, _02179564 ; =0x42524d4c
ldr r2, _02179568 ; =func_ov29_0216e048
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179560 ; =data_ov29_0217a5c0
ldr r1, _0217956c ; =func_0203e7b4
ldr r1, _0217956c ; =_ZN9ActorTypeD1Ev
ldr r2, _02179570 ; =data_ov29_0217a5b4
bl __register_global_object
ldr r3, _02179574 ; =data_ov29_021798e8
@@ -14313,7 +14313,7 @@ func_ov29_021794dc: ; 0x021794dc
_02179560: .word data_ov29_0217a5c0
_02179564: .word 0x42524d4c
_02179568: .word func_ov29_0216e048
_0217956c: .word func_0203e7b4
_0217956c: .word _ZN9ActorTypeD1Ev
_02179570: .word data_ov29_0217a5b4
_02179574: .word data_ov29_021798e8
_02179578: .word data_ov29_021798e8
@@ -14330,9 +14330,9 @@ func_ov29_0217958c: ; 0x0217958c
ldr r1, _021795bc ; =0x42524d31
ldr r2, _021795c0 ; =func_ov29_0216f144
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021795b8 ; =data_ov29_0217a5f8
ldr r1, _021795c4 ; =func_0203e7b4
ldr r1, _021795c4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021795c8 ; =data_ov29_0217a5ec
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14341,7 +14341,7 @@ func_ov29_0217958c: ; 0x0217958c
_021795b8: .word data_ov29_0217a5f8
_021795bc: .word 0x42524d31
_021795c0: .word func_ov29_0216f144
_021795c4: .word func_0203e7b4
_021795c4: .word _ZN9ActorTypeD1Ev
_021795c8: .word data_ov29_0217a5ec
.global func_ov29_021795cc
@@ -14352,9 +14352,9 @@ func_ov29_021795cc: ; 0x021795cc
ldr r1, _021795fc ; =0x474f3154
ldr r2, _02179600 ; =func_ov29_0216ff60
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021795f8 ; =data_ov29_0217a618
ldr r1, _02179604 ; =func_0203e7b4
ldr r1, _02179604 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179608 ; =data_ov29_0217a60c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14363,7 +14363,7 @@ func_ov29_021795cc: ; 0x021795cc
_021795f8: .word data_ov29_0217a618
_021795fc: .word 0x474f3154
_02179600: .word func_ov29_0216ff60
_02179604: .word func_0203e7b4
_02179604: .word _ZN9ActorTypeD1Ev
_02179608: .word data_ov29_0217a60c
.global func_ov29_0217960c
@@ -14374,9 +14374,9 @@ func_ov29_0217960c: ; 0x0217960c
ldr r1, _0217963c ; =0x474f314d
ldr r2, _02179640 ; =func_ov29_02171540
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179638 ; =data_ov29_0217bc3c
ldr r1, _02179644 ; =func_0203e7b4
ldr r1, _02179644 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179648 ; =data_ov29_0217bc30
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14385,7 +14385,7 @@ func_ov29_0217960c: ; 0x0217960c
_02179638: .word data_ov29_0217bc3c
_0217963c: .word 0x474f314d
_02179640: .word func_ov29_02171540
_02179644: .word func_0203e7b4
_02179644: .word _ZN9ActorTypeD1Ev
_02179648: .word data_ov29_0217bc30
.global func_ov29_0217964c
@@ -14396,9 +14396,9 @@ func_ov29_0217964c: ; 0x0217964c
ldr r1, _0217967c ; =0x474f3145
ldr r2, _02179680 ; =func_ov29_021726cc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179678 ; =data_ov29_0217bc64
ldr r1, _02179684 ; =func_0203e7b4
ldr r1, _02179684 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179688 ; =data_ov29_0217bc58
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14407,7 +14407,7 @@ func_ov29_0217964c: ; 0x0217964c
_02179678: .word data_ov29_0217bc64
_0217967c: .word 0x474f3145
_02179680: .word func_ov29_021726cc
_02179684: .word func_0203e7b4
_02179684: .word _ZN9ActorTypeD1Ev
_02179688: .word data_ov29_0217bc58
.global func_ov29_0217968c
@@ -14418,9 +14418,9 @@ func_ov29_0217968c: ; 0x0217968c
ldr r1, _021796bc ; =0x474f3150
ldr r2, _021796c0 ; =func_ov29_02174f6c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021796b8 ; =data_ov29_0217bc84
ldr r1, _021796c4 ; =func_0203e7b4
ldr r1, _021796c4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021796c8 ; =data_ov29_0217bc78
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14429,7 +14429,7 @@ func_ov29_0217968c: ; 0x0217968c
_021796b8: .word data_ov29_0217bc84
_021796bc: .word 0x474f3150
_021796c0: .word func_ov29_02174f6c
_021796c4: .word func_0203e7b4
_021796c4: .word _ZN9ActorTypeD1Ev
_021796c8: .word data_ov29_0217bc78
.global func_ov29_021796cc
@@ -14460,9 +14460,9 @@ func_ov29_02179704: ; 0x02179704
ldr r1, _02179734 ; =0x474f3143
ldr r2, _02179738 ; =func_ov29_0217679c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179730 ; =data_ov29_0217bcc4
ldr r1, _0217973c ; =func_0203e7b4
ldr r1, _0217973c ; =_ZN9ActorTypeD1Ev
ldr r2, _02179740 ; =data_ov29_0217bcb8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14471,7 +14471,7 @@ func_ov29_02179704: ; 0x02179704
_02179730: .word data_ov29_0217bcc4
_02179734: .word 0x474f3143
_02179738: .word func_ov29_0217679c
_0217973c: .word func_0203e7b4
_0217973c: .word _ZN9ActorTypeD1Ev
_02179740: .word data_ov29_0217bcb8
.global func_ov29_02179744
@@ -14494,9 +14494,9 @@ func_ov29_0217975c: ; 0x0217975c
ldr r1, _0217978c ; =0x54535350
ldr r2, _02179790 ; =func_ov29_021778f8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02179788 ; =data_ov29_0217bd14
ldr r1, _02179794 ; =func_0203e7b4
ldr r1, _02179794 ; =_ZN9ActorTypeD1Ev
ldr r2, _02179798 ; =data_ov29_0217bd08
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14505,7 +14505,7 @@ func_ov29_0217975c: ; 0x0217975c
_02179788: .word data_ov29_0217bd14
_0217978c: .word 0x54535350
_02179790: .word func_ov29_021778f8
_02179794: .word func_0203e7b4
_02179794: .word _ZN9ActorTypeD1Ev
_02179798: .word data_ov29_0217bd08
.global func_ov29_0217979c
@@ -14516,9 +14516,9 @@ func_ov29_0217979c: ; 0x0217979c
ldr r1, _021797cc ; =0x444d534f
ldr r2, _021797d0 ; =func_ov29_02178358
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021797c8 ; =data_ov29_0217bd38
ldr r1, _021797d4 ; =func_0203e7b4
ldr r1, _021797d4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021797d8 ; =data_ov29_0217bd2c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14527,7 +14527,7 @@ func_ov29_0217979c: ; 0x0217979c
_021797c8: .word data_ov29_0217bd38
_021797cc: .word 0x444d534f
_021797d0: .word func_ov29_02178358
_021797d4: .word func_0203e7b4
_021797d4: .word _ZN9ActorTypeD1Ev
_021797d8: .word data_ov29_0217bd2c
.global func_ov29_021797dc
asm/ov30.inc
+2 -2
View File
@@ -131,8 +131,8 @@
.extern func_020367ec
.extern func_02036da8
.extern func_02036edc
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f558
.extern func_0204f754
.extern func_ov00_02079470
asm/ov30.s
+12 -12
View File
@@ -16196,36 +16196,36 @@ func_ov30_02188824: ; 0x02188824
ldr r1, _0218898c ; =0x43485352
ldr r2, _02188990 ; =func_ov30_02180628
ldr r3, _02188994 ; =func_ov30_02180548
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188988 ; =data_ov30_021894ac
ldr r1, _02188998 ; =func_0203e7b4
ldr r1, _02188998 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218899c ; =data_ov30_021894a0
bl __register_global_object
ldr r0, _021889a0 ; =data_ov30_021894cc
ldr r1, _021889a4 ; =0x43485332
ldr r2, _021889a8 ; =func_ov30_0218066c
ldr r3, _021889ac ; =func_ov30_021805ac
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021889a0 ; =data_ov30_021894cc
ldr r1, _02188998 ; =func_0203e7b4
ldr r1, _02188998 ; =_ZN9ActorTypeD1Ev
ldr r2, _021889b0 ; =data_ov30_021894c0
bl __register_global_object
ldr r0, _021889b4 ; =data_ov30_021894ec
ldr r1, _021889b8 ; =0x43485336
ldr r2, _021889bc ; =func_ov30_021806b0
ldr r3, _021889c0 ; =func_ov30_02180610
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021889b4 ; =data_ov30_021894ec
ldr r1, _02188998 ; =func_0203e7b4
ldr r1, _02188998 ; =_ZN9ActorTypeD1Ev
ldr r2, _021889c4 ; =data_ov30_021894e0
bl __register_global_object
ldr r0, _021889c8 ; =data_ov30_0218950c
ldr r1, _021889cc ; =0x43485334
ldr r2, _021889d0 ; =func_ov30_021806f4
ldr r3, _021889d4 ; =func_ov30_0218061c
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021889c8 ; =data_ov30_0218950c
ldr r1, _02188998 ; =func_0203e7b4
ldr r1, _02188998 ; =_ZN9ActorTypeD1Ev
ldr r2, _021889d8 ; =data_ov30_02189500
bl __register_global_object
mov lr, #0
@@ -16285,7 +16285,7 @@ _02188988: .word data_ov30_021894ac
_0218898c: .word 0x43485352
_02188990: .word func_ov30_02180628
_02188994: .word func_ov30_02180548
_02188998: .word func_0203e7b4
_02188998: .word _ZN9ActorTypeD1Ev
_0218899c: .word data_ov30_021894a0
_021889a0: .word data_ov30_021894cc
_021889a4: .word 0x43485332
@@ -16315,9 +16315,9 @@ func_ov30_021889ec: ; 0x021889ec
ldr r1, _02188a1c ; =0x43484f42
ldr r2, _02188a20 ; =func_ov30_021847b0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188a18 ; =data_ov30_0218953c
ldr r1, _02188a24 ; =func_0203e7b4
ldr r1, _02188a24 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188a28 ; =data_ov30_02189530
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16326,7 +16326,7 @@ func_ov30_021889ec: ; 0x021889ec
_02188a18: .word data_ov30_0218953c
_02188a1c: .word 0x43484f42
_02188a20: .word func_ov30_021847b0
_02188a24: .word func_0203e7b4
_02188a24: .word _ZN9ActorTypeD1Ev
_02188a28: .word data_ov30_02189530
.section .ctor, 4, 1, 4
asm/ov31.inc
+2 -2
View File
@@ -143,8 +143,8 @@
.extern func_020376c0
.extern func_02038b40
.extern func_02039250
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_ov00_02079e68
.extern func_ov00_02079ed8
.extern func_ov00_02079f3c
asm/ov31.s
+48 -48
View File
@@ -8220,153 +8220,153 @@ func_ov31_02181b6c: ; 0x02181b6c
ldr r1, _02181e44 ; =0x4954444d
ldr r2, _02181e48 ; =func_ov31_0217dbdc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181e40 ; =data_ov31_02183e94
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181e50 ; =data_ov31_02183e88
bl __register_global_object
ldr r0, _02181e54 ; =data_ov31_02183eb4
ldr r1, _02181e58 ; =0x4954534f
ldr r2, _02181e5c ; =func_ov31_0217dc1c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181e54 ; =data_ov31_02183eb4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181e60 ; =data_ov31_02183ea8
bl __register_global_object
ldr r0, _02181e64 ; =data_ov31_02183ed4
ldr r1, _02181e68 ; =0x49544855
ldr r2, _02181e6c ; =func_ov31_0217dc5c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181e64 ; =data_ov31_02183ed4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181e70 ; =data_ov31_02183ec8
bl __register_global_object
ldr r0, _02181e74 ; =data_ov31_02183ef4
ldr r1, _02181e78 ; =0x49544152
ldr r2, _02181e7c ; =func_ov31_0217dc9c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181e74 ; =data_ov31_02183ef4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181e80 ; =data_ov31_02183ee8
bl __register_global_object
ldr r0, _02181e84 ; =data_ov31_02183f14
ldr r1, _02181e88 ; =0x4954424d
ldr r2, _02181e8c ; =func_ov31_0217dcdc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181e84 ; =data_ov31_02183f14
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181e90 ; =data_ov31_02183f08
bl __register_global_object
ldr r0, _02181e94 ; =data_ov31_02183f34
ldr r1, _02181e98 ; =0x49544254
ldr r2, _02181e9c ; =func_ov31_0217dd1c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181e94 ; =data_ov31_02183f34
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181ea0 ; =data_ov31_02183f28
bl __register_global_object
ldr r0, _02181ea4 ; =data_ov31_02183f54
ldr r1, _02181ea8 ; =0x49544150
ldr r2, _02181eac ; =func_ov31_0217dd5c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181ea4 ; =data_ov31_02183f54
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181eb0 ; =data_ov31_02183f48
bl __register_global_object
ldr r0, _02181eb4 ; =data_ov31_02183f74
ldr r1, _02181eb8 ; =0x49544242
ldr r2, _02181ebc ; =func_ov31_0217dd9c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181eb4 ; =data_ov31_02183f74
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181ec0 ; =data_ov31_02183f68
bl __register_global_object
ldr r0, _02181ec4 ; =data_ov31_02183f94
ldr r1, _02181ec8 ; =0x49544232
ldr r2, _02181ecc ; =func_ov31_0217dddc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181ec4 ; =data_ov31_02183f94
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181ed0 ; =data_ov31_02183f88
bl __register_global_object
ldr r0, _02181ed4 ; =data_ov31_02183fb4
ldr r1, _02181ed8 ; =0x49545452
ldr r2, _02181edc ; =func_ov31_0217de1c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181ed4 ; =data_ov31_02183fb4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181ee0 ; =data_ov31_02183fa8
bl __register_global_object
ldr r0, _02181ee4 ; =data_ov31_02183fd4
ldr r1, _02181ee8 ; =0x49545350
ldr r2, _02181eec ; =func_ov31_0217de4c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181ee4 ; =data_ov31_02183fd4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181ef0 ; =data_ov31_02183fc8
bl __register_global_object
ldr r0, _02181ef4 ; =data_ov31_02183ff4
ldr r1, _02181ef8 ; =0x49545352
ldr r2, _02181efc ; =func_ov31_0217de7c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181ef4 ; =data_ov31_02183ff4
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181f00 ; =data_ov31_02183fe8
bl __register_global_object
ldr r0, _02181f04 ; =data_ov31_02184014
ldr r1, _02181f08 ; =0x4954534c
ldr r2, _02181f0c ; =func_ov31_0217debc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181f04 ; =data_ov31_02184014
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181f10 ; =data_ov31_02184008
bl __register_global_object
ldr r0, _02181f14 ; =data_ov31_02184034
ldr r1, _02181f18 ; =0x49545042
ldr r2, _02181f1c ; =func_ov31_0217defc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181f14 ; =data_ov31_02184034
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181f20 ; =data_ov31_02184028
bl __register_global_object
ldr r0, _02181f24 ; =data_ov31_02184054
ldr r1, _02181f28 ; =0x4954424b
ldr r2, _02181f2c ; =func_ov31_0217df3c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181f24 ; =data_ov31_02184054
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181f30 ; =data_ov31_02184048
bl __register_global_object
ldr r0, _02181f34 ; =data_ov31_02184074
ldr r1, _02181f38 ; =0x49544343
ldr r2, _02181f3c ; =func_ov31_0217df7c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181f34 ; =data_ov31_02184074
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181f40 ; =data_ov31_02184068
bl __register_global_object
ldr r0, _02181f44 ; =data_ov31_02184094
ldr r1, _02181f48 ; =0x49544259
ldr r2, _02181f4c ; =func_ov31_0217dfbc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181f44 ; =data_ov31_02184094
ldr r1, _02181e4c ; =func_0203e7b4
ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02181f50 ; =data_ov31_02184088
bl __register_global_object
mov r1, #0
@@ -8401,7 +8401,7 @@ func_ov31_02181b6c: ; 0x02181b6c
_02181e40: .word data_ov31_02183e94
_02181e44: .word 0x4954444d
_02181e48: .word func_ov31_0217dbdc
_02181e4c: .word func_0203e7b4
_02181e4c: .word _ZN9ActorTypeD1Ev
_02181e50: .word data_ov31_02183e88
_02181e54: .word data_ov31_02183eb4
_02181e58: .word 0x4954534f
@@ -8477,27 +8477,27 @@ func_ov31_02181f58: ; 0x02181f58
ldr r1, _02181fd0 ; =0x4954534e
ldr r2, _02181fd4 ; =func_ov31_02180708
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181fcc ; =data_ov31_02184160
ldr r1, _02181fd8 ; =func_0203e7b4
ldr r1, _02181fd8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02181fdc ; =data_ov31_02184154
bl __register_global_object
ldr r0, _02181fe0 ; =data_ov31_02184180
ldr r1, _02181fe4 ; =0x49545332
ldr r2, _02181fe8 ; =func_ov31_0218074c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181fe0 ; =data_ov31_02184180
ldr r1, _02181fd8 ; =func_0203e7b4
ldr r1, _02181fd8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02181fec ; =data_ov31_02184174
bl __register_global_object
ldr r0, _02181ff0 ; =data_ov31_021841a0
ldr r1, _02181ff4 ; =0x49545333
ldr r2, _02181ff8 ; =func_ov31_02180790
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02181ff0 ; =data_ov31_021841a0
ldr r1, _02181fd8 ; =func_0203e7b4
ldr r1, _02181fd8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02181ffc ; =data_ov31_02184194
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -8506,7 +8506,7 @@ func_ov31_02181f58: ; 0x02181f58
_02181fcc: .word data_ov31_02184160
_02181fd0: .word 0x4954534e
_02181fd4: .word func_ov31_02180708
_02181fd8: .word func_0203e7b4
_02181fd8: .word _ZN9ActorTypeD1Ev
_02181fdc: .word data_ov31_02184154
_02181fe0: .word data_ov31_02184180
_02181fe4: .word 0x49545332
@@ -8525,9 +8525,9 @@ func_ov31_02182000: ; 0x02182000
ldr r1, _02182030 ; =0x53495453
ldr r2, _02182034 ; =func_ov31_02180a84
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218202c ; =data_ov31_021841c0
ldr r1, _02182038 ; =func_0203e7b4
ldr r1, _02182038 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218203c ; =data_ov31_021841b4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -8536,7 +8536,7 @@ func_ov31_02182000: ; 0x02182000
_0218202c: .word data_ov31_021841c0
_02182030: .word 0x53495453
_02182034: .word func_ov31_02180a84
_02182038: .word func_0203e7b4
_02182038: .word _ZN9ActorTypeD1Ev
_0218203c: .word data_ov31_021841b4
.global func_ov31_02182040
@@ -8547,9 +8547,9 @@ func_ov31_02182040: ; 0x02182040
ldr r1, _02182070 ; =0x54455452
ldr r2, _02182074 ; =func_ov31_02181448
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218206c ; =data_ov31_021841e0
ldr r1, _02182078 ; =func_0203e7b4
ldr r1, _02182078 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218207c ; =data_ov31_021841d4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -8558,7 +8558,7 @@ func_ov31_02182040: ; 0x02182040
_0218206c: .word data_ov31_021841e0
_02182070: .word 0x54455452
_02182074: .word func_ov31_02181448
_02182078: .word func_0203e7b4
_02182078: .word _ZN9ActorTypeD1Ev
_0218207c: .word data_ov31_021841d4
.section .ctor, 4, 1, 4
asm/ov32.inc
+12 -12
View File
@@ -6,6 +6,14 @@
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -59,9 +67,12 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_02051f54
.extern data_02056be4
@@ -78,7 +89,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern gAdventureFlags
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -137,13 +147,10 @@
.extern func_0202e740
.extern func_0203493c
.extern func_020370d0
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
.extern func_ov00_0207c444
@@ -204,14 +211,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
@@ -347,4 +346,5 @@
.extern func_ov14_0213b904
.extern func_ov14_0213b984
.extern func_ov14_0213d480
.extern gAdventureFlags
.extern strncpy
asm/ov32.s
+18 -18
View File
@@ -11153,9 +11153,9 @@ func_ov32_02184d3c: ; 0x02184d3c
ldr r1, _02184e44 ; =0x43485543
ldr r2, _02184e48 ; =func_ov32_0217c81c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02184e40 ; =data_ov32_021861ec
ldr r1, _02184e4c ; =func_0203e7b4
ldr r1, _02184e4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02184e50 ; =data_ov32_021861e0
bl __register_global_object
mov r3, #1
@@ -11217,7 +11217,7 @@ func_ov32_02184d3c: ; 0x02184d3c
_02184e40: .word data_ov32_021861ec
_02184e44: .word 0x43485543
_02184e48: .word func_ov32_0217c81c
_02184e4c: .word func_0203e7b4
_02184e4c: .word _ZN9ActorTypeD1Ev
_02184e50: .word data_ov32_021861e0
_02184e54: .word 0x00001b33
_02184e58: .word 0x00001555
@@ -11234,9 +11234,9 @@ func_ov32_02184e68: ; 0x02184e68
ldr r1, _02184f6c ; =0x49434843
ldr r2, _02184f70 ; =func_ov32_0217dd10
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02184f68 ; =data_ov32_02186218
ldr r1, _02184f74 ; =func_0203e7b4
ldr r1, _02184f74 ; =_ZN9ActorTypeD1Ev
ldr r2, _02184f78 ; =data_ov32_0218620c
bl __register_global_object
mov r3, #1
@@ -11297,7 +11297,7 @@ func_ov32_02184e68: ; 0x02184e68
_02184f68: .word data_ov32_02186218
_02184f6c: .word 0x49434843
_02184f70: .word func_ov32_0217dd10
_02184f74: .word func_0203e7b4
_02184f74: .word _ZN9ActorTypeD1Ev
_02184f78: .word data_ov32_0218620c
_02184f7c: .word 0x00001b33
_02184f80: .word 0x00001555
@@ -11314,9 +11314,9 @@ func_ov32_02184f90: ; 0x02184f90
ldr r1, _02185094 ; =0x47454c4c
ldr r2, _02185098 ; =func_ov32_0217f878
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02185090 ; =data_ov32_02186244
ldr r1, _0218509c ; =func_0203e7b4
ldr r1, _0218509c ; =_ZN9ActorTypeD1Ev
ldr r2, _021850a0 ; =data_ov32_02186238
bl __register_global_object
mov r1, #1
@@ -11377,7 +11377,7 @@ func_ov32_02184f90: ; 0x02184f90
_02185090: .word data_ov32_02186244
_02185094: .word 0x47454c4c
_02185098: .word func_ov32_0217f878
_0218509c: .word func_0203e7b4
_0218509c: .word _ZN9ActorTypeD1Ev
_021850a0: .word data_ov32_02186238
_021850a4: .word 0x00001b33
_021850a8: .word 0x00001555
@@ -11450,9 +11450,9 @@ func_ov32_02185168: ; 0x02185168
ldr r1, _0218525c ; =0x42454530
ldr r2, _02185260 ; =func_ov32_02183034
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02185258 ; =data_ov32_021862a4
ldr r1, _02185264 ; =func_0203e7b4
ldr r1, _02185264 ; =_ZN9ActorTypeD1Ev
ldr r2, _02185268 ; =data_ov32_02186298
bl __register_global_object
mov r3, #0
@@ -11509,7 +11509,7 @@ func_ov32_02185168: ; 0x02185168
_02185258: .word data_ov32_021862a4
_0218525c: .word 0x42454530
_02185260: .word func_ov32_02183034
_02185264: .word func_0203e7b4
_02185264: .word _ZN9ActorTypeD1Ev
_02185268: .word data_ov32_02186298
_0218526c: .word data_ov32_02185da8
_02185270: .word func_ov00_020cceec
@@ -11524,9 +11524,9 @@ func_ov32_02185278: ; 0x02185278
ldr r1, _0218536c ; =0x42454548
ldr r2, _02185370 ; =func_ov32_02183d28
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02185368 ; =data_ov32_021862d0
ldr r1, _02185374 ; =func_0203e7b4
ldr r1, _02185374 ; =_ZN9ActorTypeD1Ev
ldr r2, _02185378 ; =data_ov32_021862c4
bl __register_global_object
mov r2, #0
@@ -11583,7 +11583,7 @@ func_ov32_02185278: ; 0x02185278
_02185368: .word data_ov32_021862d0
_0218536c: .word 0x42454548
_02185370: .word func_ov32_02183d28
_02185374: .word func_0203e7b4
_02185374: .word _ZN9ActorTypeD1Ev
_02185378: .word data_ov32_021862c4
_0218537c: .word data_ov32_02185f38
_02185380: .word func_ov00_020cceec
@@ -11597,9 +11597,9 @@ func_ov32_02185388: ; 0x02185388
ldr r1, _021853b8 ; =0x49434848
ldr r2, _021853bc ; =func_ov32_0218468c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021853b4 ; =data_ov32_021862fc
ldr r1, _021853c0 ; =func_0203e7b4
ldr r1, _021853c0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021853c4 ; =data_ov32_021862f0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -11608,7 +11608,7 @@ func_ov32_02185388: ; 0x02185388
_021853b4: .word data_ov32_021862fc
_021853b8: .word 0x49434848
_021853bc: .word func_ov32_0218468c
_021853c0: .word func_0203e7b4
_021853c0: .word _ZN9ActorTypeD1Ev
_021853c4: .word data_ov32_021862f0
.section .ctor, 4, 1, 4
asm/ov33.inc
+2 -2
View File
@@ -108,8 +108,8 @@
.extern func_02036f68
.extern func_02037628
.extern func_02038b40
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_0207a1c8
asm/ov33.s
+15 -15
View File
@@ -4862,9 +4862,9 @@ func_ov33_0217fb90: ; 0x0217fb90
ldr r1, _0217fc90 ; =0x504f4f4e
ldr r2, _0217fc94 ; =func_ov33_0217bd80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217fc8c ; =data_ov33_0218058c
ldr r1, _0217fc98 ; =func_0203e7b4
ldr r1, _0217fc98 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217fc9c ; =data_ov33_02180580
bl __register_global_object
mov r2, #0
@@ -4924,7 +4924,7 @@ func_ov33_0217fb90: ; 0x0217fb90
_0217fc8c: .word data_ov33_0218058c
_0217fc90: .word 0x504f4f4e
_0217fc94: .word func_ov33_0217bd80
_0217fc98: .word func_0203e7b4
_0217fc98: .word _ZN9ActorTypeD1Ev
_0217fc9c: .word data_ov33_02180580
_0217fca0: .word 0x000004cd
_0217fca4: .word data_ov33_0217fec0
@@ -4939,9 +4939,9 @@ func_ov33_0217fcb0: ; 0x0217fcb0
ldr r1, _0217fce0 ; =0x464c5442
ldr r2, _0217fce4 ; =func_ov33_0217c44c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217fcdc ; =data_ov33_021805b8
ldr r1, _0217fce8 ; =func_0203e7b4
ldr r1, _0217fce8 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217fcec ; =data_ov33_021805ac
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -4950,7 +4950,7 @@ func_ov33_0217fcb0: ; 0x0217fcb0
_0217fcdc: .word data_ov33_021805b8
_0217fce0: .word 0x464c5442
_0217fce4: .word func_ov33_0217c44c
_0217fce8: .word func_0203e7b4
_0217fce8: .word _ZN9ActorTypeD1Ev
_0217fcec: .word data_ov33_021805ac
.global func_ov33_0217fcf0
@@ -4961,9 +4961,9 @@ func_ov33_0217fcf0: ; 0x0217fcf0
ldr r1, _0217fd20 ; =0x4d524547
ldr r2, _0217fd24 ; =func_ov33_0217cfa8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217fd1c ; =data_ov33_021805d8
ldr r1, _0217fd28 ; =func_0203e7b4
ldr r1, _0217fd28 ; =_ZN9ActorTypeD1Ev
ldr r2, _0217fd2c ; =data_ov33_021805cc
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -4972,7 +4972,7 @@ func_ov33_0217fcf0: ; 0x0217fcf0
_0217fd1c: .word data_ov33_021805d8
_0217fd20: .word 0x4d524547
_0217fd24: .word func_ov33_0217cfa8
_0217fd28: .word func_0203e7b4
_0217fd28: .word _ZN9ActorTypeD1Ev
_0217fd2c: .word data_ov33_021805cc
.global func_ov33_0217fd30
@@ -4984,9 +4984,9 @@ func_ov33_0217fd30: ; 0x0217fd30
ldr r1, _0217fe34 ; =0x4b4f4b4f
ldr r2, _0217fe38 ; =func_ov33_0217ddfc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217fe30 ; =data_ov33_021805f8
ldr r1, _0217fe3c ; =func_0203e7b4
ldr r1, _0217fe3c ; =_ZN9ActorTypeD1Ev
ldr r2, _0217fe40 ; =data_ov33_021805ec
bl __register_global_object
mov r3, #0
@@ -5047,7 +5047,7 @@ func_ov33_0217fd30: ; 0x0217fd30
_0217fe30: .word data_ov33_021805f8
_0217fe34: .word 0x4b4f4b4f
_0217fe38: .word func_ov33_0217ddfc
_0217fe3c: .word func_0203e7b4
_0217fe3c: .word _ZN9ActorTypeD1Ev
_0217fe40: .word data_ov33_021805ec
_0217fe44: .word 0x00001333
_0217fe48: .word data_ov33_021802a8
@@ -5062,9 +5062,9 @@ func_ov33_0217fe54: ; 0x0217fe54
ldr r1, _0217fe84 ; =0x4b4f4b41
ldr r2, _0217fe88 ; =func_ov33_0217f658
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0217fe80 ; =data_ov33_02180624
ldr r1, _0217fe8c ; =func_0203e7b4
ldr r1, _0217fe8c ; =_ZN9ActorTypeD1Ev
ldr r2, _0217fe90 ; =data_ov33_02180618
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -5073,7 +5073,7 @@ func_ov33_0217fe54: ; 0x0217fe54
_0217fe80: .word data_ov33_02180624
_0217fe84: .word 0x4b4f4b41
_0217fe88: .word func_ov33_0217f658
_0217fe8c: .word func_0203e7b4
_0217fe8c: .word _ZN9ActorTypeD1Ev
_0217fe90: .word data_ov33_02180618
.section .ctor, 4, 1, 4
asm/ov34.inc
+2 -2
View File
@@ -118,8 +118,8 @@
.extern func_0202e310
.extern func_0202e544
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_0207a1c8
asm/ov34.s
+9 -9
View File
@@ -11162,9 +11162,9 @@ func_ov34_02185818: ; 0x02185818
ldr r1, _0218593c ; =0x47524f4b
ldr r2, _02185940 ; =func_ov34_0217bd80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02185938 ; =data_ov34_021861ac
ldr r1, _02185944 ; =func_0203e7b4
ldr r1, _02185944 ; =_ZN9ActorTypeD1Ev
ldr r2, _02185948 ; =data_ov34_021861a0
bl __register_global_object
ldr r3, _0218594c ; =data_ov34_021861a0
@@ -11233,7 +11233,7 @@ func_ov34_02185818: ; 0x02185818
_02185938: .word data_ov34_021861ac
_0218593c: .word 0x47524f4b
_02185940: .word func_ov34_0217bd80
_02185944: .word func_0203e7b4
_02185944: .word _ZN9ActorTypeD1Ev
_02185948: .word data_ov34_021861a0
_0218594c: .word data_ov34_021861a0
_02185950: .word data_ov34_021861cc
@@ -11254,9 +11254,9 @@ func_ov34_02185974: ; 0x02185974
ldr r1, _021859c0 ; =0x47524f42
ldr r2, _021859c4 ; =func_ov34_02184728
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021859bc ; =data_ov34_02186374
ldr r1, _021859c8 ; =func_0203e7b4
ldr r1, _021859c8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021859cc ; =data_ov34_02186368
bl __register_global_object
ldr r0, _021859d0 ; =data_ov34_02186394
@@ -11272,7 +11272,7 @@ func_ov34_02185974: ; 0x02185974
_021859bc: .word data_ov34_02186374
_021859c0: .word 0x47524f42
_021859c4: .word func_ov34_02184728
_021859c8: .word func_0203e7b4
_021859c8: .word _ZN9ActorTypeD1Ev
_021859cc: .word data_ov34_02186368
_021859d0: .word data_ov34_02186394
_021859d4: .word func_ov34_02185020
@@ -11287,9 +11287,9 @@ func_ov34_021859dc: ; 0x021859dc
ldr r1, _02185a4c ; =0x47524254
ldr r2, _02185a50 ; =func_ov34_02185034
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02185a48 ; =data_ov34_021863ac
ldr r1, _02185a54 ; =func_0203e7b4
ldr r1, _02185a54 ; =_ZN9ActorTypeD1Ev
ldr r2, _02185a58 ; =data_ov34_021863a0
bl __register_global_object
ldr r1, _02185a5c ; =data_02057200
@@ -11313,7 +11313,7 @@ func_ov34_021859dc: ; 0x021859dc
_02185a48: .word data_ov34_021863ac
_02185a4c: .word 0x47524254
_02185a50: .word func_ov34_02185034
_02185a54: .word func_0203e7b4
_02185a54: .word _ZN9ActorTypeD1Ev
_02185a58: .word data_ov34_021863a0
_02185a5c: .word data_02057200
_02185a60: .word data_ov34_02186070
asm/ov35.inc
+10 -10
View File
@@ -7,6 +7,13 @@
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl14CheckTouchFastEj
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -63,8 +70,11 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_027e0194
.extern data_027e037c
@@ -145,11 +155,8 @@
.extern func_0203608c
.extern func_02036140
.extern func_02036ce4
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
@@ -170,13 +177,6 @@
.extern func_ov00_02089318
.extern func_ov00_0208b158
.extern func_ov00_0208e7a4
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a6110
asm/ov35.s
+12 -12
View File
@@ -11807,9 +11807,9 @@ func_ov35_02185668: ; 0x02185668
ldr r1, _021856cc ; =0x52594453
ldr r2, _021856d0 ; =func_ov35_0217bd80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021856c8 ; =data_ov35_02185ecc
ldr r1, _021856d4 ; =func_0203e7b4
ldr r1, _021856d4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021856d8 ; =data_ov35_02185ec0
bl __register_global_object
ldr r3, _021856dc ; =data_ov35_0218595c
@@ -11830,7 +11830,7 @@ func_ov35_02185668: ; 0x02185668
_021856c8: .word data_ov35_02185ecc
_021856cc: .word 0x52594453
_021856d0: .word func_ov35_0217bd80
_021856d4: .word func_0203e7b4
_021856d4: .word _ZN9ActorTypeD1Ev
_021856d8: .word data_ov35_02185ec0
_021856dc: .word data_ov35_0218595c
_021856e0: .word 0x00000ccd
@@ -11846,9 +11846,9 @@ func_ov35_021856f0: ; 0x021856f0
ldr r1, _02185720 ; =0x5259444d
ldr r2, _02185724 ; =func_ov35_0217d854
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218571c ; =data_ov35_02185ef8
ldr r1, _02185728 ; =func_0203e7b4
ldr r1, _02185728 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218572c ; =data_ov35_02185eec
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -11857,7 +11857,7 @@ func_ov35_021856f0: ; 0x021856f0
_0218571c: .word data_ov35_02185ef8
_02185720: .word 0x5259444d
_02185724: .word func_ov35_0217d854
_02185728: .word func_0203e7b4
_02185728: .word _ZN9ActorTypeD1Ev
_0218572c: .word data_ov35_02185eec
.global func_ov35_02185730
@@ -11868,9 +11868,9 @@ func_ov35_02185730: ; 0x02185730
ldr r1, _0218585c ; =0x52595244
ldr r2, _02185860 ; =func_ov35_0217e940
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02185858 ; =data_ov35_02186f9c
ldr r1, _02185864 ; =func_0203e7b4
ldr r1, _02185864 ; =_ZN9ActorTypeD1Ev
ldr r2, _02185868 ; =data_ov35_02186f90
bl __register_global_object
ldr ip, _0218586c ; =0x00002333
@@ -11942,7 +11942,7 @@ func_ov35_02185730: ; 0x02185730
_02185858: .word data_ov35_02186f9c
_0218585c: .word 0x52595244
_02185860: .word func_ov35_0217e940
_02185864: .word func_0203e7b4
_02185864: .word _ZN9ActorTypeD1Ev
_02185868: .word data_ov35_02186f90
_0218586c: .word 0x00002333
_02185870: .word data_ov35_02185c70
@@ -11974,9 +11974,9 @@ func_ov35_021858c0: ; 0x021858c0
ldr r1, _021858f0 ; =0x52594448
ldr r2, _021858f4 ; =func_ov35_02184810
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021858ec ; =data_ov35_02186ff8
ldr r1, _021858f8 ; =func_0203e7b4
ldr r1, _021858f8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021858fc ; =data_ov35_02186fec
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -11985,7 +11985,7 @@ func_ov35_021858c0: ; 0x021858c0
_021858ec: .word data_ov35_02186ff8
_021858f0: .word 0x52594448
_021858f4: .word func_ov35_02184810
_021858f8: .word func_0203e7b4
_021858f8: .word _ZN9ActorTypeD1Ev
_021858fc: .word data_ov35_02186fec
.section .ctor, 4, 1, 4
asm/ov36.inc
+2 -2
View File
@@ -142,8 +142,8 @@
.extern func_02033e70
.extern func_020368f4
.extern func_02036ce4
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
asm/ov36.s
+6 -6
View File
@@ -12916,9 +12916,9 @@ func_ov36_02186bb4: ; 0x02186bb4
ldr r1, _02186be4 ; =0x50574253
ldr r2, _02186be8 ; =func_ov36_0217bd80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02186be0 ; =data_ov36_02186fac
ldr r1, _02186bec ; =func_0203e7b4
ldr r1, _02186bec ; =_ZN9ActorTypeD1Ev
ldr r2, _02186bf0 ; =data_ov36_02186fa0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -12927,7 +12927,7 @@ func_ov36_02186bb4: ; 0x02186bb4
_02186be0: .word data_ov36_02186fac
_02186be4: .word 0x50574253
_02186be8: .word func_ov36_0217bd80
_02186bec: .word func_0203e7b4
_02186bec: .word _ZN9ActorTypeD1Ev
_02186bf0: .word data_ov36_02186fa0
.global func_ov36_02186bf4
@@ -12938,9 +12938,9 @@ func_ov36_02186bf4: ; 0x02186bf4
ldr r1, _02186c24 ; =0x50424652
ldr r2, _02186c28 ; =func_ov36_02185ffc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02186c20 ; =data_ov36_02186fcc
ldr r1, _02186c2c ; =func_0203e7b4
ldr r1, _02186c2c ; =_ZN9ActorTypeD1Ev
ldr r2, _02186c30 ; =data_ov36_02186fc0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -12949,7 +12949,7 @@ func_ov36_02186bf4: ; 0x02186bf4
_02186c20: .word data_ov36_02186fcc
_02186c24: .word 0x50424652
_02186c28: .word func_ov36_02185ffc
_02186c2c: .word func_0203e7b4
_02186c2c: .word _ZN9ActorTypeD1Ev
_02186c30: .word data_ov36_02186fc0
.section .ctor, 4, 1, 4
asm/ov37.inc
+2 -2
View File
@@ -66,6 +66,8 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
@@ -132,8 +134,6 @@
.extern func_0202e310
.extern func_0202e58c
.extern func_02036140
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_0207a1c8
asm/ov37.s
+15 -15
View File
@@ -15351,9 +15351,9 @@ func_ov37_02188690: ; 0x02188690
ldr r1, _02188794 ; =0x57534253
ldr r2, _02188798 ; =func_ov37_0217bd80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188790 ; =data_ov37_0218916c
ldr r1, _0218879c ; =func_0203e7b4
ldr r1, _0218879c ; =_ZN9ActorTypeD1Ev
ldr r2, _021887a0 ; =data_ov37_02189160
bl __register_global_object
mov lr, #0
@@ -15414,7 +15414,7 @@ func_ov37_02188690: ; 0x02188690
_02188790: .word data_ov37_0218916c
_02188794: .word 0x57534253
_02188798: .word func_ov37_0217bd80
_0218879c: .word func_0203e7b4
_0218879c: .word _ZN9ActorTypeD1Ev
_021887a0: .word data_ov37_02189160
_021887a4: .word 0x00001b33
_021887a8: .word data_ov37_02188a20
@@ -15429,9 +15429,9 @@ func_ov37_021887b4: ; 0x021887b4
ldr r1, _02188800 ; =0x57534242
ldr r2, _02188804 ; =func_ov37_021843a4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021887fc ; =data_ov37_021891a0
ldr r1, _02188808 ; =func_0203e7b4
ldr r1, _02188808 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218880c ; =data_ov37_02189194
bl __register_global_object
ldr r0, _02188810 ; =data_ov37_021891c0
@@ -15447,7 +15447,7 @@ func_ov37_021887b4: ; 0x021887b4
_021887fc: .word data_ov37_021891a0
_02188800: .word 0x57534242
_02188804: .word func_ov37_021843a4
_02188808: .word func_0203e7b4
_02188808: .word _ZN9ActorTypeD1Ev
_0218880c: .word data_ov37_02189194
_02188810: .word data_ov37_021891c0
_02188814: .word func_ov37_02185054
@@ -15461,9 +15461,9 @@ func_ov37_0218881c: ; 0x0218881c
ldr r1, _0218884c ; =0x57534246
ldr r2, _02188850 ; =func_ov37_02185068
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188848 ; =data_ov37_021891d8
ldr r1, _02188854 ; =func_0203e7b4
ldr r1, _02188854 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188858 ; =data_ov37_021891cc
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15472,7 +15472,7 @@ func_ov37_0218881c: ; 0x0218881c
_02188848: .word data_ov37_021891d8
_0218884c: .word 0x57534246
_02188850: .word func_ov37_02185068
_02188854: .word func_0203e7b4
_02188854: .word _ZN9ActorTypeD1Ev
_02188858: .word data_ov37_021891cc
.global func_ov37_0218885c
@@ -15483,9 +15483,9 @@ func_ov37_0218885c: ; 0x0218885c
ldr r1, _0218888c ; =0x57534243
ldr r2, _02188890 ; =func_ov37_021853ac
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188888 ; =data_ov37_021891f8
ldr r1, _02188894 ; =func_0203e7b4
ldr r1, _02188894 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188898 ; =data_ov37_021891ec
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -15494,7 +15494,7 @@ func_ov37_0218885c: ; 0x0218885c
_02188888: .word data_ov37_021891f8
_0218888c: .word 0x57534243
_02188890: .word func_ov37_021853ac
_02188894: .word func_0203e7b4
_02188894: .word _ZN9ActorTypeD1Ev
_02188898: .word data_ov37_021891ec
.global func_ov37_0218889c
@@ -15506,9 +15506,9 @@ func_ov37_0218889c: ; 0x0218889c
ldr r1, _02188998 ; =0x57534248
ldr r2, _0218899c ; =func_ov37_0218553c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188994 ; =data_ov37_02189218
ldr r1, _021889a0 ; =func_0203e7b4
ldr r1, _021889a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021889a4 ; =data_ov37_0218920c
bl __register_global_object
mov r2, #0
@@ -15567,7 +15567,7 @@ func_ov37_0218889c: ; 0x0218889c
_02188994: .word data_ov37_02189218
_02188998: .word 0x57534248
_0218899c: .word func_ov37_0218553c
_021889a0: .word func_0203e7b4
_021889a0: .word _ZN9ActorTypeD1Ev
_021889a4: .word data_ov37_0218920c
_021889a8: .word data_ov37_02188f00
_021889ac: .word func_ov00_020cceec
asm/ov38.inc
+2 -2
View File
@@ -152,8 +152,8 @@
.extern func_0202e58c
.extern func_02036770
.extern func_02036ce4
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_0207a1c8
asm/ov38.s
+6 -6
View File
@@ -14764,9 +14764,9 @@ func_ov38_02188ae4: ; 0x02188ae4
ldr r1, _02188be0 ; =0x47444f46
ldr r2, _02188be4 ; =func_ov38_0217bd80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188bdc ; =data_ov38_021891ec
ldr r1, _02188be8 ; =func_0203e7b4
ldr r1, _02188be8 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188bec ; =data_ov38_021891e0
bl __register_global_object
ldr r1, _02188bf0 ; =data_02057200
@@ -14825,7 +14825,7 @@ func_ov38_02188ae4: ; 0x02188ae4
_02188bdc: .word data_ov38_021891ec
_02188be0: .word 0x47444f46
_02188be4: .word func_ov38_0217bd80
_02188be8: .word func_0203e7b4
_02188be8: .word _ZN9ActorTypeD1Ev
_02188bec: .word data_ov38_021891e0
_02188bf0: .word data_02057200
_02188bf4: .word data_ov38_02188ca0
@@ -14848,9 +14848,9 @@ func_ov38_02188c20: ; 0x02188c20
ldr r1, _02188c50 ; =0x4e564d4d
ldr r2, _02188c54 ; =func_ov38_021884dc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188c4c ; =data_ov38_02189470
ldr r1, _02188c58 ; =func_0203e7b4
ldr r1, _02188c58 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188c5c ; =data_ov38_02189464
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -14859,7 +14859,7 @@ func_ov38_02188c20: ; 0x02188c20
_02188c4c: .word data_ov38_02189470
_02188c50: .word 0x4e564d4d
_02188c54: .word func_ov38_021884dc
_02188c58: .word func_0203e7b4
_02188c58: .word _ZN9ActorTypeD1Ev
_02188c5c: .word data_ov38_02189464
.section .ctor, 4, 1, 4
asm/ov39.inc
+7 -7
View File
@@ -7,6 +7,10 @@
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
@@ -59,8 +63,11 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_027e0194
@@ -135,11 +142,8 @@
.extern func_02036ce4
.extern func_0203780c
.extern func_02038718
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207c1b0
.extern func_ov00_0207c444
@@ -154,10 +158,6 @@
.extern func_ov00_02087fe0
.extern func_ov00_02088000
.extern func_ov00_02089318
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
asm/ov39.s
+3 -3
View File
@@ -13266,9 +13266,9 @@ func_ov39_02186968: ; 0x02186968
ldr r1, _021869a4 ; =0x474f4354
ldr r2, _021869a8 ; =func_ov39_0217bd80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021869a0 ; =data_ov39_02186ccc
ldr r1, _021869ac ; =func_0203e7b4
ldr r1, _021869ac ; =_ZN9ActorTypeD1Ev
ldr r2, _021869b0 ; =data_ov39_02186cc0
bl __register_global_object
ldr r0, _021869b4 ; =data_ov39_02186cc0
@@ -13280,7 +13280,7 @@ func_ov39_02186968: ; 0x02186968
_021869a0: .word data_ov39_02186ccc
_021869a4: .word 0x474f4354
_021869a8: .word func_ov39_0217bd80
_021869ac: .word func_0203e7b4
_021869ac: .word _ZN9ActorTypeD1Ev
_021869b0: .word data_ov39_02186cc0
_021869b4: .word data_ov39_02186cc0
_021869b8: .word data_ov39_02186a28
asm/ov40.inc
+2 -2
View File
@@ -241,8 +241,8 @@
.extern func_0203d7e0
.extern func_0203dcb4
.extern func_0203e0c8
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_02042190
.extern func_02043594
.extern func_020435b4
asm/ov40.s
+21 -21
View File
@@ -16338,9 +16338,9 @@ func_ov40_02188360: ; 0x02188360
ldr r1, _02188390 ; =0x444d4348
ldr r2, _02188394 ; =func_ov40_0217bd80
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218838c ; =data_ov40_02189acc
ldr r1, _02188398 ; =func_0203e7b4
ldr r1, _02188398 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218839c ; =data_ov40_02189ac0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16349,7 +16349,7 @@ func_ov40_02188360: ; 0x02188360
_0218838c: .word data_ov40_02189acc
_02188390: .word 0x444d4348
_02188394: .word func_ov40_0217bd80
_02188398: .word func_0203e7b4
_02188398: .word _ZN9ActorTypeD1Ev
_0218839c: .word data_ov40_02189ac0
.global func_ov40_021883a0
@@ -16360,9 +16360,9 @@ func_ov40_021883a0: ; 0x021883a0
ldr r1, _021883d0 ; =0x444d4b53
ldr r2, _021883d4 ; =func_ov40_02183e24
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021883cc ; =data_ov40_0219a0ec
ldr r1, _021883d8 ; =func_0203e7b4
ldr r1, _021883d8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021883dc ; =data_ov40_0219a0e0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16371,7 +16371,7 @@ func_ov40_021883a0: ; 0x021883a0
_021883cc: .word data_ov40_0219a0ec
_021883d0: .word 0x444d4b53
_021883d4: .word func_ov40_02183e24
_021883d8: .word func_0203e7b4
_021883d8: .word _ZN9ActorTypeD1Ev
_021883dc: .word data_ov40_0219a0e0
.global func_ov40_021883e0
@@ -16382,9 +16382,9 @@ func_ov40_021883e0: ; 0x021883e0
ldr r1, _02188410 ; =0x444d5452
ldr r2, _02188414 ; =func_ov40_02184a4c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218840c ; =data_ov40_0219a10c
ldr r1, _02188418 ; =func_0203e7b4
ldr r1, _02188418 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218841c ; =data_ov40_0219a100
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16393,7 +16393,7 @@ func_ov40_021883e0: ; 0x021883e0
_0218840c: .word data_ov40_0219a10c
_02188410: .word 0x444d5452
_02188414: .word func_ov40_02184a4c
_02188418: .word func_0203e7b4
_02188418: .word _ZN9ActorTypeD1Ev
_0218841c: .word data_ov40_0219a100
.global func_ov40_02188420
@@ -16404,9 +16404,9 @@ func_ov40_02188420: ; 0x02188420
ldr r1, _02188450 ; =0x444d5345
ldr r2, _02188454 ; =func_ov40_02184e58
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218844c ; =data_ov40_0219a12c
ldr r1, _02188458 ; =func_0203e7b4
ldr r1, _02188458 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218845c ; =data_ov40_0219a120
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16415,7 +16415,7 @@ func_ov40_02188420: ; 0x02188420
_0218844c: .word data_ov40_0219a12c
_02188450: .word 0x444d5345
_02188454: .word func_ov40_02184e58
_02188458: .word func_0203e7b4
_02188458: .word _ZN9ActorTypeD1Ev
_0218845c: .word data_ov40_0219a120
.global func_ov40_02188460
@@ -16467,9 +16467,9 @@ func_ov40_021884ac: ; 0x021884ac
ldr r1, _021884dc ; =0x444d5350
ldr r2, _021884e0 ; =func_ov40_021853f0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021884d8 ; =data_ov40_0219a14c
ldr r1, _021884e4 ; =func_0203e7b4
ldr r1, _021884e4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021884e8 ; =data_ov40_0219a140
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16478,7 +16478,7 @@ func_ov40_021884ac: ; 0x021884ac
_021884d8: .word data_ov40_0219a14c
_021884dc: .word 0x444d5350
_021884e0: .word func_ov40_021853f0
_021884e4: .word func_0203e7b4
_021884e4: .word _ZN9ActorTypeD1Ev
_021884e8: .word data_ov40_0219a140
.global func_ov40_021884ec
@@ -16489,9 +16489,9 @@ func_ov40_021884ec: ; 0x021884ec
ldr r1, _0218851c ; =0x444d4556
ldr r2, _02188520 ; =func_ov40_021857cc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02188518 ; =data_ov40_0219a16c
ldr r1, _02188524 ; =func_0203e7b4
ldr r1, _02188524 ; =_ZN9ActorTypeD1Ev
ldr r2, _02188528 ; =data_ov40_0219a160
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16500,7 +16500,7 @@ func_ov40_021884ec: ; 0x021884ec
_02188518: .word data_ov40_0219a16c
_0218851c: .word 0x444d4556
_02188520: .word func_ov40_021857cc
_02188524: .word func_0203e7b4
_02188524: .word _ZN9ActorTypeD1Ev
_02188528: .word data_ov40_0219a160
.global func_ov40_0218852c
@@ -16593,9 +16593,9 @@ func_ov40_021885c4: ; 0x021885c4
ldr r1, _021885f4 ; =0x444d4847
ldr r2, _021885f8 ; =func_ov40_02187380
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021885f0 ; =data_ov40_0219a18c
ldr r1, _021885fc ; =func_0203e7b4
ldr r1, _021885fc ; =_ZN9ActorTypeD1Ev
ldr r2, _02188600 ; =data_ov40_0219a180
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -16604,7 +16604,7 @@ func_ov40_021885c4: ; 0x021885c4
_021885f0: .word data_ov40_0219a18c
_021885f4: .word 0x444d4847
_021885f8: .word func_ov40_02187380
_021885fc: .word func_0203e7b4
_021885fc: .word _ZN9ActorTypeD1Ev
_02188600: .word data_ov40_0219a180
.section .ctor, 4, 1, 4
asm/ov41.inc
+5 -5
View File
@@ -2,6 +2,7 @@
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags3GetEj
.extern _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
@@ -59,9 +60,12 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_027e0764
@@ -73,7 +77,6 @@
.extern data_027e0e60
.extern data_027e0f68
.extern data_027e0f6c
.extern gAdventureFlags
.extern data_027e0f78
.extern data_027e0f90
.extern data_027e0f94
@@ -122,11 +125,8 @@
.extern func_02036f68
.extern func_02037628
.extern func_020385b8
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c31c
@@ -140,7 +140,6 @@
.extern func_ov00_0208cd48
.extern func_ov00_02093a5c
.extern func_ov00_02094824
.extern _ZN14AdventureFlags3GetEj
.extern func_ov00_020a956c
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
@@ -304,4 +303,5 @@
.extern func_ov14_0214aa0c
.extern func_ov26_02175f30
.extern func_ov26_02175f68
.extern gAdventureFlags
.extern gItemManager
asm/ov41.s
+18 -18
View File
@@ -6015,9 +6015,9 @@ func_ov41_0218e098: ; 0x0218e098
ldr r1, _0218e0c8 ; =0x53574f4e
ldr r2, _0218e0cc ; =func_ov41_02189560
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e0c4 ; =data_ov41_0218ea8c
ldr r1, _0218e0d0 ; =func_0203e7b4
ldr r1, _0218e0d0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e0d4 ; =data_ov41_0218ea80
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6026,7 +6026,7 @@ func_ov41_0218e098: ; 0x0218e098
_0218e0c4: .word data_ov41_0218ea8c
_0218e0c8: .word 0x53574f4e
_0218e0cc: .word func_ov41_02189560
_0218e0d0: .word func_0203e7b4
_0218e0d0: .word _ZN9ActorTypeD1Ev
_0218e0d4: .word data_ov41_0218ea80
.global func_ov41_0218e0d8
@@ -6037,9 +6037,9 @@ func_ov41_0218e0d8: ; 0x0218e0d8
ldr r1, _0218e120 ; =0x43525053
ldr r2, _0218e124 ; =func_ov41_02189be4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e11c ; =data_ov41_0218eaac
ldr r1, _0218e128 ; =func_0203e7b4
ldr r1, _0218e128 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e12c ; =data_ov41_0218eaa0
bl __register_global_object
ldr r1, _0218e130 ; =data_02057200
@@ -6054,7 +6054,7 @@ func_ov41_0218e0d8: ; 0x0218e0d8
_0218e11c: .word data_ov41_0218eaac
_0218e120: .word 0x43525053
_0218e124: .word func_ov41_02189be4
_0218e128: .word func_0203e7b4
_0218e128: .word _ZN9ActorTypeD1Ev
_0218e12c: .word data_ov41_0218eaa0
_0218e130: .word data_02057200
_0218e134: .word data_ov41_0218e444
@@ -6067,9 +6067,9 @@ func_ov41_0218e138: ; 0x0218e138
ldr r1, _0218e168 ; =0x4f53574f
ldr r2, _0218e16c ; =func_ov41_0218a2fc
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e164 ; =data_ov41_0218eacc
ldr r1, _0218e170 ; =func_0203e7b4
ldr r1, _0218e170 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e174 ; =data_ov41_0218eac0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6078,7 +6078,7 @@ func_ov41_0218e138: ; 0x0218e138
_0218e164: .word data_ov41_0218eacc
_0218e168: .word 0x4f53574f
_0218e16c: .word func_ov41_0218a2fc
_0218e170: .word func_0203e7b4
_0218e170: .word _ZN9ActorTypeD1Ev
_0218e174: .word data_ov41_0218eac0
.global func_ov41_0218e178
@@ -6089,9 +6089,9 @@ func_ov41_0218e178: ; 0x0218e178
ldr r1, _0218e1a8 ; =0x4353574d
ldr r2, _0218e1ac ; =func_ov41_0218aac0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e1a4 ; =data_ov41_0218eaec
ldr r1, _0218e1b0 ; =func_0203e7b4
ldr r1, _0218e1b0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e1b4 ; =data_ov41_0218eae0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6100,7 +6100,7 @@ func_ov41_0218e178: ; 0x0218e178
_0218e1a4: .word data_ov41_0218eaec
_0218e1a8: .word 0x4353574d
_0218e1ac: .word func_ov41_0218aac0
_0218e1b0: .word func_0203e7b4
_0218e1b0: .word _ZN9ActorTypeD1Ev
_0218e1b4: .word data_ov41_0218eae0
.global func_ov41_0218e1b8
@@ -6111,9 +6111,9 @@ func_ov41_0218e1b8: ; 0x0218e1b8
ldr r1, _0218e1e8 ; =0x4353544d
ldr r2, _0218e1ec ; =func_ov41_0218c45c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e1e4 ; =data_ov41_0218eb10
ldr r1, _0218e1f0 ; =func_0203e7b4
ldr r1, _0218e1f0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e1f4 ; =data_ov41_0218eb04
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6122,7 +6122,7 @@ func_ov41_0218e1b8: ; 0x0218e1b8
_0218e1e4: .word data_ov41_0218eb10
_0218e1e8: .word 0x4353544d
_0218e1ec: .word func_ov41_0218c45c
_0218e1f0: .word func_0203e7b4
_0218e1f0: .word _ZN9ActorTypeD1Ev
_0218e1f4: .word data_ov41_0218eb04
.global func_ov41_0218e1f8
@@ -6134,9 +6134,9 @@ func_ov41_0218e1f8: ; 0x0218e1f8
ldr r1, _0218e2ec ; =0x4b4d4244
ldr r2, _0218e2f0 ; =func_ov41_0218ce94
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e2e8 ; =data_ov41_0218eb30
ldr r1, _0218e2f4 ; =func_0203e7b4
ldr r1, _0218e2f4 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e2f8 ; =data_ov41_0218eb24
bl __register_global_object
mov r0, #0xc
@@ -6193,7 +6193,7 @@ func_ov41_0218e1f8: ; 0x0218e1f8
_0218e2e8: .word data_ov41_0218eb30
_0218e2ec: .word 0x4b4d4244
_0218e2f0: .word func_ov41_0218ce94
_0218e2f4: .word func_0203e7b4
_0218e2f4: .word _ZN9ActorTypeD1Ev
_0218e2f8: .word data_ov41_0218eb24
_0218e2fc: .word 0x00001b33
_0218e300: .word data_ov41_0218e85c
asm/ov42.inc
+5 -5
View File
@@ -2,6 +2,7 @@
.extern _ZN11ItemManager13ForceEquipItemEi
.extern _ZN11ItemManager20ClearForcedEquipItemEv
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags3GetEj
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
@@ -47,8 +48,11 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_027e05f4
.extern data_027e0618
@@ -59,7 +63,6 @@
.extern data_027e0e58
.extern data_027e0e60
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f78
.extern data_027e0f94
.extern data_027e0fb8
@@ -106,16 +109,12 @@
.extern func_020349cc
.extern func_02034bc8
.extern func_020385b8
.extern func_0203e784
.extern func_0203e7b4
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207bb1c
.extern func_ov00_0207c1b0
.extern func_ov00_02083918
.extern func_ov00_0208726c
.extern func_ov00_02087400
.extern _ZN14AdventureFlags3GetEj
.extern func_ov00_020a61ac
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
@@ -186,6 +185,7 @@
.extern func_ov14_02145f0c
.extern func_ov14_0214a92c
.extern func_ov14_0214aa0c
.extern gAdventureFlags
.extern gItemManager
.extern strcat
.extern strcpy
asm/ov42.s
+8 -8
View File
@@ -3942,9 +3942,9 @@ func_ov42_0218c744: ; 0x0218c744
ldr r1, _0218c774 ; =0x4d544e50
ldr r2, _0218c778 ; =func_ov42_0218a760
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218c770 ; =data_ov42_0218cd30
ldr r1, _0218c77c ; =func_0203e7b4
ldr r1, _0218c77c ; =_ZN9ActorTypeD1Ev
ldr r2, _0218c780 ; =data_ov42_0218cd24
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -3953,7 +3953,7 @@ func_ov42_0218c744: ; 0x0218c744
_0218c770: .word data_ov42_0218cd30
_0218c774: .word 0x4d544e50
_0218c778: .word func_ov42_0218a760
_0218c77c: .word func_0203e7b4
_0218c77c: .word _ZN9ActorTypeD1Ev
_0218c780: .word data_ov42_0218cd24
.global func_ov42_0218c784
@@ -3964,18 +3964,18 @@ func_ov42_0218c784: ; 0x0218c784
ldr r1, _0218c7d8 ; =0x4d544748
ldr r2, _0218c7dc ; =func_ov42_0218b914
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218c7d4 ; =data_ov42_0218cd54
ldr r1, _0218c7e0 ; =func_0203e7b4
ldr r1, _0218c7e0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218c7e4 ; =data_ov42_0218cd48
bl __register_global_object
ldr r0, _0218c7e8 ; =data_ov42_0218cd74
ldr r1, _0218c7ec ; =0x4d544752
ldr r2, _0218c7f0 ; =func_ov42_0218b944
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218c7e8 ; =data_ov42_0218cd74
ldr r1, _0218c7e0 ; =func_0203e7b4
ldr r1, _0218c7e0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218c7f4 ; =data_ov42_0218cd68
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -3984,7 +3984,7 @@ func_ov42_0218c784: ; 0x0218c784
_0218c7d4: .word data_ov42_0218cd54
_0218c7d8: .word 0x4d544748
_0218c7dc: .word func_ov42_0218b914
_0218c7e0: .word func_0203e7b4
_0218c7e0: .word _ZN9ActorTypeD1Ev
_0218c7e4: .word data_ov42_0218cd48
_0218c7e8: .word data_ov42_0218cd74
_0218c7ec: .word 0x4d544752
asm/ov43.inc
+2 -2
View File
@@ -90,8 +90,8 @@
.extern func_0202e58c
.extern func_02036ce4
.extern func_02036da8
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_0207c474
asm/ov43.s
+8 -8
View File
@@ -4708,18 +4708,18 @@ func_ov43_0218d414: ; 0x0218d414
ldr r1, _0218d548 ; =0x50424c4e
ldr r2, _0218d54c ; =func_ov43_02189560
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218d544 ; =data_ov43_0218db0c
ldr r1, _0218d550 ; =func_0203e7b4
ldr r1, _0218d550 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218d554 ; =data_ov43_0218db00
bl __register_global_object
ldr r0, _0218d558 ; =data_ov43_0218db2c
ldr r1, _0218d55c ; =0x55424c4e
ldr r2, _0218d560 ; =func_ov43_021895a0
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218d558 ; =data_ov43_0218db2c
ldr r1, _0218d550 ; =func_0203e7b4
ldr r1, _0218d550 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218d564 ; =data_ov43_0218db20
bl __register_global_object
mov r0, #1
@@ -4783,7 +4783,7 @@ func_ov43_0218d414: ; 0x0218d414
_0218d544: .word data_ov43_0218db0c
_0218d548: .word 0x50424c4e
_0218d54c: .word func_ov43_02189560
_0218d550: .word func_0203e7b4
_0218d550: .word _ZN9ActorTypeD1Ev
_0218d554: .word data_ov43_0218db00
_0218d558: .word data_ov43_0218db2c
_0218d55c: .word 0x55424c4e
@@ -4804,9 +4804,9 @@ func_ov43_0218d580: ; 0x0218d580
ldr r1, _0218d5b0 ; =0x50425a4b
ldr r2, _0218d5b4 ; =func_ov43_0218b018
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218d5ac ; =data_ov43_0218db58
ldr r1, _0218d5b8 ; =func_0203e7b4
ldr r1, _0218d5b8 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218d5bc ; =data_ov43_0218db4c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -4815,7 +4815,7 @@ func_ov43_0218d580: ; 0x0218d580
_0218d5ac: .word data_ov43_0218db58
_0218d5b0: .word 0x50425a4b
_0218d5b4: .word func_ov43_0218b018
_0218d5b8: .word func_0203e7b4
_0218d5b8: .word _ZN9ActorTypeD1Ev
_0218d5bc: .word data_ov43_0218db4c
.section .ctor, 4, 1, 4
asm/ov44.inc
+2 -2
View File
@@ -100,8 +100,8 @@
.extern func_0202dc38
.extern func_0202e310
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_02042f74
.extern func_0204f614
.extern func_0204f754
asm/ov44.s
+24 -24
View File
@@ -7115,9 +7115,9 @@ func_ov44_0218ea9c: ; 0x0218ea9c
ldr r1, _0218eba4 ; =0x534e414b
ldr r2, _0218eba8 ; =func_ov44_02189560
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218eba0 ; =data_ov44_0218feec
ldr r1, _0218ebac ; =func_0203e7b4
ldr r1, _0218ebac ; =_ZN9ActorTypeD1Ev
ldr r2, _0218ebb0 ; =data_ov44_0218fee0
bl __register_global_object
mov r1, #1
@@ -7179,7 +7179,7 @@ func_ov44_0218ea9c: ; 0x0218ea9c
_0218eba0: .word data_ov44_0218feec
_0218eba4: .word 0x534e414b
_0218eba8: .word func_ov44_02189560
_0218ebac: .word func_0203e7b4
_0218ebac: .word _ZN9ActorTypeD1Ev
_0218ebb0: .word data_ov44_0218fee0
_0218ebb4: .word 0x000004cd
_0218ebb8: .word 0x00001555
@@ -7196,9 +7196,9 @@ func_ov44_0218ebc8: ; 0x0218ebc8
ldr r1, _0218ecc4 ; =0x52415431
ldr r2, _0218ecc8 ; =func_ov44_0218a0a8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218ecc0 ; =data_ov44_0218ff18
ldr r1, _0218eccc ; =func_0203e7b4
ldr r1, _0218eccc ; =_ZN9ActorTypeD1Ev
ldr r2, _0218ecd0 ; =data_ov44_0218ff0c
bl __register_global_object
mov r3, #1
@@ -7257,7 +7257,7 @@ func_ov44_0218ebc8: ; 0x0218ebc8
_0218ecc0: .word data_ov44_0218ff18
_0218ecc4: .word 0x52415431
_0218ecc8: .word func_ov44_0218a0a8
_0218eccc: .word func_0203e7b4
_0218eccc: .word _ZN9ActorTypeD1Ev
_0218ecd0: .word data_ov44_0218ff0c
_0218ecd4: .word 0x000004cd
_0218ecd8: .word data_ov44_0218f3e4
@@ -7272,9 +7272,9 @@ func_ov44_0218ece4: ; 0x0218ece4
ldr r1, _0218ed14 ; =0x4b455930
ldr r2, _0218ed18 ; =func_ov44_0218aa98
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218ed10 ; =data_ov44_0218ff44
ldr r1, _0218ed1c ; =func_0203e7b4
ldr r1, _0218ed1c ; =_ZN9ActorTypeD1Ev
ldr r2, _0218ed20 ; =data_ov44_0218ff38
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -7283,7 +7283,7 @@ func_ov44_0218ece4: ; 0x0218ece4
_0218ed10: .word data_ov44_0218ff44
_0218ed14: .word 0x4b455930
_0218ed18: .word func_ov44_0218aa98
_0218ed1c: .word func_0203e7b4
_0218ed1c: .word _ZN9ActorTypeD1Ev
_0218ed20: .word data_ov44_0218ff38
.global func_ov44_0218ed24
@@ -7295,9 +7295,9 @@ func_ov44_0218ed24: ; 0x0218ed24
ldr r1, _0218eee4 ; =0x4f435441
ldr r2, _0218eee8 ; =func_ov44_0218b084
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218eee0 ; =data_ov44_0218ff64
ldr r1, _0218eeec ; =func_0203e7b4
ldr r1, _0218eeec ; =_ZN9ActorTypeD1Ev
ldr r2, _0218eef0 ; =data_ov44_0218ff58
bl __register_global_object
mov r3, #1
@@ -7405,7 +7405,7 @@ func_ov44_0218ed24: ; 0x0218ed24
_0218eee0: .word data_ov44_0218ff64
_0218eee4: .word 0x4f435441
_0218eee8: .word func_ov44_0218b084
_0218eeec: .word func_0203e7b4
_0218eeec: .word _ZN9ActorTypeD1Ev
_0218eef0: .word data_ov44_0218ff58
_0218eef4: .word 0x00001b33
_0218eef8: .word data_ov44_0218f670
@@ -7422,9 +7422,9 @@ func_ov44_0218ef0c: ; 0x0218ef0c
ldr r1, _0218ef3c ; =0x4f435348
ldr r2, _0218ef40 ; =func_ov44_0218c288
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218ef38 ; =data_ov44_0218ff9c
ldr r1, _0218ef44 ; =func_0203e7b4
ldr r1, _0218ef44 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218ef48 ; =data_ov44_0218ff90
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -7433,7 +7433,7 @@ func_ov44_0218ef0c: ; 0x0218ef0c
_0218ef38: .word data_ov44_0218ff9c
_0218ef3c: .word 0x4f435348
_0218ef40: .word func_ov44_0218c288
_0218ef44: .word func_0203e7b4
_0218ef44: .word _ZN9ActorTypeD1Ev
_0218ef48: .word data_ov44_0218ff90
.global func_ov44_0218ef4c
@@ -7445,9 +7445,9 @@ func_ov44_0218ef4c: ; 0x0218ef4c
ldr r1, _0218f04c ; =0x4b455448
ldr r2, _0218f050 ; =func_ov44_0218c6d8
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218f048 ; =data_ov44_0218ffd0
ldr r1, _0218f054 ; =func_0203e7b4
ldr r1, _0218f054 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218f058 ; =data_ov44_0218ffc4
bl __register_global_object
mov r1, #1
@@ -7507,7 +7507,7 @@ func_ov44_0218ef4c: ; 0x0218ef4c
_0218f048: .word data_ov44_0218ffd0
_0218f04c: .word 0x4b455448
_0218f050: .word func_ov44_0218c6d8
_0218f054: .word func_0203e7b4
_0218f054: .word _ZN9ActorTypeD1Ev
_0218f058: .word data_ov44_0218ffc4
_0218f05c: .word 0x000004cd
_0218f060: .word 0x00002aab
@@ -7524,9 +7524,9 @@ func_ov44_0218f070: ; 0x0218f070
ldr r1, _0218f16c ; =0x52415430
ldr r2, _0218f170 ; =func_ov44_0218d510
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218f168 ; =data_ov44_0218fffc
ldr r1, _0218f174 ; =func_0203e7b4
ldr r1, _0218f174 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218f178 ; =data_ov44_0218fff0
bl __register_global_object
mov r3, #1
@@ -7585,7 +7585,7 @@ func_ov44_0218f070: ; 0x0218f070
_0218f168: .word data_ov44_0218fffc
_0218f16c: .word 0x52415430
_0218f170: .word func_ov44_0218d510
_0218f174: .word func_0203e7b4
_0218f174: .word _ZN9ActorTypeD1Ev
_0218f178: .word data_ov44_0218fff0
_0218f17c: .word 0x000004cd
_0218f180: .word data_ov44_0218fc68
@@ -7600,9 +7600,9 @@ func_ov44_0218f18c: ; 0x0218f18c
ldr r1, _0218f1bc ; =0x52415448
ldr r2, _0218f1c0 ; =func_ov44_0218e320
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218f1b8 ; =data_ov44_02190028
ldr r1, _0218f1c4 ; =func_0203e7b4
ldr r1, _0218f1c4 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218f1c8 ; =data_ov44_0219001c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -7611,7 +7611,7 @@ func_ov44_0218f18c: ; 0x0218f18c
_0218f1b8: .word data_ov44_02190028
_0218f1bc: .word 0x52415448
_0218f1c0: .word func_ov44_0218e320
_0218f1c4: .word func_0203e7b4
_0218f1c4: .word _ZN9ActorTypeD1Ev
_0218f1c8: .word data_ov44_0219001c
.section .ctor, 4, 1, 4
asm/ov45.inc
+2 -2
View File
@@ -107,8 +107,8 @@
.extern func_020376c0
.extern func_02039250
.extern func_0203d77c
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_ov00_0207b1fc
.extern func_ov00_0207c1b0
.extern func_ov00_0207c474
asm/ov45.s
+9 -9
View File
@@ -6579,9 +6579,9 @@ func_ov45_0218e3e8: ; 0x0218e3e8
ldr r1, _0218e418 ; =0x54524144
ldr r2, _0218e41c ; =func_ov45_02189560
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e414 ; =data_ov45_0218ed8c
ldr r1, _0218e420 ; =func_0203e7b4
ldr r1, _0218e420 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e424 ; =data_ov45_0218ed80
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6590,7 +6590,7 @@ func_ov45_0218e3e8: ; 0x0218e3e8
_0218e414: .word data_ov45_0218ed8c
_0218e418: .word 0x54524144
_0218e41c: .word func_ov45_02189560
_0218e420: .word func_0203e7b4
_0218e420: .word _ZN9ActorTypeD1Ev
_0218e424: .word data_ov45_0218ed80
.global func_ov45_0218e428
@@ -6601,9 +6601,9 @@ func_ov45_0218e428: ; 0x0218e428
ldr r1, _0218e458 ; =0x54524142
ldr r2, _0218e45c ; =func_ov45_0218a838
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e454 ; =data_ov45_0218edb0
ldr r1, _0218e460 ; =func_0203e7b4
ldr r1, _0218e460 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e464 ; =data_ov45_0218eda4
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6612,7 +6612,7 @@ func_ov45_0218e428: ; 0x0218e428
_0218e454: .word data_ov45_0218edb0
_0218e458: .word 0x54524142
_0218e45c: .word func_ov45_0218a838
_0218e460: .word func_0203e7b4
_0218e460: .word _ZN9ActorTypeD1Ev
_0218e464: .word data_ov45_0218eda4
.global func_ov45_0218e468
@@ -6623,9 +6623,9 @@ func_ov45_0218e468: ; 0x0218e468
ldr r1, _0218e498 ; =0x4a554447
ldr r2, _0218e49c ; =func_ov45_0218c4c4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0218e494 ; =data_ov45_0218edd4
ldr r1, _0218e4a0 ; =func_0203e7b4
ldr r1, _0218e4a0 ; =_ZN9ActorTypeD1Ev
ldr r2, _0218e4a4 ; =data_ov45_0218edc8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6634,7 +6634,7 @@ func_ov45_0218e468: ; 0x0218e468
_0218e494: .word data_ov45_0218edd4
_0218e498: .word 0x4a554447
_0218e49c: .word func_ov45_0218c4c4
_0218e4a0: .word func_0203e7b4
_0218e4a0: .word _ZN9ActorTypeD1Ev
_0218e4a4: .word data_ov45_0218edc8
.section .ctor, 4, 1, 4
asm/ov46.inc
+2 -2
View File
@@ -116,8 +116,8 @@
.extern func_02036ce4
.extern func_02036f68
.extern func_02037628
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207ba90
asm/ov46.s
+12 -12
View File
@@ -5269,9 +5269,9 @@ func_ov46_021944ac: ; 0x021944ac
ldr r1, _021944dc ; =0x4c4e424b
ldr r2, _021944e0 ; =func_ov46_02190040
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021944d8 ; =data_ov46_02194bac
ldr r1, _021944e4 ; =func_0203e7b4
ldr r1, _021944e4 ; =_ZN9ActorTypeD1Ev
ldr r2, _021944e8 ; =data_ov46_02194ba0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -5280,7 +5280,7 @@ func_ov46_021944ac: ; 0x021944ac
_021944d8: .word data_ov46_02194bac
_021944dc: .word 0x4c4e424b
_021944e0: .word func_ov46_02190040
_021944e4: .word func_0203e7b4
_021944e4: .word _ZN9ActorTypeD1Ev
_021944e8: .word data_ov46_02194ba0
.global func_ov46_021944ec
@@ -5291,9 +5291,9 @@ func_ov46_021944ec: ; 0x021944ec
ldr r1, _0219451c ; =0x4c4e4232
ldr r2, _02194520 ; =func_ov46_02190978
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02194518 ; =data_ov46_02194bcc
ldr r1, _02194524 ; =func_0203e7b4
ldr r1, _02194524 ; =_ZN9ActorTypeD1Ev
ldr r2, _02194528 ; =data_ov46_02194bc0
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -5302,7 +5302,7 @@ func_ov46_021944ec: ; 0x021944ec
_02194518: .word data_ov46_02194bcc
_0219451c: .word 0x4c4e4232
_02194520: .word func_ov46_02190978
_02194524: .word func_0203e7b4
_02194524: .word _ZN9ActorTypeD1Ev
_02194528: .word data_ov46_02194bc0
.global func_ov46_0219452c
@@ -5314,9 +5314,9 @@ func_ov46_0219452c: ; 0x0219452c
ldr r1, _02194594 ; =0x4d524848
ldr r2, _02194598 ; =func_ov46_02191e5c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02194590 ; =data_ov46_02194c54
ldr r1, _0219459c ; =func_0203e7b4
ldr r1, _0219459c ; =_ZN9ActorTypeD1Ev
ldr r2, _021945a0 ; =data_ov46_02194c48
bl __register_global_object
ldr r1, _021945a4 ; =data_02057200
@@ -5338,7 +5338,7 @@ func_ov46_0219452c: ; 0x0219452c
_02194590: .word data_ov46_02194c54
_02194594: .word 0x4d524848
_02194598: .word func_ov46_02191e5c
_0219459c: .word func_0203e7b4
_0219459c: .word _ZN9ActorTypeD1Ev
_021945a0: .word data_ov46_02194c48
_021945a4: .word data_02057200
_021945a8: .word data_ov46_02194900
@@ -5352,9 +5352,9 @@ func_ov46_021945ac: ; 0x021945ac
ldr r1, _02194624 ; =0x54534e49
ldr r2, _02194628 ; =func_ov46_02192930
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02194620 ; =data_ov46_02194c74
ldr r1, _0219462c ; =func_0203e7b4
ldr r1, _0219462c ; =_ZN9ActorTypeD1Ev
ldr r2, _02194630 ; =data_ov46_02194c68
bl __register_global_object
ldr r1, _02194634 ; =data_02057200
@@ -5380,7 +5380,7 @@ func_ov46_021945ac: ; 0x021945ac
_02194620: .word data_ov46_02194c74
_02194624: .word 0x54534e49
_02194628: .word func_ov46_02192930
_0219462c: .word func_0203e7b4
_0219462c: .word _ZN9ActorTypeD1Ev
_02194630: .word data_ov46_02194c68
_02194634: .word data_02057200
_02194638: .word data_ov46_02194a6c
asm/ov47.inc
+2 -2
View File
@@ -39,8 +39,8 @@
.extern func_0201e388
.extern func_0202e310
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
asm/ov47.s
+12 -12
View File
@@ -5136,9 +5136,9 @@ func_ov47_021942f0: ; 0x021942f0
ldr r1, _02194320 ; =0x524c5347
ldr r2, _02194324 ; =func_ov47_02190040
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0219431c ; =data_ov47_02194a0c
ldr r1, _02194328 ; =func_0203e7b4
ldr r1, _02194328 ; =_ZN9ActorTypeD1Ev
ldr r2, _0219432c ; =data_ov47_02194a00
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -5147,7 +5147,7 @@ func_ov47_021942f0: ; 0x021942f0
_0219431c: .word data_ov47_02194a0c
_02194320: .word 0x524c5347
_02194324: .word func_ov47_02190040
_02194328: .word func_0203e7b4
_02194328: .word _ZN9ActorTypeD1Ev
_0219432c: .word data_ov47_02194a00
.global func_ov47_02194330
@@ -5158,9 +5158,9 @@ func_ov47_02194330: ; 0x02194330
ldr r1, _02194360 ; =0x524c5354
ldr r2, _02194364 ; =func_ov47_02190334
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _0219435c ; =data_ov47_02194a2c
ldr r1, _02194368 ; =func_0203e7b4
ldr r1, _02194368 ; =_ZN9ActorTypeD1Ev
ldr r2, _0219436c ; =data_ov47_02194a20
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -5169,7 +5169,7 @@ func_ov47_02194330: ; 0x02194330
_0219435c: .word data_ov47_02194a2c
_02194360: .word 0x524c5354
_02194364: .word func_ov47_02190334
_02194368: .word func_0203e7b4
_02194368: .word _ZN9ActorTypeD1Ev
_0219436c: .word data_ov47_02194a20
.global func_ov47_02194370
@@ -5181,9 +5181,9 @@ func_ov47_02194370: ; 0x02194370
ldr r1, _02194484 ; =0x4653484d
ldr r2, _02194488 ; =func_ov47_02191438
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02194480 ; =data_ov47_02194a4c
ldr r1, _0219448c ; =func_0203e7b4
ldr r1, _0219448c ; =_ZN9ActorTypeD1Ev
ldr r2, _02194490 ; =data_ov47_02194a40
bl __register_global_object
mov r0, #7
@@ -5248,7 +5248,7 @@ func_ov47_02194370: ; 0x02194370
_02194480: .word data_ov47_02194a4c
_02194484: .word 0x4653484d
_02194488: .word func_ov47_02191438
_0219448c: .word func_0203e7b4
_0219448c: .word _ZN9ActorTypeD1Ev
_02194490: .word data_ov47_02194a40
_02194494: .word 0x00000b33
_02194498: .word 0x00001555
@@ -5264,9 +5264,9 @@ func_ov47_021944a8: ; 0x021944a8
ldr r1, _021944d8 ; =0x46534842
ldr r2, _021944dc ; =func_ov47_02193a54
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021944d4 ; =data_ov47_02194a78
ldr r1, _021944e0 ; =func_0203e7b4
ldr r1, _021944e0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021944e4 ; =data_ov47_02194a6c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -5275,7 +5275,7 @@ func_ov47_021944a8: ; 0x021944a8
_021944d4: .word data_ov47_02194a78
_021944d8: .word 0x46534842
_021944dc: .word func_ov47_02193a54
_021944e0: .word func_0203e7b4
_021944e0: .word _ZN9ActorTypeD1Ev
_021944e4: .word data_ov47_02194a6c
.section .ctor, 4, 1, 4
asm/ov48.inc
+2 -2
View File
@@ -102,8 +102,8 @@
.extern func_0201e544
.extern func_0202b154
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_0207a1c8
asm/ov48.s
+18 -18
View File
@@ -5759,9 +5759,9 @@ func_ov48_021946c0: ; 0x021946c0
ldr r1, _021947b4 ; =0x42424c45
ldr r2, _021947b8 ; =func_ov48_02190040
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021947b0 ; =data_ov48_0219540c
ldr r1, _021947bc ; =func_0203e7b4
ldr r1, _021947bc ; =_ZN9ActorTypeD1Ev
ldr r2, _021947c0 ; =data_ov48_02195400
bl __register_global_object
mov ip, #1
@@ -5818,7 +5818,7 @@ func_ov48_021946c0: ; 0x021946c0
_021947b0: .word data_ov48_0219540c
_021947b4: .word 0x42424c45
_021947b8: .word func_ov48_02190040
_021947bc: .word func_0203e7b4
_021947bc: .word _ZN9ActorTypeD1Ev
_021947c0: .word data_ov48_02195400
_021947c4: .word data_ov48_02194b40
_021947c8: .word func_ov00_020cceec
@@ -5833,9 +5833,9 @@ func_ov48_021947d0: ; 0x021947d0
ldr r1, _021948d8 ; =0x424d4f53
ldr r2, _021948dc ; =func_ov48_02190c34
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021948d4 ; =data_ov48_02195438
ldr r1, _021948e0 ; =func_0203e7b4
ldr r1, _021948e0 ; =_ZN9ActorTypeD1Ev
ldr r2, _021948e4 ; =data_ov48_0219542c
bl __register_global_object
mov r3, #0
@@ -5897,7 +5897,7 @@ func_ov48_021947d0: ; 0x021947d0
_021948d4: .word data_ov48_02195438
_021948d8: .word 0x424d4f53
_021948dc: .word func_ov48_02190c34
_021948e0: .word func_0203e7b4
_021948e0: .word _ZN9ActorTypeD1Ev
_021948e4: .word data_ov48_0219542c
_021948e8: .word 0x00001333
_021948ec: .word data_ov48_02194d50
@@ -5913,9 +5913,9 @@ func_ov48_021948f8: ; 0x021948f8
ldr r1, _021949f4 ; =0x5441494c
ldr r2, _021949f8 ; =func_ov48_02191d48
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021949f0 ; =data_ov48_02195478
ldr r1, _021949fc ; =func_0203e7b4
ldr r1, _021949fc ; =_ZN9ActorTypeD1Ev
ldr r2, _02194a00 ; =data_ov48_0219546c
bl __register_global_object
mov ip, #1
@@ -5974,7 +5974,7 @@ func_ov48_021948f8: ; 0x021948f8
_021949f0: .word data_ov48_02195478
_021949f4: .word 0x5441494c
_021949f8: .word func_ov48_02191d48
_021949fc: .word func_0203e7b4
_021949fc: .word _ZN9ActorTypeD1Ev
_02194a00: .word data_ov48_0219546c
_02194a04: .word 0x00001555
_02194a08: .word data_ov48_02194f30
@@ -5989,9 +5989,9 @@ func_ov48_02194a14: ; 0x02194a14
ldr r1, _02194a44 ; =0x46495242
ldr r2, _02194a48 ; =func_ov48_02193414
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02194a40 ; =data_ov48_021954a4
ldr r1, _02194a4c ; =func_0203e7b4
ldr r1, _02194a4c ; =_ZN9ActorTypeD1Ev
ldr r2, _02194a50 ; =data_ov48_02195498
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6000,7 +6000,7 @@ func_ov48_02194a14: ; 0x02194a14
_02194a40: .word data_ov48_021954a4
_02194a44: .word 0x46495242
_02194a48: .word func_ov48_02193414
_02194a4c: .word func_0203e7b4
_02194a4c: .word _ZN9ActorTypeD1Ev
_02194a50: .word data_ov48_02195498
.global func_ov48_02194a54
@@ -6011,9 +6011,9 @@ func_ov48_02194a54: ; 0x02194a54
ldr r1, _02194a84 ; =0x54414c42
ldr r2, _02194a88 ; =func_ov48_02193fd4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02194a80 ; =data_ov48_021954c4
ldr r1, _02194a8c ; =func_0203e7b4
ldr r1, _02194a8c ; =_ZN9ActorTypeD1Ev
ldr r2, _02194a90 ; =data_ov48_021954b8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6022,7 +6022,7 @@ func_ov48_02194a54: ; 0x02194a54
_02194a80: .word data_ov48_021954c4
_02194a84: .word 0x54414c42
_02194a88: .word func_ov48_02193fd4
_02194a8c: .word func_0203e7b4
_02194a8c: .word _ZN9ActorTypeD1Ev
_02194a90: .word data_ov48_021954b8
.global func_ov48_02194a94
@@ -6033,9 +6033,9 @@ func_ov48_02194a94: ; 0x02194a94
ldr r1, _02194ac4 ; =0x424d5345
ldr r2, _02194ac8 ; =func_ov48_021940ac
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02194ac0 ; =data_ov48_021954e4
ldr r1, _02194acc ; =func_0203e7b4
ldr r1, _02194acc ; =_ZN9ActorTypeD1Ev
ldr r2, _02194ad0 ; =data_ov48_021954d8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6044,7 +6044,7 @@ func_ov48_02194a94: ; 0x02194a94
_02194ac0: .word data_ov48_021954e4
_02194ac4: .word 0x424d5345
_02194ac8: .word func_ov48_021940ac
_02194acc: .word func_0203e7b4
_02194acc: .word _ZN9ActorTypeD1Ev
_02194ad0: .word data_ov48_021954d8
.section .ctor, 4, 1, 4
asm/ov49.inc
+2 -2
View File
@@ -110,8 +110,8 @@
.extern func_0202b154
.extern func_0202e310
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f754
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
asm/ov49.s
+9 -9
View File
@@ -3496,9 +3496,9 @@ func_ov49_021982c8: ; 0x021982c8
ldr r1, _021983d0 ; =0x4c4b4c4b
ldr r2, _021983d4 ; =func_ov49_02195500
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _021983cc ; =data_ov49_0219892c
ldr r1, _021983d8 ; =func_0203e7b4
ldr r1, _021983d8 ; =_ZN9ActorTypeD1Ev
ldr r2, _021983dc ; =data_ov49_02198920
bl __register_global_object
mov r4, #1
@@ -3560,7 +3560,7 @@ func_ov49_021982c8: ; 0x021982c8
_021983cc: .word data_ov49_0219892c
_021983d0: .word 0x4c4b4c4b
_021983d4: .word func_ov49_02195500
_021983d8: .word func_0203e7b4
_021983d8: .word _ZN9ActorTypeD1Ev
_021983dc: .word data_ov49_02198920
_021983e0: .word 0x00001b33
_021983e4: .word 0x00001555
@@ -3576,9 +3576,9 @@ func_ov49_021983f4: ; 0x021983f4
ldr r1, _02198424 ; =0x4e534844
ldr r2, _02198428 ; =func_ov49_0219763c
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02198420 ; =data_ov49_02198958
ldr r1, _0219842c ; =func_0203e7b4
ldr r1, _0219842c ; =_ZN9ActorTypeD1Ev
ldr r2, _02198430 ; =data_ov49_0219894c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -3587,7 +3587,7 @@ func_ov49_021983f4: ; 0x021983f4
_02198420: .word data_ov49_02198958
_02198424: .word 0x4e534844
_02198428: .word func_ov49_0219763c
_0219842c: .word func_0203e7b4
_0219842c: .word _ZN9ActorTypeD1Ev
_02198430: .word data_ov49_0219894c
.global func_ov49_02198434
@@ -3598,9 +3598,9 @@ func_ov49_02198434: ; 0x02198434
ldr r1, _02198464 ; =0x45514152
ldr r2, _02198468 ; =func_ov49_02197cf4
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02198460 ; =data_ov49_02198978
ldr r1, _0219846c ; =func_0203e7b4
ldr r1, _0219846c ; =_ZN9ActorTypeD1Ev
ldr r2, _02198470 ; =data_ov49_0219896c
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -3609,7 +3609,7 @@ func_ov49_02198434: ; 0x02198434
_02198460: .word data_ov49_02198978
_02198464: .word 0x45514152
_02198468: .word func_ov49_02197cf4
_0219846c: .word func_0203e7b4
_0219846c: .word _ZN9ActorTypeD1Ev
_02198470: .word data_ov49_0219896c
.section .ctor, 4, 1, 4
asm/ov50.inc
+7 -7
View File
@@ -6,6 +6,9 @@
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -60,8 +63,11 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor9IsGrabbedEv
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02054954
.extern data_027e0194
@@ -70,7 +76,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern gAdventureFlags
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
@@ -103,11 +108,8 @@
.extern func_0202bfc0
.extern func_0202db30
.extern func_0202e310
.extern func_0203e784
.extern func_0203e7b4
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
@@ -126,9 +128,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a95a4
@@ -191,3 +190,4 @@
.extern func_ov14_021482c0
.extern func_ov14_02148334
.extern func_ov14_02148364
.extern gAdventureFlags
asm/ov50.s
+6 -6
View File
@@ -3898,9 +3898,9 @@ func_ov50_0219882c: ; 0x0219882c
ldr r1, _02198878 ; =0x42494752
ldr r2, _0219887c ; =func_ov50_02195500
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02198874 ; =data_ov50_02198cac
ldr r1, _02198880 ; =func_0203e7b4
ldr r1, _02198880 ; =_ZN9ActorTypeD1Ev
ldr r2, _02198884 ; =data_ov50_02198ca0
bl __register_global_object
ldr r1, _02198888 ; =0x00004b5c
@@ -3916,7 +3916,7 @@ func_ov50_0219882c: ; 0x0219882c
_02198874: .word data_ov50_02198cac
_02198878: .word 0x42494752
_0219887c: .word func_ov50_02195500
_02198880: .word func_0203e7b4
_02198880: .word _ZN9ActorTypeD1Ev
_02198884: .word data_ov50_02198ca0
_02198888: .word 0x00004b5c
_0219888c: .word data_ov50_021989c0
@@ -3930,9 +3930,9 @@ func_ov50_02198890: ; 0x02198890
ldr r1, _02198988 ; =0x43524f57
ldr r2, _0219898c ; =func_ov50_02197580
mov r3, #0
bl func_0203e784
bl _ZN9ActorTypeC1EjPFP5ActorvEPv
ldr r0, _02198984 ; =data_ov50_02198ccc
ldr r1, _02198990 ; =func_0203e7b4
ldr r1, _02198990 ; =_ZN9ActorTypeD1Ev
ldr r2, _02198994 ; =data_ov50_02198cc0
bl __register_global_object
mov ip, #1
@@ -3990,7 +3990,7 @@ func_ov50_02198890: ; 0x02198890
_02198984: .word data_ov50_02198ccc
_02198988: .word 0x43524f57
_0219898c: .word func_ov50_02197580
_02198990: .word func_0203e7b4
_02198990: .word _ZN9ActorTypeD1Ev
_02198994: .word data_ov50_02198cc0
_02198998: .word 0x00001b33
_0219899c: .word data_ov50_02198ad8
asm/ov51.inc
+2 -2
View File
@@ -39,8 +39,8 @@
.extern func_0202bb98
.extern func_0202bba8
.extern func_0202bbbc
.extern func_0203e784
.extern func_0203e7b4
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object

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