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

Merge branch 'main' into item-manager

Browse Source
This commit is contained in:
Aetias
2024-04-16 21:34:10 +02:00
parent c323a0cda8 bdeea7c6fc
commit 9889b69468
138 changed files with 62914 additions and 62341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dtcm.s
+2 -2
View File
@@ -3947,8 +3947,8 @@ data_027e0f6c:
.global data_027e0f70
data_027e0f70:
.space 0x4
.global data_027e0f74
data_027e0f74:
.global gAdventureFlags
gAdventureFlags:
.space 0x4
.global data_027e0f78
data_027e0f78:
asm/itcm.s
+881 -881
View File
File diff suppressed because it is too large Load Diff
asm/main.inc
+5 -5
View File
@@ -101,7 +101,6 @@
.extern data_027e0e2c
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f7c
.extern data_027e0f80
.extern data_027e0f84
@@ -319,10 +318,10 @@
.extern func_ov00_0208b180
.extern func_ov00_0208cae8
.extern func_ov00_0208caf8
.extern func_ov00_02097628
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern _ZN14AdventureFlags6ExistsEv
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern func_ov00_0209d728
.extern func_ov00_0209d90c
.extern func_ov00_020a5e9c
@@ -418,6 +417,7 @@
.extern func_ov16_021200fc
.extern func_ov16_02120130
.extern func_ov18_02169634
.extern gAdventureFlags
.extern gHeap
.extern gItemManager
.extern gOverlayManager
asm/main.s
+3837 -3837
View File
File diff suppressed because it is too large Load Diff
asm/ov00/Actor/Actor.inc
+2 -2
View File
@@ -20,7 +20,7 @@
.extern data_027e0d0c
.extern data_027e0d3c
.extern data_027e0e60
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
@@ -53,7 +53,7 @@
.extern func_ov00_02084be0
.extern func_ov00_02084c5c
.extern func_ov00_02087ef0
.extern func_ov00_02097738
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern func_ov00_020bc46c
.extern func_ov00_020bc7f8
.extern func_ov00_020bc854
asm/ov00/Actor/Actor.s
+9 -9
View File
@@ -803,9 +803,9 @@ _020c1d3c:
arm_func_start _ZN5Actor18func_ov00_020c1d58Ev
_ZN5Actor18func_ov00_020c1d58Ev: ; 0x020c1d58
stmdb sp!, {r3, lr}
ldr r0, _020c1d98 ; =data_027e0f74
ldr r0, _020c1d98 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, pc}
@@ -820,7 +820,7 @@ _ZN5Actor18func_ov00_020c1d58Ev: ; 0x020c1d58
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c1d58Ev
_020c1d98: .word data_027e0f74
_020c1d98: .word gAdventureFlags
_020c1d9c: .word data_027e0f90
.global _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
@@ -994,11 +994,11 @@ _020c1fc4: .word data_027e0f90
_ZN5Actor18func_ov00_020c1fc8Ej: ; 0x020c1fc8
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0x6c
ldr r2, _020c2224 ; =data_027e0f74
ldr r2, _020c2224 ; =gAdventureFlags
mov r4, r0
ldr r0, [r2]
mov r6, r1
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
addne sp, sp, #0x6c
movne r0, #0
@@ -1149,7 +1149,7 @@ _020c2218:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c1fc8Ej
_020c2224: .word data_027e0f74
_020c2224: .word gAdventureFlags
_020c2228: .word data_027e0f94
_020c222c: .word data_027e0f90
_020c2230: .word gItemManager
@@ -1323,10 +1323,10 @@ _ZN5Actor18func_ov00_020c243cEiPi: ; 0x020c243c
mov r7, r0
movne r0, #0
strne r0, [r6]
ldr r0, _020c26f0 ; =data_027e0f74
ldr r0, _020c26f0 ; =gAdventureFlags
mov r5, r1
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
@@ -1514,7 +1514,7 @@ _020c26e4:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c243cEiPi
_020c26f0: .word data_027e0f74
_020c26f0: .word gAdventureFlags
_020c26f4: .word data_027e0fe4
_020c26f8: .word 0x41525257
_020c26fc: .word 0x5342454d
asm/ov00/Actor/ActorManager.s
+69 -69
View File
@@ -58,17 +58,17 @@ _020c3470:
.global _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
arm_func_start _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
_ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori: ; 0x020c3484
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
mov sl, r0
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r10, r0
mvn r3, #0
str r3, [sl]
str r3, [r10]
ldr r0, _020c3570 ; =data_027e103c
str r3, [sl, #4]
str r3, [r10, #4]
ldr r0, [r0]
mov sb, r2
mov r9, r2
ldrb r0, [r0, #0x24]
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _020c3574 ; =data_027e077c
ldr r2, _020c3578 ; =data_02056be4
ldr r0, [r0]
@@ -81,7 +81,7 @@ _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori: ; 0x020c3484
moveq r8, #0
add r7, r6, r0, lsl #2
cmp r6, r7
ldmhsia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmhsia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r4, #0
_020c34e8:
ldr r0, [r6]
@@ -89,7 +89,7 @@ _020c34e8:
ldrneb r1, [r0, #0x118]
cmpne r1, #0
beq _020c3560
mov r1, sb
mov r1, r9
bl _ZN5Actor18func_ov00_020c27a8Ei
cmp r0, #0
beq _020c3560
@@ -111,14 +111,14 @@ _020c34e8:
ldr r1, [r6]
mov r5, r0
ldr r0, [r1, #8]
str r0, [sl]
str r0, [r10]
ldr r0, [r1, #0xc]
str r0, [sl, #4]
str r0, [r10, #4]
_020c3560:
add r6, r6, #4
cmp r6, r7
blo _020c34e8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
_020c3570: .word data_027e103c
@@ -399,11 +399,11 @@ _020c38ec:
.global _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
arm_func_start _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
_ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p: ; 0x020c38fc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mvn r4, #0
mov sb, r0
str r4, [sb]
str r4, [sb, #4]
mov r9, r0
str r4, [r9]
str r4, [r9, #4]
ldr r5, [r1, #0x10]
ldr r0, [r1, #4]
mov r8, r2
@@ -411,7 +411,7 @@ _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p: ; 0x020c38fc
mov r7, r3
sub r4, r4, #0x80000000
cmp r5, r6
ldmhsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmhsia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020c3930:
ldr r2, [r5]
cmp r2, #0
@@ -429,14 +429,14 @@ _020c3930:
ldr r1, [r5]
mov r4, r0
ldr r0, [r1, #8]
str r0, [sb]
str r0, [r9]
ldr r0, [r1, #0xc]
str r0, [sb, #4]
str r0, [r9, #4]
_020c397c:
add r5, r5, #4
cmp r5, r6
blo _020c3930
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.global _ZN12ActorManager18func_ov00_020c398cEv
@@ -462,26 +462,26 @@ _020c39a8: .word func_ov00_020c3f3c
.global _ZN12ActorManager18func_ov00_020c39acEjPjb
arm_func_start _ZN12ActorManager18func_ov00_020c39acEjPjb
_ZN12ActorManager18func_ov00_020c39acEjPjb: ; 0x020c39ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
movs r8, r2
mov sl, r0
mov sb, r1
mov r10, r0
mov r9, r1
mov r7, r3
bne _020c39d8
cmp r7, #0
addne sp, sp, #0x10
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_020c39d8:
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
mov r4, #0
ldr fp, [r0, sb, lsl #2]
cmp fp, #0
ldrneb r0, [fp, #0x118]
ldr r11, [r0, r9, lsl #2]
cmp r11, #0
ldrneb r0, [r11, #0x118]
cmpne r0, #0
beq _020c3b20
ldr r0, [sl, #4]
ldr r0, [r10, #4]
cmp r8, #0
cmpeq r7, #0
moveq r6, #1
@@ -490,19 +490,19 @@ _020c39d8:
cmp r0, #0
ble _020c3b20
_020c3a14:
cmp r5, sb
ldrne r0, [sl, #0x10]
cmp r5, r9
ldrne r0, [r10, #0x10]
ldrne r0, [r0, r5, lsl #2]
cmpne r0, #0
beq _020c3b08
ldr r0, [sl, #0x14]
ldr r0, [r10, #0x14]
mov r1, r5
bl func_ov00_020c3f08
cmp r0, #0
beq _020c3b08
cmp r6, #0
bne _020c3a60
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
mov r1, r8
ldr r0, [r0, r5, lsl #2]
ldr r0, [r0, #4]
@@ -510,7 +510,7 @@ _020c3a14:
cmp r7, r0
beq _020c3b08
_020c3a60:
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
add r3, sp, #0
ldr r0, [r0, r5, lsl #2]
add ip, r0, #0x7c
@@ -519,12 +519,12 @@ _020c3a60:
ldr r0, [ip, #0xc]
mov r1, r5
str r0, [sp, #0xc]
ldr r0, [sl, #0x14]
ldr r0, [r10, #0x14]
bl func_ov00_020c3ef0
ldr r1, [sl, #0x10]
ldr r1, [r10, #0x10]
ldr r3, [r0]
ldr r2, [r1, r5, lsl #2]
mov r1, fp
mov r1, r11
str r3, [r2, #0x7c]
ldr r3, [r0, #4]
str r3, [r2, #0x80]
@@ -532,14 +532,14 @@ _020c3a60:
str r3, [r2, #0x84]
ldr r0, [r0, #0xc]
str r0, [r2, #0x88]
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
ldr r0, [r0, r5, lsl #2]
ldr r2, [r0]
ldr r2, [r2, #0x44]
blx r2
cmp r0, #0
ldrne r0, [sl, #0x10]
ldr r1, [sl, #0x10]
ldrne r0, [r10, #0x10]
ldr r1, [r10, #0x10]
ldrne r4, [r0, r5, lsl #2]
ldr r0, [sp]
ldr r1, [r1, r5, lsl #2]
@@ -555,14 +555,14 @@ _020c3a60:
_020c3b08:
add r0, r5, #1
mov r0, r0, lsl #0x10
ldr r1, [sl, #4]
ldr r1, [r10, #4]
mov r5, r0, lsr #0x10
cmp r1, r0, lsr #16
bgt _020c3a14
_020c3b20:
mov r0, r4
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPjb
.global _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -610,12 +610,12 @@ _020c3ba8:
.global _ZN12ActorManager18func_ov00_020c3bb0EiPi
arm_func_start _ZN12ActorManager18func_ov00_020c3bb0EiPi
_ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xd4
movs sl, r2
movs r10, r2
str r0, [sp]
movne r0, #0
strne r0, [sl]
strne r0, [r10]
ldr r0, _020c3ce4 ; =data_027e0e60
add r2, sp, #0x14
ldr r0, [r0]
@@ -625,11 +625,11 @@ _ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
cmp r5, #0
addle sp, sp, #0xd4
movle r0, #0
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [sp]
mov fp, #0
mov r11, #0
ldr r0, [r0, #4]
str fp, [sp, #4]
str r11, [sp, #4]
cmp r0, #0
ldr r0, [sp]
ldr r7, [r0, #0x10]
@@ -646,11 +646,11 @@ _020c3c10:
mov r8, r6
cmp r5, #0
ble _020c3c88
add sb, sp, #0x14
add r9, sp, #0x14
add r4, sp, #8
_020c3c44:
ldr r3, [r7]
mov r0, sb
mov r0, r9
ldr r2, [r3, #0x48]
mov r1, r4
str r2, [sp, #8]
@@ -664,22 +664,22 @@ _020c3c44:
bne _020c3c88
add r8, r8, #1
cmp r8, r5
add sb, sb, #0x18
add r9, r9, #0x18
blt _020c3c44
_020c3c88:
cmp r6, #0
beq _020c3cb8
cmp sl, #0
cmp r10, #0
beq _020c3cb4
ldr r0, [r7]
add r0, r0, #0x100
ldrsh r0, [r0, #0x20]
cmp r0, #0
ldrgt r0, [sl]
ldrgt r0, [r10]
addgt r0, r0, #1
strgt r0, [sl]
strgt r0, [r10]
_020c3cb4:
add fp, fp, #1
add r11, r11, #1
_020c3cb8:
ldr r0, [sp]
add r7, r7, #4
@@ -690,9 +690,9 @@ _020c3cb8:
cmp r0, r1
blt _020c3c10
_020c3cd8:
mov r0, fp
mov r0, r11
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3bb0EiPi
_020c3ce4: .word data_027e0e60
@@ -700,25 +700,25 @@ _020c3ce4: .word data_027e0e60
.global _ZN12ActorManager18func_ov00_020c3ce8Eii
arm_func_start _ZN12ActorManager18func_ov00_020c3ce8Eii
_ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xcc
ldr r3, _020c3dcc ; =data_027e0e60
mov fp, r0
mov r11, r0
ldr r0, [r3]
mov sl, r2
mov r10, r2
add r2, sp, #0xc
mov r3, #8
bl func_ov00_020836cc
mov r5, r0
cmp r5, #0
addle sp, sp, #0xcc
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldr r0, [fp, #4]
ldr r7, [fp, #0x10]
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [r11, #4]
ldr r7, [r11, #0x10]
cmp r0, #0
mov r6, #0
addle sp, sp, #0xcc
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r4, sp, #0
_020c3d38:
ldr r1, [r7]
@@ -731,10 +731,10 @@ _020c3d38:
mov r8, #0
cmp r5, #0
ble _020c3db0
add sb, sp, #0xc
add r9, sp, #0xc
_020c3d64:
ldr r3, [r7]
mov r0, sb
mov r0, r9
ldr r2, [r3, #0x48]
mov r1, r4
str r2, [sp]
@@ -746,21 +746,21 @@ _020c3d64:
cmp r0, #0
beq _020c3da0
ldr r0, [r7]
mov r1, sl
mov r1, r10
bl _ZN5Actor10SetUnk_129Eb
_020c3da0:
add r8, r8, #1
cmp r8, r5
add sb, sb, #0x18
add r9, r9, #0x18
blt _020c3d64
_020c3db0:
ldr r0, [fp, #4]
ldr r0, [r11, #4]
add r6, r6, #1
cmp r6, r0
add r7, r7, #4
blt _020c3d38
add sp, sp, #0xcc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3ce8Eii
_020c3dcc: .word data_027e0e60
asm/ov00/Item/ItemManager.inc
+3 -3
View File
@@ -3,7 +3,7 @@
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern data_027e0e60
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f78
.extern data_027e0fbc
.extern data_027e103c
@@ -16,8 +16,8 @@
.extern func_ov00_02079ffc
.extern func_ov00_02084b08
.extern func_ov00_02084b14
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern func_ov00_020cf374
.extern func_ov00_020d73bc
.extern func_ov05_02104004
asm/ov00/Item/ItemManager.s
+44 -44
View File
@@ -326,10 +326,10 @@ _020adefa:
mov r2, #1
orr r3, r2
str r3, [r0, r1]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x13
ldr r0, [r0]
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020adf12:
mov r2, #0x4b
@@ -338,11 +338,11 @@ _020adf12:
mov r1, #2
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #9
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020adf2c:
mov r2, #0x4b
@@ -351,11 +351,11 @@ _020adf2c:
mov r1, #4
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0xa
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020adf46:
mov r2, #0x4b
@@ -364,11 +364,11 @@ _020adf46:
mov r1, #8
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0xb
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020adf60:
mov r2, #0x4b
@@ -377,11 +377,11 @@ _020adf60:
mov r1, #0x10
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0xc
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020adf7a:
mov r2, #0x4b
@@ -391,11 +391,11 @@ _020adf7a:
sub r1, #0x2c
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x2b
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020adf96:
mov r2, #0x4b
@@ -405,11 +405,11 @@ _020adf96:
add r1, #0xd4
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x30
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
mov r0, #3
mov r1, #0
bl func_ov09_0211ca20
@@ -422,11 +422,11 @@ _020adfbe:
mov r1, #0x40
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x16
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020adfd8:
mov r2, #0x4b
@@ -435,11 +435,11 @@ _020adfd8:
mov r1, #0x80
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x17
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020adff2:
bl _ZN11ItemManager13UpgradeQuiverEv
@@ -500,11 +500,11 @@ _020ae04e:
lsl r1, r1, #0xc
orr r1, r3
str r1, [r0, r2]
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x8c
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
ldr r0, _020ae248 ; =data_027e0fbc
mov r1, #5
ldr r0, [r0]
@@ -520,25 +520,25 @@ _020ae072:
str r1, [r0, r2]
b _020ae222
_020ae082:
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x7e
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020ae090:
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x7d
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020ae09e:
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x7f
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
b _020ae222
_020ae0ac:
mov r2, #0x4a
@@ -650,42 +650,42 @@ _020ae160:
str r1, [r0, #0xc]
b _020ae222
_020ae16c:
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
ldr r1, _020ae24c ; =0x00000126
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
mov r0, #6
mov r1, #8
bl func_ov09_0211ca20
b _020ae222
_020ae182:
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
ldr r1, _020ae250 ; =0x00000127
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
mov r0, #4
mov r1, #8
bl func_ov09_0211ca20
b _020ae222
_020ae198:
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x4a
ldr r0, [r0]
lsl r1, r1, #2
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
mov r0, #3
mov r1, #8
bl func_ov09_0211ca20
b _020ae222
_020ae1b0:
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
ldr r1, _020ae254 ; =0x00000129
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
mov r0, #2
mov r1, #8
bl func_ov09_0211ca20
@@ -740,22 +740,22 @@ _020ae1fe:
orr r0, r4
str r0, [r3, r2]
_020ae222:
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x7d
ldr r0, [r0]
blx func_ov00_02097760
blx _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ae270
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
mov r1, #0x7e
ldr r0, [r0]
blx func_ov00_02097760
blx _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ae270
ldr r0, _020ae244 ; =data_027e0f74
ldr r0, _020ae244 ; =gAdventureFlags
b _020ae258
nop
_020ae244: .word data_027e0f74
_020ae244: .word gAdventureFlags
_020ae248: .word data_027e0fbc
_020ae24c: .word 0x00000126
_020ae250: .word 0x00000127
@@ -763,18 +763,18 @@ _020ae254: .word 0x00000129
_020ae258:
mov r1, #0x7f
ldr r0, [r0]
blx func_ov00_02097760
blx _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ae270
ldr r0, _020ae274 ; =data_027e0f74
ldr r0, _020ae274 ; =gAdventureFlags
mov r1, #0x80
ldr r0, [r0]
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
_020ae270:
pop {r3, r4, r5, pc}
nop
_020ae274: .word data_027e0f74
_020ae274: .word gAdventureFlags
.global _ZN11ItemManager13GiveEquipItemEij
thumb_func_start _ZN11ItemManager13GiveEquipItemEij
asm/ov00/Player/LinkStateBase.inc
+2 -2
View File
@@ -13,7 +13,7 @@
.extern data_027e0d38
.extern data_027e0e58
.extern data_027e0f64
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
@@ -32,7 +32,7 @@
.extern func_0202e58c
.extern func_ov00_0207c5d4
.extern func_ov00_0208b180
.extern func_ov00_02097bbc
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern func_ov00_020a5e9c
.extern func_ov00_020b1498
.extern func_ov00_020b1a4c
asm/ov00/Player/LinkStateBase.s
+3 -3
View File
@@ -91,9 +91,9 @@ _020a807c:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020a8084:
ldr r0, _020a80f8 ; =data_027e0f74
ldr r0, _020a80f8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
@@ -125,7 +125,7 @@ _020a80f0:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end _ZN13LinkStateBase8vfunc_24Ei
_020a80f8: .word data_027e0f74
_020a80f8: .word gAdventureFlags
_020a80fc: .word data_027e0c68
_020a8100: .word data_027e0f64
_020a8104: .word data_027e0fb8
asm/ov00/Player/LinkStateDamage.inc
+4 -4
View File
@@ -37,7 +37,7 @@
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0e58
.extern data_027e0f74
.extern gAdventureFlags
.extern data_ov00_020e9360
.extern data_ov00_020e9c88
.extern data_ov00_020eec68
@@ -54,9 +54,9 @@
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
.extern func_ov00_0207c2e8
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097ff4
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern func_ov00_020a5e9c
.extern func_ov00_020b7e6c
.extern func_ov00_020c0e24
asm/ov00/Player/LinkStateDamage.s
+8 -8
View File
@@ -589,12 +589,12 @@ _020ac698:
ldr r0, [r0, #4]
cmp r0, #0
bgt _020ac6c8
ldr r0, _020ac7e4 ; =data_027e0f74
ldr r0, _020ac7e4 ; =gAdventureFlags
mov r1, #1
ldr r0, [r0]
mov r2, r1
mov r3, #0
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
_020ac6c8:
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
@@ -672,7 +672,7 @@ _020ac7d4: .word data_027e0618
_020ac7d8: .word data_027e0c54
_020ac7dc: .word data_ov00_020eec68
_020ac7e0: .word data_027e0db0
_020ac7e4: .word data_027e0f74
_020ac7e4: .word gAdventureFlags
_020ac7e8: .word data_027e077c
_020ac7ec: .word data_02056be4
@@ -790,17 +790,17 @@ _020ac930:
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020ac9bc
ldr r0, _020ac9e0 ; =data_027e0f74
ldr r0, _020ac9e0 ; =gAdventureFlags
mov r1, #0xff
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ac9bc
ldr r0, _020ac9e0 ; =data_027e0f74
ldr r0, _020ac9e0 ; =gAdventureFlags
mov r1, #0xf
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_020ac9bc:
cmp r4, #5
movne r0, #0
@@ -813,7 +813,7 @@ _020ac9d0: .word data_027e0e58
_020ac9d4: .word data_ov00_020eec9c
_020ac9d8: .word data_027e0618
_020ac9dc: .word gItemManager
_020ac9e0: .word data_027e0f74
_020ac9e0: .word gAdventureFlags
.global _ZN15LinkStateDamage18func_ov00_020ac9e4Ei
arm_func_start _ZN15LinkStateDamage18func_ov00_020ac9e4Ei
asm/ov00/Player/LinkStateInteract.s
+22 -22
View File
@@ -483,7 +483,7 @@ _020aa840: .word gItemManager
.global _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
arm_func_start _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
_ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x2c
mov r4, r1
mov r5, r0
@@ -506,7 +506,7 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
ldr r3, _020aabd0 ; =data_02050f54
mov r1, r0, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh sb, [r3, r2]
ldrsh r9, [r3, r2]
ldr r6, [sp, #0x20]
str r1, [sp]
mov r1, r1, asr #0x1f
@@ -524,16 +524,16 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
str r1, [sp, #0xc]
ldr r7, [sp, #0x28]
orr r2, r2, r3, lsl #20
smull r4, r3, r7, sb
smull r4, r3, r7, r9
adds r4, r4, #0x800
adc r3, r3, #0
mov r4, r4, lsr #0xc
orr r4, r4, r3, lsl #20
add r1, sp, #0x10
mov r8, sb, asr #0x1f
mov r8, r9, asr #0x1f
add r4, r2, r4
bl _ZN5Actor9GetHitboxEP8Cylinder
smull r1, r0, r6, sb
smull r1, r0, r6, r9
adds r1, r1, #0x800
adc r0, r0, #0
mov r2, r1, lsr #0xc
@@ -583,10 +583,10 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
movgt r4, r1
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerVelEv
umull r3, r2, r4, sb
umull r3, r2, r4, r9
mla r2, r4, r8, r2
mov r1, r4, asr #0x1f
mla r2, r1, sb, r2
mla r2, r1, r9, r2
adds r3, r3, #0x800
adc r1, r2, #0
mov r2, r3, lsr #0xc
@@ -622,10 +622,10 @@ _020aaa04:
movlt r4, r1
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerVelEv
umull r3, r2, r4, sb
umull r3, r2, r4, r9
mla r2, r4, r8, r2
mov r1, r4, asr #0x1f
mla r2, r1, sb, r2
mla r2, r1, r9, r2
adds r3, r3, #0x800
adc r1, r2, #0
mov r2, r3, lsr #0xc
@@ -641,11 +641,11 @@ _020aaa98:
cmp r7, r4
movle r4, r7
bl _ZN13LinkStateBase12GetPlayerVelEv
umull r3, r2, r4, sb
umull r3, r2, r4, r9
adds r3, r3, #0x800
mla r2, r4, r8, r2
mov r1, r4, asr #0x1f
mla r2, r1, sb, r2
mla r2, r1, r9, r2
adc r2, r2, #0
mov r3, r3, lsr #0xc
ldr r1, _020aabd4 ; =0x00000155
@@ -672,20 +672,20 @@ _020aaa98:
orr r2, r2, r1, lsl #20
add r1, r3, r2
str r1, [r0, #8]
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020aab34:
addge sp, sp, #0x2c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, r9, pc}
mvn r4, #0x154
cmp r7, r4
movge r4, r7
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerVelEv
umull r3, r2, r4, sb
umull r3, r2, r4, r9
adds r3, r3, #0x800
mla r2, r4, r8, r2
mov r1, r4, asr #0x1f
mla r2, r1, sb, r2
mla r2, r1, r9, r2
adc r2, r2, #0
mov r3, r3, lsr #0xc
mvn r1, #0x154
@@ -712,7 +712,7 @@ _020aab34:
add r1, r3, r2
str r1, [r0, #8]
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
_020aabd0: .word data_02050f54
@@ -1345,7 +1345,7 @@ _020ab49c:
.global _ZN17LinkStateInteract8vfunc_34EP5Vec3p
arm_func_start _ZN17LinkStateInteract8vfunc_34EP5Vec3p
_ZN17LinkStateInteract8vfunc_34EP5Vec3p: ; 0x020ab4a4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r6, r0
mov r4, r1
bl _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
@@ -1390,10 +1390,10 @@ _020ab4ec:
mov r8, r0, lsl #0x1
mov r2, r8, lsl #0x1
mov r0, r5, lsl #0x1
ldrsh sb, [ip, r0]
ldrsh r9, [ip, r0]
adds r5, r1, #0x800
add r8, r8, #1
umull r1, r0, sb, r6
umull r1, r0, r9, r6
mov r5, r5, lsr #0xc
ldrsh r2, [ip, r2]
mov r8, r8, lsl #0x1
@@ -1403,8 +1403,8 @@ _020ab4ec:
mla lr, r3, r6, lr
adc r3, lr, #0
orr r5, r5, r3, lsl #20
mla r0, sb, r7, r0
mov r3, sb, asr #0x1f
mla r0, r9, r7, r0
mov r3, r9, asr #0x1f
mla r0, r3, r6, r0
smull r7, r6, r2, r5
smull r3, r2, ip, r5
@@ -1437,7 +1437,7 @@ _020ab5f4:
str r0, [r4, #4]
_020ab604:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN17LinkStateInteract8vfunc_34EP5Vec3p
_020ab60c: .word data_02050f54
asm/ov00/Player/LinkStateItem.inc
+2 -2
View File
@@ -4,13 +4,13 @@
.extern _ZN13LinkStateBase18EquipItem_vfunc_28Ev
.extern _ZN13LinkStateBase8vfunc_34EP5Vec3p
.extern _ZN13PlayerControl13StopFollowingEv
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0fb8
.extern data_027e103c
.extern data_027e1098
.extern func_01fffcd8
.extern func_01fffcec
.extern func_ov00_02097b9c
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern func_ov00_020b7e6c
.extern func_ov00_020cf01c
.extern func_ov00_020cf9dc
asm/ov00/Player/LinkStateItem.s
+4 -4
View File
@@ -184,16 +184,16 @@ _020abf6c: .word func_01fffcd8
.global _ZN13LinkStateItem18func_ov00_020abf70Ev
arm_func_start _ZN13LinkStateItem18func_ov00_020abf70Ev
_ZN13LinkStateItem18func_ov00_020abf70Ev: ; 0x020abf70
ldr r1, _020abf88 ; =data_027e0f74
ldr r1, _020abf88 ; =gAdventureFlags
mov r2, r0
ldr r0, [r1]
ldr ip, _020abf8c ; =func_ov00_02097b9c
ldr ip, _020abf8c ; =_ZN14AdventureFlags18func_ov00_02097b9cEv
ldr r1, [r2, #0x5c]
bx ip
.align 2, 0
arm_func_end _ZN13LinkStateItem18func_ov00_020abf70Ev
_020abf88: .word data_027e0f74
_020abf8c: .word func_ov00_02097b9c
_020abf88: .word gAdventureFlags
_020abf8c: .word _ZN14AdventureFlags18func_ov00_02097b9cEv
.global _ZN13LinkStateItem8vfunc_28Ev
arm_func_start _ZN13LinkStateItem8vfunc_28Ev
asm/ov00/Player/PlayerBase.inc
+2 -2
View File
@@ -8,7 +8,7 @@
.extern data_027e0e58
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
@@ -25,7 +25,7 @@
.extern func_ov00_02083ee0
.extern func_ov00_0208ae94
.extern func_ov00_0208f030
.extern func_ov00_02097700
.extern _ZN14AdventureFlags18func_ov00_02097700Ev
.extern _ZN12ActorManager14Actor_vfunc_10Ej
.extern func_ov04_0210b258
.extern func_ov04_0210b280
asm/ov00/Player/PlayerBase.s
+3 -3
View File
@@ -369,9 +369,9 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
ldr r0, _020a7f68 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082af4
ldr r0, _020a7f80 ; =data_027e0f74
ldr r0, _020a7f80 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097700
bl _ZN14AdventureFlags18func_ov00_02097700Ev
_020a7f40:
ldrb r0, [sp, #0x1c]
cmp r0, #0
@@ -392,7 +392,7 @@ _020a7f70: .word data_027e0fa0
_020a7f74: .word data_027e0fb0
_020a7f78: .word data_027e0fb8
_020a7f7c: .word data_027e0fe4
_020a7f80: .word data_027e0f74
_020a7f80: .word gAdventureFlags
_020a7f84: .word data_027e0f64
.global _ZN10PlayerBase22TeleportToLastEntranceEb
asm/ov00/Player/PlayerControl.inc
+3 -3
View File
@@ -19,7 +19,7 @@
.extern data_027e0e2c
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
@@ -52,8 +52,8 @@
.extern func_ov00_02085108
.extern func_ov00_02085594
.extern func_ov00_0208b180
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern func_ov00_020a5e9c
.extern func_ov00_020b78a0
.extern func_ov00_020b7924
asm/ov00/Player/PlayerControl.s
+101 -101
View File
@@ -216,10 +216,10 @@ _ZN13PlayerControl18func_ov00_020af06cEv: ; 0x020af06c
ldrb r0, [r6, #0x7a]
ldrb r5, [r6, #0x79]
cmp r0, #0
ldr r0, _020af27c ; =data_027e0f74
ldr r0, _020af27c ; =gAdventureFlags
strneb r5, [r6, #0x7b]
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _020af280 ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -348,7 +348,7 @@ _020af268:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020af06cEv
_020af27c: .word data_027e0f74
_020af27c: .word gAdventureFlags
_020af280: .word data_027e0c68
_020af284: .word data_027e0d38
_020af288: .word gItemManager
@@ -586,9 +586,9 @@ _ZN13PlayerControl18func_ov00_020af538Ev: ; 0x020af538
ldrb r0, [r4, #0x78]
cmp r0, #0
beq _020af57c
ldr r0, _020af6c4 ; =data_027e0f74
ldr r0, _020af6c4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _020af6c8 ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -690,7 +690,7 @@ _020af694:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020af538Ev
_020af6c4: .word data_027e0f74
_020af6c4: .word gAdventureFlags
_020af6c8: .word data_027e0c68
_020af6cc: .word data_027e0fac
_020af6d0: .word data_027e0ffc
@@ -746,72 +746,72 @@ _020af774: .word data_027e0e60
.global _ZN13PlayerControl18func_ov00_020af778Ev
arm_func_start _ZN13PlayerControl18func_ov00_020af778Ev
_ZN13PlayerControl18func_ov00_020af778Ev: ; 0x020af778
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x14
mov sb, r0
ldrb r0, [sb, #0x78]
mov r9, r0
ldrb r0, [r9, #0x78]
cmp r0, #0
beq _020af7b8
ldr r0, _020afabc ; =data_027e0f74
ldr r0, _020afabc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020af7b8
ldr r0, _020afabc ; =data_027e0f74
ldr r0, _020afabc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
beq _020af7cc
_020af7b8:
mov r0, #0xf
strh r0, [sb, #0xaa]
strh r0, [r9, #0xaa]
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020af7cc:
ldrsh r0, [sb, #0xaa]
ldrsh r0, [r9, #0xaa]
cmp r0, #0
ble _020af7ec
sub r0, r0, #1
strh r0, [sb, #0xaa]
strh r0, [r9, #0xaa]
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020af7ec:
bl _ZN13PlayerControl18func_ov00_020aeef8Ev
cmp r0, #0
bne _020af810
mvn r0, #0
str r0, [sb, #0x8c]
str r0, [sb, #0x90]
str r0, [r9, #0x8c]
str r0, [r9, #0x90]
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020af810:
ldrh r0, [sb, #0x34]
ldrh r0, [r9, #0x34]
mov r4, #0
mov r5, r4
tst r0, #2
beq _020af8b0
ldrsh r0, [sb, #0x60]
ldrsh r0, [r9, #0x60]
cmp r0, #0x15
bge _020af8b0
ldrsh r0, [sb, #0x68]
ldr r1, [sb, #0x28]
ldrsh r2, [sb, #0x66]
ldrsh r0, [r9, #0x68]
ldr r1, [r9, #0x28]
ldrsh r2, [r9, #0x66]
sub r1, r1, r0
mul r0, r1, r1
ldr r1, [sb, #0x24]
ldr r1, [r9, #0x24]
sub r1, r1, r2
mla r0, r1, r1, r0
cmp r0, #0x64
bge _020af8b0
mov r0, sb
mov r0, r9
mov r1, #7
mov r2, #1
bl _ZN13PlayerControl18func_ov00_020af2d4Ejb
cmp r0, #0
ldrneb r0, [sb, #0x79]
ldrneb r0, [r9, #0x79]
movne r4, #1
cmpne r0, #0
beq _020af8b0
@@ -845,14 +845,14 @@ _020af8dc:
mov r4, #0
beq _020afa68
ldr r0, _020afacc ; =data_027e0fe4
add r1, sb, #0x8c
add r1, r9, #0x8c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r6, r0
mov r7, r4
beq _020af97c
ldr r7, [r6, #0x12c]
mov r0, sb
mov r0, r9
mov r1, r7
mov r2, r8
bl _ZN13PlayerControl18func_ov00_020afe88Eib
@@ -868,18 +868,18 @@ _020af8dc:
cmp r0, #0
beq _020af97c
_020af944:
ldr r1, [sb, #0x8c]
ldr r1, [r9, #0x8c]
mvn r0, #0
str r1, [sb, #0x84]
ldr r2, [sb, #0x90]
str r1, [r9, #0x84]
ldr r2, [r9, #0x90]
mov r1, #0
str r2, [sb, #0x88]
str r0, [sb, #0x8c]
str r0, [sb, #0x90]
str r2, [r9, #0x88]
str r0, [r9, #0x8c]
str r0, [r9, #0x90]
mov r0, r6
strb r1, [sb, #0x80]
strb r1, [r9, #0x80]
mov r1, #0xf
strh r1, [sb, #0xa8]
strh r1, [r9, #0xa8]
bl _ZN5Actor16XzDistanceToLinkEv
mov r4, r0
_020af97c:
@@ -895,19 +895,19 @@ _020af97c:
bne _020af9e0
cmp r1, #0
beq _020afaa8
mov r0, sb
mov r0, r9
mov r2, r8
bl _ZN13PlayerControl18func_ov00_020afeecEib
cmp r0, #0
beq _020afaa8
add r1, sp, #8
mov r0, sb
mov r0, r9
mov r2, r4
mov r3, r7
bl _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
add sp, sp, #0x14
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020af9e0:
mov r0, r5
ldr r2, [r0]
@@ -916,13 +916,13 @@ _020af9e0:
cmp r0, #0
beq _020afa18
add r1, sp, #8
mov r0, sb
mov r0, r9
mov r2, r4
mov r3, r7
bl _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
add sp, sp, #0x14
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020afa18:
cmp r4, #0
bne _020afaa8
@@ -933,17 +933,17 @@ _020afa18:
cmp r0, #0
beq _020afaa8
add r1, sp, #8
mov r0, sb
mov r0, r9
mov r2, #0
bl func_ov00_020b7d4c
add r1, sp, #8
mov r0, sb
mov r0, r9
mov r2, r4
mov r3, r7
bl _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
add sp, sp, #0x14
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020afa68:
ldr r1, _020afacc ; =data_027e0fe4
add r0, sp, #0
@@ -951,25 +951,25 @@ _020afa68:
mov r2, r4
bl _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
ldr r0, [sp]
str r0, [sb, #0x8c]
str r0, [r9, #0x8c]
ldr r0, [sp, #4]
str r0, [sb, #0x90]
ldrsh r0, [sb, #0x60]
str r0, [r9, #0x90]
ldrsh r0, [r9, #0x60]
cmp r0, #0
bne _020afaa8
ldr r0, [sb, #0x8c]
str r0, [sb, #0x94]
ldr r0, [sb, #0x90]
str r0, [sb, #0x98]
ldr r0, [r9, #0x8c]
str r0, [r9, #0x94]
ldr r0, [r9, #0x90]
str r0, [r9, #0x98]
_020afaa8:
cmp r4, #0
movgt r0, #1
movle r0, #0
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020af778Ev
_020afabc: .word data_027e0f74
_020afabc: .word gAdventureFlags
_020afac0: .word data_027e0f90
_020afac4: .word gItemManager
_020afac8: .word data_027e0fc8
@@ -1025,14 +1025,14 @@ _020afb68: .word data_027e0e60
.global _ZN13PlayerControl18func_ov00_020afb6cEv
arm_func_start _ZN13PlayerControl18func_ov00_020afb6cEv
_ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x20
mov sb, r0
mov r9, r0
bl _ZN13PlayerControl18func_ov00_020af778Ev
ldr r1, _020afe70 ; =data_027e0fe4
mov r4, r0
ldr r0, [r1]
add r1, sb, #0x84
add r1, r9, #0x84
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, _020afe74 ; =gItemManager
mov r5, r0
@@ -1043,7 +1043,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
mov r0, r6
bl _ZNK11ItemManager8GetFairyEi
cmp r5, #0
ldreqb r1, [sb, #0x81]
ldreqb r1, [r9, #0x81]
cmpeq r1, #0
bne _020afbcc
cmp r0, #0
@@ -1051,7 +1051,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
bl func_ov00_020bad18
_020afbcc:
cmp r5, #0
ldr r6, [sb, #0xa4]
ldr r6, [r9, #0xa4]
beq _020afce8
ldr r0, _020afe78 ; =data_027e0f94
add r1, r5, #0x48
@@ -1080,8 +1080,8 @@ _020afc20: ; jump table
b _020afc50 ; case 5
_020afc38:
sub r0, r8, #4
str r0, [sb, #0x84]
str r0, [sb, #0x88]
str r0, [r9, #0x84]
str r0, [r9, #0x88]
b _020afc9c
_020afc48:
mov r7, #1
@@ -1117,7 +1117,7 @@ _020afc9c:
cmp r0, #0
bne _020afcf4
add r1, sp, #0x10
mov r0, sb
mov r0, r9
mov r2, r7
bl _ZN13PlayerControl18func_ov00_020aff90Eii
cmp r4, #0
@@ -1130,17 +1130,17 @@ _020afc9c:
b _020afcf4
_020afce8:
mvn r0, #0
str r0, [sb, #0x84]
str r0, [sb, #0x88]
str r0, [r9, #0x84]
str r0, [r9, #0x88]
_020afcf4:
ldrb r0, [sb, #0x81]
ldrb r0, [r9, #0x81]
cmp r0, #0
beq _020afe24
ldr r0, _020afe84 ; =data_027e0e60
add r1, sb, #0x9c
add r1, r9, #0x9c
ldr r0, [r0]
bl func_ov00_020840c4
str r0, [sb, #0xa0]
str r0, [r9, #0xa0]
cmp r0, #0
beq _020afd88
ldr r1, [r0, #0x18]
@@ -1149,7 +1149,7 @@ _020afcf4:
str r1, [sp, #8]
ldr r0, [r0, #0x20]
str r0, [sp, #0xc]
ldr r0, [sb, #0xa0]
ldr r0, [r9, #0xa0]
ldr r1, [r0]
ldr r1, [r1, #0x54]
blx r1
@@ -1163,7 +1163,7 @@ _020afd5c:
ldr r1, [sp, #8]
add r0, r1, r0
str r0, [sp, #8]
ldr r0, [sb, #0xa0]
ldr r0, [r9, #0xa0]
ldrsb r0, [r0, #0x12]
cmp r0, #1
moveq r5, #1
@@ -1177,8 +1177,8 @@ _020afd88:
ldr r1, [r1, #4]
ldr r0, [r0]
str r1, [sp, #8]
ldrb r3, [sb, #0x9c]
ldrb r2, [sb, #0x9d]
ldrb r3, [r9, #0x9c]
ldrb r2, [r9, #0x9d]
sub r5, sp, #4
add r1, sp, #4
strb r3, [r5]
@@ -1196,14 +1196,14 @@ _020afdc4:
cmp r0, #0
bne _020afe10
add r1, sp, #4
mov r0, sb
mov r0, r9
mov r2, r5
bl _ZN13PlayerControl18func_ov00_020aff90Eii
cmp r4, #0
beq _020afe10
str r6, [sp]
ldrb r2, [sb, #0x9c]
ldrb r3, [sb, #0x9d]
ldrb r2, [r9, #0x9c]
ldrb r3, [r9, #0x9d]
ldr r0, _020afe80 ; =data_027e0ffc
add r1, sp, #4
bl func_ov00_020ced7c
@@ -1215,26 +1215,26 @@ _020afe10:
b _020afe2c
_020afe24:
mov r0, #0
str r0, [sb, #0xa0]
str r0, [r9, #0xa0]
_020afe2c:
ldrsh r1, [sb, #0xa8]
ldrsh r1, [r9, #0xa8]
cmp r1, #0
ble _020afe64
ldr r0, [sb, #0xa4]
ldr r0, [r9, #0xa4]
sub r0, r0, r6
cmp r0, #0x29
bgt _020afe64
sub r0, r1, #1
strh r0, [sb, #0xa8]
ldrsh r0, [sb, #0xa8]
strh r0, [r9, #0xa8]
ldrsh r0, [r9, #0xa8]
cmp r0, #0
bgt _020afe64
mov r0, sb
mov r0, r9
bl _ZN13PlayerControl13StopFollowingEv
_020afe64:
str r6, [sb, #0xa4]
str r6, [r9, #0xa4]
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020afb6cEv
_020afe70: .word data_027e0fe4
@@ -1909,7 +1909,7 @@ _020b0774: .word data_027e0e60
.global _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
arm_func_start _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x18
mov r8, r3
mov r3, #0
@@ -1918,7 +1918,7 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
ldr r3, _020b0aac ; =data_027e0f64
str r4, [sp, #0xc]
ldr r4, [r1, #4]
mov sb, r0
mov r9, r0
str r4, [sp, #0x10]
ldr r1, [r1, #8]
ldr r0, [r3]
@@ -1937,7 +1937,7 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r0, r4, lsl #0x10
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
@@ -1955,11 +1955,11 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
mov r1, r3, asr #0xb
add r2, r2, r0, lsr #20
add r3, r3, r1, lsr #20
ldr lr, [sb, #0x10]
ldr lr, [r9, #0x10]
ldr r4, [sp, #8]
ldr ip, [sb, #0x14]
ldr ip, [r9, #0x14]
ldr r5, [sp, #4]
mov r0, sb
mov r0, r9
mov r1, #1
mov r6, r2, asr #0xc
mov r7, r3, asr #0xc
@@ -1981,7 +1981,7 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
str r0, [r8]
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b089c:
mvn r0, #0x17
sub r1, r0, r6
@@ -1998,7 +1998,7 @@ _020b089c:
str r0, [r8]
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b08dc:
rsb r1, r6, #0
cmp r6, r1
@@ -2027,9 +2027,9 @@ _020b08dc:
_020b093c:
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b0948:
mov r0, sb
mov r0, r9
mov r1, #1
bl _ZN13PlayerControl13CheckTouchingEj
cmp r0, #0
@@ -2055,7 +2055,7 @@ _020b099c:
str r0, [r8]
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b09b0:
cmp r6, #0
ble _020b09c4
@@ -2088,20 +2088,20 @@ _020b0a08:
str r0, [r8]
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b0a20:
mov r0, sb
mov r0, r9
mov r1, #1
bl _ZN13PlayerControl17CheckUntouchedNowEj
cmp r0, #0
beq _020b0aa0
ldr r3, [sb, #0x1c]
ldr r3, [r9, #0x1c]
ldr r2, [sp, #8]
cmp r6, #0
rsblt r6, r6, #0
cmp r7, #0
rsblt r7, r7, #0
ldr r1, [sb, #0x20]
ldr r1, [r9, #0x20]
ldr r0, [sp, #4]
sub r2, r3, r2
sub r1, r1, r0
@@ -2123,11 +2123,11 @@ _020b0a78:
_020b0a94:
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b0aa0:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
_020b0aac: .word data_027e0f64
asm/ov00/Player/TouchGesture.s
+35 -35
View File
@@ -54,7 +54,7 @@ _020a9314:
.global _ZN12TouchGesture6UpdateEPv
arm_func_start _ZN12TouchGesture6UpdateEPv
_ZN12TouchGesture6UpdateEPv: ; 0x020a9334
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldrsh r2, [r1, #0x60]
cmp r2, #0
ble _020a9350
@@ -119,44 +119,44 @@ _020a93cc:
mov r8, r7
mov r1, r2
_020a9428:
add sb, r0, r1, lsl #1
ldrsh sl, [sb, #0x10]
ldrsh sb, [sb, #0x2c]
add r2, r2, sl
cmp sb, r3
movlt r3, sb
add r9, r0, r1, lsl #1
ldrsh r10, [r9, #0x10]
ldrsh r9, [r9, #0x2c]
add r2, r2, r10
cmp r9, r3
movlt r3, r9
blt _020a944c
cmp sb, ip
movgt ip, sb
cmp r9, ip
movgt ip, r9
_020a944c:
add sb, r0, r1, lsl #1
ldrsh sb, [sb, #0x48]
cmp sb, lr
movlt lr, sb
add r9, r0, r1, lsl #1
ldrsh r9, [r9, #0x48]
cmp r9, lr
movlt lr, r9
blt _020a9468
cmp sb, r4
movgt r4, sb
cmp r9, r4
movgt r4, r9
_020a9468:
add sb, r0, r1, lsl #1
ldrsh fp, [sb, #0x48]
ldrsh sl, [sb, #0x2c]
add sb, sl, fp
sub sl, sl, fp
mov sb, sb, lsl #0x10
mov sl, sl, lsl #0x10
cmp r5, sb, asr #16
mov sb, sb, asr #0x10
mov sl, sl, asr #0x10
movgt r5, sb
add r9, r0, r1, lsl #1
ldrsh r11, [r9, #0x48]
ldrsh r10, [r9, #0x2c]
add r9, r10, r11
sub r10, r10, r11
mov r9, r9, lsl #0x10
mov r10, r10, lsl #0x10
cmp r5, r9, asr #16
mov r9, r9, asr #0x10
mov r10, r10, asr #0x10
movgt r5, r9
bgt _020a94a0
cmp sb, r6
movgt r6, sb
cmp r9, r6
movgt r6, r9
_020a94a0:
cmp sl, r7
movlt r7, sl
cmp r10, r7
movlt r7, r10
blt _020a94b4
cmp sl, r8
movgt r8, sl
cmp r10, r8
movgt r8, r10
_020a94b4:
add r1, r1, #1
cmp r1, #0xe
@@ -171,21 +171,21 @@ _020a94b4:
subge r3, r8, r7
strb r1, [r0, #4]
cmpge r3, #0x46
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r3, _020a952c ; =0xffff2aab
cmp r2, r3
bge _020a9508
mov r2, #1
strb r2, [r0, #4]
str r1, [r0, #8]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_020a9508:
rsb r1, r3, #0
cmp r2, r1
movgt r1, #1
strgtb r1, [r0, #4]
strgt r1, [r0, #8]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12TouchGesture6UpdateEPv
_020a9520: .word 0xffffd555
asm/ov00/Save/AdventureFlags.inc
+34
View File
@@ -0,0 +1,34 @@
#pragma once
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0db0
.extern data_027e0dbc
.extern data_027e0e60
.extern func_0204f754
.extern func_ov00_0207b2f0
.extern func_ov00_0207b334
.extern func_ov00_0207ba94
.extern func_ov00_020838f8
.extern func_ov00_020980f4
.extern func_ov00_020980f8
.extern func_ov00_020980fc
.extern func_ov00_02098114
.extern func_ov00_02098150
.extern func_ov00_02098658
.extern func_ov00_02098694
.extern func_ov00_020987c4
.extern func_ov00_02098834
.extern func_ov00_02098860
.extern func_ov00_02098c48
.extern func_ov00_02098c68
.extern func_ov00_02098d20
.extern func_ov00_02098d34
.extern func_ov00_02098fa4
.extern func_ov00_02099024
.extern func_ov00_0209907c
.extern func_ov00_020990a4
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov40_02183200
.extern func_ov40_021834cc
.extern gAdventureFlags
asm/ov00/Save/AdventureFlags.s
+1245
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020773c0.inc
+2 -2
View File
@@ -28,7 +28,7 @@
.extern data_027e0e28
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f7c
.extern data_027e1054
.extern data_ov00_020ec718
@@ -139,7 +139,7 @@
.extern func_ov00_02083588
.extern func_ov00_020849c0
.extern func_ov00_02088074
.extern func_ov00_02097c50
.extern _ZN14AdventureFlags15Get_FlagsUnk_48Ei
.extern func_ov00_0209d738
.extern func_ov00_0209d758
.extern func_ov00_0209d768
asm/ov00/ov00_020773c0.s
+44 -44
View File
@@ -3374,9 +3374,9 @@ func_ov00_02078b88: ; 0x02078b88
blt _02078bb8
cmp r1, #0x21
bge _02078bb8
ldr r0, _02078bc0 ; =data_027e0f74
ldr r0, _02078bc0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097c50
bl _ZN14AdventureFlags15Get_FlagsUnk_48Ei
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, pc}
@@ -3385,7 +3385,7 @@ _02078bb8:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_02078b88
_02078bc0: .word data_027e0f74
_02078bc0: .word gAdventureFlags
.global func_ov00_02078bc4
thumb_func_start func_ov00_02078bc4
@@ -4036,14 +4036,14 @@ _02079148: .word data_027e0c38
.global func_ov00_0207914c
arm_func_start func_ov00_0207914c
func_ov00_0207914c: ; 0x0207914c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _020791d8 ; =data_027e0e60
mov fp, r0
mov r11, r0
ldr r7, [r4]
mov sl, r1
mov r10, r1
mov r0, r7
mov sb, r2
mov r9, r2
mov r8, r3
bl func_ov00_02083394
mov r6, r0
@@ -4055,22 +4055,22 @@ func_ov00_0207914c: ; 0x0207914c
mov r4, r0
mov r0, r7
bl func_ov00_020833b8
ldr r1, [sl, #8]
ldr r1, [r10, #8]
sub r0, r0, r5
sub r1, r1, r5
str r1, [sp]
stmib sp, {r0, sb}
stmib sp, {r0, r9}
ldrb r2, [sp, #0x38]
str r8, [sp, #0xc]
sub r3, r4, r6
str r2, [sp, #0x10]
ldr r2, [sl]
mov r0, fp
ldr r2, [r10]
mov r0, r11
mov r1, #1
sub r2, r2, r6
bl func_ov00_02079024
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207914c
_020791d8: .word data_027e0e60
@@ -4095,14 +4095,14 @@ func_ov00_020791dc: ; 0x020791dc
.global func_ov00_0207920c
arm_func_start func_ov00_0207920c
func_ov00_0207920c: ; 0x0207920c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _0207929c ; =data_027e0e60
mov fp, r0
mov r11, r0
ldr r7, [r4]
mov sl, r1
mov r10, r1
mov r0, r7
mov sb, r2
mov r9, r2
mov r8, r3
bl func_ov00_02083394
mov r6, r0
@@ -4115,22 +4115,22 @@ func_ov00_0207920c: ; 0x0207920c
mov r0, r7
bl func_ov00_020833b8
sub r3, r4, r6
ldr r1, [sl, #8]
ldr r1, [r10, #8]
sub r0, r0, r5
sub r1, r1, r5
str r1, [sp]
str r0, [sp, #4]
mov r0, fp
str sb, [sp, #8]
add r1, sb, #4
mov r0, r11
str r9, [sp, #8]
add r1, r9, #4
str r1, [sp, #0xc]
str r8, [sp, #0x10]
ldr r2, [sl]
ldr r2, [r10]
mov r1, #0
sub r2, r2, r6
bl func_ov00_02079024
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207920c
_0207929c: .word data_027e0e60
@@ -4138,11 +4138,11 @@ _0207929c: .word data_027e0e60
.global func_ov00_020792a0
arm_func_start func_ov00_020792a0
func_ov00_020792a0: ; 0x020792a0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
ldr r0, [r0]
mov sl, r1
mov sb, r2
mov r10, r1
mov r9, r2
mov r8, r3
cmp r0, #0
ldr r7, [sp, #0x28]
@@ -4150,16 +4150,16 @@ func_ov00_020792a0: ; 0x020792a0
str r7, [sp]
bl func_ov03_020f0844
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_020792d4:
cmp sl, #0
cmp r10, #0
ldreq r0, _020793b0 ; =data_027e0c38
ldreq r0, [r0, #0x14]
addeq sb, sb, r0, lsl #12
addeq r9, r9, r0, lsl #12
beq _020792f4
ldr r0, _020793b0 ; =data_027e0c38
ldr r0, [r0, #0x14]
add sb, sb, r0
add r9, r9, r0
_020792f4:
ldr r0, _020793b4 ; =data_027e0e60
ldr r6, [r0]
@@ -4180,18 +4180,18 @@ _020792f4:
sub r0, r0, r4
mov r1, #0xc0
bl func_01ff9b4c
cmp sl, #0
cmp r10, #0
beq _02079368
mla r1, sb, r6, r5
mla r1, r9, r6, r5
str r1, [r7]
mov r1, #0
mla r0, r8, r0, r4
str r1, [r7, #4]
add sp, sp, #4
str r0, [r7, #8]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02079368:
smull r1, r2, sb, r6
smull r1, r2, r9, r6
adds r3, r1, #0x800
smull r1, r0, r8, r0
adc r2, r2, #0
@@ -4208,7 +4208,7 @@ _02079368:
add r0, r4, r1
str r0, [r7, #8]
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov00_020792a0
_020793b0: .word data_027e0c38
@@ -4275,9 +4275,9 @@ _02079458:
.global func_ov00_02079470
arm_func_start func_ov00_02079470
func_ov00_02079470: ; 0x02079470
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x14
mov sb, r0
mov r9, r0
mov r8, r1
mov r7, r2
mov r6, r3
@@ -4302,13 +4302,13 @@ _020794c8:
ldrb r0, [sp, #0x3c]
cmp r0, #0
bne _02079564
mov r0, sb
mov r0, r9
bl func_ov00_02078f54
cmp r0, #0
beq _02079564
ldrb r0, [sp, #0x38]
cmp r0, #0
ldrne r0, [sb]
ldrne r0, [r9]
cmpne r0, #0
beq _0207955c
ldr r1, _02079674 ; =gOverlayManager
@@ -4330,7 +4330,7 @@ _020794c8:
mov r0, #0
str r0, [sp, #0x10]
ldr r1, [r5]
mov r0, sb
mov r0, r9
mov r2, r1, lsl #0xc
mov r1, #1
mov r3, #0x100000
@@ -4371,7 +4371,7 @@ _02079564:
mov r0, #0
str r0, [sp, #0x10]
ldr r1, [r5]
mov r0, sb
mov r0, r9
mov r2, r1, lsl #0xc
mov r1, #1
mov r3, #0x100000
@@ -4379,7 +4379,7 @@ _02079564:
b _02079614
_020795f8:
mov ip, #0
mov r0, sb
mov r0, r9
mov r1, r8
mov r2, r5
mov r3, r4
@@ -4394,10 +4394,10 @@ _02079614:
str r0, [r4]
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_02079638:
ldr r1, [r5]
mov r0, sb
mov r0, r9
add r1, r1, r7
str r1, [r5]
ldr r2, [r4]
@@ -4408,7 +4408,7 @@ _02079638:
str r5, [r4]
bl func_ov00_020793d0
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov00_02079470
_0207966c: .word data_027e0e28
asm/ov00/ov00_0207af9c.inc
+65 -89
View File
@@ -1,10 +1,6 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern FastDivide
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase12SetUpdatePosEb
.extern _ZN11ItemManager21LoadDungeonItemModelsEv
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
@@ -22,7 +18,6 @@
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c313cEj
@@ -66,14 +61,9 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern data_02050f54
.extern data_02052f54
.extern data_02056be4
.extern data_02057840
.extern data_0205785c
.extern data_02057878
.extern data_02063e4c
.extern data_020691a0
.extern data_027e0194
.extern data_027e037c
.extern data_027e0384
.extern data_027e03c8
@@ -85,7 +75,6 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
@@ -108,7 +97,6 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f80
@@ -124,11 +112,19 @@
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e103c
.extern data_027e10a4
.extern data_ov00_020e5868
.extern data_ov00_020e9360
.extern data_ov00_020dbf88
.extern data_ov00_020e31ec
.extern data_ov00_020e32ec
.extern data_ov00_020e33ec
.extern data_ov00_020e34ec
.extern data_ov00_020e35ec
.extern data_ov00_020e36ec
.extern data_ov00_020e37ec
.extern data_ov00_020e38ec
.extern data_ov00_020e39ec
.extern data_ov00_020eab04
.extern data_ov00_020eec68
.extern data_ov00_020eec9c
.extern data_ov09_0211f5dc
@@ -136,7 +132,6 @@
.extern func_01ff8018
.extern func_01ff8024
.extern func_01ff8214
.extern func_01ff8230
.extern func_01ff892c
.extern func_01ff8954
.extern func_01ff8af8
@@ -151,7 +146,6 @@
.extern func_01ff99f4
.extern func_01ff9a50
.extern func_01ff9b4c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
@@ -167,7 +161,6 @@
.extern func_01ffbe34
.extern func_01ffbe78
.extern func_01ffbf5c
.extern func_01ffe1cc
.extern func_01ffe468
.extern func_01ffe61c
.extern func_01ffe904
@@ -195,9 +188,6 @@
.extern func_020052e4
.extern func_02005628
.extern func_02005660
.extern func_02005934
.extern func_02005a04
.extern func_02005a18
.extern func_02005b58
.extern func_02005bfc
.extern func_02005dcc
@@ -218,29 +208,15 @@
.extern func_02012830
.extern func_020128bc
.extern func_02012934
.extern func_0201842c
.extern func_02018c3c
.extern func_02018cb8
.extern func_020193f0
.extern func_02019434
.extern func_02019534
.extern func_02019570
.extern func_02019624
.extern func_02019654
.extern func_020196bc
.extern func_020196fc
.extern func_020197bc
.extern func_020197fc
.extern func_0201983c
.extern func_0201b5e4
.extern func_0201e24c
.extern func_0201e388
.extern func_0201e4cc
.extern func_02023b3c
.extern func_02024130
.extern func_0202ab78
.extern func_0202abdc
.extern func_0202ac0c
.extern func_0202b154
.extern func_0202b2e8
.extern func_0202b3bc
@@ -250,22 +226,13 @@
.extern func_0202b734
.extern func_0202b7e4
.extern func_0202b8e4
.extern func_0202bac0
.extern func_0202c69c
.extern func_0202d56c
.extern func_0202d598
.extern func_0202d5dc
.extern func_0202d644
.extern func_0202d77c
.extern func_0202d7ac
.extern func_0202e58c
.extern func_0202e9f4
.extern func_0202ea18
.extern func_0202ea24
.extern func_0202ea34
.extern func_0202ea50
.extern func_0203005c
.extern func_0203010c
.extern func_020313c8
.extern func_02034a1c
.extern func_02035064
@@ -277,7 +244,6 @@
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0203fe60
.extern func_02040464
.extern func_02042b40
.extern func_02042bfc
@@ -308,45 +274,66 @@
.extern func_ov00_020798bc
.extern func_ov00_02079e04
.extern func_ov00_02079e3c
.extern func_ov00_02079e68
.extern func_ov00_020a956c
.extern func_ov00_020a95ec
.extern func_ov00_020a960c
.extern func_ov00_020a9614
.extern func_ov00_020a9650
.extern func_ov00_020a96d4
.extern func_ov00_020a9740
.extern func_ov00_020a9764
.extern func_ov00_020a97d0
.extern func_ov00_020a97e0
.extern func_ov00_020a97f8
.extern func_ov00_020a9864
.extern func_ov00_020a9890
.extern func_ov00_020a98bc
.extern func_ov00_020a9968
.extern func_ov00_020a9994
.extern func_ov00_020a9998
.extern func_ov00_020a9a68
.extern _ZN14AdventureFlags18func_ov00_020976c8Ev
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
.extern _ZN14AdventureFlags18func_ov00_020980d0Ev
.extern func_ov00_0209afc4
.extern func_ov00_0209b5a4
.extern func_ov00_0209b6f4
.extern func_ov00_0209b7c4
.extern func_ov00_0209b894
.extern func_ov00_0209b960
.extern func_ov00_0209bbe8
.extern func_ov00_0209bc38
.extern func_ov00_0209c08c
.extern func_ov00_0209c1e4
.extern func_ov00_0209c2b4
.extern func_ov00_0209c2d0
.extern func_ov00_0209c530
.extern func_ov00_0209c61c
.extern func_ov00_0209c788
.extern func_ov00_0209c8e4
.extern func_ov00_0209cc3c
.extern func_ov00_0209cc48
.extern func_ov00_0209cd80
.extern func_ov00_0209cd9c
.extern func_ov00_0209cddc
.extern func_ov00_0209cdf8
.extern func_ov00_0209d6e8
.extern func_ov00_0209d71c
.extern func_ov00_0209d738
.extern func_ov00_0209d778
.extern func_ov00_0209da68
.extern func_ov00_0209da90
.extern func_ov00_0209dc60
.extern func_ov00_0209dd44
.extern func_ov00_0209dec4
.extern func_ov00_020a0330
.extern func_ov00_020a0368
.extern func_ov00_020a0508
.extern func_ov00_020a0848
.extern func_ov00_020a1774
.extern func_ov00_020a17d0
.extern func_ov00_020a1838
.extern func_ov00_020a1888
.extern func_ov00_020a19c8
.extern func_ov00_020a1a0c
.extern func_ov00_020a3510
.extern func_ov00_020a3710
.extern func_ov00_020a3de0
.extern func_ov00_020a5e9c
.extern func_ov00_020a6110
.extern func_ov00_020a61ac
.extern func_ov00_020b3ea8
.extern func_ov00_020b7e6c
.extern func_ov00_020bcdec
.extern func_ov00_020bd304
.extern func_ov00_020bd618
.extern func_ov00_020bd728
.extern func_ov00_020c0bdc
.extern func_ov00_020c0c08
.extern func_ov00_020c0c70
.extern func_ov00_020c0c9c
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c45c4
.extern func_ov00_020c4648
.extern func_ov00_020c46cc
.extern func_ov00_020c474c
.extern func_ov00_020cf13c
.extern func_ov00_020cf414
.extern func_ov00_020cfcec
@@ -384,7 +371,6 @@
.extern func_ov04_0210cb00
.extern func_ov04_0210cb1c
.extern func_ov04_0210dd90
.extern func_ov05_02100ae0
.extern func_ov05_02100e0c
.extern func_ov05_02101080
.extern func_ov05_021010b0
@@ -397,7 +383,6 @@
.extern func_ov05_02111c00
.extern func_ov05_02111c6c
.extern func_ov05_02111c70
.extern func_ov05_02112268
.extern func_ov08_02113080
.extern func_ov08_0211351c
.extern func_ov08_021135b8
@@ -415,7 +400,6 @@
.extern func_ov15_02129c24
.extern func_ov15_02129c34
.extern func_ov15_02129c44
.extern func_ov15_02136630
.extern func_ov15_0214c3c4
.extern func_ov15_0214c414
.extern func_ov15_02175cc4
@@ -428,17 +412,9 @@
.extern func_ov18_0216ac24
.extern func_ov18_0216ad38
.extern func_ov26_02173b7c
.extern func_ov28_0216d6d0
.extern func_ov29_0216d918
.extern func_ov40_02182970
.extern func_ov40_02182980
.extern func_ov40_02182b9c
.extern func_ov40_02183200
.extern func_ov40_021833c4
.extern func_ov40_021834cc
.extern func_ov40_02183dac
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcat
.extern strcmp
.extern strcpy
asm/ov00/ov00_0207af9c.s
+1154 -34045
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020980f4.inc
+366
View File
@@ -0,0 +1,366 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern FastDivide
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase12SetUpdatePosEb
.extern _ZN11ItemManager21LoadDungeonItemModelsEv
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
.extern data_02052f54
.extern data_02057840
.extern data_0205785c
.extern data_02057878
.extern data_027e0194
.extern data_027e0618
.extern data_027e071c
.extern data_027e0764
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0de4
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f80
.extern data_027e0f84
.extern data_027e0f88
.extern data_027e0f8c
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fec
.extern data_027e10a4
.extern data_ov00_020e2fa8
.extern data_ov00_020e5868
.extern data_ov00_020e9360
.extern data_ov00_020e9e18
.extern data_ov00_020ea110
.extern data_ov00_020ecde4
.extern data_ov00_020ecde8
.extern data_ov00_020ecdf6
.extern data_ov00_020ece38
.extern data_ov00_020ece48
.extern data_ov00_020ece4a
.extern data_ov00_020ee0a0
.extern data_ov00_020ee0e8
.extern data_ov00_020ee0f4
.extern data_ov00_020ee108
.extern data_ov00_020ee110
.extern data_ov00_020ee11c
.extern data_ov00_020ee128
.extern data_ov00_020ee13c
.extern data_ov00_020ee148
.extern data_ov00_020ee154
.extern data_ov00_020ee160
.extern data_ov00_020ee16c
.extern func_01ff8214
.extern func_01ff8230
.extern func_01ff98f0
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffa8d4
.extern func_01ffbf5c
.extern func_01ffe1cc
.extern func_01fffb4c
.extern func_01fffbec
.extern func_02002c14
.extern func_02005934
.extern func_02005a04
.extern func_02005a18
.extern func_02005dcc
.extern func_020078f4
.extern func_0200c8d0
.extern func_0201842c
.extern func_02018c3c
.extern func_02018cb8
.extern func_020193f0
.extern func_02019434
.extern func_02019534
.extern func_02019570
.extern func_02019624
.extern func_02019654
.extern func_020197bc
.extern func_020197fc
.extern func_0201983c
.extern func_0201e24c
.extern func_0201e388
.extern func_0201e4cc
.extern func_0202ac0c
.extern func_0202b4e4
.extern func_0202b66c
.extern func_0202b734
.extern func_0202bac0
.extern func_0202d598
.extern func_0202d5dc
.extern func_0202d644
.extern func_0202d77c
.extern func_0202d7ac
.extern func_0202ea24
.extern func_0202ea34
.extern func_0202ea50
.extern func_0203005c
.extern func_0203010c
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0203fe60
.extern func_02043594
.extern func_02043600
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02079e68
.extern func_ov00_0207b2f0
.extern func_ov00_0207b334
.extern func_ov00_0207b5bc
.extern func_ov00_0207bb1c
.extern func_ov00_02080f20
.extern func_ov00_02080f64
.extern func_ov00_02080f94
.extern func_ov00_02082424
.extern func_ov00_02082538
.extern func_ov00_02082638
.extern func_ov00_02082d08
.extern func_ov00_020833f4
.extern func_ov00_02083400
.extern func_ov00_0208344c
.extern func_ov00_020836dc
.extern func_ov00_020838e8
.extern func_ov00_02083908
.extern func_ov00_02083928
.extern func_ov00_02083938
.extern func_ov00_02083948
.extern func_ov00_02083978
.extern func_ov00_02083ee0
.extern func_ov00_02084984
.extern func_ov00_02084b38
.extern func_ov00_02086cd0
.extern func_ov00_02086ed4
.extern func_ov00_0208726c
.extern func_ov00_02087400
.extern func_ov00_020875f8
.extern func_ov00_020879e4
.extern func_ov00_02087ab0
.extern func_ov00_02087d84
.extern func_ov00_02087d98
.extern func_ov00_02089168
.extern func_ov00_02089318
.extern func_ov00_0208949c
.extern func_ov00_0208a91c
.extern func_ov00_0208b5a4
.extern func_ov00_0208b5bc
.extern func_ov00_0208b690
.extern func_ov00_0208b694
.extern func_ov00_0208b698
.extern func_ov00_0208b6b8
.extern func_ov00_0208b6bc
.extern func_ov00_0208b6c4
.extern func_ov00_0208b6c8
.extern func_ov00_0208b6d0
.extern func_ov00_0208b6d8
.extern func_ov00_0208b6e0
.extern func_ov00_0208b6e8
.extern func_ov00_0208b6f0
.extern func_ov00_0208b6f8
.extern func_ov00_0208b700
.extern func_ov00_0208b704
.extern func_ov00_0208b70c
.extern func_ov00_0208b710
.extern func_ov00_0208b714
.extern func_ov00_0208b71c
.extern func_ov00_0208b844
.extern func_ov00_0208b870
.extern func_ov00_0208b89c
.extern func_ov00_0208ba30
.extern func_ov00_0208ba38
.extern func_ov00_0208ba40
.extern func_ov00_0208ba48
.extern func_ov00_0208ba50
.extern func_ov00_0208c384
.extern func_ov00_0208c38c
.extern func_ov00_0208c39c
.extern func_ov00_0208ccdc
.extern func_ov00_0208d5e0
.extern func_ov00_020908f8
.extern func_ov00_0209097c
.extern func_ov00_02090980
.extern func_ov00_020909e4
.extern func_ov00_020909e8
.extern func_ov00_020909ec
.extern func_ov00_020909f0
.extern func_ov00_020909f4
.extern func_ov00_020909f8
.extern func_ov00_020909fc
.extern func_ov00_02090a00
.extern func_ov00_02090a08
.extern func_ov00_02090a0c
.extern func_ov00_02090a10
.extern func_ov00_02090a14
.extern func_ov00_02090a54
.extern func_ov00_02090a64
.extern func_ov00_02090a70
.extern func_ov00_02090a7c
.extern func_ov00_02090a90
.extern func_ov00_02090aa0
.extern func_ov00_02090ab8
.extern func_ov00_02090ac8
.extern func_ov00_02090ad8
.extern func_ov00_02090ae4
.extern func_ov00_02090af0
.extern func_ov00_02090afc
.extern func_ov00_02090b08
.extern func_ov00_02090b38
.extern func_ov00_02090b68
.extern func_ov00_02090b98
.extern func_ov00_02090bc8
.extern func_ov00_02090bd8
.extern func_ov00_02090be8
.extern func_ov00_02090c04
.extern func_ov00_02090c10
.extern func_ov00_02090c1c
.extern func_ov00_02090c28
.extern func_ov00_02090c58
.extern func_ov00_02090c88
.extern func_ov00_02090c98
.extern func_ov00_02090ca4
.extern func_ov00_02090cb0
.extern func_ov00_02090cbc
.extern func_ov00_02090d48
.extern func_ov00_02090d60
.extern func_ov00_02090dec
.extern func_ov00_02090e10
.extern func_ov00_02090e20
.extern func_ov00_02090e30
.extern func_ov00_02090e54
.extern func_ov00_02090e90
.extern func_ov00_02090e9c
.extern func_ov00_02090ea8
.extern func_ov00_02090eb4
.extern func_ov00_02090ef0
.extern func_ov00_02090efc
.extern func_ov00_02090f08
.extern func_ov00_02090f14
.extern func_ov00_02090f24
.extern func_ov00_02090f74
.extern func_ov00_0209320c
.extern _ZN14AdventureFlags6ExistsEv
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern func_ov00_020a956c
.extern func_ov00_020a95ec
.extern func_ov00_020a960c
.extern func_ov00_020a9614
.extern func_ov00_020a9650
.extern func_ov00_020a96d4
.extern func_ov00_020a9740
.extern func_ov00_020a9764
.extern func_ov00_020a97d0
.extern func_ov00_020a97e0
.extern func_ov00_020a97f8
.extern func_ov00_020a9864
.extern func_ov00_020a9890
.extern func_ov00_020a98bc
.extern func_ov00_020a9968
.extern func_ov00_020a9994
.extern func_ov00_020a9998
.extern func_ov00_020a9a68
.extern func_ov00_020b3ea8
.extern func_ov00_020bcdec
.extern func_ov00_020bd618
.extern func_ov00_020bd728
.extern func_ov00_020c0bdc
.extern func_ov00_020c0c08
.extern func_ov00_020c0c70
.extern func_ov00_020c0c9c
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c0e5c
.extern func_ov00_020c45c4
.extern func_ov00_020c4648
.extern func_ov00_020c46cc
.extern func_ov00_020c474c
.extern func_ov05_02100ae0
.extern func_ov05_02112268
.extern func_ov15_02136630
.extern func_ov18_0215df1c
.extern func_ov28_0216d6d0
.extern func_ov29_0216d918
.extern func_ov40_02182970
.extern func_ov40_02182980
.extern func_ov40_02182b9c
.extern func_ov40_021833c4
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcat
.extern strcmp
.extern strcpy
asm/ov00/ov00_020980f4.s
+31667
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020a8e04.s
+26 -26
View File
@@ -808,29 +808,29 @@ _020a9c08:
.global func_ov00_020a9c14
arm_func_start func_ov00_020a9c14
func_ov00_020a9c14: ; 0x020a9c14
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x94
mov r8, r2
movs sb, r1
movs r9, r1
cmpeq r8, #0
mov sl, r0
mov r10, r0
addeq sp, sp, #0x94
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldr r1, [sl, #0x68]
mov r0, sl
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r10, #0x68]
mov r0, r10
bl func_ov00_020a9624
ldr r5, [sl, #8]
ldr r5, [r10, #8]
mov r6, r0
ldr r4, [r5, #4]
ldr r7, [sl, #0x68]
ldr r7, [r10, #0x68]
mvn r1, #0
add r0, sp, #0x70
str r1, [sp]
bl func_01ff80d4
add fp, sp, #0
add r11, sp, #0
b _020a9c94
_020a9c68:
mov r0, sl
mov r0, r10
bl func_ov00_020a9624
mov r1, r0
ldr r0, [r1]
@@ -842,7 +842,7 @@ _020a9c68:
add r1, r1, #0x28
bl func_01ff8690
_020a9c94:
mov r0, fp
mov r0, r11
mov r2, r7
add r1, r5, r4
bl func_0201b2f8
@@ -854,7 +854,7 @@ _020a9c94:
add r1, sp, #0x4c
bl func_01ff83a0
cmp r0, #0
mov r0, sb, asr #0x4
mov r0, r9, asr #0x4
bne _020a9d48
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -886,7 +886,7 @@ _020a9c94:
mov r2, r0
bl func_01ff8690
add sp, sp, #0x94
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_020a9d48:
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -916,7 +916,7 @@ _020a9d48:
mov r2, r0
bl func_01ff8690
add sp, sp, #0x94
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020a9c14
_020a9dbc: .word data_02050f54
@@ -957,27 +957,27 @@ _020a9e10:
.global func_ov00_020a9e28
arm_func_start func_ov00_020a9e28
func_ov00_020a9e28: ; 0x020a9e28
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
movs r6, r1
mov r7, r0
ldrne r0, [r6, #4]
mov r5, r2
ldrne r0, [r0, #8]
cmpne r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r0, r6
mov r4, #0
bl func_ov00_020c0e94
cmp r0, #0
bls _020a9e9c
mov r8, r4
mov sb, #1
mov r9, #1
_020a9e64:
ldr r0, [r7, #0x98]
mov r1, r4
ldrb r0, [r0, r4]
cmp r5, r0
moveq r2, sb
moveq r2, r9
movne r2, r8
mov r0, r6
bl func_ov00_020c0ea0
@@ -993,7 +993,7 @@ _020a9e9c:
mov r1, r6
ldr r2, [r2, #0x24]
blx r2
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov00_020a9e28
.global func_ov00_020a9eb4
@@ -1197,14 +1197,14 @@ func_ov00_020aa0f0: ; 0x020aa0f0
.global func_ov00_020aa124
arm_func_start func_ov00_020aa124
func_ov00_020aa124: ; 0x020aa124
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r8, r0
ldr r4, [r8, #0x94]
mov r7, r1
mov r6, r2
mov r5, r3
cmp r4, #0
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r1, [r0]
ldr r1, [r1, #8]
blx r1
@@ -1243,8 +1243,8 @@ func_ov00_020aa124: ; 0x020aa124
ldr r1, [r8, #0x94]
mov r2, r4
bl func_02019534
ldr sb, [r8, #0x84]
cmp sb, #0
ldr r9, [r8, #0x84]
cmp r9, #0
blt _020aa280
mov r0, r8
ldr r1, [r0]
@@ -1253,7 +1253,7 @@ func_ov00_020aa124: ; 0x020aa124
ldr r1, [r1, #8]
moveq r5, #0
blx r1
mov r1, sb
mov r1, r9
mov r2, r5
bl func_02019570
mov r0, r8
@@ -1287,7 +1287,7 @@ func_ov00_020aa124: ; 0x020aa124
_020aa280:
ldr r5, [r8, #0x8c]
cmp r5, #0
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldrb r0, [sp, #0x20]
cmp r0, #0
mov r0, r8
@@ -1326,7 +1326,7 @@ _020aa280:
ldr r1, [r8, #0x8c]
mov r2, r4
bl func_02019534
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov00_020aa124
_020aa328: .word data_ov00_020e9360
asm/ov00/ov00_020b1498.inc
+9 -9
View File
@@ -150,7 +150,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f90
.extern data_027e0f94
@@ -326,14 +325,14 @@
.extern func_ov00_0208b988
.extern func_ov00_0208f70c
.extern func_ov00_02093a1c
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bbc
.extern func_ov00_02097bcc
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209cbd4
@@ -459,6 +458,7 @@
.extern func_ov59_0219af14
.extern func_ov59_0219afc4
.extern func_ov59_0219b020
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcat
asm/ov00/ov00_020b1498.s
+395 -395
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020c3e54.inc
+10 -10
View File
@@ -110,7 +110,6 @@
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f88
.extern data_027e0f90
@@ -524,15 +523,15 @@
.extern func_ov00_02089b00
.extern func_ov00_02093a1c
.extern func_ov00_020965c0
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bbc
.extern func_ov00_02097bcc
.extern func_ov00_02097bdc
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEi
.extern func_ov00_020985c0
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
@@ -669,6 +668,7 @@
.extern func_ov26_0216ecb8
.extern func_ov26_021767ec
.extern func_ov29_0216d918
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcat
asm/ov00/ov00_020c3e54.s
+556 -556
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020d59f0.inc
+62 -62
View File
@@ -209,7 +209,7 @@ func_ov00_020d5c54: ; 0x020d5c54
.global func_ov00_020d5cd8
arm_func_start func_ov00_020d5cd8
func_ov00_020d5cd8: ; 0x020d5cd8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
ldr r3, [r0, #4]
ldr r2, [r0, #8]
ldr r4, [r0, #0xc]
@@ -218,23 +218,23 @@ func_ov00_020d5cd8: ; 0x020d5cd8
mul r5, r2, r2
mul ip, r4, r2
mul r7, lr, r3
mul sb, r4, r3
mul r9, r4, r3
mul r6, lr, r2
mul r8, lr, lr
add sl, r0, #0x800
add r10, r0, #0x800
mul r0, r4, lr
add lr, r5, #0x800
mul r5, r2, r3
mov r4, sl, asr #0xc
mov r4, r10, asr #0xc
add r3, ip, #0x800
add r2, r4, lr, asr #12
add ip, sb, #0x800
add ip, r9, #0x800
mov r2, r2, lsl #0x1
rsb r2, r2, #0x1000
add r8, r8, #0x800
mov sb, lr, asr #0xc
mov r9, lr, asr #0xc
add lr, r0, #0x800
add r0, sb, r8, asr #12
add r0, r9, r8, asr #12
mov r0, r0, lsl #0x1
add r4, r4, r8, asr #12
mov r4, r4, lsl #0x1
@@ -242,10 +242,10 @@ func_ov00_020d5cd8: ; 0x020d5cd8
mov r3, r3, asr #0xc
add r8, r3, r7, asr #12
rsb r7, r3, r7, asr #12
add sb, r6, #0x800
add r9, r6, #0x800
mov r3, ip, asr #0xc
rsb r6, r3, sb, asr #12
add r3, r3, sb, asr #12
rsb r6, r3, r9, asr #12
add r3, r3, r9, asr #12
str r2, [r1]
mov r2, r8, lsl #0x1
str r2, [r1, #4]
@@ -267,58 +267,58 @@ func_ov00_020d5cd8: ; 0x020d5cd8
str r0, [r1, #0x1c]
rsb r0, r4, #0x1000
str r0, [r1, #0x20]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov00_020d5cd8
.global func_ov00_020d5dc4
arm_func_start func_ov00_020d5dc4
func_ov00_020d5dc4: ; 0x020d5dc4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r4, [r0]
ldr r5, [r1]
ldmib r1, {r3, fp, lr}
ldmib r0, {r2, sl, ip}
mul sb, r4, lr
ldmib r1, {r3, r11, lr}
ldmib r0, {r2, r10, ip}
mul r9, r4, lr
mul r1, ip, r5
mul r6, r2, fp
add sb, sb, #0x800
mul r6, r2, r11
add r9, r9, #0x800
mul r7, r2, lr
mul r8, ip, r3
add r7, r7, #0x800
add r1, r1, #0x800
mov sb, sb, asr #0xc
add sb, sb, r1, asr #12
mov r9, r9, asr #0xc
add r9, r9, r1, asr #12
add r6, r6, #0x800
add r6, sb, r6, asr #12
mul sb, sl, r3
add sb, sb, #0x800
sub r6, r6, sb, asr #12
mul sb, sl, r5
mul r1, sl, lr
add r6, r9, r6, asr #12
mul r9, r10, r3
add r9, r9, #0x800
sub r6, r6, r9, asr #12
mul r9, r10, r5
mul r1, r10, lr
str r6, [r0]
add r8, r8, #0x800
mov r7, r7, asr #0xc
add r7, r7, r8, asr #12
add sb, sb, #0x800
add sb, r7, sb, asr #12
add r9, r9, #0x800
add r9, r7, r9, asr #12
mul r7, r4, r3
mul r3, r2, r3
mul r6, ip, fp
mul r6, ip, r11
mul lr, ip, lr
mul ip, r4, r5
mul r8, r4, fp
mul r8, r4, r11
mul r4, r2, r5
mul r2, sl, fp
add sl, r1, #0x800
mul r2, r10, r11
add r10, r1, #0x800
add r1, r8, #0x800
sub r1, sb, r1, asr #12
sub r1, r9, r1, asr #12
add r5, ip, #0x800
add r8, r6, #0x800
str r1, [r0, #4]
mov r6, sl, asr #0xc
add sb, r7, #0x800
mov r6, r10, asr #0xc
add r9, r7, #0x800
add r7, r6, r8, asr #12
add r8, r7, sb, asr #12
add r8, r7, r9, asr #12
add r6, lr, #0x800
mov r5, r5, asr #0xc
add r7, r4, #0x800
@@ -330,58 +330,58 @@ func_ov00_020d5dc4: ; 0x020d5dc4
str r5, [r0, #8]
sub r1, r3, r1, asr #12
str r1, [r0, #0xc]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov00_020d5dc4
.global func_ov00_020d5eac
arm_func_start func_ov00_020d5eac
func_ov00_020d5eac: ; 0x020d5eac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r5, [r1]
ldr r4, [r0, #0xc]
ldr r2, [r0, #8]
ldmib r1, {r3, fp, lr}
ldmib r1, {r3, r11, lr}
ldmia r0, {r6, ip}
mul sl, r5, r4
mul r10, r5, r4
mul r1, lr, r6
mul r7, r3, r2
add sl, sl, #0x800
add r10, r10, #0x800
mul r8, r3, r4
mul sb, lr, ip
mul r9, lr, ip
add r8, r8, #0x800
add r1, r1, #0x800
mov sl, sl, asr #0xc
add sl, sl, r1, asr #12
mov r10, r10, asr #0xc
add r10, r10, r1, asr #12
add r7, r7, #0x800
add r7, sl, r7, asr #12
mul sl, fp, ip
add sl, sl, #0x800
sub r7, r7, sl, asr #12
mul sl, fp, r6
mul r1, fp, r4
add r7, r10, r7, asr #12
mul r10, r11, ip
add r10, r10, #0x800
sub r7, r7, r10, asr #12
mul r10, r11, r6
mul r1, r11, r4
str r7, [r0]
mul r4, lr, r4
mul r7, lr, r2
mul lr, r5, r6
mul r6, r3, r6
add sb, sb, #0x800
add r9, r9, #0x800
mov r8, r8, asr #0xc
add r8, r8, sb, asr #12
add sl, sl, #0x800
mul sb, r5, r2
add sl, r8, sl, asr #12
add r8, r8, r9, asr #12
add r10, r10, #0x800
mul r9, r5, r2
add r10, r8, r10, asr #12
mul r8, r5, ip
mul r5, r3, ip
mul r2, fp, r2
add fp, r1, #0x800
add r1, sb, #0x800
mul r2, r11, r2
add r11, r1, #0x800
add r1, r9, #0x800
add r3, lr, #0x800
add sb, r7, #0x800
mov r7, fp, asr #0xc
sub r1, sl, r1, asr #12
add r9, r7, #0x800
mov r7, r11, asr #0xc
sub r1, r10, r1, asr #12
str r1, [r0, #4]
add r8, r8, #0x800
add r7, r7, sb, asr #12
add r7, r7, r9, asr #12
add r4, r4, #0x800
mov r3, r3, asr #0xc
rsb r4, r3, r4, asr #12
@@ -394,7 +394,7 @@ func_ov00_020d5eac: ; 0x020d5eac
str r5, [r0, #8]
sub r1, r3, r1, asr #12
str r1, [r0, #0xc]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov00_020d5eac
.global func_ov00_020d5f98
asm/ov01.s
+389 -389
View File
File diff suppressed because it is too large Load Diff
asm/ov02.inc
+2 -2
View File
@@ -30,7 +30,6 @@
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0e60
.extern data_027e0f74
.extern data_027e0f88
.extern data_027e0f8c
.extern data_027e0fbc
@@ -124,7 +123,7 @@
.extern func_ov00_0208df74
.extern func_ov00_0208e420
.extern func_ov00_0208e4f4
.extern func_ov00_02097760
.extern _ZN14AdventureFlags3GetEj
.extern func_ov00_0209cd80
.extern func_ov00_020a19fc
.extern func_ov00_020a1a24
@@ -259,4 +258,5 @@
.extern func_ov09_0211d090
.extern func_ov45_0218a284
.extern func_ov45_0218db94
.extern gAdventureFlags
.extern gItemManager
asm/ov02.s
+118 -118
View File
@@ -263,7 +263,7 @@ _020ef080: .word gItemManager
.global func_ov02_020ef084
arm_func_start func_ov02_020ef084
func_ov02_020ef084: ; 0x020ef084
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0xc
ldr r2, _020ef998 ; =gItemManager
ldr r1, _020ef99c ; =0x91a2b3c5
@@ -295,7 +295,7 @@ _020ef0d0:
cmp r7, #0x80
blt _020ef0d0
mov r7, #0
mov sb, r5
mov r9, r5
add r8, r5, #0x10
mov r6, r7
_020ef108:
@@ -306,11 +306,11 @@ _020ef108:
mov r1, r7
bl func_ov02_020f0a54
cmp r0, #0
streqb r6, [sb, #0x6c]
streqb r6, [r9, #0x6c]
add r7, r7, #1
cmp r7, #3
add r8, r8, #0xf0
add sb, sb, #0xf0
add r9, r9, #0xf0
blt _020ef108
mov r2, #0x13
str r2, [sp]
@@ -455,10 +455,10 @@ _020ef310:
mov r0, #0x27
str r0, [r5, #0x478]
_020ef360:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0x33
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef3b0
mov r2, #0x29
@@ -512,10 +512,10 @@ _020ef3f4:
mov r0, #0x30
str r0, [r5, #0x5f8]
_020ef438:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0x76
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef488
mov r2, #0x34
@@ -533,10 +533,10 @@ _020ef438:
mov r0, #0x34
str r0, [r5, #0x658]
_020ef488:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0x75
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef4d8
mov r2, #0x35
@@ -554,10 +554,10 @@ _020ef488:
mov r0, #0x35
str r0, [r5, #0x6b8]
_020ef4d8:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0x77
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef528
mov r2, #0x36
@@ -575,10 +575,10 @@ _020ef4d8:
mov r0, #0x36
str r0, [r5, #0x718]
_020ef528:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0x9b
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef578
mov r2, #0x37
@@ -596,10 +596,10 @@ _020ef528:
mov r0, #0x37
str r0, [r5, #0x778]
_020ef578:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0xa5
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef5c8
mov r2, #0x38
@@ -686,10 +686,10 @@ _020ef67c:
str r0, [r5, #0x8f8]
b _020ef82c
_020ef6d0:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0xb5
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef724
mov r3, #0x15
@@ -708,16 +708,16 @@ _020ef6d0:
str r0, [r5, #0x8f8]
b _020ef82c
_020ef724:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
ldr r1, _020ef9a4 ; =0x00000123
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _020ef82c
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0x7d
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef78c
mov r2, #0x18
@@ -735,10 +735,10 @@ _020ef724:
mov r0, #0x18
str r0, [r5, #0xa18]
_020ef78c:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0x7e
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef7dc
mov r2, #0x17
@@ -756,10 +756,10 @@ _020ef78c:
mov r0, #0x17
str r0, [r5, #0x9b8]
_020ef7dc:
ldr r0, _020ef9a0 ; =data_027e0f74
ldr r0, _020ef9a0 ; =gAdventureFlags
mov r1, #0x7f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020ef82c
mov r2, #0x19
@@ -871,12 +871,12 @@ _020ef96c:
str r1, [r5, #0xd14]
blx func_ov09_021144d0
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov02_020ef084
_020ef998: .word gItemManager
_020ef99c: .word 0x91a2b3c5
_020ef9a0: .word data_027e0f74
_020ef9a0: .word gAdventureFlags
_020ef9a4: .word 0x00000123
_020ef9a8: .word data_ov02_020f69e0
@@ -1323,7 +1323,7 @@ _020eff6c: .word 0x04000304
.global func_ov02_020eff70
arm_func_start func_ov02_020eff70
func_ov02_020eff70: ; 0x020eff70
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x48
mov r7, r0
add r0, sp, #0x28
@@ -1379,10 +1379,10 @@ _020f0000:
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020f008c
ldr r0, _020f0724 ; =data_027e0f74
ldr r0, _020f0724 ; =gAdventureFlags
mov r1, #0xb5
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r2, r4
mov r0, #0x50
@@ -1633,7 +1633,7 @@ _020f0414:
blx func_ov09_02113868
ldrb r0, [r7, #0xd0e]
mov r2, #2
mov sb, #0
mov r9, #0
cmp r0, #0
ldrne r0, _020f071c ; =data_ov09_0211f528
movne r1, #0x14000
@@ -1654,18 +1654,18 @@ _020f0414:
mov r6, r1
_020f0474:
mov r0, r6
mov r1, sb
mov r1, r9
mov r2, r4
mov r3, r5
str r8, [sp]
bl func_0203493c
add sb, sb, #1
cmp sb, #6
add r9, r9, #1
cmp r9, #6
ble _020f0474
ldr r0, _020f0724 ; =data_027e0f74
ldr r0, _020f0724 ; =gAdventureFlags
mov r1, #0xd4
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
add r6, sp, #0x28
mov r0, #0xef
@@ -1682,10 +1682,10 @@ _020f04d0:
str r6, [sp]
bl func_0203493c
_020f04e0:
ldr r0, _020f0724 ; =data_027e0f74
ldr r0, _020f0724 ; =gAdventureFlags
mov r1, #0xd5
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
add r6, sp, #0x28
mov r0, #0xef
@@ -1702,10 +1702,10 @@ _020f0518:
str r6, [sp]
bl func_0203493c
_020f0528:
ldr r0, _020f0724 ; =data_027e0f74
ldr r0, _020f0724 ; =gAdventureFlags
mov r1, #0xd6
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
add r6, sp, #0x28
mov r0, #0xef
@@ -1722,18 +1722,18 @@ _020f0560:
str r6, [sp]
bl func_0203493c
_020f0570:
mov sb, #0xd
mov r9, #0xd
add r8, sp, #0x28
mov r6, #0xef
_020f057c:
mov r0, r6
mov r1, sb
mov r1, r9
mov r2, r4
mov r3, r5
str r8, [sp]
bl func_0203493c
add sb, sb, #1
cmp sb, #0xe
add r9, r9, #1
cmp r9, #0xe
ble _020f057c
ldrb r0, [r7, #0xd0e]
cmp r0, #0
@@ -1828,18 +1828,18 @@ _020f06e0:
ldrb r0, [r7, #0xd0e]
cmp r0, #0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r1, #0x14000
ldr r0, _020f071c ; =data_ov09_0211f528
rsb r1, r1, #0
str r1, [r0]
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov02_020eff70
_020f071c: .word data_ov09_0211f528
_020f0720: .word gItemManager
_020f0724: .word data_027e0f74
_020f0724: .word gAdventureFlags
_020f0728: .word 0x91a2b3c5
_020f072c: .word 0x88888889
_020f0730: .word data_027e0fbc
@@ -2160,31 +2160,31 @@ func_ov02_020f0b3c: ; 0x020f0b3c
cmp r0, #0
movne r4, #0x2f
bne _020f0bcc
ldr r0, _020f0bd8 ; =data_027e0f74
ldr r0, _020f0bd8 ; =gAdventureFlags
mov r1, #0xa7
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r4, #0x2e
bne _020f0bcc
ldr r0, _020f0bd8 ; =data_027e0f74
ldr r0, _020f0bd8 ; =gAdventureFlags
mov r1, #0xa4
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r4, #0x2d
bne _020f0bcc
ldr r0, _020f0bd8 ; =data_027e0f74
ldr r0, _020f0bd8 ; =gAdventureFlags
mov r1, #0xa3
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r4, #0x2c
bne _020f0bcc
ldr r0, _020f0bd8 ; =data_027e0f74
ldr r0, _020f0bd8 ; =gAdventureFlags
mov r1, #0xa2
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r4, #0x2b
_020f0bcc:
@@ -2193,7 +2193,7 @@ _020f0bcc:
.align 2, 0
arm_func_end func_ov02_020f0b3c
_020f0bd4: .word gItemManager
_020f0bd8: .word data_027e0f74
_020f0bd8: .word gAdventureFlags
.global func_ov02_020f0bdc
arm_func_start func_ov02_020f0bdc
@@ -6049,7 +6049,7 @@ func_ov02_020f3ae0: ; 0x020f3ae0
.global func_ov02_020f3ae4
arm_func_start func_ov02_020f3ae4
func_ov02_020f3ae4: ; 0x020f3ae4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x6c
str r0, [sp, #8]
add r0, sp, #0x4c
@@ -6083,59 +6083,59 @@ func_ov02_020f3ae4: ; 0x020f3ae4
str r3, [sp, #0x38]
str r2, [sp, #0x2c]
str r1, [sp, #0x30]
mov fp, #5
mov r11, #5
mov r6, #0x30
mov r7, #0x3b
mov r8, #0x1c
add sl, sp, #0x4c
add r10, sp, #0x4c
_020f3b80:
mov r0, #0x4d
add r1, r4, #1
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
ldr r0, _020f41ec ; =gItemManager
mov r1, r4
ldr r0, [r0]
blx _ZNK11ItemManager10GetUnk_098Ej
mov sb, r0
cmp sb, #0
mov r9, r0
cmp r9, #0
ble _020f3d9c
ldr r0, [sp, #0x24]
add r1, r4, #0xd
add r0, r0, sb
add r0, r0, r9
str r0, [sp, #0x24]
mov r0, #0x4d
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
ldr r0, [sp, #8]
mov r1, r5
add r0, r0, r4, lsl #2
ldr r0, [r0, #0x10]
mov r2, #0
mov r3, sl
mov r3, r10
bl func_02032788
ldr r1, [sp, #0x1c]
mov r0, #0x4d
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
mov r0, #1
str r0, [sp, #0x28]
mov r1, sb
mov r1, r9
add r0, sp, #0x28
mov r2, sl
str fp, [sp, #0x34]
mov r2, r10
str r11, [sp, #0x34]
bl func_ov02_020f5f98
mov r0, #0x4d
add r1, r4, #0x10
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
blx func_0202ab48
cmp r0, #1
@@ -6157,18 +6157,18 @@ _020f3c58:
mov r1, #0xc
str r0, [sp, #0xc]
bl func_01ff9b4c
mov sb, r0
cmp sb, #0
mov r9, r0
cmp r9, #0
ble _020f3cc4
mov r0, #0x4d
add r1, r4, #0x2c
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
add r0, sp, #0x28
mov r1, sb
mov r2, sl
mov r1, r9
mov r2, r10
str r6, [sp, #0x34]
bl func_ov02_020f5f98
_020f3cc4:
@@ -6176,12 +6176,12 @@ _020f3cc4:
add r1, r4, #0x38
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
mov r0, #0xc
mul r1, sb, r0
mul r1, r9, r0
ldr r0, [sp, #0xc]
mov r2, sl
mov r2, r10
sub r1, r0, r1
add r0, sp, #0x28
str r7, [sp, #0x34]
@@ -6195,19 +6195,19 @@ _020f3d00:
mov r1, #0x64
str r0, [sp, #0x10]
bl func_01ff9b4c
mov sb, r0
cmp sb, #0
mov r9, r0
cmp r9, #0
ble _020f3d5c
mov r0, #0x4d
add r1, r4, #0x13
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
mov r0, #0
stmia sp, {r0, sl}
stmia sp, {r0, r10}
mov r0, #0x4d
add r1, sb, #0x22
add r1, r9, #0x22
add r2, r4, #0x19
mov r3, r5
bl func_020349cc
@@ -6216,12 +6216,12 @@ _020f3d5c:
add r1, r4, #0x16
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
mov r0, #0x64
mul r1, sb, r0
mul r1, r9, r0
ldr r0, [sp, #0x10]
mov r2, sl
mov r2, r10
sub r1, r0, r1
mov r0, #0
str r0, [sp, #0x28]
@@ -6233,7 +6233,7 @@ _020f3d9c:
add r4, r4, #1
add r0, r0, #3
str r0, [sp, #0x1c]
add fp, fp, #3
add r11, r11, #3
add r6, r6, #3
add r7, r7, #2
add r8, r8, #2
@@ -6248,10 +6248,10 @@ _020f3d9c:
str r1, [sp, #0x2c]
mov r7, #0
str r0, [sp, #0x20]
mov fp, #9
mov r11, #9
mov r8, #0x3b
mov sb, #0x42
mov sl, #0x19
mov r9, #0x42
mov r10, #0x19
add r6, sp, #0x4c
_020f3dfc:
mov r0, #0xec
@@ -6296,7 +6296,7 @@ _020f3dfc:
mov r1, r4
add r0, sp, #0x28
mov r2, r6
str fp, [sp, #0x34]
str r11, [sp, #0x34]
bl func_ov02_020f5f98
_020f3eac:
mov r0, #0xec
@@ -6352,7 +6352,7 @@ _020f3f48:
mov r2, r6
sub r1, r0, r1
add r0, sp, #0x28
str sb, [sp, #0x34]
str r9, [sp, #0x34]
bl func_ov02_020f5f98
b _020f4020
_020f3f84:
@@ -6394,17 +6394,17 @@ _020f3fe0:
mov r0, #0
str r0, [sp, #0x28]
add r0, sp, #0x28
str sl, [sp, #0x34]
str r10, [sp, #0x34]
bl func_ov02_020f5f98
_020f4020:
ldr r0, [sp, #0x20]
add r7, r7, #1
add r0, r0, #3
str r0, [sp, #0x20]
add fp, fp, #3
add r11, r11, #3
add r8, r8, #3
add sb, sb, #2
add sl, sl, #2
add r9, r9, #2
add r10, r10, #2
cmp r7, #2
blt _020f3dfc
ldr r0, _020f41ec ; =gItemManager
@@ -6499,7 +6499,7 @@ _020f40fc:
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
addeq sp, sp, #0x6c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r2, r5
mov r0, #0xec
mov r1, #6
@@ -6513,7 +6513,7 @@ _020f40fc:
str r4, [sp]
bl func_0203493c
add sp, sp, #0x6c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov02_020f3ae4
_020f41ec: .word gItemManager
@@ -8663,11 +8663,11 @@ _020f5f94: .word data_ov00_020eec9c
.global func_ov02_020f5f98
arm_func_start func_ov02_020f5f98
func_ov02_020f5f98: ; 0x020f5f98
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #8
mov r6, r0
ldr r0, [r6, #0x10]
ldrb sb, [r6, #0x20]
ldrb r9, [r6, #0x20]
ldr r7, [r6, #0xc]
ldr r8, [r6, #0x14]
mov r5, r1
@@ -8685,10 +8685,10 @@ _020f5fdc:
mov r0, r5
mov r1, #0x3e8
bl func_01ff9b4c
mov sl, r0
cmp sl, #0
mov r10, r0
cmp r10, #0
bgt _020f5ffc
cmp sb, #0
cmp r9, #0
beq _020f6020
_020f5ffc:
ldr r0, [r6, #0x18]
@@ -8696,9 +8696,9 @@ _020f5ffc:
stmia sp, {r0, r4}
ldmib r6, {r0, r1}
mov r3, r8
add r1, r1, sl
add r1, r1, r10
bl func_020349cc
mov sb, #1
mov r9, #1
b _020f6030
_020f6020:
ldr r0, [r6]
@@ -8707,17 +8707,17 @@ _020f6020:
subeq r8, r8, r0
_020f6030:
mov r0, #0x3e8
mul r0, sl, r0
mul r0, r10, r0
add r7, r7, #1
sub r5, r5, r0
_020f6040:
mov r0, r5
mov r1, #0x64
bl func_01ff9b4c
mov sl, r0
cmp sl, #0
mov r10, r0
cmp r10, #0
bgt _020f6060
cmp sb, #0
cmp r9, #0
beq _020f6084
_020f6060:
ldr r0, [r6, #0x18]
@@ -8725,9 +8725,9 @@ _020f6060:
stmia sp, {r0, r4}
ldmib r6, {r0, r1}
mov r3, r8
add r1, r1, sl
add r1, r1, r10
bl func_020349cc
mov sb, #1
mov r9, #1
b _020f6094
_020f6084:
ldr r0, [r6]
@@ -8736,17 +8736,17 @@ _020f6084:
subeq r8, r8, r0
_020f6094:
mov r0, #0x64
mul r0, sl, r0
mul r0, r10, r0
add r7, r7, #1
sub r5, r5, r0
_020f60a4:
mov r0, r5
mov r1, #0xa
bl func_01ff9b4c
mov sl, r0
cmp sl, #0
mov r10, r0
cmp r10, #0
bgt _020f60c4
cmp sb, #0
cmp r9, #0
beq _020f60e4
_020f60c4:
ldr r0, [r6, #0x18]
@@ -8754,7 +8754,7 @@ _020f60c4:
stmia sp, {r0, r4}
ldmib r6, {r0, r1}
mov r3, r8
add r1, r1, sl
add r1, r1, r10
bl func_020349cc
b _020f60f4
_020f60e4:
@@ -8778,7 +8778,7 @@ _020f60f8:
bl func_020349cc
_020f6124:
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov02_020f5f98
.global func_ov02_020f612c
asm/ov03.inc
+48 -48
View File
@@ -5,6 +5,47 @@
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN14OverlayManager6UnloadEj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager15GetEquippedItemEv
@@ -47,7 +88,6 @@
.extern data_027e0e58
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f7c
.extern data_027e0f84
.extern data_027e0f88
@@ -267,12 +307,12 @@
.extern func_ov00_0208c38c
.extern func_ov00_0208c39c
.extern func_ov00_0208ca00
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bbc
.extern func_ov00_02097bcc
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209d748
@@ -291,47 +331,6 @@
.extern func_ov00_020a95a4
.extern func_ov00_020bb50c
.extern func_ov00_020bc500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020cef40
.extern func_ov00_020cef50
.extern func_ov00_020cefbc
@@ -499,6 +498,7 @@
.extern func_ov52_02195764
.extern func_ov52_0219611c
.extern func_ov52_02196198
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcat
asm/ov03.s
+433 -433
View File
File diff suppressed because it is too large Load Diff
asm/ov04.inc
+18 -18
View File
@@ -70,7 +70,6 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f90
@@ -458,23 +457,23 @@
.extern func_ov00_02097240
.extern func_ov00_020972e0
.extern func_ov00_02097354
.extern func_ov00_02097674
.extern func_ov00_02097684
.extern func_ov00_02097694
.extern func_ov00_020976c8
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097a44
.extern func_ov00_02097c18
.extern func_ov00_02097c38
.extern func_ov00_02097c80
.extern func_ov00_02097c98
.extern func_ov00_02097cb0
.extern func_ov00_02097cc8
.extern func_ov00_02097ce0
.extern func_ov00_02097d10
.extern func_ov00_02097db4
.extern func_ov00_02097e58
.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
@@ -712,6 +711,7 @@
.extern func_ov40_02186948
.extern func_ov40_02186c8c
.extern func_ov40_02187ba0
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern gPlayerAnimHandler
asm/ov04.s
+60 -60
View File
@@ -131,21 +131,21 @@ func_ov04_02100bcc: ; 0x02100bcc
cmp r0, #2
bne _02100c34
mov r5, #0
ldr r4, _02100c60 ; =data_027e0f74
ldr r4, _02100c60 ; =gAdventureFlags
ldr r6, _02100c64 ; =0x0000012a
add r7, r5, #0
_02100bf0:
ldr r0, [r4]
add r1, r5, r6
add r2, r7, #0
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
add r5, r5, #1
cmp r5, #4
blt _02100bf0
ldr r0, _02100c60 ; =data_027e0f74
ldr r0, _02100c60 ; =gAdventureFlags
mov r1, #0x94
ldr r0, [r0]
blx func_ov00_02097760
blx _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02100c2c
ldr r0, _02100c68 ; =data_ov00_020ec678
@@ -153,13 +153,13 @@ _02100bf0:
ldrb r4, [r0]
cmp r4, #0
ble _02100c2c
ldr r6, _02100c60 ; =data_027e0f74
ldr r6, _02100c60 ; =gAdventureFlags
ldr r7, _02100c64 ; =0x0000012a
_02100c1c:
ldr r0, [r6]
add r1, r5, r7
mov r2, #1
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
add r5, r5, #1
cmp r5, r4
blt _02100c1c
@@ -181,7 +181,7 @@ _02100c34:
nop
thumb_func_end func_ov04_02100bcc
_02100c5c: .word data_027e0618
_02100c60: .word data_027e0f74
_02100c60: .word gAdventureFlags
_02100c64: .word 0x0000012a
_02100c68: .word data_ov00_020ec678
@@ -3428,7 +3428,7 @@ func_ov04_021024c4: ; 0x021024c4
ldr r0, [r4, #8]
cmp r0, #1
bne _02102578
ldr r0, _021025d0 ; =data_027e0f74
ldr r0, _021025d0 ; =gAdventureFlags
add r1, r4, #0
ldr r0, [r0]
bl func_ov04_0210455c
@@ -3473,7 +3473,7 @@ _021025c0: .word data_027e0fe4
_021025c4: .word data_027e0d38
_021025c8: .word data_027e0f70
_021025cc: .word data_027e0f68
_021025d0: .word data_027e0f74
_021025d0: .word gAdventureFlags
_021025d4: .word 0x414e4353
.global func_ov04_021025d8
@@ -7233,7 +7233,7 @@ _0210443e:
_02104458:
str r0, [r4, #0x44]
add r0, r4, #0
blx func_ov00_02097694
blx _ZN14AdventureFlags4LoadEv
add r0, r4, #0
pop {r4, pc}
.align 2, 0
@@ -7280,7 +7280,7 @@ _0210449c:
thumb_func_start func_ov04_021044a8
func_ov04_021044a8: ; 0x021044a8
push {r3, lr}
ldr r0, _021044cc ; =data_027e0f74
ldr r0, _021044cc ; =gAdventureFlags
ldr r0, [r0]
cmp r0, #0
bne _021044ca
@@ -7293,20 +7293,20 @@ func_ov04_021044a8: ; 0x021044a8
beq _021044c6
bl func_ov04_0210441c
_021044c6:
ldr r1, _021044cc ; =data_027e0f74
ldr r1, _021044cc ; =gAdventureFlags
str r0, [r1]
_021044ca:
pop {r3, pc}
.align 2, 0
thumb_func_end func_ov04_021044a8
_021044cc: .word data_027e0f74
_021044cc: .word gAdventureFlags
_021044d0: .word data_027e0ce0
.global func_ov04_021044d4
thumb_func_start func_ov04_021044d4
func_ov04_021044d4: ; 0x021044d4
push {r4, lr}
ldr r0, _021044f4 ; =data_027e0f74
ldr r0, _021044f4 ; =gAdventureFlags
ldr r4, [r0]
cmp r4, #0
beq _021044f2
@@ -7316,14 +7316,14 @@ func_ov04_021044d4: ; 0x021044d4
add r0, r4, #0
blx _ZN9SysObjectdlEPv
_021044ec:
ldr r0, _021044f4 ; =data_027e0f74
ldr r0, _021044f4 ; =gAdventureFlags
mov r1, #0
str r1, [r0]
_021044f2:
pop {r4, pc}
.align 2, 0
thumb_func_end func_ov04_021044d4
_021044f4: .word data_027e0f74
_021044f4: .word gAdventureFlags
.global func_ov04_021044f8
thumb_func_start func_ov04_021044f8
@@ -7335,7 +7335,7 @@ func_ov04_021044f8: ; 0x021044f8
cmp r1, #1
bne _0210451e
ldr r1, [r4, #0xc]
blx func_ov00_02097c98
blx _ZN14AdventureFlags15Get_FlagsUnk_40Ei
mov r1, #2
add r2, r0, #0
lsl r1, r1, #8
@@ -7355,7 +7355,7 @@ _02104524:
ldr r0, [r5, #0x44]
blx func_ov00_0209906c
add r0, r5, #0
blx func_ov00_020976c8
blx _ZN14AdventureFlags18func_ov00_020976c8Ev
pop {r3, r4, r5, pc}
.align 2, 0
thumb_func_end func_ov04_021044f8
@@ -7402,7 +7402,7 @@ _0210457a:
pop {r4, r5, r6, r7, pc}
_02104580:
add r1, r4, #0
blx func_ov00_02097c18
blx _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
cmp r0, #0
beq _02104590
add sp, #0x104
@@ -7424,7 +7424,7 @@ _02104590:
strb r2, [r1, #0x14]
add r0, r4, #0
strb r2, [r1, #0x15]
blx func_ov00_02097d10
blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
cmp r0, #0
bne _021045bc
add sp, #0x104
@@ -7482,7 +7482,7 @@ _021045bc:
strb r1, [r2, #0x15]
add r0, r6, #0
add r1, r4, #0
blx func_ov00_02097db4
blx _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2
add r0, sp, #0x18
blx func_ov00_020a5e9c
cmp r0, #0x47
@@ -7539,10 +7539,10 @@ _02104682:
ldr r3, [r0, #4]
orr r1, r3
str r1, [r0, #4]
ldr r0, _021046c4 ; =data_027e0f74
ldr r0, _021046c4 ; =gAdventureFlags
add r1, r4, #0
ldr r0, [r0]
blx func_ov00_02097a44
blx _ZN14AdventureFlags18func_ov00_02097a44Eii
add r0, sp, #0x54
blx func_ov00_0209a508
add sp, #0x104
@@ -7556,7 +7556,7 @@ _021046b6:
thumb_func_end func_ov04_0210455c
_021046bc: .word data_027e0e60
_021046c0: .word data_ov00_020eab04
_021046c4: .word data_027e0f74
_021046c4: .word gAdventureFlags
.global func_ov04_021046c8
thumb_func_start func_ov04_021046c8
@@ -7675,9 +7675,9 @@ _02104778:
ldr r1, [r0, #0xc]
cmp r1, #0x21
beq _021047a2
ldr r0, _0210498c ; =data_027e0f74
ldr r0, _0210498c ; =gAdventureFlags
ldr r0, [r0]
blx func_ov00_02097c38
blx _ZN14AdventureFlags15Get_FlagsUnk_49Ei
cmp r0, #0
beq _021047a2
mov r7, #1
@@ -7846,7 +7846,7 @@ _021048cc:
strb r1, [r0, #3]
str r1, [r0, #4]
str r1, [r0, #8]
ldr r0, _0210498c ; =data_027e0f74
ldr r0, _0210498c ; =gAdventureFlags
ldr r1, [sp]
ldr r0, [r0]
bl func_ov04_021044f8
@@ -7909,7 +7909,7 @@ _02104920:
thumb_func_end func_ov04_021046dc
_02104984: .word data_027e0d38
_02104988: .word data_027e0618
_0210498c: .word data_027e0f74
_0210498c: .word gAdventureFlags
_02104990: .word data_027e0c54
_02104994: .word data_027e06d8
_02104998: .word data_02075dac
@@ -7977,7 +7977,7 @@ _02104a3c:
ldr r0, _02104ae4 ; =data_027e0f64
ldr r0, [r0]
bl func_ov04_02103740
ldr r0, _02104ae8 ; =data_027e0f74
ldr r0, _02104ae8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov04_0210453c
bl func_ov04_0210bd28
@@ -8023,7 +8023,7 @@ _02104ad8: .word data_ov00_020ee734
_02104adc: .word data_027e0f68
_02104ae0: .word data_027e0e60
_02104ae4: .word data_027e0f64
_02104ae8: .word data_027e0f74
_02104ae8: .word gAdventureFlags
_02104aec: .word data_027e0fe4
_02104af0: .word data_027e0c68
_02104af4: .word data_027e103c
@@ -9049,22 +9049,22 @@ _021052b6:
bl func_ov03_020f3d5c
cmp r0, #0
bne _021052ec
ldr r0, _02105314 ; =data_027e0f74
ldr r0, _02105314 ; =gAdventureFlags
mov r1, #0xe8
ldr r0, [r0]
mov r2, #0
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
_021052ec:
ldr r0, _02105314 ; =data_027e0f74
ldr r0, _02105314 ; =gAdventureFlags
mov r1, #0x56
ldr r0, [r0]
mov r2, #0
blx func_ov00_0209779c
ldr r0, _02105314 ; =data_027e0f74
blx _ZN14AdventureFlags3SetEjb
ldr r0, _02105314 ; =gAdventureFlags
mov r1, #0x9e
ldr r0, [r0]
mov r2, #0
blx func_ov00_0209779c
blx _ZN14AdventureFlags3SetEjb
_02105304:
add r0, r4, #0
pop {r3, r4, r5, pc}
@@ -9073,7 +9073,7 @@ _02105304:
_02105308: .word 0x7fffffff
_0210530c: .word data_027e0618
_02105310: .word data_027e0dbc
_02105314: .word data_027e0f74
_02105314: .word gAdventureFlags
.global func_ov04_02105318
thumb_func_start func_ov04_02105318
@@ -9299,10 +9299,10 @@ func_ov04_021054a4: ; 0x021054a4
bne _021054d8
add r0, #0x20
strh r0, [r5]
ldr r0, _02105540 ; =data_027e0f74
ldr r0, _02105540 ; =gAdventureFlags
ldr r1, [r6, #0xc]
ldr r0, [r0]
blx func_ov00_02097c80
blx _ZN14AdventureFlags15Get_FlagsUnk_42Ei
add r4, #0x80
add r0, r4, r0
lsl r0, r0, #0x10
@@ -9359,7 +9359,7 @@ _0210553a:
pop {r3, r4, r5, r6, r7, pc}
nop
thumb_func_end func_ov04_021054a4
_02105540: .word data_027e0f74
_02105540: .word gAdventureFlags
_02105544: .word data_027e0d38
_02105548: .word data_027e0ce0
@@ -14653,10 +14653,10 @@ _02107cca:
ldr r0, [sp]
cmp r0, #0
beq _02107cde
ldr r0, _02107e04 ; =data_027e0f74
ldr r0, _02107e04 ; =gAdventureFlags
ldr r1, [r4, #0x18]
ldr r0, [r0]
blx func_ov00_02097cb0
blx _ZN14AdventureFlags15Get_FlagsUnk_38Ei
str r0, [r6]
b _02107db2
_02107cde:
@@ -14822,7 +14822,7 @@ _02107df4:
_02107df8: .word 0x00007fff
_02107dfc: .word data_027e0d38
_02107e00: .word data_027e0618
_02107e04: .word data_027e0f74
_02107e04: .word gAdventureFlags
_02107e08: .word data_027e0ce0
.global func_ov04_02107e0c
@@ -15154,11 +15154,11 @@ func_ov04_02108078: ; 0x02108078
cmp r4, #0x15
bge _021080a0
ldr r1, _02108270 ; =data_027e0d38
ldr r0, _02108274 ; =data_027e0f74
ldr r0, _02108274 ; =gAdventureFlags
ldr r1, [r1]
ldr r0, [r0]
ldr r1, [r1, #0x18]
blx func_ov00_02097e58
blx _ZN14AdventureFlags12Get_FlagsUnkEi
ldrh r7, [r0, #0x3c]
b _02108120
_021080a0:
@@ -15240,11 +15240,11 @@ _02108120:
cmp r4, #0x15
bge _0210813a
ldr r1, _02108270 ; =data_027e0d38
ldr r0, _02108274 ; =data_027e0f74
ldr r0, _02108274 ; =gAdventureFlags
ldr r1, [r1]
ldr r0, [r0]
ldr r1, [r1, #0x18]
blx func_ov00_02097e58
blx _ZN14AdventureFlags12Get_FlagsUnkEi
ldrh r2, [r0, #0x3e]
b _0210819a
_0210813a:
@@ -15403,7 +15403,7 @@ _02108268:
nop
thumb_func_end func_ov04_02108078
_02108270: .word data_027e0d38
_02108274: .word data_027e0f74
_02108274: .word gAdventureFlags
_02108278: .word data_ov00_020e9360
_0210827c: .word func_ov04_02108060
_02108280: .word data_027e01b8
@@ -18748,10 +18748,10 @@ _02109c70:
mvn r0, r0
cmp r2, r0
beq _02109d32
ldr r0, _02109d9c ; =data_027e0f74
ldr r0, _02109d9c ; =gAdventureFlags
add r1, r2, #0
ldr r0, [r0]
blx func_ov00_02097cc8
blx _ZN14AdventureFlags15Get_FlagsUnk_34Ei
add r1, r0, #0
add r0, r4, #0
bl func_ov04_0210a050
@@ -18882,7 +18882,7 @@ _02109d8c: .word data_027e0f7c
_02109d90: .word data_ov00_020eec68
_02109d94: .word data_ov00_020eec9c
_02109d98: .word data_027e0618
_02109d9c: .word data_027e0f74
_02109d9c: .word gAdventureFlags
_02109da0: .word data_027e0ffc
_02109da4: .word data_027e101c
_02109da8: .word data_ov00_020eec64
@@ -23845,9 +23845,9 @@ _0210c370:
ldrb r0, [r0, #0x15]
strb r0, [r2, #0x1d]
beq _0210c3c4
ldr r0, _0210c3f8 ; =data_027e0f74
ldr r0, _0210c3f8 ; =gAdventureFlags
ldr r0, [r0]
blx func_ov00_02097ce0
blx _ZN14AdventureFlags15Get_FlagsUnk_44Ei
add r1, r0, #0
cmp r1, #0x2e
beq _0210c3c4
@@ -23875,7 +23875,7 @@ _0210c3e8: .word 0x00000440
_0210c3ec: .word data_027e0f6c
_0210c3f0: .word data_027e103c
_0210c3f4: .word data_027e0d38
_0210c3f8: .word data_027e0f74
_0210c3f8: .word gAdventureFlags
.global func_ov04_0210c3fc
thumb_func_start func_ov04_0210c3fc
@@ -23974,12 +23974,12 @@ func_ov04_0210c3fc: ; 0x0210c3fc
add r1, sp, #4
bl func_ov04_02106970
_0210c4d0:
ldr r0, _0210c528 ; =data_027e0f74
ldr r0, _0210c528 ; =gAdventureFlags
ldrb r3, [r5, #0x13]
ldr r0, [r0]
ldr r2, [r6]
add r1, sp, #4
blx func_ov00_02097674
blx _ZN14AdventureFlags18func_ov00_02097674Ev
add r0, sp, #4
bl func_0203005c
add r0, sp, #0x18
@@ -24002,15 +24002,15 @@ _0210c518: .word data_027e0618
_0210c51c: .word data_ov09_0211f5b4
_0210c520: .word data_ov09_0211f530
_0210c524: .word data_ov00_020e9370
_0210c528: .word data_027e0f74
_0210c528: .word gAdventureFlags
.global func_ov04_0210c52c
thumb_func_start func_ov04_0210c52c
func_ov04_0210c52c: ; 0x0210c52c
push {r4, lr}
ldr r0, _0210c5a0 ; =data_027e0f74
ldr r0, _0210c5a0 ; =gAdventureFlags
ldr r0, [r0]
blx func_ov00_02097684
blx _ZN14AdventureFlags18func_ov00_02097684Ev
ldr r0, _0210c5a4 ; =data_027e0618
ldr r0, [r0]
cmp r0, #2
@@ -24057,7 +24057,7 @@ _0210c552:
pop {r4, pc}
.align 2, 0
thumb_func_end func_ov04_0210c52c
_0210c5a0: .word data_027e0f74
_0210c5a0: .word gAdventureFlags
_0210c5a4: .word data_027e0618
_0210c5a8: .word data_ov09_0211f530
_0210c5ac: .word data_ov09_0211f5b4
asm/ov05.inc
+12 -12
View File
@@ -5,6 +5,10 @@
.extern _ZN11ItemManager15LoadFanfareItemEi
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN12ActorManager11DeleteActorEjb
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase12ApplyImpulseEii
.extern _ZN13LinkStateBase12GetEquipItemEi
@@ -114,6 +118,7 @@
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
.extern _ZN4Item18func_ov00_020ad020Ei
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN9SysObjectdlEPv
.extern _ZNK11ItemManager13HasAllPotionsEv
.extern _ZNK11ItemManager15HasPurplePotionEv
@@ -159,7 +164,6 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f88
@@ -369,12 +373,12 @@
.extern func_ov00_0208cb84
.extern func_ov00_0208df2c
.extern func_ov00_02095fe0
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097bbc
.extern func_ov00_02097ff4
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern func_ov00_020981b8
.extern func_ov00_02098694
.extern func_ov00_02098890
@@ -440,11 +444,6 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN12ActorManager11DeleteActorEjb
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern func_ov00_020c3eb0
.extern func_ov00_020ce2f0
.extern func_ov00_020ce8e4
@@ -576,6 +575,7 @@
.extern func_ov58_0219a5c8
.extern func_ov59_0219907c
.extern func_ov59_021990a4
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcmp
asm/ov05.s
+651 -651
View File
File diff suppressed because it is too large Load Diff
asm/ov06.s
+39 -39
View File
@@ -1695,7 +1695,7 @@ _02101ee0:
.global func_ov06_02101ee8
arm_func_start func_ov06_02101ee8
func_ov06_02101ee8: ; 0x02101ee8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r8, r0
ldr r0, [r8]
mov r1, #0
@@ -1708,7 +1708,7 @@ func_ov06_02101ee8: ; 0x02101ee8
cmp r0, #0
ble _02101f9c
mvn r4, #0
add sb, r4, #0x10000
add r9, r4, #0x10000
_02101f20:
ldr r1, [r8]
add r0, r8, r7, lsl #1
@@ -1717,7 +1717,7 @@ _02101f20:
mov r0, r6
bl func_02023ea4
mov r1, r0
cmp r1, sb
cmp r1, r9
ldreq r0, [r6]
ldreqh r1, [r0, #2]
mov r0, r6
@@ -1744,7 +1744,7 @@ _02101f20:
_02101f9c:
mov r0, #0
strb r0, [r8, #0x41]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov06_02101ee8
.global func_ov06_02101fa8
@@ -2083,7 +2083,7 @@ _021023c4:
.global func_ov06_021023d8
arm_func_start func_ov06_021023d8
func_ov06_021023d8: ; 0x021023d8
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
mov r5, r0
ldr r1, [r5, #0x22c]
@@ -2095,7 +2095,7 @@ func_ov06_021023d8: ; 0x021023d8
mov r0, #1
mov r8, #0
strb r0, [sp, #0xe]
add sb, r5, #0x184
add r9, r5, #0x184
mov r7, r8
add r6, sp, #4
_02102414:
@@ -2106,7 +2106,7 @@ _02102414:
cmp r0, #0
beq _02102444
_0210242c:
mov r0, sb
mov r0, r9
mov r1, r7
mov r2, r4
mov r3, r6
@@ -2115,7 +2115,7 @@ _0210242c:
_02102444:
add r8, r8, #1
cmp r8, #7
add sb, sb, #0x18
add r9, r9, #0x18
blt _02102414
ldr r0, [r5, #0x178]
add r3, sp, #4
@@ -2156,7 +2156,7 @@ _02102490:
str r4, [sp]
bl func_ov06_02101fa8
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov06_021023d8
_021024ec: .word 0x00000102
@@ -2200,7 +2200,7 @@ _02102560: .word 0x04001014
.global func_ov06_02102564
arm_func_start func_ov06_02102564
func_ov06_02102564: ; 0x02102564
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r4, r0
ldr r0, [r4, #0x178]
mov r7, #0
@@ -2212,13 +2212,13 @@ func_ov06_02102564: ; 0x02102564
ldr r6, _021026b4 ; =data_027e0d78
cmp r0, #1
movne r0, r7
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
mov sb, r4
add sl, r4, #0x184
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r9, r4
add r10, r4, #0x184
mov r5, r7
_021025a4:
mov r0, sl
add r1, sb, #0x100
mov r0, r10
add r1, r9, #0x100
ldr ip, [r0]
ldrh r8, [r1, #0x8e]
ldr ip, [ip]
@@ -2233,18 +2233,18 @@ _021025a4:
cmp r0, #0
strne r7, [r4, #0x230]
movne r0, #1
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
add r7, r7, #1
cmp r7, #7
add sb, sb, #0x18
add sl, sl, #0x18
add r9, r9, #0x18
add r10, r10, #0x18
blt _021025a4
ldrb r0, [r4, #0x23b]
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r1, [r4, #0x178]
ldr sb, [r6, #0x1c]
ldr r9, [r6, #0x1c]
ldr r0, [r1, #0xc]
ldr r5, [r1, #8]
add r0, r0, #1
@@ -2263,7 +2263,7 @@ _02102634:
beq _02102688
ldr r0, [r4, #0x234]
mov r1, r5
mov r2, sb
mov r2, r9
mov r3, r8
bl func_02034b90
cmp r0, #0
@@ -2274,7 +2274,7 @@ _02102634:
ldr r2, [r2, #4]
blx r2
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_02102688:
ldr r0, [r4, #0x178]
add r5, r5, #1
@@ -2287,7 +2287,7 @@ _021026a0:
mov r0, #0
ldrh r2, [r1, #6]
strh r2, [r1, #0xa]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov06_02102564
_021026b4: .word data_027e0d78
@@ -2780,10 +2780,10 @@ _02102d60: .word 0x00000103
.global func_ov06_02102d64
arm_func_start func_ov06_02102d64
func_ov06_02102d64: ; 0x02102d64
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov sl, r0
add r0, sl, #0x44
mov r10, r0
add r0, r10, #0x44
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x10]
@@ -2791,7 +2791,7 @@ func_ov06_02102d64: ; 0x02102d64
mov r0, #0
str r0, [sp, #0xc]
str r0, [sp, #8]
ldr r1, [sl, #0x178]
ldr r1, [r10, #0x178]
ldr r0, [r1, #0x20]
ldr r7, [r1, #0x1c]
add r0, r0, #1
@@ -2800,31 +2800,31 @@ func_ov06_02102d64: ; 0x02102d64
ldr r4, _02102e78 ; =0x0000ffff
mov r5, #6
mov r6, #4
add fp, sp, #0xc
add r11, sp, #0xc
_02102db8:
str r6, [sp]
str r6, [sp, #4]
ldr r0, [sl, #0x234]
ldr r0, [r10, #0x234]
mov r1, r7
mov r2, fp
mov r2, r11
add r3, sp, #8
bl func_020347b0
ldr r0, [sl, #0x178]
ldr r0, [r10, #0x178]
ldr r2, [r0]
ldr r1, [r0, #0x1c]
ldr r2, [r2, #0x10]
sub r1, r7, r1
blx r2
mov r8, r0
ldr sb, [sl, #0x70]
ldr r9, [r10, #0x70]
mov r1, r8
mov r0, sb
mov r0, r9
bl func_02023ea4
mov r1, r0
cmp r1, r4
ldreq r0, [sb]
ldreq r0, [r9]
ldreqh r1, [r0, #2]
mov r0, sb
mov r0, r9
bl func_02023eec
str r5, [sp]
ldrsb r1, [r0, #2]
@@ -2833,24 +2833,24 @@ _02102db8:
ldr r8, [sp, #0xc]
add r1, r1, r1, lsr #31
sub r1, r8, r1, asr #1
add r0, sl, #0x44
add r0, r10, #0x44
ldr r8, [r0]
sub r2, r2, #7
ldr r8, [r8, #0xc]
and r1, r1, #0xff
and r2, r2, #0xff
blx r8
ldr r0, [sl, #0x178]
ldr r0, [r10, #0x178]
add r7, r7, #1
ldr r0, [r0, #0x20]
add r0, r0, #1
cmp r7, r0
blt _02102db8
_02102e68:
mov r0, sl
mov r0, r10
bl func_ov06_02101ee8
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov06_02102d64
_02102e78: .word 0x0000ffff
asm/ov08.s
+17 -17
View File
@@ -771,29 +771,29 @@ func_ov08_021135b8: ; 0x021135b8
.global func_ov08_021135bc
arm_func_start func_ov08_021135bc
func_ov08_021135bc: ; 0x021135bc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov sl, r0
mov r10, r0
mov r8, #0
mov r0, #2
str r0, [sl]
str r0, [r10]
mov r7, #0x2000
rsb r7, r7, #0
strh r8, [sl, #0xe]
strh r8, [r10, #0xe]
mov r0, #0x1000
strh r0, [sl, #0x10]
mov sb, r1
strh r8, [sl, #0x12]
strh r0, [r10, #0x10]
mov r9, r1
strh r8, [r10, #0x12]
mov r5, r7, lsr #0x11
mov r6, #1
mov r4, r8
mov fp, r8
mov r11, r8
_02113600:
ldr r0, [sl]
ldr r0, [r10]
cmp r8, r0
bge _02113648
mov r0, #0x10
mov r1, sb
mov r1, r9
mov r2, #4
bl _ZN9SysObjectnwEmPjj
cmp r0, #0
@@ -805,23 +805,23 @@ _02113600:
str r6, [sp, #4]
bl func_ov08_021136c0
_0211363c:
add r1, sl, r8, lsl #2
add r1, r10, r8, lsl #2
str r0, [r1, #4]
b _02113650
_02113648:
add r0, sl, r8, lsl #2
add r0, r10, r8, lsl #2
str r4, [r0, #4]
_02113650:
add r0, sl, r8
add r0, r10, r8
add r8, r8, #1
strb fp, [r0, #0xc]
strb r11, [r0, #0xc]
cmp r8, #2
blt _02113600
mov r0, sl
mov r0, r10
bl func_ov00_020a1a3c
mov r0, sl
mov r0, r10
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov08_021135bc
.global func_ov08_02113678
asm/ov09.inc
+8 -8
View File
@@ -4,6 +4,7 @@
.extern _ZN11ItemManager13EquipShipPartEjj
.extern _ZN11ItemManager16SetShipPartCountEjjc
.extern _ZN11ItemManager16SetTreasureCountEjc
.extern _ZN12ActorManager14Actor_vfunc_28Ev
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
@@ -43,7 +44,6 @@
.extern data_027e0e58
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e0fbc
.extern data_027e0fe4
@@ -233,12 +233,12 @@
.extern func_ov00_02083ee0
.extern func_ov00_020848b8
.extern func_ov00_02087d34
.extern func_ov00_02097644
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_02097c68
.extern func_ov00_02097d10
.extern func_ov00_02097ecc
.extern _ZN14AdventureFlags6CopyToEPi
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags15Get_FlagsUnk_4aEi
.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
.extern _ZN14AdventureFlags18func_ov00_02097eccEv
.extern func_ov00_020a5e9c
.extern func_ov00_020a61ac
.extern func_ov00_020a956c
@@ -274,7 +274,6 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN12ActorManager14Actor_vfunc_28Ev
.extern func_ov00_020cef40
.extern func_ov00_020cf270
.extern func_ov00_020cf330
@@ -451,6 +450,7 @@
.extern func_ov17_021600f0
.extern func_ov18_02160a74
.extern func_ov29_0216dcf4
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcat
asm/ov09.s
+127 -127
View File
@@ -98,7 +98,7 @@ _02112caa:
beq _02112ce2
mov r0, #0x17
add r1, sp, #0
blx func_ov00_02097d10
blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
b _02112d24
_02112ce2:
ldr r0, _02112d54 ; =data_027e0618
@@ -107,7 +107,7 @@ _02112ce2:
bne _02112cf4
mov r0, #0x17
add r1, sp, #0
blx func_ov00_02097d10
blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
b _02112d24
_02112cf4:
ldr r4, _02112d58 ; =data_ov00_020eab04
@@ -116,14 +116,14 @@ _02112cf4:
bne _02112d06
mov r0, #1
add r1, sp, #0
blx func_ov00_02097d10
blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
b _02112d24
_02112d06:
blx func_ov00_02097ecc
blx _ZN14AdventureFlags18func_ov00_02097eccEv
cmp r0, #0x21
beq _02112d16
add r1, sp, #0
blx func_ov00_02097d10
blx _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
b _02112d24
_02112d16:
ldr r0, [r4]
@@ -3614,10 +3614,10 @@ _021148ba:
add r1, sp, #8
mov r2, #0x40
blx func_020078f4
ldr r0, _02114998 ; =data_027e0f74
ldr r0, _02114998 ; =gAdventureFlags
add r1, sp, #8
ldr r0, [r0]
blx func_ov00_02097644
blx _ZN14AdventureFlags6CopyToEPi
mov r0, #0x40
str r0, [sp]
ldr r0, [r5, #8]
@@ -3710,7 +3710,7 @@ _02114988: .word data_027e0fbc
_0211498c: .word data_ov00_020e9e18
_02114990: .word data_ov09_0211f5b4
_02114994: .word data_ov00_020e9f08
_02114998: .word data_027e0f74
_02114998: .word gAdventureFlags
_0211499c: .word data_ov00_020eaac4
_021149a0: .word 0x00000cac
_021149a4: .word data_ov00_020eacc8
@@ -4762,20 +4762,20 @@ func_ov09_021152fc: ; 0x021152fc
.global func_ov09_0211530c
arm_func_start func_ov09_0211530c
func_ov09_0211530c: ; 0x0211530c
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x3c
mov sb, r0
ldr r0, [sb, #0x1c]
mov r9, r0
ldr r0, [r9, #0x1c]
mov r8, r1
ldr r1, [r0, #0x460]
mov r7, r2
mov r6, r3
bl func_ov00_020a9624
mov r5, r0
ldr r0, [sb, #0x20]
ldr r1, [sb, #0x60]
ldr r0, [r9, #0x20]
ldr r1, [r9, #0x60]
bl func_ov00_020a9624
ldrh r1, [sb, #0x94]
ldrh r1, [r9, #0x94]
mov r4, r0
ldr r3, _02115404 ; =data_02050f54
mov r1, r1, asr #0x4
@@ -4811,7 +4811,7 @@ func_ov09_0211530c: ; 0x0211530c
mov r2, r0
str r3, [sp, #8]
bl func_01ff9bc4
ldr r1, [sb, #0xc]
ldr r1, [r9, #0xc]
add r0, sp, #0xc
bl func_01fffbec
add r0, sp, #0xc
@@ -4823,7 +4823,7 @@ func_ov09_0211530c: ; 0x0211530c
add r0, sp, #0xc
bl func_01ff9bc4
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov09_0211530c
_02115404: .word data_02050f54
@@ -4898,13 +4898,13 @@ func_ov09_02115478: ; 0x02115478
arm_func_start func_ov09_021154e8
func_ov09_021154e8: ; 0x021154e8
stmdb sp!, {r4, r5, r6, lr}
ldr r3, _02115558 ; =data_027e0f74
ldr r3, _02115558 ; =gAdventureFlags
mov r6, r0
ldr r0, [r3]
mov r5, r1
mov r1, #0x30
mov r4, r2
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
cmpeq r4, #0
moveq r5, #0
@@ -4929,19 +4929,19 @@ _02115548:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov09_021154e8
_02115558: .word data_027e0f74
_02115558: .word gAdventureFlags
.global func_ov09_0211555c
arm_func_start func_ov09_0211555c
func_ov09_0211555c: ; 0x0211555c
stmdb sp!, {r4, r5, r6, lr}
ldr r3, _0211560c ; =data_027e0f74
ldr r3, _0211560c ; =gAdventureFlags
mov r4, r0
ldr r0, [r3]
mov r6, r1
mov r1, #0x30
mov r5, r2
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
cmpeq r5, #0
moveq r6, #0
@@ -4982,7 +4982,7 @@ _021155f0:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov09_0211555c
_0211560c: .word data_027e0f74
_0211560c: .word gAdventureFlags
.global func_ov09_02115610
arm_func_start func_ov09_02115610
@@ -5029,7 +5029,7 @@ func_ov09_02115610: ; 0x02115610
.global func_ov09_021156a4
arm_func_start func_ov09_021156a4
func_ov09_021156a4: ; 0x021156a4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xdc
mov r5, r0
ldr r3, [r5, #0x6c]
@@ -5038,10 +5038,10 @@ func_ov09_021156a4: ; 0x021156a4
str r2, [sp, #8]
cmp r3, #0
addlt sp, sp, #0xdc
ldmltia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmltia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
cmp r6, #0
addeq sp, sp, #0xdc
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r1, [r5, #0x9a]
cmp r1, #0
bne _021156e8
@@ -5067,22 +5067,22 @@ _021156e8:
ldr r2, [sp, #8]
bl func_ov09_02115e38
add r0, r6, #0x5c
add fp, r6, #0x1ac
add r11, r6, #0x1ac
ldr r7, _02115a9c ; =data_02050f54
str r0, [sp, #0xc]
mov r4, #0
add r8, sp, #0xac
add r6, sp, #0x58
_02115750:
ldr sl, [sp, #0xc]
add sb, sp, #0x7c
ldmia sl!, {r0, r1, r2, r3}
stmia sb!, {r0, r1, r2, r3}
ldmia sl!, {r0, r1, r2, r3}
stmia sb!, {r0, r1, r2, r3}
ldmia sl, {r0, r1, r2, r3}
mov lr, fp
stmia sb, {r0, r1, r2, r3}
ldr r10, [sp, #0xc]
add r9, sp, #0x7c
ldmia r10!, {r0, r1, r2, r3}
stmia r9!, {r0, r1, r2, r3}
ldmia r10!, {r0, r1, r2, r3}
stmia r9!, {r0, r1, r2, r3}
ldmia r10, {r0, r1, r2, r3}
mov lr, r11
stmia r9, {r0, r1, r2, r3}
ldmia lr!, {r0, r1, r2, r3}
add ip, sp, #0x34
stmia ip!, {r0, r1, r2, r3}
@@ -5133,13 +5133,13 @@ _02115804:
ldrsh r3, [r7, r3]
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
smull sb, r3, r1, r3
adds sb, sb, #0x800
smull r9, r3, r1, r3
adds r9, r9, #0x800
adc r1, r3, #0
mov r3, sb, lsr #0xc
mov r3, r9, lsr #0xc
orr r3, r3, r1, lsl #20
mov r1, r3, lsl #0x10
mov sb, r1, asr #0x10
mov r9, r1, asr #0x10
mov r1, r2, lsl #0x1
add r2, r7, r2, lsl #1
ldrsh r1, [r7, r1]
@@ -5150,17 +5150,17 @@ _02115804:
mov r0, r8
mov r2, r1
bl func_01ff8e84
mov r0, sb, lsl #0x10
mov r0, r9, lsl #0x10
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
mov r1, r0, lsl #0x1
add r0, r7, r0, lsl #1
ldrsh sb, [r0, #2]
ldrsh sl, [r7, r1]
ldrsh r9, [r0, #2]
ldrsh r10, [r7, r1]
mov r0, r8
mov r2, sb
mov r1, sl
mov r2, r9
mov r1, r10
blx func_01ff8abc
add r1, sp, #0x7c
mov r0, r8
@@ -5186,8 +5186,8 @@ _02115804:
mov r0, r6
mov r2, r1
bl func_01ff8690
mov r1, sl
mov r2, sb
mov r1, r10
mov r2, r9
mov r0, r6
blx func_01ff8230
add r1, sp, #0x34
@@ -5242,7 +5242,7 @@ _021159d0:
add r4, r4, #1
add r0, r0, #0x30
str r0, [sp, #0xc]
add fp, fp, #0x24
add r11, r11, #0x24
cmp r4, #7
blt _02115750
mov r0, r5
@@ -5250,7 +5250,7 @@ _021159d0:
ldr r0, [r5, #0x54]
cmp r0, #0
addeq sp, sp, #0xdc
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r5, #0x58]
cmp r1, #0
bne _02115a44
@@ -5266,11 +5266,11 @@ _021159d0:
ldr r4, [r4, #0x10]
blx r4
add sp, sp, #0xdc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02115a44:
cmp r1, #1
addne sp, sp, #0xdc
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r0]
ldr r1, [r1, #8]
blx r1
@@ -5289,7 +5289,7 @@ _02115a44:
ldr r4, [r4, #0x10]
blx r4
add sp, sp, #0xdc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov09_021156a4
_02115a9c: .word data_02050f54
@@ -5360,7 +5360,7 @@ func_ov09_02115b10: ; 0x02115b10
.global func_ov09_02115b5c
arm_func_start func_ov09_02115b5c
func_ov09_02115b5c: ; 0x02115b5c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0xc0
mov r7, r1
ldr r1, [r7, #8]
@@ -5370,11 +5370,11 @@ func_ov09_02115b5c: ; 0x02115b5c
mov r8, r0
mov r5, #0
mvneq r6, #0
mvn sb, #0
mvn r9, #0
_02115b88:
add r0, r8, r5, lsl #2
ldr r0, [r0, #0x458]
cmp r0, sb
cmp r0, r9
bne _02115bb4
ldr r0, [r7, #4]
mov r1, r4
@@ -5468,10 +5468,10 @@ _02115cdc:
ldr r0, [r0, #0x14]
cmp r0, #1
addne sp, sp, #0xc0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
cmp r6, #1
addhi sp, sp, #0xc0
ldmhiia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmhiia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, [r7, #4]
ldr r0, [r0]
and r0, r0, #4
@@ -5480,7 +5480,7 @@ _02115cdc:
movne r0, #0
cmp r0, #0
addne sp, sp, #0xc0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add r0, sp, #0x30
mov r1, #0
bl func_0201b1bc
@@ -5500,7 +5500,7 @@ _02115cdc:
ldmia r5, {r0, r1, r2, r3}
stmia r4, {r0, r1, r2, r3}
add sp, sp, #0xc0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov09_02115b5c
_02115d74: .word data_ov09_0211d9a4
@@ -5779,10 +5779,10 @@ _02116024:
ldr r0, [r1, #0x14]
cmp r0, #1
bne _02116062
ldr r0, _0211606c ; =data_027e0f74
ldr r0, _0211606c ; =gAdventureFlags
ldr r1, [r1, #0x18]
ldr r0, [r0]
blx func_ov00_02097c68
blx _ZN14AdventureFlags15Get_FlagsUnk_4aEi
cmp r0, #0
beq _02116062
ldr r1, _02116068 ; =data_027e0ce0
@@ -5809,7 +5809,7 @@ _02116062:
thumb_func_end func_ov09_02115fe4
_02116064: .word data_027e0d38
_02116068: .word data_027e0ce0
_0211606c: .word data_027e0f74
_0211606c: .word gAdventureFlags
.global func_ov09_02116070
thumb_func_start func_ov09_02116070
@@ -12746,22 +12746,22 @@ _02119c9c:
.global func_ov09_02119cd4
arm_func_start func_ov09_02119cd4
func_ov09_02119cd4: ; 0x02119cd4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov sl, r0
ldr r0, [sl, #4]
mov r10, r0
ldr r0, [r10, #4]
cmp r0, #1
addls sp, sp, #0x18
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r3, _02119f98 ; =0x04000444
mov r1, #0
ldr r0, _02119f9c ; =0x21230000
str r1, [r3]
str r0, [r3, #0x64]
add r0, sl, #0x1f00
add r0, r10, #0x1f00
ldrh r2, [r0, #0x52]
ldr r0, _02119fa0 ; =0x42108000
add r1, sl, #0x1000
add r1, r10, #0x1000
orr r2, r2, #0x108000
orr r2, r2, #0x42000000
str r2, [r3, #0x7c]
@@ -12775,13 +12775,13 @@ func_ov09_02119cd4: ; 0x02119cd4
str r0, [r3, #0x28]
str r0, [r3, #0x28]
str r0, [r3, #0x28]
ldr r0, [sl, #4]
ldrh sb, [sl, #8]
ldr r0, [r10, #4]
ldrh r9, [r10, #8]
sub r0, r0, #1
cmp sb, r0
cmp r9, r0
bhs _02119f84
mov r0, #0x14
mla r7, sb, r0, sl
mla r7, r9, r0, r10
ldr r0, _02119fa4 ; =data_ov03_02100648
ldr r8, [r0]
_02119d6c:
@@ -12789,9 +12789,9 @@ _02119d6c:
mov r1, #3
str r1, [r0]
sub r5, r0, #0x74
add r4, sl, #0x1000
add r4, r10, #0x1000
add r6, sp, #0xc
add fp, sp, #0
add r11, sp, #0
_02119d88:
ldrb r0, [r4, #0xf50]
cmp r0, #0x58
@@ -12868,7 +12868,7 @@ _02119e98:
mov r0, r6
mov r1, r8
bl func_01fffbec
mov r0, fp
mov r0, r11
mov r1, r8
bl func_01fffbec
ldr r0, [sp, #0x10]
@@ -12907,9 +12907,9 @@ _02119e98:
str r0, [r5]
mov r0, r1, lsr #0x10
str r0, [r5]
ldr r0, [sl, #4]
add sb, sb, #1
cmp sb, r0
ldr r0, [r10, #4]
add r9, r9, #1
cmp r9, r0
add r7, r7, #0x14
bhs _02119f68
ldr r0, [r7, #4]
@@ -12921,16 +12921,16 @@ _02119f68:
ldr r0, _02119fac ; =0x04000504
mov r1, #0
str r1, [r0]
ldr r0, [sl, #4]
ldr r0, [r10, #4]
sub r0, r0, #1
cmp sb, r0
cmp r9, r0
blo _02119d6c
_02119f84:
ldr r0, _02119fb0 ; =0x04000448
mov r1, #1
str r1, [r0]
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov09_02119cd4
_02119f98: .word 0x04000444
@@ -13635,7 +13635,7 @@ func_ov09_0211a604: ; 0x0211a604
.global func_ov09_0211a69c
arm_func_start func_ov09_0211a69c
func_ov09_0211a69c: ; 0x0211a69c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r8, r0
ldr r0, [r8, #0x8a4]
mov r7, r1
@@ -13643,10 +13643,10 @@ func_ov09_0211a69c: ; 0x0211a69c
mov r6, r2
mov r5, r3
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldr sb, _0211a748 ; =data_ov03_0210041c
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r9, _0211a748 ; =data_ov03_0210041c
mov r4, #0
mvn sl, #0
mvn r10, #0
_0211a6cc:
cmp r4, r5
bgt _0211a734
@@ -13659,10 +13659,10 @@ _0211a6cc:
blt _0211a734
cmp r1, #0
ldrneh r0, [r1, #8]
moveq r0, sl
moveq r0, r10
cmp r0, #0
blt _0211a734
ldr r0, [sb, r0, lsl #2]
ldr r0, [r9, r0, lsl #2]
mov r1, r7
bl strcmp
cmp r0, #0
@@ -13673,13 +13673,13 @@ _0211a6cc:
ldrne r0, [r0, #0x8b0]
strne r0, [r1]
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0211a734:
add r4, r4, #1
cmp r4, #3
blo _0211a6cc
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov09_0211a69c
_0211a748: .word data_ov03_0210041c
@@ -13687,25 +13687,25 @@ _0211a748: .word data_ov03_0210041c
.global func_ov09_0211a74c
arm_func_start func_ov09_0211a74c
func_ov09_0211a74c: ; 0x0211a74c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov sl, r0
ldr r0, [sl, #0x8a4]
ldr fp, [sp, #0x30]
mov r10, r0
ldr r0, [r10, #0x8a4]
ldr r11, [sp, #0x30]
cmp r0, #0
str r3, [sp]
mov sb, r1
mov r9, r1
mov r8, r2
addeq sp, sp, #8
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mvn r0, #0
mov r6, #0
str r0, [sp, #4]
_0211a788:
cmp r6, fp
cmp r6, r11
bgt _0211a81c
add r0, sl, r6, lsl #2
add r0, r10, r6, lsl #2
ldr r2, [r0, #0x8a4]
cmp r2, #0
beq _0211a81c
@@ -13724,7 +13724,7 @@ _0211a788:
ldr r0, _0211a834 ; =data_ov03_0210041c
ldr r5, [r0, r7, lsl #2]
_0211a7d8:
ldr r1, [sb, r4, lsl #2]
ldr r1, [r9, r4, lsl #2]
mov r0, r5
bl strcmp
cmp r0, #0
@@ -13732,12 +13732,12 @@ _0211a7d8:
ldr r1, [sp, #0x34]
add sp, sp, #8
cmp r1, #0
addne r0, sl, r6, lsl #2
addne r0, r10, r6, lsl #2
ldrne r0, [r0, #0x8b0]
strne r0, [r1]
ldr r0, _0211a834 ; =data_ov03_0210041c
ldr r0, [r0, r7, lsl #2]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0211a810:
add r4, r4, #1
cmp r4, r8
@@ -13748,7 +13748,7 @@ _0211a81c:
blo _0211a788
mov r0, #0
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov09_0211a74c
_0211a834: .word data_ov03_0210041c
@@ -14663,9 +14663,9 @@ func_ov09_0211b0dc: ; 0x0211b0dc
ldrh r0, [r0, #2]
tst r0, #8
beq _0211b164
ldr r0, _0211b368 ; =data_027e0f74
ldr r0, _0211b368 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0211b164
ldr r0, [r6, #0x18]
@@ -14689,9 +14689,9 @@ _0211b15c:
mov r4, #1
b _0211b34c
_0211b164:
ldr r0, _0211b368 ; =data_027e0f74
ldr r0, _0211b368 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0211b34c
ldr r0, _0211b378 ; =data_027e0f90
@@ -14834,7 +14834,7 @@ _0211b35c:
.align 2, 0
arm_func_end func_ov09_0211b0dc
_0211b364: .word data_027e05f8
_0211b368: .word data_027e0f74
_0211b368: .word gAdventureFlags
_0211b36c: .word data_027e0db0
_0211b370: .word data_027e0d38
_0211b374: .word data_ov00_020eec9c
@@ -15701,9 +15701,9 @@ func_ov09_0211bcfc: ; 0x0211bcfc
arm_func_start func_ov09_0211bd14
func_ov09_0211bd14: ; 0x0211bd14
stmdb sp!, {r3, lr}
ldr r0, _0211bd50 ; =data_027e0f74
ldr r0, _0211bd50 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0211bd40
ldr r0, _0211bd54 ; =data_027e0f90
@@ -15719,7 +15719,7 @@ _0211bd48:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov09_0211bd14
_0211bd50: .word data_027e0f74
_0211bd50: .word gAdventureFlags
_0211bd54: .word data_027e0f90
.global func_ov09_0211bd58
@@ -18365,7 +18365,7 @@ func_ov09_0211d174: ; 0x0211d174
.global func_ov09_0211d180
arm_func_start func_ov09_0211d180
func_ov09_0211d180: ; 0x0211d180
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x9c
mov r4, r1
ldrsh r7, [r4, #0x1e]
@@ -18377,14 +18377,14 @@ func_ov09_0211d180: ; 0x0211d180
ldr r1, _0211d654 ; =0xfffffccd
str r2, [sp, #0x94]
add r3, r2, r1
ldr sb, [r4, #8]
ldr r9, [r4, #8]
ldr r1, _0211d658 ; =data_027e0e60
mov r5, r0
ldr r0, [r1]
add r1, sp, #0x90
mov r2, r6
str r3, [sp, #0x94]
str sb, [sp, #0x98]
str r9, [sp, #0x98]
bl func_ov00_02083ee0
ldr r1, [sp, #0x94]
cmp r1, r0
@@ -18397,10 +18397,10 @@ func_ov09_0211d180: ; 0x0211d180
ldr r2, [r5, #0x30]
mov r1, #0
sub r2, r2, r0
smull sb, r3, r2, r8
adds sb, sb, #0x800
smull r9, r3, r2, r8
adds r9, r9, #0x800
adc r2, r3, #0
mov r3, sb, lsr #0xc
mov r3, r9, lsr #0xc
orr r3, r3, r2, lsl #20
add r0, r0, r3
str r0, [sp, #0x80]
@@ -18439,22 +18439,22 @@ _0211d28c:
cmp r0, #0
beq _0211d2e0
ldr r3, [r0, #0x20]
ldr sb, [sp, #0x84]
ldr r9, [sp, #0x84]
ldr r3, [r3]
ldr r3, [r3, #4]
add r3, sb, r3
add r3, r9, r3
str r3, [r0, #0x28]
ldr r3, [r0, #0x20]
ldr sb, [sp, #0x88]
ldr r9, [sp, #0x88]
ldr r3, [r3]
ldr r3, [r3, #8]
add r3, sb, r3
add r3, r9, r3
str r3, [r0, #0x2c]
ldr r3, [r0, #0x20]
ldr sb, [sp, #0x8c]
ldr r9, [sp, #0x8c]
ldr r3, [r3]
ldr r3, [r3, #0xc]
add r3, sb, r3
add r3, r9, r3
str r3, [r0, #0x30]
_0211d2e0:
add r1, r1, #4
@@ -18623,8 +18623,8 @@ _0211d420:
mov r8, #0xc
add r5, r5, #0x10
mov r4, #0
add sl, sp, #0x3c
add sb, sp, #0x18
add r10, sp, #0x3c
add r9, sp, #0x18
mov r7, r8
_0211d574:
ldr r1, [r5]
@@ -18642,9 +18642,9 @@ _0211d574:
mov r0, r4, lsr #0x1
mul ip, r0, r8
ldr r0, [r1, #0x20]
ldr r3, [sl, ip]
ldr r3, [r10, ip]
ldr r2, [r0]
add r0, sl, ip
add r0, r10, ip
ldr r2, [r2, #4]
add r2, r3, r2
str r2, [r1, #0x28]
@@ -18662,7 +18662,7 @@ _0211d574:
str r0, [r1, #0x30]
_0211d5f8:
and r0, r4, #1
mla r1, r0, r7, sb
mla r1, r0, r7, r9
mov r0, r5
bl func_ov00_020b7ea4
_0211d608:
@@ -18671,7 +18671,7 @@ _0211d608:
add r5, r5, #4
blo _0211d574
add sp, sp, #0x9c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_0211d620:
add r3, r5, #0x10
mov r2, #0
@@ -18686,7 +18686,7 @@ _0211d628:
cmp r2, #4
blo _0211d628
add sp, sp, #0x9c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov09_0211d180
_0211d654: .word 0xfffffccd
asm/ov10.s
+477 -477
View File
File diff suppressed because it is too large Load Diff
asm/ov12.inc
+6 -6
View File
@@ -105,7 +105,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f74
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -433,11 +432,11 @@
.extern func_ov00_02090e10
.extern func_ov00_02090f64
.extern func_ov00_02094824
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_02097810
.extern func_ov00_02097bbc
.extern func_ov00_02097bcc
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
@@ -758,6 +757,7 @@
.extern func_ov61_02179ce4
.extern func_ov61_02179ee4
.extern func_ov61_02179f88
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern gPlayerAnimHandler
asm/ov12.s
+834 -834
View File
File diff suppressed because it is too large Load Diff
asm/ov13.s
+47 -47
View File
@@ -1389,7 +1389,7 @@ _02113d44: .word func_ov13_02113c54
.global func_ov13_02113d48
arm_func_start func_ov13_02113d48
func_ov13_02113d48: ; 0x02113d48
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r1, _02113fb8 ; =data_ov13_02116204
movs r4, r0
ldr r6, [r1, #4]
@@ -1398,16 +1398,16 @@ func_ov13_02113d48: ; 0x02113d48
mov r1, r4
bl func_ov13_021130b0
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113d70:
cmp r4, #0
mov sl, #0
mov r10, #0
bne _02113e34
add r1, r6, #0x5000
mov r0, #1
str r0, [r1, #0xf0]
add r0, r6, #0x1e0
str sl, [r1, #0x108]
str r10, [r1, #0x108]
add r0, r0, #0x5000
str r0, [r1, #0x5e0]
add r0, r6, #0x5500
@@ -1434,7 +1434,7 @@ _02113d70:
add r3, r6, #0x5500
mov r1, #1
strh r1, [r3, #0xf0]
mov r4, sl
mov r4, r10
add r0, r0, #0x5400
mov r1, #0xff
mov r2, #0x20
@@ -1448,7 +1448,7 @@ _02113d70:
mov r0, r6
mov r1, #0x26
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113e34:
ldrh r0, [r4]
cmp r0, #0x26
@@ -1470,35 +1470,35 @@ _02113e68:
mov r0, r6
mov r1, #0xb
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113e84:
cmp r0, #0xb
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r4, r6, #0x5000
ldr r0, [r4, #0xf4]
cmp r0, #5
bne _02113f7c
add r0, r6, #0x1e0
mov r7, sl
mov r7, r10
add r8, r0, #0x5000
mov fp, #6
mov r5, sl
mov r11, #6
mov r5, r10
b _02113f14
_02113eb4:
ldrh r0, [r8]
mov sb, r0, lsl #0x1
cmp sb, #0x48
mov r9, r0, lsl #0x1
cmp r9, #0x48
blt _02113f04
ldr r2, [r4, #0xf8]
mov sl, r5
mov r10, r5
cmp r2, #0
beq _02113ee4
mov r0, fp
mov r0, r11
mov r1, r8
blx r2
mov sl, r0
mov r10, r0
_02113ee4:
cmp sl, #0
cmp r10, #0
beq _02113f04
add r1, r6, #0x120
mov r0, r8
@@ -1507,7 +1507,7 @@ _02113ee4:
bl func_02007ad8
b _02113f20
_02113f04:
add r0, sb, #3
add r0, r9, #3
bic r0, r0, #3
add r8, r8, r0
add r7, r7, #1
@@ -1516,7 +1516,7 @@ _02113f14:
cmp r7, r0
blt _02113eb4
_02113f20:
cmp sl, #0
cmp r10, #0
bne _02113f7c
ldr r4, _02113fb8 ; =data_ov13_02116204
ldrh r1, [r4]
@@ -1538,13 +1538,13 @@ _02113f20:
mov r0, r6
mov r1, #0x26
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113f7c:
cmp sl, #0
cmp r10, #0
beq _02113f90
mov r0, #0
bl func_ov13_02113b2c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113f90:
add r0, r6, #0x5000
ldr r1, [r0, #0xf4]
@@ -1555,7 +1555,7 @@ _02113f90:
mov r0, r6
mov r1, #3
bl func_ov13_021131ac
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov13_02113d48
_02113fb8: .word data_ov13_02116204
@@ -1734,7 +1734,7 @@ _021141d4: .word data_ov13_0211620c
.global func_ov13_021141d8
arm_func_start func_ov13_021141d8
func_ov13_021141d8: ; 0x021141d8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
mov r4, r1
cmp r0, #0xa
@@ -1979,31 +1979,31 @@ _02114554:
cmp r7, #0
ldrneh r0, [r4, #0x10]
ldr r1, _02114794 ; =data_ov13_0211620c
mov sl, #0
mov r10, #0
ldr r2, [r1]
moveq r0, #0
mov r0, r0, lsl #0x10
ldr r1, [r2, #0xd8]
mov r8, r0, lsr #0x10
add r0, r2, #0x58
mov fp, sl
mov r11, r10
cmp r1, #0
add sb, r0, r8, lsl #3
add r9, r0, r8, lsl #3
bne _02114598
bl func_ov13_021149ac
cmp r0, #3
moveq fp, #1
moveq r11, #1
_02114598:
cmp fp, #0
cmp r11, #0
cmpne r6, #0
movne sl, #1
strh r8, [sb]
movne r10, #1
strh r8, [r9]
cmp r7, #0
beq _021145c8
ldrh r0, [r4, #0xa]
strh r0, [sb, #2]
strh r0, [r9, #2]
ldrh r0, [r4, #0xc]
strh r0, [sb, #4]
strh r0, [r9, #4]
ldrh r0, [r4, #0xe]
b _021145ec
_021145c8:
@@ -2012,12 +2012,12 @@ _021145c8:
add r0, r0, #0x240
add r1, r0, #0x5000
ldrh r0, [r1, #4]
strh r0, [sb, #2]
strh r0, [r9, #2]
ldrh r0, [r1, #6]
strh r0, [sb, #4]
strh r0, [r9, #4]
ldrh r0, [r1, #8]
_021145ec:
strh r0, [sb, #6]
strh r0, [r9, #6]
ldr r0, _02114794 ; =data_ov13_0211620c
ldr r1, [sp, #8]
ldr r0, [r0]
@@ -2025,7 +2025,7 @@ _021145ec:
add r0, r0, #0x760
add r0, r0, #0x5000
bl func_ov13_02112dbc
cmp sl, #0
cmp r10, #0
ldrne r0, [r6, #0x10]
cmpne r0, #0
ldrne r0, [r6, #0x20]
@@ -2051,10 +2051,10 @@ _0211464c:
add r0, r0, #0x5000
mov r1, r1, lsr #0x10
bl func_ov13_02112f1c
cmp sl, #0
cmp r10, #0
beq _02114788
ldr r0, _02114794 ; =data_ov13_0211620c
mov r1, sb
mov r1, r9
ldr r2, [r0]
mov r0, #4
ldr r2, [r2, #4]
@@ -2129,7 +2129,7 @@ _02114784:
_02114788:
mov r0, r5
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov13_021141d8
_02114794: .word data_ov13_0211620c
@@ -2355,7 +2355,7 @@ _02114a30: .word func_ov13_021140d0
.global func_ov13_02114a34
arm_func_start func_ov13_02114a34
func_ov13_02114a34: ; 0x02114a34
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
mov r8, r0
mov r7, r1
@@ -2381,25 +2381,25 @@ func_ov13_02114a34: ; 0x02114a34
add r0, r0, #0x5000
mov r3, #1
bl func_ov13_02112df4
movs sb, r0
movs r9, r0
bne _02114aac
bl func_0200f248
b _02114af0
_02114aac:
ldr r0, [sp, #0x30]
bl func_ov13_02112d6c
movs sl, r0
movs r10, r0
bne _02114ac0
bl func_0200f248
_02114ac0:
mov r0, sb
mov r0, r9
mov r1, r8
mov r2, r7
mov r3, sl
mov r3, r10
bl func_ov13_02112f24
ldr r7, [sp, #0x2c]
ldr r3, [sp, #0x28]
mov r0, sb
mov r0, r9
mov r1, r6
mov r2, r5
str r7, [sp]
@@ -2408,7 +2408,7 @@ _02114af0:
mov r0, r4
bl func_0200ee60
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov13_02114a34
_02114b00: .word data_ov13_0211620c
asm/ov14/Actor/ActorRupee.s
+22 -22
View File
@@ -42,7 +42,7 @@ _0213aec8: .word _ZTV10ActorRupee
.global _ZN10ActorRupee8vfunc_08Ev
arm_func_start _ZN10ActorRupee8vfunc_08Ev
_ZN10ActorRupee8vfunc_08Ev: ; 0x0213aecc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r4, r0
ldrh r0, [r4, #0x20]
@@ -108,30 +108,30 @@ _0213afb4:
mvn ip, #0x110
ldr r5, [r0]
ldmib r0, {r3, r7}
umull sb, r0, r7, r5
umull r9, r0, r7, r5
mla r0, r7, r3, r0
ldr r3, _0213b108 ; =data_027e0764
ldr r8, [r3, #0x10]
ldr r6, [r3, #0xc]
adds sl, r8, sb
ldr fp, [r3, #0x14]
adds r10, r8, r9
ldr r11, [r3, #0x14]
mla r0, r6, r5, r0
umull r3, lr, r7, sl
adc sb, fp, r0
umull r3, lr, r7, r10
adc r9, r11, r0
adds r0, r8, r3
str r0, [sp, #0x14]
ldr r0, _0213b108 ; =data_027e0764
mla lr, r7, sb, lr
str sl, [r0]
mla lr, r7, r9, lr
str r10, [r0]
ldr r3, [sp, #0x14]
str sb, [r0, #4]
str r9, [r0, #4]
str r3, [r0]
rsb r0, r1, #0x224
str r0, [sp, #0x10]
umull r0, r5, sb, r0
umull r0, r5, r9, r0
str r0, [sp, #4]
mla r5, sb, r2, r5
mla lr, r6, sl, lr
mla r5, r9, r2, r5
mla lr, r6, r10, lr
ldr r0, [sp, #0x10]
mov r3, r2
mla r5, r3, r0, r5
@@ -139,19 +139,19 @@ _0213afb4:
str r0, [sp]
ldr r5, [sp, #0x14]
ldr r0, _0213b108 ; =data_027e0764
adc sb, fp, lr
umull sl, r5, r7, r5
mla r5, r7, sb, r5
adc r9, r11, lr
umull r10, r5, r7, r5
mla r5, r7, r9, r5
ldr r7, [sp, #0x14]
rsb r1, r1, #0x334
str sb, [r0, #4]
umull r0, r3, sb, r1
str r9, [r0, #4]
umull r0, r3, r9, r1
mla r5, r6, r7, r5
mov r6, sl
mov r6, r10
adds r6, r8, r6
adc r7, fp, r5
adc r7, r11, r5
ldr r5, _0213b108 ; =data_027e0764
mla r3, sb, r2, r3
mla r3, r9, r2, r3
mov r0, r2
mla r3, r0, r1, r3
add r0, r3, #0x55
@@ -169,7 +169,7 @@ _0213afb4:
mov r0, r4
str r2, [r4, #0x64]
ldr r2, [sp]
str sl, [sp, #0xc]
str r10, [sp, #0xc]
str r2, [r4, #0x68]
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b0f4
@@ -189,7 +189,7 @@ _0213b0e8:
_0213b0f4:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN10ActorRupee8vfunc_08Ev
_0213b100: .word data_ov14_021589b4
asm/ov14/ov14_0211f640.inc
+12 -12
View File
@@ -112,7 +112,6 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f90
@@ -353,17 +352,17 @@
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_020965c0
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bbc
.extern func_ov00_02097bcc
.extern func_ov00_02098058
.extern func_ov00_02098064
.extern func_ov00_02098074
.extern func_ov00_0209809c
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098064Ei
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209cbd4
@@ -516,6 +515,7 @@
.extern func_ov57_0219a6b8
.extern func_ov57_0219a850
.extern func_ov58_0219ab28
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcmp
asm/ov14/ov14_0211f640.s
+522 -522
View File
File diff suppressed because it is too large Load Diff
asm/ov14/ov14_0213b778.inc
+76 -76
View File
@@ -14,9 +14,71 @@
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN11ItemManager9SetPotionEjj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl20UpdateUsingEquipItemEv
.extern _ZN15LinkStateDamage18func_ov00_020aca94Ev
.extern _ZN4Item18func_ov00_020ad020Ei
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c3094Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetMaxAmmoEi
@@ -24,6 +86,7 @@
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager9HasPotionEj
.extern _ZTV11FilterActor
.extern data_02050f54
.extern data_02056be4
.extern data_02057200
@@ -52,7 +115,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -88,7 +150,6 @@
.extern data_ov00_020e2e3c
.extern data_ov00_020e2f04
.extern data_ov00_020e5684
.extern _ZTV11FilterActor
.extern data_ov00_020e899c
.extern data_ov00_020e8b08
.extern data_ov00_020e9360
@@ -346,18 +407,18 @@
.extern func_ov00_02093a4c
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bbc
.extern func_ov00_02097bcc
.extern func_ov00_02097cf8
.extern func_ov00_02097ff4
.extern func_ov00_02098058
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags15Get_FlagsUnk_30Ei
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a5e9c
@@ -488,69 +549,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor18func_ov00_020c3094Ev
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -851,6 +850,7 @@
.extern func_ov59_02198e6c
.extern func_ov59_02198fc8
.extern func_ov59_02198fcc
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern gPlayerAnimHandler
asm/ov14/ov14_0213b778.s
+1005 -1005
View File
File diff suppressed because it is too large Load Diff
asm/ov15.inc
+84 -84
View File
@@ -16,6 +16,11 @@
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager19SetTreasureSalvagedEj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl11IsTappedNowEv
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN13PlayerControl13StopFollowingEv
@@ -24,12 +29,79 @@
.extern _ZN13PlayerControl18func_ov00_020af538Ev
.extern _ZN13PlayerControl9UpdateAimEv
.extern _ZN4Item18func_ov00_020ad020Ei
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetUnk_098Ej
.extern _ZNK11ItemManager18IsTreasureSalvagedEj
.extern _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
.extern _ZNK11ItemManager7HasItemEi
.extern _ZTV11FilterActor
.extern data_02050f54
.extern data_02051f54
.extern data_02053f54
@@ -69,7 +141,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f84
@@ -111,7 +182,6 @@
.extern data_ov00_020e2f04
.extern data_ov00_020e2f68
.extern data_ov00_020e5868
.extern _ZTV11FilterActor
.extern data_ov00_020e83cc
.extern data_ov00_020e899c
.extern data_ov00_020e9360
@@ -470,17 +540,17 @@
.extern func_ov00_0209549c
.extern func_ov00_02095720
.extern func_ov00_02095764
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bcc
.extern func_ov00_02098058
.extern func_ov00_020980bc
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_020980bcEi
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209c1e4
@@ -572,78 +642,7 @@
.extern func_ov00_020c0e24
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -908,6 +907,7 @@
.extern func_ov09_0211d180
.extern func_ov09_0211d668
.extern func_ov09_0211d794
.extern gAdventureFlags
.extern gItemManager
.extern strcat
.extern strncpy
asm/ov15.s
+4469 -4469
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+71 -71
View File
@@ -3,7 +3,70 @@
.extern Divide
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager19GetDungeonItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor18func_ov00_020c2d54Ev
.extern _ZN5Actor18func_ov00_020c2de4Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3158Ev
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
@@ -24,7 +87,6 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f90
@@ -251,13 +313,13 @@
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_020965c0
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bcc
.extern func_ov00_02098058
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.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_0209cd9c
@@ -304,70 +366,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor18func_ov00_020c2d54Ev
.extern _ZN5Actor18func_ov00_020c2de4Ev
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3158Ev
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c4ae8
@@ -478,4 +477,5 @@
.extern func_ov29_0216d77c
.extern func_ov50_02196508
.extern func_ov50_021965b4
.extern gAdventureFlags
.extern gItemManager
asm/ov17.s
+495 -495
View File
File diff suppressed because it is too large Load Diff
asm/ov18.inc
+65 -65
View File
@@ -1,7 +1,63 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -29,7 +85,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f84
.extern data_027e0f94
.extern data_027e0fc8
@@ -279,14 +334,14 @@
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern func_ov00_02097ff4
.extern func_ov00_02098058
.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_020a5e9c
@@ -317,63 +372,7 @@
.extern func_ov00_020c0e24
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -562,3 +561,4 @@
.extern func_ov45_0218b948
.extern func_ov45_0218bf60
.extern func_ov45_0218bfb0
.extern gAdventureFlags
asm/ov18.s
+728 -728
View File
File diff suppressed because it is too large Load Diff
asm/ov19.inc
+8 -8
View File
@@ -98,7 +98,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f90
@@ -232,13 +231,13 @@
.extern func_ov00_02093a3c
.extern func_ov00_02093a4c
.extern func_ov00_02094824
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02098058
.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
@@ -369,5 +368,6 @@
.extern func_ov05_02102c2c
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov19.s
+83 -83
View File
@@ -175,11 +175,11 @@ func_ov19_0216d8ec: ; 0x0216d8ec
arm_func_start func_ov19_0216d8f8
func_ov19_0216d8f8: ; 0x0216d8f8
stmdb sp!, {r4, lr}
ldr r1, _0216da10 ; =data_027e0f74
ldr r1, _0216da10 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x1e
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -246,7 +246,7 @@ func_ov19_0216d8f8: ; 0x0216d8f8
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov19_0216d8f8
_0216da10: .word data_027e0f74
_0216da10: .word gAdventureFlags
_0216da14: .word data_ov19_02176340
_0216da18: .word 0xffffe4cd
@@ -322,7 +322,7 @@ func_ov19_0216daa4: ; 0x0216daa4
.global func_ov19_0216dac8
arm_func_start func_ov19_0216dac8
func_ov19_0216dac8: ; 0x0216dac8
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
movs r4, r1
mov r5, r0
@@ -437,16 +437,16 @@ _0216dc18:
ldrsh lr, [r2, r6]
ldrsh r6, [r2, r0]
ldr r7, [r3, #0x65c]
smull r0, sb, r8, lr
smull r0, r9, r8, lr
adds r0, r0, #0x800
adc r8, sb, #0
adc r8, r9, #0
smull lr, r6, r7, r6
adds r7, lr, #0x800
mov sb, r0, lsr #0xc
mov r9, r0, lsr #0xc
adc r0, r6, #0
mov r6, r7, lsr #0xc
orr sb, sb, r8, lsl #20
add r7, sb, #0x7000
orr r9, r9, r8, lsl #20
add r7, r9, #0x7000
orr r6, r6, r0, lsl #20
add r0, r7, r6
str r0, [sp, #4]
@@ -493,12 +493,12 @@ _0216dc18:
cmpne r4, #1
cmpne r4, #3
addne sp, sp, #0x24
ldmneia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
mov r0, r5
bl _ZN5Actor16XzDistanceToLinkEv
cmp r0, #0x800
addle sp, sp, #0x24
ldmleia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, pc}
mov r0, r5
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
@@ -506,7 +506,7 @@ _0216dc18:
add r0, r5, #0x78
bl func_0202b154
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov19_0216dac8
_0216dd94: .word data_027e0f94
@@ -978,7 +978,7 @@ func_ov19_0216e310: ; 0x0216e310
.global func_ov19_0216e334
arm_func_start func_ov19_0216e334
func_ov19_0216e334: ; 0x0216e334
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x7c
mov r4, r0
add r0, sp, #0x50
@@ -1090,33 +1090,33 @@ _0216e46c:
ldr r0, [sp, #0x34]
ldr r3, [r5, #4]
str r0, [sp, #0x18]
ldr sl, [sp, #0x14]
ldr r10, [sp, #0x14]
mov r0, r6
umull r7, r6, sl, ip
mla r6, sl, r3, r6
umull r7, r6, r10, ip
mla r6, r10, r3, r6
ldr lr, [r5, #0xc]
ldr sb, [r5, #0x10]
ldr r9, [r5, #0x10]
mla r6, lr, ip, r6
ldr r8, [r5, #0x14]
adds r3, sb, r7
adds r3, r9, r7
adc ip, r8, r6
ldr r6, _0216e68c ; =0x00004001
ldr fp, [sp, #0x2c]
umull r6, sl, ip, r6
ldr r11, [sp, #0x2c]
umull r6, r10, ip, r6
mov r6, #0
mla sl, ip, r6, sl
mla r10, ip, r6, r10
mov r7, r6
ldr r6, _0216e68c ; =0x00004001
stmia r5, {r3, ip}
mla sl, r7, r6, sl
sub r6, sl, #0x2000
add r6, fp, r6
ldr sl, [sp, #0x14]
mla r10, r7, r6, r10
sub r6, r10, #0x2000
add r6, r11, r6
ldr r10, [sp, #0x14]
str r6, [sp, #0x2c]
umull r7, r6, sl, r3
mla r6, sl, ip, r6
umull r7, r6, r10, r3
mla r6, r10, ip, r6
mla r6, lr, r3, r6
adds r3, sb, r7
adds r3, r9, r7
adc r6, r8, r6
stmia r5, {r3, r6}
ldr r3, _0216e68c ; =0x00004001
@@ -1155,15 +1155,15 @@ _0216e46c:
str r1, [sp, #0x38]
str r0, [sp, #0x40]
ldmib r5, {r1, r7}
umull sb, r8, r7, r3
umull r9, r8, r7, r3
add r0, sp, #0x38
mla r8, r7, r1, r8
ldr r6, [r5, #0xc]
ldr fp, [r5, #0x10]
ldr r11, [r5, #0x10]
mla r8, r6, r3, r8
ldr sl, [r5, #0x14]
adds r1, fp, sb
adc r3, sl, r8
ldr r10, [r5, #0x14]
adds r1, r11, r9
adc r3, r10, r8
stmia r5, {r1, r3}
mov r1, #0x7c
umull r1, r6, r3, r1
@@ -1183,7 +1183,7 @@ _0216e46c:
_0216e64c:
add sp, sp, #0x7c
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e658:
ldr r0, [sp, #4]
add r4, r4, #0x7b
@@ -1197,7 +1197,7 @@ _0216e658:
_0216e67c:
mov r0, #1
add sp, sp, #0x7c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov19_0216e334
_0216e688: .word data_02050f54
@@ -1537,12 +1537,12 @@ func_ov19_0216eac8: ; 0x0216eac8
arm_func_start func_ov19_0216eacc
func_ov19_0216eacc: ; 0x0216eacc
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _0216eb28 ; =data_027e0f74
ldr r1, _0216eb28 ; =gAdventureFlags
mov r5, r0
ldr r0, [r1]
mov r1, #0x1e
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldr r0, _0216eb2c ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
@@ -1562,7 +1562,7 @@ _0216eafc:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov19_0216eacc
_0216eb28: .word data_027e0f74
_0216eb28: .word gAdventureFlags
_0216eb2c: .word gItemManager
_0216eb30: .word 0x0000048d
_0216eb34: .word data_027e0ffc
@@ -2562,9 +2562,9 @@ _0216f828:
cmp r0, #0
addeq sp, sp, #0x1c8
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _0216f938 ; =data_027e0f74
ldr r0, _0216f938 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
str r0, [r5, #8]
mov r0, r5
mov r1, #5
@@ -2574,9 +2574,9 @@ _0216f828:
_0216f86c:
mov r1, #0
bl func_ov19_0216dac8
ldr r0, _0216f938 ; =data_027e0f74
ldr r0, _0216f938 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
ldr r1, [r5, #8]
add r1, r1, #0x3c
cmp r1, r0
@@ -2589,9 +2589,9 @@ _0216f86c:
add sp, sp, #0x1c8
ldmia sp!, {r3, r4, r5, pc}
_0216f8ac:
ldr r0, _0216f938 ; =data_027e0f74
ldr r0, _0216f938 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
ldr r1, [r5, #8]
add r1, r1, #0x4b
cmp r1, r0
@@ -2628,7 +2628,7 @@ _0216f928: .word 0x00001388
_0216f92c: .word 0x00006590
_0216f930: .word 0x7e07e07f
_0216f934: .word data_027e0c68
_0216f938: .word data_027e0f74
_0216f938: .word gAdventureFlags
.global func_ov19_0216f93c
arm_func_start func_ov19_0216f93c
@@ -3777,10 +3777,10 @@ _02170870:
ldmneia sp!, {r3, r4, r5, r6, r7, r8, pc}
add r0, r5, #0x18
bl func_ov00_020b7e6c
ldr r0, _021708dc ; =data_027e0f74
ldr r0, _021708dc ; =gAdventureFlags
mov r1, #7
ldr r0, [r0]
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
mov r0, r4
bl func_ov00_020cc960
mov r0, r4
@@ -3800,7 +3800,7 @@ _021708cc: .word 0x00001007
_021708d0: .word 0x00001008
_021708d4: .word 0x00001009
_021708d8: .word 0x0000030d
_021708dc: .word data_027e0f74
_021708dc: .word gAdventureFlags
.global func_ov19_021708e0
arm_func_start func_ov19_021708e0
@@ -6897,7 +6897,7 @@ _021730d0:
mov r2, #0x1e
mov r1, #6
str r0, [sp, #4]
ldr r0, _02173148 ; =data_027e0f74
ldr r0, _02173148 ; =gAdventureFlags
strb r2, [sp, #9]
strb r1, [sp, #0xa]
ldr r1, [r4, #0x18]
@@ -6908,7 +6908,7 @@ _021730d0:
str r2, [sp, #0x24]
ldr r2, [r4, #0x20]
str r2, [sp, #0x28]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x64]
add r0, sp, #0
bl func_ov00_0209a508
@@ -6923,7 +6923,7 @@ _0217313c:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov19_02173084
_02173148: .word data_027e0f74
_02173148: .word gAdventureFlags
.global func_ov19_0217314c
arm_func_start func_ov19_0217314c
@@ -7346,10 +7346,10 @@ _02173674:
add sp, sp, #8
ldmia sp!, {r4, pc}
_0217369c:
ldr r0, _0217378c ; =data_027e0f74
ldr r0, _0217378c ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _021736d4
mov r0, r4
@@ -7361,16 +7361,16 @@ _0217369c:
add sp, sp, #8
ldmia sp!, {r4, pc}
_021736d4:
ldr r0, _0217378c ; =data_027e0f74
ldr r0, _0217378c ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #8
ldmeqia sp!, {r4, pc}
ldr r0, _0217378c ; =data_027e0f74
ldr r0, _0217378c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xa
bne _02173714
ldr r0, _02173790 ; =data_027e0fc8
@@ -7378,9 +7378,9 @@ _021736d4:
ldr r0, [r0]
bl func_ov00_020bcfb8
_02173714:
ldr r0, _0217378c ; =data_027e0f74
ldr r0, _0217378c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #5
bne _0217373c
ldr r0, _02173788 ; =data_027e0ffc
@@ -7412,7 +7412,7 @@ _0217377c:
arm_func_end func_ov19_0217358c
_02173784: .word 0x00000666
_02173788: .word data_027e0ffc
_0217378c: .word data_027e0f74
_0217378c: .word gAdventureFlags
_02173790: .word data_027e0fc8
_02173794: .word 0x000001b3
@@ -7476,7 +7476,7 @@ _0217383c:
add r0, sp, #0
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _021738b8 ; =data_027e0f74
ldr r0, _021738b8 ; =gAdventureFlags
mov ip, #0x1e
mov r3, #0x28
ldr r0, [r0]
@@ -7485,7 +7485,7 @@ _0217383c:
strb r3, [sp, #9]
strb r2, [sp, #0xa]
strb r2, [sp, #0xb]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x68]
add r0, sp, #0
bl func_ov00_0209a508
@@ -7500,7 +7500,7 @@ _021738ac:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov19_02173798
_021738b8: .word data_027e0f74
_021738b8: .word gAdventureFlags
.global func_ov19_021738bc
arm_func_start func_ov19_021738bc
@@ -7824,29 +7824,29 @@ _02173d50: .word data_027e0fe4
.global func_ov19_02173d54
arm_func_start func_ov19_02173d54
func_ov19_02173d54: ; 0x02173d54
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov sl, r0
ldrb r7, [sl, #0x14]
mov sb, r1
mov r10, r0
ldrb r7, [r10, #0x14]
mov r9, r1
add r0, r7, #2
cmp r7, r0
bge _02173e1c
ldr r4, _02173ee8 ; =data_027e0e60
add r5, sp, #2
mov fp, #1
mov r11, #1
_02173d80:
ldrb r8, [sl, #0x15]
ldrb r8, [r10, #0x15]
add r0, r8, #2
cmp r8, r0
bge _02173e08
and r6, r7, #0xff
_02173d94:
cmp sb, #0
cmp r9, #0
ldr r0, [r4]
beq _02173dcc
mov r1, r5
mov r2, fp
mov r2, r11
strb r6, [sp, #2]
strb r8, [sp, #3]
bl func_ov00_02082680
@@ -7868,31 +7868,31 @@ _02173dcc:
mov r3, #0x15
bl func_ov00_02084d24
_02173df4:
ldrb r0, [sl, #0x15]
ldrb r0, [r10, #0x15]
add r8, r8, #1
add r0, r0, #2
cmp r8, r0
blt _02173d94
_02173e08:
ldrb r0, [sl, #0x14]
ldrb r0, [r10, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _02173d80
_02173e1c:
ldrh r4, [sl, #0x2a]
ldrh r4, [r10, #0x2a]
ldr r1, _02173eec ; =data_027e0f6c
add r0, sp, #8
ldr r1, [r1]
mov r2, r4
ldrh r5, [sl, #0x28]
ldrh r5, [r10, #0x28]
bl func_ov00_02093a4c
ldr r1, _02173eec ; =data_027e0f6c
add r0, sp, #4
ldr r1, [r1]
mov r2, r5
bl func_ov00_02093a4c
cmp sb, #0
cmp r9, #0
add r2, sp, #8
beq _02173ea0
ldr r1, [sp, #8]
@@ -7912,7 +7912,7 @@ _02173e1c:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02173ea0:
ldr r0, _02173eec ; =data_027e0f6c
ldr r1, [sp, #8]
@@ -7931,7 +7931,7 @@ _02173ea0:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov19_02173d54
_02173ee8: .word data_027e0e60
@@ -8388,9 +8388,9 @@ func_ov19_02174454: ; 0x02174454
ldrh r1, [r4, #0x24]
cmp r1, #0
ble _0217448c
ldr r0, _02174548 ; =data_027e0f74
ldr r0, _02174548 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
addeq sp, sp, #0xc
@@ -8400,9 +8400,9 @@ _0217448c:
ldrh r1, [r4, #0x26]
cmp r1, #0
ble _021744b8
ldr r0, _02174548 ; =data_027e0f74
ldr r0, _02174548 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
addne sp, sp, #0xc
@@ -8447,7 +8447,7 @@ _021744b8:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov19_02174454
_02174548: .word data_027e0f74
_02174548: .word gAdventureFlags
_0217454c: .word data_027e0e60
_02174550: .word data_ov19_02176b88
asm/ov20.inc
+77 -77
View File
@@ -3,11 +3,80 @@
.extern Divide
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase20GetPlayerControlDataEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18CollidesWithShieldEP8Cylinder
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
@@ -23,7 +92,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f74
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -150,13 +218,13 @@
.extern func_ov00_0208ccdc
.extern func_ov00_0208cd0c
.extern func_ov00_02094824
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern func_ov00_0209809c
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
@@ -197,76 +265,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18CollidesWithShieldEP8Cylinder
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c50fc
@@ -425,5 +424,6 @@
.extern func_ov14_0215152c
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov20.s
+279 -279
View File
File diff suppressed because it is too large Load Diff
asm/ov21.s
+98 -98
View File
@@ -2313,14 +2313,14 @@ func_ov21_0216f234: ; 0x0216f234
.global func_ov21_0216f25c
arm_func_start func_ov21_0216f25c
func_ov21_0216f25c: ; 0x0216f25c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x50
mov r4, r0
bl func_ov21_02170334
cmp r0, #0
addeq sp, sp, #0x50
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r1, #0
str r1, [r4, #0x16c]
ldr r2, [r4, #0x48]
@@ -2364,21 +2364,21 @@ func_ov21_0216f25c: ; 0x0216f25c
orr r1, r1, #0xd
strh r1, [r4, #0x9c]
ldr ip, [r4, #0x4c]
ldr sb, [r4, #0x50]
ldr r9, [r4, #0x50]
ldr r8, [r4, #0x48]
sub sl, sb, #0x1000
sub r10, r9, #0x1000
sub r1, r8, #0x1000
sub r2, ip, #0x800
add sb, sb, #0x1000
add r9, r9, #0x1000
add r8, r8, #0x1000
str sl, [sp, #0x4c]
str r10, [sp, #0x4c]
str r1, [sp, #0x44]
str r2, [sp, #0x48]
ldmia r0, {r0, r1, r2}
stmia r7, {r0, r1, r2}
str r8, [sp, #0x38]
str ip, [sp, #0x3c]
str sb, [sp, #0x40]
str r9, [sp, #0x40]
ldmia r6, {r0, r1, r2}
stmia r5, {r0, r1, r2}
str lr, [sp]
@@ -2391,7 +2391,7 @@ func_ov21_0216f25c: ; 0x0216f25c
mov r0, r4
bl func_ov14_02137970
add sp, sp, #0x50
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov21_0216f25c
.global func_ov21_0216f398
@@ -2724,32 +2724,32 @@ _0216f7c4: .word 0x00000477
.global func_ov21_0216f7c8
arm_func_start func_ov21_0216f7c8
func_ov21_0216f7c8: ; 0x0216f7c8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x118
mov sl, r0
ldr r0, [sl, #0x224]
mov r10, r0
ldr r0, [r10, #0x224]
cmp r0, #0
ldreq r0, [sl, #0x228]
ldreq r0, [r10, #0x228]
cmpeq r0, #0
addeq sp, sp, #0x118
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
mov r0, sl
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r10
mov r1, #0
bl func_01fffd04
cmp r0, #0
addeq sp, sp, #0x118
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
add r0, sl, #0x48
add r1, sl, #0x54
add r2, sl, #0x60
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r10, #0x48
add r1, r10, #0x54
add r2, r10, #0x60
bl func_01ff9bf8
ldr r0, [sl, #0x138]
ldr r0, [r10, #0x138]
cmp r0, #0x1e
addlt sp, sp, #0x118
movlt r0, #0
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0216fb80 ; =0x0000ffff
mov r5, #0
add r4, sp, #0x48
@@ -2768,31 +2768,31 @@ func_ov21_0216f7c8: ; 0x0216f7c8
strb r5, [sp, #0x113]
strb r5, [sp, #0x114]
strb r5, [sp, #0x115]
add r0, sl, #0x8c
add r0, r10, #0x8c
ldmia r0, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldr r1, [sl, #0x98]
ldr r1, [r10, #0x98]
ldr r0, _0216fb84 ; =data_027e0e60
str r1, [sp, #0x54]
ldr r2, [sl, #0x48]
ldr r2, [r10, #0x48]
add r1, sp, #0xb8
str r2, [sp, #0x24]
ldr r3, [sl, #0x4c]
ldr r3, [r10, #0x4c]
add r2, sp, #0x24
str r3, [sp, #0x28]
ldr r6, [sl, #0x50]
ldr r6, [r10, #0x50]
add r3, sp, #0x18
str r6, [sp, #0x2c]
ldr r6, [sl, #0x54]
ldr r6, [r10, #0x54]
str r6, [sp, #0x18]
ldr r6, [sl, #0x58]
ldr r6, [r10, #0x58]
str r6, [sp, #0x1c]
ldr r6, [sl, #0x5c]
ldr r6, [r10, #0x5c]
str r6, [sp, #0x20]
str r4, [sp]
ldr r4, [sl, #8]
ldr r4, [r10, #8]
str r4, [sp, #4]
ldrh r4, [sl, #0x9c]
ldrh r4, [r10, #0x9c]
str r4, [sp, #8]
str r5, [sp, #0xc]
str r5, [sp, #0x10]
@@ -2804,7 +2804,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
cmp r0, #0
addne sp, sp, #0x118
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0216fb88 ; =data_ov21_02171bb4
ldr r0, [r0, #0x20]
tst r0, #1
@@ -2868,19 +2868,19 @@ _0216f9c0:
strh r0, [sp, #0x7e]
strh r0, [sp, #0x80]
strh r0, [sp, #0x82]
ldr r0, [sl, #0x4c]
ldr r2, [sl, #0x50]
ldr r1, [sl, #0x48]
ldr r0, [r10, #0x4c]
ldr r2, [r10, #0x50]
ldr r1, [r10, #0x48]
add r0, r0, #0x9a
add r0, r0, #0x900
ldr sb, _0216fb90 ; =data_ov21_02171750
ldr r9, _0216fb90 ; =data_ov21_02171750
ldr r4, _0216fb84 ; =data_027e0e60
str r1, [sp, #0x3c]
str r0, [sp, #0x40]
str r2, [sp, #0x44]
mov r6, #0x800
mov r5, #0xd
mov fp, r8
mov r11, r8
add r7, sp, #0x30
_0216fa3c:
ldr r1, [sp, #0x3c]
@@ -2890,7 +2890,7 @@ _0216fa3c:
str r0, [sp, #0x34]
str r1, [sp, #0x38]
mov r0, r7
mov r1, sb
mov r1, r9
mov r2, r7
bl func_01ff9bc4
ldr r1, [r4]
@@ -2903,12 +2903,12 @@ _0216fa3c:
bl func_ov00_020b199c
cmp r0, #0
beq _0216fac4
ldr r0, [sl, #8]
ldr r0, [r10, #8]
add r1, sp, #0x58
stmia sp, {r0, r6}
str r5, [sp, #8]
str fp, [sp, #0xc]
str fp, [sp, #0x10]
str r11, [sp, #0xc]
str r11, [sp, #0x10]
ldr r0, [r4]
mov r2, r7
add r3, sp, #0x3c
@@ -2916,19 +2916,19 @@ _0216fa3c:
cmp r0, #0
addeq sp, sp, #0x118
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fac4:
add r8, r8, #1
cmp r8, #4
add sb, sb, #0xc
add r9, r9, #0xc
blt _0216fa3c
ldr r0, [sl, #0x224]
ldr r1, [sl, #0x228]
ldr r0, [r10, #0x224]
ldr r1, [r10, #0x228]
rsb r0, r0, #0
str r0, [sl, #0x224]
str r0, [r10, #0x224]
rsb r1, r1, #0
ldr r0, _0216fbb8 ; =data_027e0fc8
str r1, [sl, #0x228]
str r1, [r10, #0x228]
ldr r0, [r0]
mov r4, #0
bl func_ov00_020bc500
@@ -2942,7 +2942,7 @@ _0216fac4:
cmp r0, #0
moveq r4, #1
_0216fb20:
ldrb r0, [sl, #0x158]
ldrb r0, [r10, #0x158]
cmp r0, #0
bne _0216fb60
ldr r0, _0216fbb8 ; =data_027e0fc8
@@ -2952,14 +2952,14 @@ _0216fb20:
beq _0216fb60
cmp r4, #0
bne _0216fb60
mov r0, sl
mov r0, r10
ldr r2, [r0]
mov r1, #3
ldr r2, [r2, #0xb8]
blx r2
b _0216fb74
_0216fb60:
mov r0, sl
mov r0, r10
ldr r2, [r0]
mov r1, #6
ldr r2, [r2, #0xb8]
@@ -2967,7 +2967,7 @@ _0216fb60:
_0216fb74:
mov r0, #0
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_0216f7c8
_0216fb80: .word 0x0000ffff
@@ -3037,11 +3037,11 @@ _0216fc58: .word data_027e0fc8
.global func_ov21_0216fc5c
arm_func_start func_ov21_0216fc5c
func_ov21_0216fc5c: ; 0x0216fc5c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r4, r2
ldr r2, [r4]
mov sl, r0
mov r10, r0
cmp r2, #0
ldreq r2, [r4, #4]
str r1, [sp]
@@ -3051,18 +3051,18 @@ func_ov21_0216fc5c: ; 0x0216fc5c
mov r2, r3
bl func_ov21_02170050
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fc98:
ldrb r0, [sp, #0x68]
cmp r0, #0
beq _0216fcc0
ldr r1, [sp]
ldr r3, [sp, #4]
mov r0, sl
mov r0, r10
mov r2, r4
bl func_ov21_021701b0
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fcc0:
ldr r0, _0216fffc ; =data_ov21_02171bb4
ldr r0, [r0, #0x54]
@@ -3183,7 +3183,7 @@ _0216fe2c:
cmp r0, #0
beq _0216ffdc
add r1, sp, #0x24
mov r0, sl
mov r0, r10
bl func_ov21_02170388
cmp r0, #0
beq _0216ffdc
@@ -3194,7 +3194,7 @@ _0216fe2c:
ldr r2, [sp, #0x28]
add sp, sp, #0x44
str r2, [r1, #4]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fec4:
rsb r0, r0, #0
str r0, [sp, #8]
@@ -3217,7 +3217,7 @@ _0216fee4:
subge r2, r2, #8
_0216ff0c:
ldr r0, _02170004 ; =data_ov21_02171780
ldr fp, [sp, #0x1c]
ldr r11, [sp, #0x1c]
add r1, r0, r2, lsl #3
ldr r2, [r0, r2, lsl #3]
ldr r0, [r1, #4]
@@ -3226,7 +3226,7 @@ _0216ff0c:
ldr r0, [sp]
ldr r1, [r0, #4]
ldr r3, [r0]
add sb, r2, r1
add r9, r2, r1
add r0, r6, r3
str r0, [sp, #0x10]
sub r8, r0, #1
@@ -3234,7 +3234,7 @@ _0216ff44:
ldr r6, [sp, #0x20]
_0216ff48:
str r8, [sp, #0x24]
add r7, r6, sb
add r7, r6, r9
str r7, [sp, #0x28]
ldr r0, [r4]
bl func_ov00_020cf05c
@@ -3243,7 +3243,7 @@ _0216ff48:
bl func_ov00_02079ab4
cmp r0, #0
beq _0216ff9c
mov r0, sl
mov r0, r10
mov r1, r5
bl func_ov21_02170388
cmp r0, #0
@@ -3251,16 +3251,16 @@ _0216ff48:
ldr r1, [sp, #0x10]
ldr r0, [sp, #4]
add sp, sp, #0x44
stmia r0, {r1, sb}
stmia r0, {r1, r9}
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216ff9c:
add r6, r6, #1
cmp r6, #1
ble _0216ff48
add r8, r8, #1
add fp, fp, #1
cmp fp, #1
add r11, r11, #1
cmp r11, #1
ble _0216ff44
_0216ffb8:
ldr r0, [sp, #0x14]
@@ -3280,7 +3280,7 @@ _0216ffdc:
ble _0216fe2c
mov r0, #0
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_0216fc5c
_0216fffc: .word data_ov21_02171bb4
@@ -3313,27 +3313,27 @@ func_ov21_0217004c: ; 0x0217004c
.global func_ov21_02170050
arm_func_start func_ov21_02170050
func_ov21_02170050: ; 0x02170050
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x28
mov sl, r1
ldr r1, [sl]
mov r10, r1
ldr r1, [r10]
str r2, [sp]
str r1, [sp, #8]
ldr r3, [sl, #4]
ldr r3, [r10, #4]
ldr r1, _021701a4 ; =data_027e0d3c
mov fp, r0
mov r11, r0
ldr r0, [r1]
add r1, sp, #8
add r2, sp, #0x1c
str r3, [sp, #0xc]
bl func_ov00_020793b8
ldr r1, [fp, #0x48]
ldr r1, [r11, #0x48]
ldr r0, _021701a8 ; =data_027e0e60
str r1, [sp, #0x10]
ldr r1, [fp, #0x4c]
ldr r1, [r11, #0x4c]
ldr r0, [r0]
str r1, [sp, #0x14]
ldr r3, [fp, #0x50]
ldr r3, [r11, #0x50]
add r1, sp, #0x10
mov r2, #0
str r3, [sp, #0x18]
@@ -3350,11 +3350,11 @@ _021700cc:
mov r0, r5
cmp r0, r6
bgt _02170180
rsb sb, r4, #0
rsb r9, r4, #0
_021700e0:
cmp r4, #0
movge r0, r4
movlt r0, sb
movlt r0, r9
cmp r0, r6
bge _02170108
cmp r5, #0
@@ -3363,11 +3363,11 @@ _021700e0:
cmp r0, r6
blt _02170174
_02170108:
ldr r1, [sl]
ldr r1, [r10]
ldr r0, _021701ac ; =data_027e103c
add r8, r4, r1
str r8, [sp, #8]
ldr r1, [sl, #4]
ldr r1, [r10, #4]
ldr r0, [r0]
add r7, r5, r1
str r7, [sp, #0xc]
@@ -3377,7 +3377,7 @@ _02170108:
bl func_ov00_02079ab4
cmp r0, #0
beq _02170174
mov r0, fp
mov r0, r11
add r1, sp, #8
bl func_ov21_02170388
cmp r0, #0
@@ -3389,7 +3389,7 @@ _02170108:
ldr r2, [sp, #0xc]
add sp, sp, #0x28
str r2, [r1, #4]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02170174:
add r5, r5, #1
cmp r5, r6
@@ -3404,7 +3404,7 @@ _0217018c:
bgt _021700b8
mov r0, #0
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_02170050
_021701a4: .word data_027e0d3c
@@ -3414,27 +3414,27 @@ _021701ac: .word data_027e103c
.global func_ov21_021701b0
arm_func_start func_ov21_021701b0
func_ov21_021701b0: ; 0x021701b0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x28
mov sb, r1
ldr r2, [sb]
mov r9, r1
ldr r2, [r9]
ldr r1, _02170328 ; =data_027e0d3c
str r2, [sp, #8]
ldr r4, [sb, #4]
mov sl, r0
ldr r4, [r9, #4]
mov r10, r0
ldr r0, [r1]
add r1, sp, #8
add r2, sp, #0x1c
str r4, [sp, #0xc]
str r3, [sp]
bl func_ov00_020793b8
ldr r1, [sl, #0x48]
ldr r1, [r10, #0x48]
ldr r0, _0217032c ; =data_027e0e60
str r1, [sp, #0x10]
ldr r1, [sl, #0x4c]
ldr r1, [r10, #0x4c]
ldr r0, [r0]
str r1, [sp, #0x14]
ldr r3, [sl, #0x50]
ldr r3, [r10, #0x50]
add r1, sp, #0x10
mov r2, #0
str r3, [sp, #0x18]
@@ -3451,11 +3451,11 @@ _0217022c:
mov r0, r5
cmp r0, r6
bgt _02170304
rsb fp, r4, #0
rsb r11, r4, #0
_02170240:
cmp r4, #0
movge r0, r4
movlt r0, fp
movlt r0, r11
cmp r0, r6
bge _02170268
cmp r5, #0
@@ -3464,16 +3464,16 @@ _02170240:
cmp r0, r6
blt _021702f8
_02170268:
ldr r0, [sb]
ldr r0, [r9]
mov r2, #0
add r8, r4, r0
str r8, [sp, #8]
ldr r0, [sb, #4]
ldr r0, [r9, #4]
add r1, r5, r0
str r1, [sp, #0xc]
ldr r0, [sl, #0x21c]
ldr r0, [r10, #0x21c]
cmp r0, r8
ldreq r0, [sl, #0x220]
ldreq r0, [r10, #0x220]
cmpeq r0, r1
moveq r2, #1
cmp r2, #0
@@ -3487,7 +3487,7 @@ _02170268:
bl func_ov00_02079ab4
cmp r0, #0
beq _021702f8
mov r0, sl
mov r0, r10
add r1, sp, #8
bl func_ov21_02170388
cmp r0, #0
@@ -3499,7 +3499,7 @@ _02170268:
ldr r2, [sp, #0xc]
add sp, sp, #0x28
str r2, [r1, #4]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021702f8:
add r5, r5, #1
cmp r5, r6
@@ -3514,7 +3514,7 @@ _02170310:
bgt _02170218
mov r0, #0
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_021701b0
_02170328: .word data_027e0d3c
asm/ov22.inc
+7 -7
View File
@@ -83,7 +83,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f90
@@ -240,12 +239,12 @@
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097c18
.extern func_ov00_02098058
.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
@@ -474,4 +473,5 @@
.extern func_ov34_0217bf0c
.extern func_ov34_0217bf34
.extern func_ov46_02193fac
.extern gAdventureFlags
.extern strncpy
asm/ov22.s
+259 -259
View File
File diff suppressed because it is too large Load Diff
asm/ov23.inc
+9 -9
View File
@@ -114,7 +114,6 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -285,14 +284,14 @@
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_020965c0
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bcc
.extern func_ov00_02098058
.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
@@ -574,5 +573,6 @@
.extern func_ov17_0216a734
.extern func_ov52_02195754
.extern func_ov52_02195b5c
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov23.s
+221 -221
View File
File diff suppressed because it is too large Load Diff
asm/ov24.inc
+77 -77
View File
@@ -2,7 +2,78 @@
.extern Approach_thunk
.extern Divide
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13CheckTouchingEj
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16IsFollowedByLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18CollidesWithShieldEP8Cylinder
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c2ebcEv
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
@@ -17,7 +88,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -153,11 +223,11 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bbc
.extern func_ov00_02098058
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
@@ -206,78 +276,7 @@
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18CollidesWithShieldEP8Cylinder
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16IsFollowedByLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c2ebcEv
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c56d8
@@ -424,5 +423,6 @@
.extern func_ov17_0216a4ac
.extern func_ov17_0216a634
.extern func_ov17_0216a734
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov24.s
+126 -126
View File
@@ -127,7 +127,7 @@ _0216d820: .word data_027e0f6c
.global func_ov24_0216d824
arm_func_start func_ov24_0216d824
func_ov24_0216d824: ; 0x0216d824
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x54
mov r5, r0
ldr r0, [r5, #0x18]
@@ -159,40 +159,40 @@ _0216d878:
ldrh r0, [r5, #0x26]
cmp r0, #0
strneb r0, [r5, #0x65]
ldrb sb, [r5, #0x14]
ldrb r9, [r5, #0x14]
ldrb r4, [r5, #0x64]
add r0, sb, r4
cmp sb, r0
add r0, r9, r4
cmp r9, r0
bge _0216d914
ldr r6, _0216da24 ; =data_027e0e60
add r8, sp, #4
mov r7, #1
_0216d8b4:
ldrb sl, [r5, #0x15]
ldrb r10, [r5, #0x15]
ldrb r0, [r5, #0x65]
add r0, sl, r0
cmp sl, r0
add r0, r10, r0
cmp r10, r0
bge _0216d8fc
and r4, sb, #0xff
and r4, r9, #0xff
_0216d8cc:
ldr r0, [r6]
mov r1, r8
mov r2, r7
strb r4, [sp, #4]
strb sl, [sp, #5]
strb r10, [sp, #5]
bl func_ov00_020826a0
ldrb r1, [r5, #0x15]
ldrb r0, [r5, #0x65]
add sl, sl, #1
add r10, r10, #1
add r0, r1, r0
cmp sl, r0
cmp r10, r0
blt _0216d8cc
_0216d8fc:
ldrb r4, [r5, #0x64]
ldrb r0, [r5, #0x14]
add sb, sb, #1
add r9, r9, #1
add r0, r0, r4
cmp sb, r0
cmp r9, r0
blt _0216d8b4
_0216d914:
ldrb r0, [r5, #0x65]
@@ -214,11 +214,11 @@ _0216d914:
ldr r8, [r5, #0x1c]
ldr r3, [r5, #0x20]
sub r2, r1, r7, asr #1
add sb, r1, r7, asr #1
add r9, r1, r7, asr #1
sub r0, r3, r6, asr #1
mov r1, #0
sub ip, r8, #0x400
add sl, r8, #0x400
add r10, r8, #0x400
add r3, r3, r6, asr #1
str r3, [sp, #0x44]
bic r1, r1, #0x1f
@@ -231,8 +231,8 @@ _0216d914:
str r0, [sp, #0x50]
ldmia r1, {r0, r1, r2}
stmia r8, {r0, r1, r2}
str sb, [sp, #0x3c]
str sl, [sp, #0x40]
str r9, [sp, #0x3c]
str r10, [sp, #0x40]
add r0, sp, #0x3c
add r3, sp, #0x30
ldmia r0, {r0, r1, r2}
@@ -262,7 +262,7 @@ _0216d914:
str r0, [r5, #0x90]
str r7, [r5, #0x94]
add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov24_0216d824
_0216da24: .word data_027e0e60
@@ -401,16 +401,16 @@ func_ov24_0216db88: ; 0x0216db88
.global func_ov24_0216db90
arm_func_start func_ov24_0216db90
func_ov24_0216db90: ; 0x0216db90
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x30
ldr r2, [r0]
mov sl, r0
mov r10, r0
ldr r2, [r2, #0x88]
blx r2
cmp r0, #0
addeq sp, sp, #0x30
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldrh r1, [sl, #0xc]
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _0216dca8 ; =data_02050f54
add r0, sp, #0xc
mov r1, r1, asr #0x4
@@ -421,59 +421,59 @@ func_ov24_0216db90: ; 0x0216db90
ldrsh r1, [r3, r4]
ldrsh r2, [r3, r2]
blx func_01ff8214
ldr r2, [sl, #0x70]
ldr r1, [sl, #0x1c]
ldr r0, [sl, #0x68]
ldr r2, [r10, #0x70]
ldr r1, [r10, #0x1c]
ldr r0, [r10, #0x68]
mov r7, #0
str r1, [sp, #4]
str r2, [sp, #8]
str r0, [sp]
ldrb r0, [sl, #0x64]
ldrb r0, [r10, #0x64]
cmp r0, #0
addle sp, sp, #0x30
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mvn r5, #0
mov r6, r7
add r4, sp, #0xc
add fp, sp, #0
add r11, sp, #0
_0216dc1c:
cmp r7, #0
ldrne r0, [sp]
mov r8, #0
addne r0, r0, #0x1000
strne r0, [sp]
ldrb r0, [sl, #0x65]
ldrb r0, [r10, #0x65]
cmp r0, #0
ble _0216dc90
mov sb, r8
mov r9, r8
_0216dc40:
ldr r0, [sl, #0x70]
ldr r0, [r10, #0x70]
cmp r8, #0
streq r0, [sp, #8]
addne r0, r0, sb
addne r0, r0, r9
strne r0, [sp, #8]
cmp r7, #0
cmpeq r8, #0
streqh r6, [sl, #0x82]
strneh r5, [sl, #0x82]
add r0, sl, #0x78
streqh r6, [r10, #0x82]
strneh r5, [r10, #0x82]
add r0, r10, #0x78
ldr r3, [r0]
mov r1, r4
ldr r3, [r3, #0x14]
mov r2, fp
mov r2, r11
blx r3
ldrb r0, [sl, #0x65]
ldrb r0, [r10, #0x65]
add r8, r8, #1
add sb, sb, #0x1000
add r9, r9, #0x1000
cmp r8, r0
blt _0216dc40
_0216dc90:
ldrb r0, [sl, #0x64]
ldrb r0, [r10, #0x64]
add r7, r7, #1
cmp r7, r0
blt _0216dc1c
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov24_0216db90
_0216dca8: .word data_02050f54
@@ -779,9 +779,9 @@ _0216e070:
ldr r0, [r4, #0x174]
cmp r0, #0
bne _0216e0a0
ldr r0, _0216e178 ; =data_027e0f74
ldr r0, _0216e178 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _0216e16c
_0216e0a0:
@@ -802,9 +802,9 @@ _0216e0c4:
ldr r0, [r4, #0x174]
cmp r0, #0
bne _0216e0f4
ldr r0, _0216e178 ; =data_027e0f74
ldr r0, _0216e178 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _0216e16c
_0216e0f4:
@@ -818,10 +818,10 @@ _0216e0f4:
bl func_ov24_0216e4c8
b _0216e16c
_0216e118:
ldr r0, _0216e178 ; =data_027e0f74
ldr r0, _0216e178 ; =gAdventureFlags
ldr r1, [r4, #0x170]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _0216e16c
mov r1, #0
@@ -830,10 +830,10 @@ _0216e118:
bl func_ov24_0216e4c8
b _0216e16c
_0216e144:
ldr r0, _0216e178 ; =data_027e0f74
ldr r0, _0216e178 ; =gAdventureFlags
ldr r1, [r4, #0x170]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _0216e16c
mov r0, r4
@@ -846,16 +846,16 @@ _0216e16c:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov24_0216e03c
_0216e178: .word data_027e0f74
_0216e178: .word gAdventureFlags
.global func_ov24_0216e17c
arm_func_start func_ov24_0216e17c
func_ov24_0216e17c: ; 0x0216e17c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, [r4, #0x130]
cmp r0, #3
addls pc, pc, r0, lsl #2
@@ -886,20 +886,20 @@ _0216e1d4:
bl func_ov24_0216e4c8
b _0216e42c
_0216e1f8:
ldr r0, _0216e49c ; =data_027e0f74
ldr r0, _0216e49c ; =gAdventureFlags
ldr r1, [r4, #0x170]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _0216e42c
ldr r0, _0216e49c ; =data_027e0f74
ldr r0, _0216e49c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
blo _0216e280
ldr r0, _0216e49c ; =data_027e0f74
ldr r0, _0216e49c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
bne _0216e258
ldr r1, _0216e4a0 ; =data_027e0f64
@@ -952,10 +952,10 @@ _0216e2dc:
add r7, r7, #2
blo _0216e2a8
_0216e2ec:
ldr r0, _0216e49c ; =data_027e0f74
ldr r0, _0216e49c ; =gAdventureFlags
ldr r1, [r4, #0x170]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _0216e42c
mov r1, #0
@@ -964,20 +964,20 @@ _0216e2ec:
bl func_ov24_0216e4c8
b _0216e42c
_0216e318:
ldr r0, _0216e49c ; =data_027e0f74
ldr r0, _0216e49c ; =gAdventureFlags
ldr r1, [r4, #0x170]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _0216e42c
ldr r0, _0216e49c ; =data_027e0f74
ldr r0, _0216e49c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
blo _0216e3a0
ldr r0, _0216e49c ; =data_027e0f74
ldr r0, _0216e49c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
bne _0216e378
ldr r1, _0216e4a0 ; =data_027e0f64
@@ -1009,12 +1009,12 @@ _0216e3a0:
mov r8, #0
add r0, r4, #0x5a
ldr r6, _0216e4b8 ; =data_ov24_021791fc
add sb, r0, #0x100
add r9, r0, #0x100
mov r5, r8
mov r7, r8
_0216e3d0:
ldr r1, [r4, #0x174]
mov r0, sb
mov r0, r9
ldr r2, [r6, r1, lsl #2]
mov r1, r7
bl func_0202b3bc
@@ -1024,13 +1024,13 @@ _0216e3d0:
add r8, r8, #1
strneh r5, [r0, #0x5a]
cmp r8, #2
add sb, sb, #2
add r9, r9, #2
blo _0216e3d0
_0216e404:
ldr r0, _0216e49c ; =data_027e0f74
ldr r0, _0216e49c ; =gAdventureFlags
ldr r1, [r4, #0x170]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _0216e42c
mov r0, r4
@@ -1066,10 +1066,10 @@ _0216e438:
add r5, r5, #1
cmp r5, #2
blo _0216e438
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov24_0216e17c
_0216e49c: .word data_027e0f74
_0216e49c: .word gAdventureFlags
_0216e4a0: .word data_027e0f64
_0216e4a4: .word data_027e0ffc
_0216e4a8: .word 0x00000355
@@ -1164,12 +1164,12 @@ _0216e5bc:
strb r3, [sp, #0xb9]
strb r2, [sp, #0xba]
bl func_ov24_0216e7b8
ldr r0, _0216e6f4 ; =data_027e0f74
ldr r0, _0216e6f4 ; =gAdventureFlags
mov r2, #0
ldr r0, [r0]
add r1, sp, #0xb0
strb r2, [sp, #0xc0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x170]
add r0, sp, #0xb0
bl func_ov00_0209a508
@@ -1206,12 +1206,12 @@ _0216e644:
cmp r0, #0
ldrneb r0, [r4, #0x2e]
cmpne r0, #0
ldr r0, _0216e6f4 ; =data_027e0f74
ldr r0, _0216e6f4 ; =gAdventureFlags
movne r2, #1
moveq r2, #0
ldr r0, [r0]
strb r2, [sp, #0x10]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x170]
mov r1, #0
add r0, sp, #0
@@ -1237,7 +1237,7 @@ _0216e6e4:
.align 2, 0
arm_func_end func_ov24_0216e4c8
_0216e6f0: .word data_027e0e60
_0216e6f4: .word data_027e0f74
_0216e6f4: .word gAdventureFlags
.global func_ov24_0216e6f8
arm_func_start func_ov24_0216e6f8
@@ -2804,7 +2804,7 @@ func_ov24_0216fa3c: ; 0x0216fa3c
add r0, sp, #0xc
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _0216fbc4 ; =data_027e0f74
ldr r0, _0216fbc4 ; =gAdventureFlags
mov ip, #1
mov r3, #0x32
ldr r0, [r0]
@@ -2814,7 +2814,7 @@ func_ov24_0216fa3c: ; 0x0216fa3c
strb r2, [sp, #0x16]
strb r2, [sp, #0x17]
strb r2, [sp, #0x1c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mov r1, #0
str r1, [r4, #0x6c]
ldr r0, _0216fbc8 ; =data_027e0fe4
@@ -2864,7 +2864,7 @@ _0216fba8:
arm_func_end func_ov24_0216fa3c
_0216fbbc: .word data_027e0f64
_0216fbc0: .word data_027e0fc8
_0216fbc4: .word data_027e0f74
_0216fbc4: .word gAdventureFlags
_0216fbc8: .word data_027e0fe4
_0216fbcc: .word 0x574c4354
_0216fbd0: .word data_027e0e60
@@ -7693,7 +7693,7 @@ _02173b14: .word data_027e0fe4
.global func_ov24_02173b18
arm_func_start func_ov24_02173b18
func_ov24_02173b18: ; 0x02173b18
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x5c
mov r4, r0
add r0, sp, #0x30
@@ -7748,14 +7748,14 @@ _02173bd8:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r4, #0x78]
ldr sb, [r4, #0x48]
ldr r9, [r4, #0x48]
ldr r2, _02173cf0 ; =data_02050f54
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
str sb, [sp, #0xc]
str r9, [sp, #0xc]
ldr r7, [r4, #0x4c]
ldrsh r1, [r2, r1]
ldrsh ip, [r2, r0]
@@ -7776,12 +7776,12 @@ _02173bd8:
str r7, [sp, #0x10]
rsb r1, r1, #0
adds r4, r4, #0x800
add r5, sb, r5
adc sb, r3, #0
add r5, r9, r5
adc r9, r3, #0
mov r3, r4, lsr #0xc
smull r7, r6, r2, ip
adds r7, r7, #0x800
orr r3, r3, sb, lsl #20
orr r3, r3, r9, lsl #20
smull r4, r1, r2, r1
adc r6, r6, #0
adds r2, r4, #0x800
@@ -7809,7 +7809,7 @@ _02173bd8:
movge r0, #1
movlt r0, #0
add sp, sp, #0x5c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov24_02173b18
_02173ce4: .word data_027e0f94
@@ -11334,8 +11334,8 @@ func_ov24_02176a80: ; 0x02176a80
.global func_ov24_02176a94
arm_func_start func_ov24_02176a94
func_ov24_02176a94: ; 0x02176a94
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
mov sb, r0
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r9, r0
mov r8, r1
bl _ZN5Actor10GetAngleToEP5Vec3p
mov r0, r0, lsl #0x10
@@ -11346,16 +11346,16 @@ func_ov24_02176a94: ; 0x02176a94
ldr r2, _02176bd4 ; =data_02050f54
mov r3, r1, lsl #0x1
mov r1, r0, lsl #0x1
add r0, sb, #0x60
add r0, r9, #0x60
ldrsh r6, [r2, r3]
ldrsh r7, [r2, r1]
bl func_01ff9cec
mov r4, r0
mov r1, r8
add r0, sb, #0x48
add r0, r9, #0x48
bl func_ov00_020ce2f0
mov r5, r0
mov r0, sb
mov r0, r9
mov r1, r8
bl _ZN5Actor12XzDistanceToEP5Vec3p
cmp r0, #0x2000
@@ -11394,30 +11394,30 @@ _02176b5c:
adds r1, r1, #0x800
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
str r3, [sb, #0x60]
str r3, [r9, #0x60]
mov r2, #0
adc r0, r0, #0
mov r1, r1, lsr #0xc
str r2, [sb, #0x64]
str r2, [r9, #0x64]
orr r1, r1, r0, lsl #20
str r1, [sb, #0x68]
str r1, [r9, #0x68]
ldr r2, [r8, #4]
ldr r0, [sb, #0x4c]
ldr r0, [r9, #0x4c]
ldr r1, _02176bd8 ; =0x0000019a
sub r2, r2, r0
str r2, [sb, #0x64]
str r2, [r9, #0x64]
cmp r2, r1
strgt r1, [sb, #0x64]
strgt r1, [r9, #0x64]
bgt _02176bc0
sub r0, r1, #0x334
cmp r2, r0
strlt r0, [sb, #0x64]
strlt r0, [r9, #0x64]
_02176bc0:
add r0, sb, #0x48
add r1, sb, #0x60
add r0, r9, #0x48
add r1, r9, #0x60
mov r2, r0
bl func_01ff9bc4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov24_02176a94
_02176bd4: .word data_02050f54
@@ -13735,16 +13735,16 @@ _02178994:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
_021789c8:
ldr r0, _02178a9c ; =data_027e0f74
ldr r0, _02178a9c ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #8
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _02178a9c ; =data_027e0f74
ldr r0, _02178a9c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
addlo sp, sp, #8
ldmloia sp!, {r3, r4, r5, pc}
@@ -13793,7 +13793,7 @@ _02178a90:
.align 2, 0
arm_func_end func_ov24_0217890c
_02178a98: .word data_027e0ffc
_02178a9c: .word data_027e0f74
_02178a9c: .word gAdventureFlags
_02178aa0: .word 0x00000333
.global func_ov24_02178aa4
@@ -13856,7 +13856,7 @@ _02178b48:
str r2, [sp, #0xc]
strb r1, [sp, #0x11]
ldr r1, [r4, #0x18]
ldr r0, _02178c68 ; =data_027e0f74
ldr r0, _02178c68 ; =gAdventureFlags
str r1, [sp, #0x28]
ldr r1, [r4, #0x1c]
ldr r0, [r0]
@@ -13866,7 +13866,7 @@ _02178b48:
str r2, [sp, #0x30]
ldrb r2, [r4, #0x36]
strb r2, [sp, #0x18]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x68]
add r0, sp, #8
bl func_ov00_0209a508
@@ -13922,7 +13922,7 @@ _02178c54:
arm_func_end func_ov24_02178aa4
_02178c60: .word data_027e0ffc
_02178c64: .word 0x000001b3
_02178c68: .word data_027e0f74
_02178c68: .word gAdventureFlags
_02178c6c: .word data_027e0e58
_02178c70: .word 0x00001019
_02178c74: .word 0x0000101a
@@ -14054,29 +14054,29 @@ _02178e1c: .word func_ov00_0208b9e4
.global func_ov24_02178e20
arm_func_start func_ov24_02178e20
func_ov24_02178e20: ; 0x02178e20
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov sl, r0
ldrb r7, [sl, #0x14]
mov sb, r1
mov r10, r0
ldrb r7, [r10, #0x14]
mov r9, r1
add r0, r7, #2
cmp r7, r0
bge _02178ee8
ldr r4, _02179010 ; =data_027e0e60
add r5, sp, #2
mov fp, #1
mov r11, #1
_02178e4c:
ldrb r8, [sl, #0x15]
ldrb r8, [r10, #0x15]
add r0, r8, #2
cmp r8, r0
bge _02178ed4
and r6, r7, #0xff
_02178e60:
cmp sb, #0
cmp r9, #0
ldr r0, [r4]
beq _02178e98
mov r1, r5
mov r2, fp
mov r2, r11
strb r6, [sp, #2]
strb r8, [sp, #3]
bl func_ov00_02082680
@@ -14098,25 +14098,25 @@ _02178e98:
mov r3, #0x35
bl func_ov00_02084d24
_02178ec0:
ldrb r0, [sl, #0x15]
ldrb r0, [r10, #0x15]
add r8, r8, #1
add r0, r0, #2
cmp r8, r0
blt _02178e60
_02178ed4:
ldrb r0, [sl, #0x14]
ldrb r0, [r10, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _02178e4c
_02178ee8:
ldrh r4, [sl, #0x2a]
ldrh r4, [r10, #0x2a]
ldr r1, _02179014 ; =data_027e0f6c
add r0, sp, #0xc
ldr r1, [r1]
mov r2, r4
ldrh r5, [sl, #0x26]
ldrh r6, [sl, #0x28]
ldrh r5, [r10, #0x26]
ldrh r6, [r10, #0x28]
bl func_ov00_02093a4c
ldr r1, _02179014 ; =data_027e0f6c
add r0, sp, #8
@@ -14128,7 +14128,7 @@ _02178ee8:
ldr r1, [r1]
mov r2, r6
bl func_ov00_02093a4c
cmp sb, #0
cmp r9, #0
add r2, sp, #0xc
beq _02178fa4
ldr r1, [sp, #0xc]
@@ -14156,7 +14156,7 @@ _02178ee8:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02178fa4:
ldr r0, _02179014 ; =data_027e0f6c
ldr r1, [sp, #0xc]
@@ -14184,7 +14184,7 @@ _02178fa4:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov24_02178e20
_02179010: .word data_027e0e60
asm/ov25.inc
+10 -10
View File
@@ -89,7 +89,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -208,15 +207,15 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bcc
.extern func_ov00_02098074
.extern func_ov00_020980ac
.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
@@ -410,5 +409,6 @@
.extern func_ov30_021872c4
.extern func_ov30_02187304
.extern func_ov30_02187340
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov25.s
+339 -339
View File
File diff suppressed because it is too large Load Diff
asm/ov26.inc
+66 -66
View File
@@ -4,6 +4,60 @@
.extern FastDivide
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18IsTreasureSalvagedEj
@@ -32,7 +86,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f7c
.extern data_027e0f84
.extern data_027e0f90
@@ -223,17 +276,17 @@
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bcc
.extern func_ov00_02097c18
.extern func_ov00_02098058
.extern func_ov00_02098074
.extern func_ov00_0209809c
.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 _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209d8d8
@@ -265,61 +318,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c47cc
@@ -536,6 +535,7 @@
.extern func_ov14_02147aa8
.extern func_ov30_02183f84
.extern func_ov30_02183fd4
.extern gAdventureFlags
.extern gItemManager
.extern strcmp
.extern strncpy
asm/ov26.s
+321 -321
View File
File diff suppressed because it is too large Load Diff
asm/ov27.inc
+7 -7
View File
@@ -82,7 +82,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -207,12 +206,12 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.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
@@ -346,4 +345,5 @@
.extern func_ov14_0214f668
.extern func_ov14_0214f7f0
.extern func_ov14_0214fa48
.extern gAdventureFlags
.extern gItemManager
asm/ov27.s
+390 -390
View File
File diff suppressed because it is too large Load Diff
asm/ov28.inc
+9 -9
View File
@@ -85,7 +85,6 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f94
@@ -220,14 +219,14 @@
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02094884
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern func_ov00_02097ff4
.extern func_ov00_02098058
.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
@@ -400,6 +399,7 @@
.extern func_ov14_0214a92c
.extern func_ov14_0214aa0c
.extern func_ov14_0214aa2c
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcat
asm/ov28.s
+222 -222
View File
File diff suppressed because it is too large Load Diff
asm/ov29.inc
+2 -2
View File
@@ -81,7 +81,7 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -235,7 +235,7 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097738
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern func_ov00_020a5e9c
.extern func_ov00_020a61ac
.extern func_ov00_020a9588
asm/ov29.s
+279 -279
View File
File diff suppressed because it is too large Load Diff
asm/ov30.inc
+69 -69
View File
@@ -1,10 +1,75 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3158Ev
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZTV11FilterActor
.extern data_02050f54
.extern data_02063e4c
.extern data_027e0764
@@ -18,7 +83,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fc8
@@ -30,7 +94,6 @@
.extern data_027e0ffc
.extern data_027e1038
.extern data_027e10b4
.extern _ZTV11FilterActor
.extern data_ov00_020e8398
.extern data_ov00_020eec68
.extern data_ov00_020eec9c
@@ -85,9 +148,9 @@
.extern func_ov00_02087d34
.extern func_ov00_020884b4
.extern func_ov00_02093a1c
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02098058
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a5e9c
@@ -121,71 +184,7 @@
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3158Ev
.extern _ZN5Actor4KillEv
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -302,4 +301,5 @@
.extern func_ov26_02170014
.extern func_ov26_0217004c
.extern func_ov59_02198fe0
.extern gAdventureFlags
.extern gItemManager
asm/ov30.s
+353 -353
View File
File diff suppressed because it is too large Load Diff
asm/ov31.inc
+49 -49
View File
@@ -3,6 +3,52 @@
.extern LoadTreasureItemFanfare
.extern _ZN11ItemManager10GiveRupeesEjj
.extern _ZN11ItemManager8GiveAmmoEit
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetMaxAmmoEi
@@ -25,7 +71,6 @@
.extern data_027e0e28
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f94
.extern data_027e0fc8
.extern data_027e0fe0
@@ -113,60 +158,14 @@
.extern func_ov00_020875f8
.extern func_ov00_020888e8
.extern func_ov00_0208b180
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern func_ov00_020a9588
.extern func_ov00_020bc500
.extern func_ov00_020bcdec
.extern func_ov00_020bd728
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020ceacc
@@ -248,4 +247,5 @@
.extern func_ov14_0214aa0c
.extern func_ov18_02160a54
.extern func_ov18_02160a64
.extern gAdventureFlags
.extern gItemManager
asm/ov31.s
+143 -143
View File
@@ -57,7 +57,7 @@ _0217bdc4: .word data_ov31_02183e80
.global func_ov31_0217bdc8
arm_func_start func_ov31_0217bdc8
func_ov31_0217bdc8: ; 0x0217bdc8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r7, r0
mov r2, #0
str r2, [r7]
@@ -140,9 +140,9 @@ _0217becc:
add r0, r7, r6, lsl #2
ldr r0, [r0, #0x2c]
mov r1, r4
and sb, r2, #0xf
and r9, r2, #0xf
blx func_ov09_0211c9a0
add r1, sb, #3
add r1, r9, #3
mul r2, r1, r0
add r1, r7, r6, lsl #2
add r6, r6, #1
@@ -155,7 +155,7 @@ _0217becc:
mov r0, r7
bl func_ov31_0217bdb4
mov r0, r7
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov31_0217bdc8
_0217bf48: .word 0x0000ffff
@@ -1340,14 +1340,14 @@ func_ov31_0217ce90: ; 0x0217ce90
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, pc}
ldr r0, _0217cebc ; =data_027e0f74
ldr r0, _0217cebc ; =gAdventureFlags
mov r1, #0x78
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov31_0217ce90
_0217cebc: .word data_027e0f74
_0217cebc: .word gAdventureFlags
.global func_ov31_0217cec0
arm_func_start func_ov31_0217cec0
@@ -1464,10 +1464,10 @@ _0217cfd0: .word data_ov31_02183e84
.global func_ov31_0217cfd4
arm_func_start func_ov31_0217cfd4
func_ov31_0217cfd4: ; 0x0217cfd4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x5c
mov sl, r0
add r0, sl, #0x1d8
mov r10, r0
add r0, r10, #0x1d8
mov r1, #0x3800
str r1, [r0, #0x7c]
mov r1, #0x4000
@@ -1477,11 +1477,11 @@ func_ov31_0217cfd4: ; 0x0217cfd4
str r2, [r0, #0x80]
strh r1, [r0, #0x86]
mov r1, #0
strb r1, [sl, #0x285]
strb r1, [r10, #0x285]
bl func_ov14_02145e48
ldr r1, [sl, #0x1e8]
ldr r1, [r10, #0x1e8]
mov r2, #0x1000
mov r0, sl
mov r0, r10
str r2, [r1, #0x10]
bl func_ov31_0217d588
add r0, sp, #0x30
@@ -1491,7 +1491,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
str r1, [sp, #0x4c]
str r1, [sp, #0x50]
bl func_ov00_020c3348
add r0, sl, #0x48
add r0, r10, #0x48
add r3, sp, #0x24
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -1515,7 +1515,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
add r0, r0, #0xe2
str r0, [sp, #0xc]
ldr r0, _0217d3ec ; =0x49544150
ldr fp, _0217d3f4 ; =gItemManager
ldr r11, _0217d3f4 ; =gItemManager
add r0, r0, #0x1200
str r0, [sp, #0x18]
ldr r0, _0217d3f8 ; =0x49545452
@@ -1527,7 +1527,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
sub r0, r0, #0x100
str r0, [sp, #0x10]
ldr r0, _0217d3ec ; =0x49544150
mov sb, r5
mov r9, r5
add r0, r0, #0x1200
str r0, [sp, #0x14]
ldr r0, _0217d3f8 ; =0x49545452
@@ -1538,7 +1538,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
add r0, r0, #0xf2
str r0, [sp, #4]
_0217d0f8:
mov r0, sl
mov r0, r10
ldr r2, [r0]
mov r1, r7
ldr r2, [r2, #0x114]
@@ -1590,21 +1590,21 @@ _0217d1a4:
beq _0217d21c
b _0217d25c
_0217d1b4:
ldr r0, [fp]
ldr r0, [r11]
mov r1, #4
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r8, r4
b _0217d25c
_0217d1cc:
ldr r0, [fp]
ldr r0, [r11]
mov r1, #5
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r8, r4
b _0217d25c
_0217d1e4:
ldr r0, [fp]
ldr r0, [r11]
mov r1, #7
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
@@ -1620,7 +1620,7 @@ _0217d1fc:
add r5, r5, #1
b _0217d25c
_0217d21c:
ldr r0, [sl, #0x470]
ldr r0, [r10, #0x470]
cmp r0, #2
bne _0217d240
add r0, r6, #2
@@ -1641,7 +1641,7 @@ _0217d250:
_0217d25c:
bl func_ov31_0217bdb8
add r0, r0, #0x70
add r0, r0, sb
add r0, r0, r9
str r0, [sp]
ldr r0, _0217d404 ; =data_027e0fe8
mov r1, r8
@@ -1668,19 +1668,19 @@ _0217d2b8:
sub r0, r0, #0xc00
str r0, [sp, #0x2c]
_0217d2c8:
add sb, sb, #8
add r9, r9, #8
add r7, r7, #1
cmp r7, #5
blt _0217d0f8
mov r0, #0
str r0, [sp, #0x54]
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
sub r0, r0, #0x1000
str r0, [sp, #0x24]
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
add r0, r0, #0x800
str r0, [sp, #0x28]
ldr r0, [sl, #0x50]
ldr r0, [r10, #0x50]
add r0, r0, #0x2800
str r0, [sp, #0x2c]
bl func_ov31_0217bdb8
@@ -1692,13 +1692,13 @@ _0217d2c8:
add r2, sp, #0x24
add r3, sp, #0x30
bl func_ov00_020c4048
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
add r0, r0, #0x1000
str r0, [sp, #0x24]
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
add r0, r0, #0x800
str r0, [sp, #0x28]
ldr r0, [sl, #0x50]
ldr r0, [r10, #0x50]
add r0, r0, #0x2800
str r0, [sp, #0x2c]
bl func_ov31_0217bdb8
@@ -1710,13 +1710,13 @@ _0217d2c8:
add r2, sp, #0x24
add r3, sp, #0x30
bl func_ov00_020c4048
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
add r0, r0, #0x1000
str r0, [sp, #0x24]
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
add r0, r0, #0x800
str r0, [sp, #0x28]
ldr r0, [sl, #0x50]
ldr r0, [r10, #0x50]
add r0, r0, #0x2800
str r0, [sp, #0x2c]
bl func_ov31_0217bdb8
@@ -1729,17 +1729,17 @@ _0217d2c8:
add r3, sp, #0x30
bl func_ov00_020c4048
mov r0, #0
str r0, [sl, #0x478]
str r0, [r10, #0x478]
ldr r0, _0217d400 ; =data_027e0dbc
blx func_ov00_0207ba90
ldrb r2, [r0, #0xb]
mov r1, #0
mov r0, sl
str r2, [sl, #0x47c]
strb r1, [sl, #0x480]
mov r0, r10
str r2, [r10, #0x47c]
strb r1, [r10, #0x480]
bl func_ov14_021450f0
add sp, sp, #0x5c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov31_0217cfd4
_0217d3e8: .word 0x00005555
@@ -2843,41 +2843,41 @@ _0217e03c: .word data_027e0ce0
.global func_ov31_0217e040
arm_func_start func_ov31_0217e040
func_ov31_0217e040: ; 0x0217e040
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r7, _0217e278 ; =data_02057878
ldr r6, _0217e27c ; =data_0205785c
ldr r5, _0217e280 ; =gItemManager
ldr r4, _0217e284 ; =data_ov31_021822b0
ldr fp, _0217e288 ; =data_027e0ce0
mov sl, #0
ldr r11, _0217e288 ; =data_027e0ce0
mov r10, #0
_0217e05c:
cmp sl, #6
cmp r10, #6
ldreq r0, [r5]
ldreqh r0, [r0, #0xb6]
cmpeq r0, #1
ldreq r8, [r4, #0xb0]
ldreq sb, [r4, #0x104]
ldreq r9, [r4, #0x104]
beq _0217e0c0
cmp sl, #7
cmp r10, #7
ldreq r0, [r5]
ldreqh r0, [r0, #0xb4]
cmpeq r0, #1
ldreq r8, [r4, #0xb4]
ldreq sb, [r4, #0x108]
ldreq r9, [r4, #0x108]
beq _0217e0c0
cmp sl, #8
cmp r10, #8
ldreq r0, [r5]
ldreqh r0, [r0, #0xb8]
cmpeq r0, #1
ldreq r8, [r4, #0xb8]
ldreq sb, [r4, #0x10c]
ldreq r9, [r4, #0x10c]
beq _0217e0c0
ldr r0, _0217e28c ; =data_ov31_02182318
ldr r8, [r0, sl, lsl #2]
ldr r8, [r0, r10, lsl #2]
ldr r0, _0217e290 ; =data_ov31_0218236c
ldr sb, [r0, sl, lsl #2]
ldr r9, [r0, r10, lsl #2]
_0217e0c0:
ldr r1, [fp, #4]
ldr r1, [r11, #4]
mov r0, #0x14
mov r2, #4
bl _ZN9SysObjectnwEmPjj
@@ -2892,13 +2892,13 @@ _0217e0c0:
_0217e0f0:
ldr r1, _0217e294 ; =data_ov31_021840a8
mov r2, #4
str r0, [r1, sl, lsl #2]
ldr r1, [fp, #4]
str r0, [r1, r10, lsl #2]
ldr r1, [r11, #4]
mov r0, #0x14
bl _ZN9SysObjectnwEmPjj
cmp r0, #0
beq _0217e128
stmia r0, {r7, sb}
stmia r0, {r7, r9}
mov r1, #0
str r1, [r0, #8]
str r1, [r0, #0xc]
@@ -2906,9 +2906,9 @@ _0217e0f0:
strb r1, [r0, #0x10]
_0217e128:
ldr r1, _0217e298 ; =data_ov31_021840f0
str r0, [r1, sl, lsl #2]
add sl, sl, #1
cmp sl, #0x12
str r0, [r1, r10, lsl #2]
add r10, r10, #1
cmp r10, #0x12
blt _0217e05c
ldr r1, _0217e288 ; =data_027e0ce0
mov r0, #0x14
@@ -2992,7 +2992,7 @@ _0217e254:
bl func_ov31_0217dfec
ldr r1, _0217e2a0 ; =data_ov31_02183e88
str r0, [r1, #0x2c0]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov31_0217e040
_0217e278: .word data_02057878
@@ -4059,7 +4059,7 @@ _0217ee70: .word data_027e0d78
.global func_ov31_0217ee74
arm_func_start func_ov31_0217ee74
func_ov31_0217ee74: ; 0x0217ee74
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x30
mov r5, r0
mov r4, r1
@@ -4083,14 +4083,14 @@ func_ov31_0217ee74: ; 0x0217ee74
ldr ip, [r3, #0x270]
ldr r3, [r3, #0x274]
add r1, r6, r1
add sb, sp, #0
add r9, sp, #0
str r8, [sp, #0x24]
str r0, [sp, #0x28]
str r1, [sp, #0x2c]
ldmia r2, {r0, r1, r2}
stmia sb, {r0, r1, r2}
mov r0, sb
mov r2, sb
stmia r9, {r0, r1, r2}
mov r0, r9
mov r2, r9
add r1, r5, #0x14
str r8, [sp, #0x18]
str r7, [sp, #0x1c]
@@ -4099,17 +4099,17 @@ func_ov31_0217ee74: ; 0x0217ee74
str ip, [sp, #0x10]
str r3, [sp, #0x14]
bl func_01ff9bf8
mov r0, sb
mov r0, r9
mov r1, r0
bl func_01ff9d4c
ldrb r0, [r5, #0x174]
mov r1, #0x400
cmp r0, #1
mov r0, sb
mov r0, r9
bne _0217ef70
bl func_01fffbec
add r0, r5, #0x48
mov r1, sb
mov r1, r9
mov r2, r0
bl func_01ff9bc4
ldr r2, [sp, #0x28]
@@ -4126,7 +4126,7 @@ _0217ef70:
rsb r1, r1, #0
bl func_01fffbec
add r0, r5, #0x48
mov r1, sb
mov r1, r9
mov r2, r0
bl func_01ff9bc4
ldr r2, [r5, #0x18]
@@ -4143,7 +4143,7 @@ _0217efac:
mov r1, r4
bl func_ov31_0217eddc
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov31_0217ee74
_0217efc0: .word data_027e0f64
@@ -5303,32 +5303,32 @@ func_ov31_0217fd84: ; 0x0217fd84
beq _0217fddc
cmp r0, #2
ldmneia sp!, {r4, pc}
ldr r0, _0217fdfc ; =data_027e0f74
ldr r0, _0217fdfc ; =gAdventureFlags
mov r1, #0x67
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
b _0217fdf0
_0217fdc4:
ldr r0, _0217fdfc ; =data_027e0f74
ldr r0, _0217fdfc ; =gAdventureFlags
mov r1, #0x68
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
b _0217fdf0
_0217fddc:
ldr r0, _0217fdfc ; =data_027e0f74
ldr r0, _0217fdfc ; =gAdventureFlags
mov r1, #0x68
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_0217fdf0:
mov r0, r4
bl func_ov31_0217fd54
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov31_0217fd84
_0217fdfc: .word data_027e0f74
_0217fdfc: .word gAdventureFlags
.global func_ov31_0217fe00
arm_func_start func_ov31_0217fe00
@@ -5351,18 +5351,18 @@ _0217fe28: .word gItemManager
arm_func_start func_ov31_0217fe2c
func_ov31_0217fe2c: ; 0x0217fe2c
stmdb sp!, {r4, lr}
ldr r1, _0217fe54 ; =data_027e0f74
ldr r1, _0217fe54 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x6b
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r4
bl func_ov31_0217fd54
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov31_0217fe2c
_0217fe54: .word data_027e0f74
_0217fe54: .word gAdventureFlags
.global func_ov31_0217fe58
arm_func_start func_ov31_0217fe58
@@ -5385,18 +5385,18 @@ _0217fe80: .word gItemManager
arm_func_start func_ov31_0217fe84
func_ov31_0217fe84: ; 0x0217fe84
stmdb sp!, {r4, lr}
ldr r1, _0217feac ; =data_027e0f74
ldr r1, _0217feac ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x6a
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r4
bl func_ov31_0217fd54
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov31_0217fe84
_0217feac: .word data_027e0f74
_0217feac: .word gAdventureFlags
.global func_ov31_0217feb0
arm_func_start func_ov31_0217feb0
@@ -5419,18 +5419,18 @@ _0217fed8: .word gItemManager
arm_func_start func_ov31_0217fedc
func_ov31_0217fedc: ; 0x0217fedc
stmdb sp!, {r4, lr}
ldr r1, _0217ff04 ; =data_027e0f74
ldr r1, _0217ff04 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x6c
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r4
bl func_ov31_0217fd54
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov31_0217fedc
_0217ff04: .word data_027e0f74
_0217ff04: .word gAdventureFlags
.global func_ov31_0217ff08
arm_func_start func_ov31_0217ff08
@@ -5496,32 +5496,32 @@ func_ov31_0217ff9c: ; 0x0217ff9c
beq _0217fff4
cmp r0, #2
ldmneia sp!, {r4, pc}
ldr r0, _02180014 ; =data_027e0f74
ldr r0, _02180014 ; =gAdventureFlags
mov r1, #0x69
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
b _02180008
_0217ffdc:
ldr r0, _02180014 ; =data_027e0f74
ldr r0, _02180014 ; =gAdventureFlags
mov r1, #0x6d
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
b _02180008
_0217fff4:
ldr r0, _02180014 ; =data_027e0f74
ldr r0, _02180014 ; =gAdventureFlags
mov r1, #0x71
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_02180008:
mov r0, r4
bl func_ov31_0217fd54
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov31_0217ff9c
_02180014: .word data_027e0f74
_02180014: .word gAdventureFlags
.global func_ov31_02180018
arm_func_start func_ov31_02180018
@@ -6423,31 +6423,31 @@ _021808a0:
movne r0, #0xf
ldmia sp!, {r4, pc}
_021808b0:
ldr r0, _02180958 ; =data_027e0f74
ldr r0, _02180958 ; =gAdventureFlags
mov r1, #0x69
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0xc
ldmeqia sp!, {r4, pc}
ldr r0, _02180958 ; =data_027e0f74
ldr r0, _02180958 ; =gAdventureFlags
mov r1, #0x6b
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #7
ldmeqia sp!, {r4, pc}
ldr r0, _02180958 ; =data_027e0f74
ldr r0, _02180958 ; =gAdventureFlags
mov r1, #0x6c
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #8
ldmeqia sp!, {r4, pc}
ldr r0, _02180958 ; =data_027e0f74
ldr r0, _02180958 ; =gAdventureFlags
mov r1, #0x67
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #5
ldmeqia sp!, {r4, pc}
@@ -6469,7 +6469,7 @@ _02180950:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov31_02180858
_02180958: .word data_027e0f74
_02180958: .word gAdventureFlags
_0218095c: .word gItemManager
.global func_ov31_02180960
@@ -6811,19 +6811,19 @@ _02180d0c:
ldrb r0, [r0, #0x29]
cmp r0, #0
bne _02180d40
ldr r0, _02180dd8 ; =data_027e0f74
ldr r0, _02180dd8 ; =gAdventureFlags
mov r1, #0x6a
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #9
moveq r0, #6
ldmia sp!, {r3, pc}
_02180d40:
ldr r0, _02180dd8 ; =data_027e0f74
ldr r0, _02180dd8 ; =gAdventureFlags
mov r1, #0x68
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #9
moveq r0, #5
@@ -6843,19 +6843,19 @@ _02180d78:
ldrb r0, [r0, #0x29]
cmp r0, #0
bne _02180dac
ldr r0, _02180dd8 ; =data_027e0f74
ldr r0, _02180dd8 ; =gAdventureFlags
mov r1, #0x6d
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0x10
moveq r0, #0xd
ldmia sp!, {r3, pc}
_02180dac:
ldr r0, _02180dd8 ; =data_027e0f74
ldr r0, _02180dd8 ; =gAdventureFlags
mov r1, #0x71
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0x11
moveq r0, #0xb
@@ -6866,7 +6866,7 @@ _02180dcc:
.align 2, 0
arm_func_end func_ov31_02180ce8
_02180dd4: .word data_027e0fe4
_02180dd8: .word data_027e0f74
_02180dd8: .word gAdventureFlags
.global func_ov31_02180ddc
arm_func_start func_ov31_02180ddc
@@ -7482,11 +7482,11 @@ _021814b4: .word data_ov31_02183d7c
func_ov31_021814b8: ; 0x021814b8
stmdb sp!, {r4, lr}
sub sp, sp, #8
ldr r1, _0218159c ; =data_027e0f74
ldr r1, _0218159c ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x148
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addne sp, sp, #8
movne r0, #0
@@ -7540,7 +7540,7 @@ _02181568:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov31_021814b8
_0218159c: .word data_027e0f74
_0218159c: .word gAdventureFlags
_021815a0: .word data_ov31_02183d68
_021815a4: .word data_ov31_02183d6c
_021815a8: .word data_ov31_02181b24
@@ -7584,7 +7584,7 @@ func_ov31_021815e0: ; 0x021815e0
.global func_ov31_02181610
arm_func_start func_ov31_02181610
func_ov31_02181610: ; 0x02181610
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r4, [r1, #0x38]
str r0, [sp]
@@ -7595,7 +7595,7 @@ func_ov31_02181610: ; 0x02181610
mov r0, r0, lsl #0x10
mov r2, r0, lsr #0xd
ldr r0, [sp]
ldrh sl, [sp, #0x34]
ldrh r10, [sp, #0x34]
str r2, [r0, #0x18]
ldrh r1, [r1, #0x30]
ldr r2, [r0, #0x14]
@@ -7605,17 +7605,17 @@ func_ov31_02181610: ; 0x02181610
cmp r2, r1, lsl #3
strlo r2, [sp, #8]
ldr r0, [sp, #8]
and r3, sl, #0x3e0
and r3, r10, #0x3e0
cmp r0, r2
movlo r1, r0
ldrlo r0, [sp]
and r2, sl, #0x7c00
and r2, r10, #0x7c00
strlo r1, [r0, #0x14]
ldr r1, [sp, #8]
mov r5, r2, asr #0xa
ldr r2, [sp]
mov sb, r1, lsr #0x1
and r1, sl, #0x1f
mov r9, r1, lsr #0x1
and r1, r10, #0x1f
add r1, r1, #0x1f
mov r0, #0x1f000
mov r1, r1, lsl #0xc
@@ -7626,7 +7626,7 @@ func_ov31_02181610: ; 0x02181610
mul r1, r6, r0
add r1, r1, #0x800
add r0, r4, #0x1f
mov fp, r1, asr #0xc
mov r11, r1, asr #0xc
mov r1, r0, lsl #0xc
mov r0, #0x1f000
bl Divide
@@ -7639,31 +7639,31 @@ func_ov31_02181610: ; 0x02181610
mov r1, r1, lsl #0xc
bl Divide
ldr r3, [sp, #0x30]
mov r1, sl, lsl #0x1b
mov r1, r10, lsl #0x1b
mul r0, r3, r0
add r0, r0, #0x800
cmp sb, #0
cmp r9, #0
mov r2, #0
mov lr, r0, asr #0xc
ble _02181780
_02181708:
ldrh sl, [r7]
ldrh r10, [r7]
add r2, r2, #1
add r7, r7, #2
mov r0, sl, asr #0xa
mov r0, r10, asr #0xa
and r3, r0, #0x1f
and r0, sl, #0x1f
mov sl, sl, asr #0x5
and sl, sl, #0x1f
add r0, r0, sl
add sl, r3, r0
mul r0, sl, fp
and r0, r10, #0x1f
mov r10, r10, asr #0x5
and r10, r10, #0x1f
add r0, r0, r10
add r10, r3, r0
mul r0, r10, r11
add r0, r0, r1, lsr #15
mov r3, r0, asr #0xc
mul r0, sl, r6
mul r0, r10, r6
add r0, r0, r4, lsl #12
mov ip, r0, asr #0xc
mul r0, sl, lr
mul r0, r10, lr
add r0, r0, r5, lsl #12
cmp r3, #0x1f
movgt r3, #0x1f
@@ -7675,7 +7675,7 @@ _02181708:
orr r3, r3, ip, lsl #5
orr r0, r3, r0, lsl #10
strh r0, [r8], #2
cmp r2, sb
cmp r2, r9
blt _02181708
_02181780:
ldr r0, [sp]
@@ -7683,23 +7683,23 @@ _02181780:
ldr r0, [r0, #0xc]
bl func_0200e2a4
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov31_02181610
.global func_ov31_02181798
arm_func_start func_ov31_02181798
func_ov31_02181798: ; 0x02181798
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r4, r0
ldr r1, [r4]
ldr r0, [r4, #4]
cmp r1, r0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
str r1, [r4, #4]
ldr r0, [r4, #0x14]
ldr ip, [r4, #8]
mov fp, r0, lsr #0x1
cmp fp, #0
mov r11, r0, lsr #0x1
cmp r11, #0
ldr lr, [r4, #0xc]
ldr r5, [r4, #0x10]
mov r6, #0
@@ -7712,26 +7712,26 @@ _021817d4:
mov r0, r0, asr #0x5
and r1, r7, #0x7c00
mov r1, r1, asr #0xa
and sb, r7, #0x1f
and r9, r7, #0x1f
mul r7, r0, r2
and r8, r3, #0x3e0
and sl, r3, #0x7c00
and r10, r3, #0x7c00
mul r0, r1, r2
add r6, r6, #1
mov r1, sl, asr #0xa
and sl, r3, #0x1f
mul r3, sb, r2
mov r1, r10, asr #0xa
and r10, r3, #0x1f
mul r3, r9, r2
rsb r2, r2, #0x1000
mla r0, r1, r2, r0
mov r1, r8, asr #0x5
mla r7, r1, r2, r7
mov r1, r7, asr #0xc
mla r2, sl, r2, r3
mla r2, r10, r2, r3
mov r1, r1, lsl #0x5
mov r3, r0, asr #0xc
orr r0, r1, r2, asr #12
orr r0, r0, r3, lsl #10
cmp r6, fp
cmp r6, r11
strh r0, [r5], #2
blt _021817d4
_02181848:
@@ -7743,7 +7743,7 @@ _02181848:
ldr r3, [r4, #0x14]
mov r0, #1
bl func_02017d30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov31_02181798
.global func_ov31_0218186c
asm/ov32.inc
+9 -9
View File
@@ -78,7 +78,7 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
@@ -204,14 +204,14 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097738
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bbc
.extern func_ov00_02098058
.extern func_ov00_02098074
.extern func_ov00_0209809c
.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
asm/ov32.s
+213 -213
View File
File diff suppressed because it is too large Load Diff
asm/ov33.s
+46 -46
View File
@@ -733,7 +733,7 @@ func_ov33_0217c658: ; 0x0217c658
.global func_ov33_0217c66c
arm_func_start func_ov33_0217c66c
func_ov33_0217c66c: ; 0x0217c66c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r4, r0
ldr r0, [r4, #0x138]
mov r1, #0x1e
@@ -754,11 +754,11 @@ func_ov33_0217c66c: ; 0x0217c66c
mla r6, r2, r3, r6
ldr r2, [r7, #0x14]
adds r5, r5, r8
adc sb, r2, r6
stmia r7, {r5, sb}
adc r9, r2, r6
stmia r7, {r5, r9}
mov r6, #0xc9
umull r5, r8, sb, r6
mla r8, sb, r1, r8
umull r5, r8, r9, r6
mla r8, r9, r1, r8
mov r3, r1
mla r8, r3, r6, r8
sub r5, r8, #0x64
@@ -767,8 +767,8 @@ func_ov33_0217c66c: ; 0x0217c66c
mov lr, r5, lsr #0x1f
smull r5, r8, ip, r5
add r8, lr, r8, asr #5
smull sb, r5, r8, r0
adds r8, sb, #0x800
smull r9, r5, r8, r0
adds r8, r9, #0x800
ldr r2, [r4, #0x48]
adc r5, r5, #0
mov r8, r8, lsr #0xc
@@ -776,26 +776,26 @@ func_ov33_0217c66c: ; 0x0217c66c
add r2, r2, r8
str r2, [r4, #0x48]
ldr r5, [r7]
ldmib r7, {r2, sb}
umull fp, sl, sb, r5
mla sl, sb, r2, sl
ldmib r7, {r2, r9}
umull r11, r10, r9, r5
mla r10, r9, r2, r10
ldr r8, [r7, #0xc]
ldr lr, [r7, #0x10]
mla sl, r8, r5, sl
mla r10, r8, r5, r10
ldr ip, [r7, #0x14]
adds r2, lr, fp
adc sb, ip, sl
umull r5, r8, sb, r6
mla r8, sb, r1, r8
adds r2, lr, r11
adc r9, ip, r10
umull r5, r8, r9, r6
mla r8, r9, r1, r8
mla r8, r3, r6, r8
sub r5, r8, #0x64
stmia r7, {r2, sb}
stmia r7, {r2, r9}
ldr ip, _0217c804 ; =0x51eb851f
mov r8, r5, lsl #0xc
smull r5, sb, ip, r8
smull r5, r9, ip, r8
mov r5, r8, lsr #0x1f
add sb, r5, sb, asr #5
smull r8, r5, sb, r0
add r9, r5, r9, asr #5
smull r8, r5, r9, r0
adds r8, r8, #0x800
ldr r2, [r4, #0x4c]
adc r5, r5, #0
@@ -805,14 +805,14 @@ func_ov33_0217c66c: ; 0x0217c66c
str r2, [r4, #0x4c]
ldr r5, [r7]
ldmib r7, {r2, lr}
umull sb, r8, lr, r5
umull r9, r8, lr, r5
mla r8, lr, r2, r8
ldr ip, [r7, #0xc]
ldr fp, [r7, #0x10]
ldr r11, [r7, #0x10]
mla r8, ip, r5, r8
ldr sl, [r7, #0x14]
adds r2, fp, sb
adc r8, sl, r8
ldr r10, [r7, #0x14]
adds r2, r11, r9
adc r8, r10, r8
stmia r7, {r2, r8}
umull r5, r7, r8, r6
mla r7, r8, r1, r7
@@ -832,7 +832,7 @@ func_ov33_0217c66c: ; 0x0217c66c
add r0, r2, r3
str r0, [r4, #0x50]
mov r0, r1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov33_0217c66c
_0217c7fc: .word 0x000002aa
@@ -2203,18 +2203,18 @@ _0217d984: .word func_ov33_0217d988
.global func_ov33_0217d988
arm_func_start func_ov33_0217d988
func_ov33_0217d988: ; 0x0217d988
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
ldr r0, [r4, #4]
cmp r0, #2
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r6, #0
mov r8, r4
add sb, r4, #8
add r9, r4, #8
mov r5, r6
_0217d9b0:
mov r0, sb
mov r0, r9
ldr ip, [r0]
ldrh r7, [r8, #0x12]
ldr ip, [ip]
@@ -2228,14 +2228,14 @@ _0217d9b0:
bl func_ov33_0217da08
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add r6, r6, #1
cmp r6, #3
add r8, r8, #0x18
add sb, sb, #0x18
add r9, r9, #0x18
blt _0217d9b0
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov33_0217d988
.global func_ov33_0217da08
@@ -3671,7 +3671,7 @@ _0217ecb0: .word 0x0000023d
.global func_ov33_0217ecb4
arm_func_start func_ov33_0217ecb4
func_ov33_0217ecb4: ; 0x0217ecb4
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x1c
mov r4, r0
ldrb r0, [r4, #0x16c]
@@ -3697,7 +3697,7 @@ _0217ed04:
mov r0, #0
strh r0, [r1, #0x82]
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0217ed18:
mov r0, r4
add r1, r4, #0x100
@@ -4046,7 +4046,7 @@ _0217f1b8:
ldr r1, [sp, #0xc]
mov r0, r0, lsl #0x1
smull r6, r5, r1, r7
adds sb, r6, #0x800
adds r9, r6, #0x800
ldrsh r3, [r3, r0]
str r2, [sp, #0x10]
ldr lr, [r4, #0x4c]
@@ -4055,7 +4055,7 @@ _0217f1b8:
adc ip, r5, #0
add lr, lr, r8
smull r5, r8, r1, r3
mov r1, sb, lsr #0xc
mov r1, r9, lsr #0xc
orr r1, r1, ip, lsl #20
add ip, r2, r1
adds r2, r5, #0x800
@@ -4164,7 +4164,7 @@ _0217f3ac:
_0217f3c0:
mov r0, #1
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov33_0217ecb4
_0217f3cc: .word data_027e0ffc
@@ -4468,7 +4468,7 @@ func_ov33_0217f70c: ; 0x0217f70c
.global func_ov33_0217f744
arm_func_start func_ov33_0217f744
func_ov33_0217f744: ; 0x0217f744
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r3, _0217f88c ; =0x00000666
mov r4, r0
@@ -4497,21 +4497,21 @@ func_ov33_0217f744: ; 0x0217f744
mov r1, r5
bl func_ov33_0217dec4
ldr r0, _0217f890 ; =data_027e0764
ldr fp, _0217f894 ; =data_02050f54
ldr r11, _0217f894 ; =data_02050f54
ldr r6, [r0, #8]
ldr lr, [r0]
ldr ip, [r0, #4]
umull r8, r7, r6, lr
ldr sl, [r0, #0x10]
ldr r10, [r0, #0x10]
mla r7, r6, ip, r7
ldr r5, [r0, #0xc]
ldr sb, [r0, #0x14]
ldr r9, [r0, #0x14]
mla r7, r5, lr, r7
adds r8, sl, r8
adds r8, r10, r8
ldr r5, _0217f890 ; =data_027e0764
mov r0, #0
str r0, [sp, #4]
adc r6, sb, r7
adc r6, r9, r7
str r8, [r5]
str r6, [r5, #4]
mov r5, r6, lsr #0x10
@@ -4524,10 +4524,10 @@ func_ov33_0217f744: ; 0x0217f744
mov r5, r5, asr #0x4
mov r7, r5, lsl #0x1
mov r5, r7, lsl #0x1
ldrsh r6, [fp, r5]
ldrsh r6, [r11, r5]
add r5, r7, #1
mov r5, r5, lsl #0x1
ldrsh r5, [fp, r5]
ldrsh r5, [r11, r5]
ldr r2, _0217f898 ; =data_027e0f94
mov r0, #0x7000
add r1, sp, #0
@@ -4549,7 +4549,7 @@ func_ov33_0217f744: ; 0x0217f744
bl func_ov33_0217f954
mov r0, #1
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov33_0217f744
_0217f88c: .word 0x00000666
asm/ov34.inc
+61 -61
View File
@@ -1,6 +1,64 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -13,7 +71,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f94
.extern data_027e0fc8
.extern data_027e0fe0
@@ -84,8 +141,8 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097968
.extern func_ov00_02097c18
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a6110
@@ -115,65 +172,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -250,5 +249,6 @@
.extern func_ov22_0217740c
.extern func_ov22_02177450
.extern func_ov22_0217746c
.extern gAdventureFlags
.extern strcpy
.extern strncpy
asm/ov34.s
+160 -160
View File
@@ -900,10 +900,10 @@ func_ov34_0217c920: ; 0x0217c920
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
_0217c950:
ldr r0, _0217cde8 ; =data_027e0f74
ldr r0, _0217cde8 ; =gAdventureFlags
mov r1, #0xd
ldr r0, [r0]
bl func_ov00_02097c18
bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
cmp r0, #0
beq _0217c998
ldrb r0, [r5, #0x2b]
@@ -1205,7 +1205,7 @@ _0217cd8c:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov34_0217c920
_0217cde8: .word data_027e0f74
_0217cde8: .word gAdventureFlags
_0217cdec: .word 0x00001e66
_0217cdf0: .word data_027e0d0c
_0217cdf4: .word data_ov34_021861a0
@@ -1621,58 +1621,58 @@ _0217d350: .word data_027e0d0c
.global func_ov34_0217d354
arm_func_start func_ov34_0217d354
func_ov34_0217d354: ; 0x0217d354
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
ldr r2, _0217d494 ; =data_ov34_021861a0
ldr r0, [r2, #0x190]
cmp r0, #0
bne _0217d454
ldr sl, [r2, #0x194]
cmp sl, #0
ldr r10, [r2, #0x194]
cmp r10, #0
beq _0217d470
ldr r1, _0217d498 ; =data_027e0764
ldr r0, _0217d49c ; =0x00000335
ldr r6, [r1]
ldmib r1, {r3, r5}
umull sb, r8, r5, r6
umull r9, r8, r5, r6
ldr r7, [r1, #0x10]
mla r8, r5, r3, r8
ldr r4, [r1, #0xc]
adds sb, r7, sb
adds r9, r7, r9
mla r8, r4, r6, r8
ldr r6, [r1, #0x14]
umull fp, r3, r5, sb
umull r11, r3, r5, r9
adc r8, r6, r8
adds ip, r7, fp
sub fp, sl, #1
umull sl, lr, r8, r0
adds ip, r7, r11
sub r11, r10, #1
umull r10, lr, r8, r0
mla r3, r5, r8, r3
str sl, [sp, #4]
mov sl, #0
str sb, [r1]
mla r3, r4, sb, r3
mla lr, r8, sl, lr
str r10, [sp, #4]
mov r10, #0
str r9, [r1]
mla r3, r4, r9, r3
mla lr, r8, r10, lr
str r8, [r1, #4]
adc r8, r6, r3
mov r3, sl
mov r3, r10
mla lr, r3, r0, lr
umull sb, r3, r8, r0
ldr sb, _0217d4a0 ; =0xfffffe66
add sb, lr, sb
str sb, [r2, #0x180]
mov sb, sl
mla r3, r8, sb, r3
mla r3, sb, r0, r3
ldr sb, _0217d4a0 ; =0xfffffe66
umull r9, r3, r8, r0
ldr r9, _0217d4a0 ; =0xfffffe66
add r9, lr, r9
str r9, [r2, #0x180]
mov r9, r10
mla r3, r8, r9, r3
mla r3, r9, r0, r3
ldr r9, _0217d4a0 ; =0xfffffe66
str ip, [r1]
add r3, r3, sb
umull sl, sb, r5, ip
mla sb, r5, r8, sb
mla sb, r4, ip, sb
add r3, r3, r9
umull r10, r9, r5, ip
mla r9, r5, r8, r9
mla r9, r4, ip, r9
str r8, [r1, #4]
str r3, [r2, #0x184]
adds r4, r7, sl
adc r5, r6, sb
adds r4, r7, r10
adc r5, r6, r9
stmia r1, {r4, r5}
umull r1, r4, r5, r0
mov r1, #0
@@ -1683,7 +1683,7 @@ func_ov34_0217d354: ; 0x0217d354
add r0, r4, r0
str r0, [r2, #0x188]
str r3, [r2, #0x190]
str fp, [r2, #0x194]
str r11, [r2, #0x194]
b _0217d470
_0217d454:
ldr r0, _0217d4a4 ; =data_ov00_020eec9c
@@ -1702,7 +1702,7 @@ _0217d470:
str r4, [sp]
bl func_ov34_0217ceb0
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_0217d354
_0217d494: .word data_ov34_021861a0
@@ -2937,7 +2937,7 @@ _0217e670: .word data_ov34_021861e0
.global func_ov34_0217e674
arm_func_start func_ov34_0217e674
func_ov34_0217e674: ; 0x0217e674
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r2, _0217e8b4 ; =data_027e0764
mov ip, #0xa5
ldr r3, [r2]
@@ -2945,46 +2945,46 @@ func_ov34_0217e674: ; 0x0217e674
umull r4, r5, r7, r3
mla r5, r7, r1, r5
ldr r6, [r2, #0xc]
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
mla r5, r6, r3, r5
adds sl, sb, r4
adds r10, r9, r4
ldr r8, [r2, #0x14]
umull r4, r1, r7, sl
umull r4, r1, r7, r10
adc r3, r8, r5
mla r1, r7, r3, r1
str sl, [r2]
mla r1, r6, sl, r1
adds r5, sb, r4
str r10, [r2]
mla r1, r6, r10, r1
adds r5, r9, r4
adc r4, r8, r1
str r3, [r2, #4]
umull sl, r1, r3, ip
mov fp, #0
mov sl, fp
mla r1, r3, sl, r1
mla r1, fp, ip, r1
umull r10, r1, r3, ip
mov r11, #0
mov r10, r11
mla r1, r3, r10, r1
mla r1, r11, ip, r1
str r5, [r2]
ldr ip, _0217e8b8 ; =0x00001001
add sl, r1, #0x29
add r10, r1, #0x29
umull r3, r1, r4, ip
mov r3, fp
mov r3, r11
mla r1, r4, r3, r1
mla r1, fp, ip, r1
mla r1, r11, ip, r1
umull ip, r3, r7, r5
mla r3, r7, r4, r3
mla r3, r6, r5, r3
add lr, r1, #0x1800
str r4, [r2, #4]
adds r5, sb, ip
adds r5, r9, ip
adc r4, r8, r3
str r5, [r2]
str r4, [r2, #4]
ldr r2, _0217e8bc ; =0x00005557
add r1, r0, #0x1000
umull r2, r3, r4, r2
mov r2, fp
mov r2, r11
mla r3, r4, r2, r3
ldr r2, _0217e8bc ; =0x00005557
mla r3, fp, r2, r3
mla r3, r11, r2, r3
ldr r2, _0217e8c0 ; =0xffffd555
add r2, r3, r2
mov r2, r2, lsl #0x10
@@ -3046,8 +3046,8 @@ _0217e7f4:
cmp r5, r4
strlt r4, [r1, #0xa70]
_0217e820:
mul r2, sl, r2
mul r1, sl, r3
mul r2, r10, r2
mul r1, r10, r3
add r2, r2, #0x800
mov r2, r2, asr #0xc
add r1, r1, #0x800
@@ -3082,7 +3082,7 @@ _0217e820:
mov r1, #1
strh r2, [r4, #0x82]
bl func_ov34_02183d14
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_0217e674
_0217e8b4: .word data_027e0764
@@ -3301,7 +3301,7 @@ _0217eb90: .word data_ov34_021861a0
.global func_ov34_0217eb94
arm_func_start func_ov34_0217eb94
func_ov34_0217eb94: ; 0x0217eb94
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
mov r4, r0
add r0, r4, #0x1000
@@ -3386,7 +3386,7 @@ _0217eccc:
mov r1, #3
bl func_ov34_0217be60
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217ece0:
add r0, r4, #0x1000
ldr r0, [r0, #0xaa0]
@@ -3397,7 +3397,7 @@ _0217ece0:
bl func_0202e310
cmp r0, #0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r1, r4, #0x1000
ldr r2, [r1, #0xa78]
add r0, sp, #0x10
@@ -3426,13 +3426,13 @@ _0217ece0:
and r4, r4, #0xff
strh r4, [sp, #0x10]
ldrh r1, [r1, #0x7e]
ldr sl, [r2, #0xd04]
ldr fp, _0217ee4c ; =data_027e0fe8
ldr r10, [r2, #0xd04]
ldr r11, _0217ee4c ; =data_027e0fe8
mov r1, r1, asr #0x4
mov r4, r1, lsl #0x1
mov r1, r4, lsl #0x1
ldrsh r6, [r3, r1]
str sl, [sp, #4]
str r10, [sp, #4]
ldr r5, [r2, #0xd08]
umull r8, r7, r6, r0
add r1, r4, #1
@@ -3440,7 +3440,7 @@ _0217ece0:
ldrsh r4, [r3, r1]
str r5, [sp, #8]
add r1, r5, #0x9a
ldr sb, [r2, #0xd0c]
ldr r9, [r2, #0xd0c]
mla r7, r6, ip, r7
mov r5, r6, asr #0x1f
adds r6, r8, #0x800
@@ -3450,7 +3450,7 @@ _0217ece0:
adc r5, r7, #0
mov r6, r6, lsr #0xc
orr r6, r6, r5, lsl #20
add r5, sl, r6
add r5, r10, r6
str r5, [sp, #4]
umull r6, r5, r4, r0
mla r5, r4, ip, r5
@@ -3460,11 +3460,11 @@ _0217ece0:
adc r0, r5, #0
mov r4, r4, lsr #0xc
orr r4, r4, r0, lsl #20
add r0, sb, r4
add r0, r9, r4
str r0, [sp, #0xc]
str ip, [sp]
ldr r1, _0217ee50 ; =0x47524f42
ldr r0, [fp]
ldr r0, [r11]
add r2, sp, #4
add r3, sp, #0x10
bl func_ov00_020c4048
@@ -3474,7 +3474,7 @@ _0217ece0:
mov r3, #0
bl func_ov00_020ceacc
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_0217eb94
_0217ee3c: .word data_027e0f94
@@ -3488,15 +3488,15 @@ _0217ee54: .word data_027e0ffc
.global func_ov34_0217ee58
arm_func_start func_ov34_0217ee58
func_ov34_0217ee58: ; 0x0217ee58
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0xc
mov r7, r0
mvn r5, #0x80000000
sub r0, r5, #0x80000000
add sb, r7, #0x1000
ldr sl, _0217ef80 ; =data_ov34_021861a0
str r0, [sb, #0xd74]
ldr r0, [sl, #0x78]
add r9, r7, #0x1000
ldr r10, _0217ef80 ; =data_ov34_021861a0
str r0, [r9, #0xd74]
ldr r0, [r10, #0x78]
mov r6, #0
cmp r0, #0
ble _0217eedc
@@ -3517,9 +3517,9 @@ _0217ee90:
bl func_01ff9ec0
cmp r0, r5
movlt r5, r0
strlt r6, [sb, #0xd74]
strlt r6, [r9, #0xd74]
_0217eecc:
ldr r0, [sl, #0x78]
ldr r0, [r10, #0x78]
add r6, r6, #1
cmp r6, r0
blt _0217ee90
@@ -3554,7 +3554,7 @@ _0217eedc:
ldr r0, [r1, #0x54]
cmp r0, r2
addne sp, sp, #0xc
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
cmp r2, #0
moveq r2, #1
ldr r0, _0217ef84 ; =data_ov34_021861e0
@@ -3564,7 +3564,7 @@ _0217eedc:
add r0, r0, #0x21c
bl func_ov34_0217be60
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov34_0217ee58
_0217ef80: .word data_ov34_021861a0
@@ -7544,10 +7544,10 @@ _02182814:
ldr r1, [r1, #0x54]
cmp r1, r0
bne _02182848
ldr r0, _02182afc ; =data_027e0f74
ldr r0, _02182afc ; =gAdventureFlags
mov r1, #0xd
ldr r0, [r0]
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
_02182848:
add r0, r4, #0xf8
add r0, r0, #0x1c00
@@ -7729,7 +7729,7 @@ _02182aec: .word 0x00003b33
_02182af0: .word 0x00001003
_02182af4: .word data_027e0e58
_02182af8: .word data_ov34_021861a0
_02182afc: .word data_027e0f74
_02182afc: .word gAdventureFlags
_02182b00: .word 0x00001005
_02182b04: .word 0x00001006
_02182b08: .word 0x00001004
@@ -8450,42 +8450,42 @@ _02183470: .word data_027e0194
.global func_ov34_02183474
arm_func_start func_ov34_02183474
func_ov34_02183474: ; 0x02183474
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xa8
mov sl, r0
add r0, sl, #0x1d00
mov r10, r0
add r0, r10, #0x1d00
ldrsh r1, [r0, #0x80]
add r0, sl, #0x7e
add r0, r10, #0x7e
add r0, r0, #0x1d00
mov r2, #0x200
bl func_0202b154
add r1, sl, #0x1d00
add r0, sl, #0x17c
add r1, r10, #0x1d00
add r0, r10, #0x17c
ldrsh r1, [r1, #0x82]
add r0, r0, #0x1c00
mov r2, #0x200
bl func_0202b154
add r2, sl, #0x128
add r2, r10, #0x128
ldr r1, _02183cf8 ; =data_ov34_0218577c
add r0, sl, #0x48
add r0, r10, #0x48
add r2, r2, #0x1c00
bl func_01ff9bc4
add r4, sl, #0x1000
add r4, r10, #0x1000
ldrb r0, [r4, #0xd88]
cmp r0, #0
addeq sp, sp, #0xa8
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
add r0, sl, #0x304
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r10, #0x304
add r2, r0, #0x1800
add r0, sl, #0x1b40
add r1, sl, #0xba0
add r0, r10, #0x1b40
add r1, r10, #0xba0
add r1, r1, #0x1000
str r0, [sp, #4]
add r7, r0, #0x40
add r0, sl, #0xb90
ldr fp, _02183cfc ; =0x000002cb
add r0, r10, #0xb90
ldr r11, _02183cfc ; =0x000002cb
add r6, r2, #0x30
add sb, r1, #0x90
add r9, r1, #0x90
mov r5, #4
mov r8, #0x84
str r0, [sp, #0x2c]
@@ -8514,7 +8514,7 @@ _02183510:
add r1, sp, #0x90
add r2, sp, #0x9c
bl func_ov00_020d5f98
add r0, sl, r5, lsl #4
add r0, r10, r5, lsl #4
add r2, r0, #0x1000
ldr r1, [r2, #0xb40]
str r0, [sp, #8]
@@ -8569,7 +8569,7 @@ _02183510:
_02183640:
mov r0, r7
add r1, sp, #0x80
mov r2, fp
mov r2, r11
bl func_ov00_020d59f0
rsb r0, r5, #4
rsb r0, r0, r0, lsl #5
@@ -8602,17 +8602,17 @@ _02183690:
mov r0, r7
bl func_ov00_020d5c54
mov r0, r7
mov r1, sb
mov r1, r9
bl func_ov00_020d5cd8
sub r5, r5, #1
sub r6, r6, #0xc
sub fp, fp, #0x66
sub r11, r11, #0x66
sub r7, r7, #0x10
sub r8, r8, #0x21
sub sb, sb, #0x24
sub r9, r9, #0x24
cmp r5, #0
bgt _02183510
add r0, sl, #0x1000
add r0, r10, #0x1000
ldr r1, [r0, #0xd30]
ldr r0, [r0, #0xab8]
sub r0, r1, r0
@@ -8625,7 +8625,7 @@ _02183710:
mov r1, #0xc000
bl Divide
ldr r1, _02183d04 ; =0x00005555
ldr r2, [sl, #0x22c]
ldr r2, [r10, #0x22c]
mul r3, r0, r1
sub r0, r1, #0x8000
add r0, r0, r3, asr #12
@@ -8634,7 +8634,7 @@ _02183710:
cmp r1, #4
mov r0, r0, asr #0x10
bhi _0218398c
add r2, sl, #0x1d00
add r2, r10, #0x1d00
ldrsh r1, [r2, #0x86]
mov ip, #0
add r0, r0, r0, lsr #31
@@ -8662,8 +8662,8 @@ _02183710:
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
mov sb, r6, lsl #0x1
add r6, sb, #1
mov r9, r6, lsl #0x1
add r6, r9, #1
mov r8, r6, lsl #0x1
add r0, r1, #1
mov r2, r1, lsl #0x1
@@ -8673,18 +8673,18 @@ _02183710:
ldrsh r2, [r4, #2]
ldrsh r1, [r4, r1]
smull r7, r5, r0, r3
mov r6, sb, lsl #0x1
ldrsh fp, [r4, r8]
mov r6, r9, lsl #0x1
ldrsh r11, [r4, r8]
ldrsh r8, [r4, r6]
adds r7, r7, #0x800
smull sb, r4, r1, r2
smull r9, r4, r1, r2
adc r6, r5, #0
adds r5, sb, #0x800
mov sb, r7, lsr #0xc
adds r5, r9, #0x800
mov r9, r7, lsr #0xc
adc r4, r4, #0
mov r7, r5, lsr #0xc
orr r7, r7, r4, lsl #20
orr sb, sb, r6, lsl #20
orr r9, r9, r6, lsl #20
smull r6, r5, r7, r8
smull r4, r3, r1, r3
adds r6, r6, #0x800
@@ -8692,15 +8692,15 @@ _02183710:
adc r0, r5, #0
mov r5, r6, lsr #0xc
orr r5, r5, r0, lsl #20
mov r0, fp, asr #0x1f
mov r0, r11, asr #0x1f
str r0, [sp, #0x18]
mov r0, sb, asr #0x1f
mov r0, r9, asr #0x1f
str r0, [sp, #0x1c]
mov r0, r8, asr #0x1f
str r0, [sp, #0x20]
mov r0, r7, asr #0x1f
str r0, [sp, #0x24]
smull r0, r6, sb, fp
smull r0, r6, r9, r11
adds r0, r0, #0x800
adc r6, r6, #0
mov r0, r0, lsr #0xc
@@ -8717,7 +8717,7 @@ _02183710:
orr r6, r6, r0, lsl #20
mov r0, r6, asr #0x1f
str r0, [sp, #0x28]
smull r1, r0, r6, fp
smull r1, r0, r6, r11
adds r2, r1, #0x800
adc r1, r0, #0
mov r0, r2, lsr #0xc
@@ -8730,14 +8730,14 @@ _02183710:
add r0, r0, r2
mov lr, r4, asr #0x1f
str r0, [sp, #0x84]
umull r5, r3, r4, fp
umull r5, r3, r4, r11
str r5, [sp, #0x34]
ldr r5, [sp, #0x18]
ldr r2, _02183d0c ; =0x00000333
mla r3, r4, r5, r3
mla r3, lr, fp, r3
mla r3, lr, r11, r3
ldr r4, [sp, #0x34]
add r0, sl, #0x1b40
add r0, r10, #0x1b40
adds r4, r4, #0x800
mov r5, r4, lsr #0xc
adc r3, r3, ip
@@ -8754,19 +8754,19 @@ _02183710:
sub r3, r5, r4
str r3, [sp, #0x88]
ldr r5, [sp, #0x18]
umull r4, r3, r7, fp
umull r4, r3, r7, r11
mla r3, r7, r5, r3
ldr r5, [sp, #0x24]
add r1, sp, #0x80
mla r3, r5, fp, r3
mla r3, r5, r11, r3
adds r5, r4, #0x800
adc r4, r3, ip
mov r3, r5, lsr #0xc
orr r3, r3, r4, lsl #20
umull r6, r5, sb, r8
umull r6, r5, r9, r8
ldr r4, [sp, #0x20]
adds r6, r6, #0x800
mla r5, sb, r4, r5
mla r5, r9, r4, r5
ldr r4, [sp, #0x1c]
mla r5, r4, r8, r5
adc r4, r5, ip
@@ -8775,14 +8775,14 @@ _02183710:
add r3, r3, r5
str r3, [sp, #0x8c]
bl func_ov00_020d59f0
add r2, sl, #0x1000
add r2, r10, #0x1000
ldr r2, [r2, #0xd64]
add r0, sl, #0x1b40
add r0, r10, #0x1b40
add r1, sp, #0x60
bl func_ov00_020d59f0
b _02183b3c
_0218398c:
add r1, sl, #0x1d00
add r1, r10, #0x1d00
ldrsh r1, [r1, #0x86]
ldr r5, _02183d08 ; =data_02050f54
add r4, r0, r0, lsr #31
@@ -8799,7 +8799,7 @@ _0218398c:
ldrsh r2, [r5, #2]
ldrsh r1, [r5, r1]
smull r6, r7, r0, r3
adds fp, r6, #0x800
adds r11, r6, #0x800
mov r4, r4, lsl #0xf
mov r4, r4, lsr #0x10
mov r4, r4, asr #0x4
@@ -8808,18 +8808,18 @@ _0218398c:
mov r4, r4, lsl #0x1
mov r8, r6, lsl #0x1
smull ip, r6, r1, r2
adc sb, r7, #0
adc r9, r7, #0
adds r7, ip, #0x800
mov fp, fp, lsr #0xc
mov r11, r11, lsr #0xc
ldrsh ip, [r5, r4]
orr fp, fp, sb, lsl #20
ldrsh sb, [r5, r8]
orr r11, r11, r9, lsl #20
ldrsh r9, [r5, r8]
adc r4, r6, #0
mov r8, r7, lsr #0xc
orr r8, r8, r4, lsl #20
smull r4, r6, r8, sb
smull r4, r6, r8, r9
adds r7, r4, #0x800
smull r5, r4, fp, ip
smull r5, r4, r11, ip
smull r3, lr, r1, r3
smull r2, r1, r0, r2
adc r0, r6, #0
@@ -8844,16 +8844,16 @@ _0218398c:
adc r3, r0, #0
mov r0, r4, lsr #0xc
orr r0, r0, r3, lsl #20
smull r5, r4, r1, sb
smull r5, r4, r1, r9
smull r3, r1, r8, ip
smull r7, r6, r2, ip
smull ip, r8, r2, sb
smull sb, r2, fp, sb
adds fp, ip, #0x800
smull ip, r8, r2, r9
smull r9, r2, r11, r9
adds r11, ip, #0x800
adc r8, r8, #0
mov fp, fp, lsr #0xc
orr fp, fp, r8, lsl #20
add r0, r0, fp
mov r11, r11, lsr #0xc
orr r11, r11, r8, lsl #20
add r0, r0, r11
str r0, [sp, #0x84]
adds r7, r7, #0x800
adc r0, r6, #0
@@ -8869,7 +8869,7 @@ _0218398c:
adc r0, r1, #0
mov r3, r3, lsr #0xc
orr r3, r3, r0, lsl #20
adds r1, sb, #0x800
adds r1, r9, #0x800
adc r0, r2, #0
mov r1, r1, lsr #0xc
orr r1, r1, r0, lsl #20
@@ -8877,28 +8877,28 @@ _0218398c:
str r0, [sp, #0x8c]
ldr r2, _02183d0c ; =0x00000333
add r1, sp, #0x80
add r0, sl, #0x1b40
add r0, r10, #0x1b40
bl func_ov00_020d59f0
add r0, sl, #0x1000
add r0, r10, #0x1000
ldr r2, [r0, #0xd64]
ldr r1, _02183d00 ; =data_ov34_021861cc
add r0, sl, #0x1b40
add r0, r10, #0x1b40
bl func_ov00_020d59f0
add r1, sl, #0x1d00
add r0, sl, #0x86
add r1, r10, #0x1d00
add r0, r10, #0x86
ldrsh r1, [r1, #0x7e]
add r0, r0, #0x1d00
mov r2, #0x100
bl func_0202b154
_02183b3c:
add r0, sl, #0x1b40
add r0, r10, #0x1b40
bl func_ov00_020d5c54
add r1, sl, #0xba0
add r0, sl, #0x1b40
add r1, r10, #0xba0
add r0, r10, #0x1b40
add r1, r1, #0x1000
bl func_ov00_020d5cd8
ldr r0, _02183d10 ; =data_ov34_02185740
add r3, sl, #0x1000
add r3, r10, #0x1000
ldr r2, [r0, #0x24]
ldr r1, [r0, #0x28]
str r2, [sp, #0x9c]
@@ -8915,7 +8915,7 @@ _02183b3c:
ldr r3, [r3, #0xd18]
str r3, [sp, #0x98]
bl func_ov00_020d5f98
add r2, sl, #0x1000
add r2, r10, #0x1000
ldr r1, [r2, #0xb90]
add r0, sp, #0x80
str r1, [sp, #0x70]
@@ -8932,15 +8932,15 @@ _02183b3c:
str r0, [sp, #0xa0]
mov r0, #0x1000
str r0, [sp, #0xa4]
add r0, sl, #0x1d00
add r0, r10, #0x1d00
ldrsh r1, [r0, #0x7c]
add r0, sp, #0x9c
bl func_ov00_020a6110
add r1, sl, #0x1d00
add r1, r10, #0x1d00
ldrsh r1, [r1, #0x7e]
add r0, sp, #0x9c
bl func_ov00_020a61ac
add r2, sl, #0x1000
add r2, r10, #0x1000
ldr r1, [r2, #0xd1c]
add r0, sp, #0x50
str r1, [sp, #0x90]
@@ -8954,7 +8954,7 @@ _02183b3c:
add r0, sp, #0x50
add r1, sp, #0x80
bl func_ov00_020d5dc4
add r0, sl, #0x1000
add r0, r10, #0x1000
ldr r7, [r0, #0xb9c]
ldr r5, [r0, #0xb98]
ldr r3, [r0, #0xb90]
@@ -8982,27 +8982,27 @@ _02183b3c:
str r1, [sp, #0x54]
str r0, [sp, #0x58]
_02183ca4:
add r0, sl, #0xb90
add r0, r10, #0xb90
add r1, sp, #0x50
add r0, r0, #0x1000
mov r2, #0xc00
bl func_ov00_020d59f0
add r1, sl, #0x1000
add r0, sl, #0xb90
add r1, r10, #0x1000
add r0, r10, #0xb90
ldr r2, [r1, #0xd64]
ldr r1, _02183d00 ; =data_ov34_021861cc
add r0, r0, #0x1000
bl func_ov00_020d59f0
add r0, sl, #0xb90
add r0, r10, #0xb90
add r0, r0, #0x1000
bl func_ov00_020d5c54
add r0, sl, #0xb90
add r1, sl, #0x54
add r0, r10, #0xb90
add r1, r10, #0x54
add r0, r0, #0x1000
add r1, r1, #0x1c00
bl func_ov00_020d5cd8
add sp, sp, #0xa8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_02183474
_02183cf8: .word data_ov34_0218577c
asm/ov35.inc
+8 -8
View File
@@ -80,7 +80,6 @@
.extern data_027e0e58
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
@@ -171,13 +170,13 @@
.extern func_ov00_02089318
.extern func_ov00_0208b158
.extern func_ov00_0208e7a4
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern func_ov00_02097ff4
.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
@@ -296,5 +295,6 @@
.extern func_ov14_02123904
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov35.s
+323 -323
View File
File diff suppressed because it is too large Load Diff
asm/ov36.inc
+70 -70
View File
@@ -3,6 +3,67 @@
.extern Divide
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14StopLinkFollowEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -18,7 +79,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
@@ -117,14 +177,14 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern func_ov00_02097c18
.extern func_ov00_0209809c
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
@@ -165,68 +225,7 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor14StopLinkFollowEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c54a0
.extern func_ov00_020c5c2c
@@ -268,5 +267,6 @@
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern func_ov19_0216e7b0
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov36.s
+278 -278
View File
File diff suppressed because it is too large Load Diff
asm/ov37.inc
+2 -2
View File
@@ -75,7 +75,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
@@ -156,7 +155,7 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097968
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
@@ -275,5 +274,6 @@
.extern func_ov14_02146634
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov37.s
+486 -486
View File
File diff suppressed because it is too large Load Diff
asm/ov38.inc
+60 -60
View File
@@ -1,6 +1,58 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -18,7 +70,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f94
.extern data_027e0fc8
.extern data_027e0fe0
@@ -113,13 +164,13 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern func_ov00_02097c18
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a6110
@@ -149,59 +200,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -272,5 +271,6 @@
.extern func_ov29_021772f8
.extern func_ov29_02178670
.extern func_ov57_02199e24
.extern gAdventureFlags
.extern gItemManager
.extern strcpy

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