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

Merge pull request #28 from AetiasHax/adventure-flags

Browse Source 
Delink `AdventureFlags`
This commit is contained in:
AetiasHax
2024-04-16 20:56:07 +02:00
committed by GitHub
parent 3078b4d110 42e47a1041
commit bdeea7c6fc
115 changed files with 37995 additions and 37429 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/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
+19 -19
View File
@@ -10266,7 +10266,7 @@ _02007e98:
adds r7, r10, r7, asr #4
beq _02007ee0
_02007ec8:
ldrb r10, [r3, -sb]
ldrb r10, [r3, -r9]
sub r4, r4, #1
.word 0xe143a09a
add r3, r3, #1
@@ -50324,13 +50324,13 @@ _02025e90:
ldr r7, _02026020 ; =data_020626a0
add r9, r1, ip
ldmia r10!, {r0, r1, r2, r3}
stmia sb!, {r0, r1, r2, r3}
stmia r9!, {r0, r1, r2, r3}
ldmia r10, {r0, r1}
stmia r9, {r0, r1}
add r9, r8, lr
ldr r4, [r7, r4, lsl #2]
add r8, r8, ip
ldmia sb!, {r0, r1, r2, r3}
ldmia r9!, {r0, r1, r2, r3}
stmia r8!, {r0, r1, r2, r3}
str r4, [r7, r6, lsl #2]
ldmia r9, {r0, r1}
@@ -76426,10 +76426,10 @@ _02037d04:
mov r0, r0, asr #0x18
ldmia sp!, {r4, r5, r6, pc}
_02037d10:
ldr r0, _02037f48 ; =data_027e0f74
ldr r0, _02037f48 ; =gAdventureFlags
ldrh r1, [r4, #4]
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
moveq r0, #1
@@ -76580,7 +76580,7 @@ _02037f30:
_02037f3c: .word data_027e0d54
_02037f40: .word data_027e0c68
_02037f44: .word data_027e0764
_02037f48: .word data_027e0f74
_02037f48: .word gAdventureFlags
_02037f4c: .word data_027e0cb4
_02037f50: .word gItemManager
_02037f54: .word data_027e0fe4
@@ -76722,20 +76722,20 @@ _02038114:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
_0203812c:
ldr r0, _02038578 ; =data_027e0f74
ldr r0, _02038578 ; =gAdventureFlags
ldr r1, [r4, #4]
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
add sp, sp, #0x18
mov r0, #2
ldmia sp!, {r3, r4, r5, pc}
_0203814c:
ldr r0, _02038578 ; =data_027e0f74
ldr r0, _02038578 ; =gAdventureFlags
ldr r1, [r4, #4]
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
add sp, sp, #0x18
mov r0, #2
ldmia sp!, {r3, r4, r5, pc}
@@ -77030,7 +77030,7 @@ _02038568:
.align 2, 0
arm_func_end func_02037f58
_02038574: .word data_027e103c
_02038578: .word data_027e0f74
_02038578: .word gAdventureFlags
_0203857c: .word data_027e0fc8
_02038580: .word 0x00007fff
_02038584: .word data_027e0cb4
@@ -81023,12 +81023,12 @@ func_0203b5d0: ; 0x0203b5d0
bl func_0203c084
cmp r0, #0
bne _0203b628
bl func_ov00_02097628
bl _ZN14AdventureFlags6ExistsEv
cmp r0, #0
beq _0203b630
ldr r0, _0203b760 ; =data_027e0f74
ldr r0, _0203b760 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _0203b630
_0203b628:
@@ -81116,7 +81116,7 @@ _0203b700:
.align 2, 0
arm_func_end func_0203b5d0
_0203b75c: .word data_027e0db0
_0203b760: .word data_027e0f74
_0203b760: .word gAdventureFlags
.global func_0203b764
arm_func_start func_0203b764
@@ -81712,9 +81712,9 @@ _0203bf68:
ldrb r0, [r4, #0x50]
cmp r0, #0
bne _0203bfcc
ldr r0, _0203c07c ; =data_027e0f74
ldr r0, _0203c07c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0203bfcc
ldr r0, _0203c080 ; =data_027e0db0
@@ -81772,7 +81772,7 @@ _0203c06c: .word data_027e0618
_0203c070: .word data_027e103c
_0203c074: .word data_027e077c
_0203c078: .word data_02056be4
_0203c07c: .word data_027e0f74
_0203c07c: .word gAdventureFlags
_0203c080: .word data_027e0db0
.global func_0203c084
@@ -108450,7 +108450,7 @@ func_0204f120: ; 0x0204f120
ldr r0, [r6, #0x18]
str r0, [sp, #0x4c]
_0204f1a8:
ldmia sb!, {r0, r1, r2, r3}
ldmia r9!, {r0, r1, r2, r3}
stmia r8!, {r0, r1, r2, r3}
subs r7, r7, #1
bne _0204f1a8
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/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
@@ -557,10 +557,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
@@ -569,11 +569,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
@@ -582,11 +582,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
@@ -595,11 +595,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
@@ -608,11 +608,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
@@ -622,11 +622,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
@@ -636,11 +636,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
@@ -653,11 +653,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
@@ -666,11 +666,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
@@ -731,11 +731,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]
@@ -751,25 +751,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
@@ -881,42 +881,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
@@ -971,22 +971,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
@@ -994,18 +994,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/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
+11 -11
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
@@ -752,14 +752,14 @@ _ZN13PlayerControl18func_ov00_020af778Ev: ; 0x020af778
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:
@@ -969,7 +969,7 @@ _020afaa8:
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
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
+3 -3
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
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
+25 -32916
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_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
+54 -54
View File
@@ -824,16 +824,16 @@ _020b1e94: .word data_027e0c68
.global func_ov00_020b1e98
arm_func_start func_ov00_020b1e98
func_ov00_020b1e98: ; 0x020b1e98
ldr r1, _020b1eb0 ; =data_027e0f74
ldr r1, _020b1eb0 ; =gAdventureFlags
mov r2, r0
ldr r0, [r1]
ldr ip, _020b1eb4 ; =func_ov00_02097b9c
ldr ip, _020b1eb4 ; =_ZN14AdventureFlags18func_ov00_02097b9cEv
ldr r1, [r2, #0x38]
bx ip
.align 2, 0
arm_func_end func_ov00_020b1e98
_020b1eb0: .word data_027e0f74
_020b1eb4: .word func_ov00_02097b9c
_020b1eb0: .word gAdventureFlags
_020b1eb4: .word _ZN14AdventureFlags18func_ov00_02097b9cEv
.global func_ov00_020b1eb8
arm_func_start func_ov00_020b1eb8
@@ -1288,11 +1288,11 @@ _020b23e0:
bl func_ov03_020f3f94
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _020b2498 ; =data_027e0f74
ldr r0, _020b2498 ; =gAdventureFlags
mov r1, #0x104
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r3, r4, r5, pc}
_020b243c:
bl func_ov05_021089c0
@@ -1325,7 +1325,7 @@ _020b2488: .word data_ov00_020eec68
_020b248c: .word 0x00000129
_020b2490: .word data_027e0f64
_020b2494: .word data_ov09_0211f5b4
_020b2498: .word data_027e0f74
_020b2498: .word gAdventureFlags
_020b249c: .word 0x0000099a
.global func_ov00_020b24a0
@@ -2061,16 +2061,16 @@ func_ov00_020b2e84: ; 0x020b2e84
ldr r1, [r4, #0x38]
cmp r1, #0
blt _020b2ea4
ldr r0, _020b2eb0 ; =data_027e0f74
ldr r0, _020b2eb0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_020b2ea4:
mvn r0, #0
str r0, [r4, #0x38]
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020b2e84
_020b2eb0: .word data_027e0f74
_020b2eb0: .word gAdventureFlags
.global func_ov00_020b2eb4
arm_func_start func_ov00_020b2eb4
@@ -2342,7 +2342,7 @@ _020b31cc:
add r0, sp, #0x18
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _020b3274 ; =data_027e0f74
ldr r0, _020b3274 ; =gAdventureFlags
mvn r4, #0
mov r3, #0x19
ldr r0, [r0]
@@ -2352,7 +2352,7 @@ _020b31cc:
strb r2, [sp, #0x22]
strb r2, [sp, #0x23]
strb r2, [sp, #0x2e]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r7, #0x38]
cmp r0, #0
add r0, sp, #0x18
@@ -2376,7 +2376,7 @@ _020b325c:
_020b3268: .word data_027e0d38
_020b326c: .word data_027e077c
_020b3270: .word data_027e0e60
_020b3274: .word data_027e0f74
_020b3274: .word gAdventureFlags
.global func_ov00_020b3278
arm_func_start func_ov00_020b3278
@@ -2894,12 +2894,12 @@ _020b3968:
strb r3, [sp, #0x22]
strb r3, [sp, #0x23]
ldrb r2, [r4, #0xa8]
ldr r0, _020b3d4c ; =data_027e0f74
ldr r0, _020b3d4c ; =gAdventureFlags
add r1, sp, #0x18
strb r2, [sp, #0x2e]
strb r3, [r4, #0xa8]
ldr r0, [r0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x38]
add r0, sp, #0x18
bl func_ov00_0209a508
@@ -3130,7 +3130,7 @@ _020b3ce4:
.align 2, 0
arm_func_end func_ov00_020b38dc
_020b3d48: .word data_027e0d38
_020b3d4c: .word data_027e0f74
_020b3d4c: .word gAdventureFlags
_020b3d50: .word data_02050f54
_020b3d54: .word 0xffffee66
_020b3d58: .word data_027e0618
@@ -5414,14 +5414,14 @@ _020b57a0:
ldrb r0, [r6, #0x56]
cmp r0, #0
bne _020b5a04
ldr r0, _020b5c8c ; =data_027e0f74
ldr r0, _020b5c8c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020b5a04
ldr r0, _020b5c8c ; =data_027e0f74
ldr r0, _020b5c8c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
ldreqsh r0, [r6, #0x5a]
cmpeq r0, #0
@@ -5739,7 +5739,7 @@ _020b5c68:
_020b5c80: .word data_027e0fb8
_020b5c84: .word 0x0000071c
_020b5c88: .word data_02050f54
_020b5c8c: .word data_027e0f74
_020b5c8c: .word gAdventureFlags
_020b5c90: .word 0x00000ccd
_020b5c94: .word data_027e0fc8
_020b5c98: .word data_027e0e60
@@ -9270,14 +9270,14 @@ _020b8970:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_020b8978:
ldr r0, _020b8b84 ; =data_027e0f74
ldr r0, _020b8b84 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020b8a04
ldr r0, _020b8b84 ; =data_027e0f74
ldr r0, _020b8b84 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
bne _020b8a04
ldrb r0, [r10, #0x11c]
@@ -9415,7 +9415,7 @@ _020b8b70:
_020b8b78: .word data_027e0618
_020b8b7c: .word data_027e0f90
_020b8b80: .word data_027e0f64
_020b8b84: .word data_027e0f74
_020b8b84: .word gAdventureFlags
_020b8b88: .word gItemManager
_020b8b8c: .word data_ov00_020e8b08
@@ -10006,14 +10006,14 @@ func_ov00_020b9330: ; 0x020b9330
add sp, sp, #0x40
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020b9384:
ldr r0, _020b9740 ; =data_027e0f74
ldr r0, _020b9740 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020b93b0
ldr r0, _020b9740 ; =data_027e0f74
ldr r0, _020b9740 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
moveq r0, #0
streqb r0, [r7, #0x28e]
@@ -10262,7 +10262,7 @@ _020b9738:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov00_020b9330
_020b9740: .word data_027e0f74
_020b9740: .word gAdventureFlags
_020b9744: .word data_027e0c68
_020b9748: .word data_027e0fc8
_020b974c: .word data_027e0f94
@@ -11576,9 +11576,9 @@ _020ba8b8:
addeq sp, sp, #0x24
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc}
ldr r0, _020bac54 ; =data_027e0f74
ldr r0, _020bac54 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _020ba914
ldr r0, _020bac58 ; =data_027e0c68
@@ -11804,7 +11804,7 @@ _020bac10:
.align 2, 0
arm_func_end func_ov00_020ba874
_020bac50: .word data_027e0fc8
_020bac54: .word data_027e0f74
_020bac54: .word gAdventureFlags
_020bac58: .word data_027e0c68
_020bac5c: .word data_ov00_020eec9c
_020bac60: .word data_027e0f94
@@ -13266,9 +13266,9 @@ func_ov00_020bbbd0: ; 0x020bbbd0
cmp r0, #0
movne r6, #0
_020bbc00:
ldr r0, _020bbc60 ; =data_027e0f74
ldr r0, _020bbc60 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _020bbc64 ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -13292,7 +13292,7 @@ _020bbc00:
arm_func_end func_ov00_020bbbd0
_020bbc58: .word data_027e0618
_020bbc5c: .word data_ov09_0211f5b4
_020bbc60: .word data_027e0f74
_020bbc60: .word gAdventureFlags
_020bbc64: .word data_027e0c68
.global func_ov00_020bbc68
@@ -13649,9 +13649,9 @@ func_ov00_020bc0a8: ; 0x020bc0a8
addeq sp, sp, #0x18
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldr r0, _020bc1b8 ; =data_027e0f74
ldr r0, _020bc1b8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
@@ -13708,7 +13708,7 @@ _020bc114:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_020bc0a8
_020bc1b8: .word data_027e0f74
_020bc1b8: .word gAdventureFlags
_020bc1bc: .word data_027e0fa0
_020bc1c0: .word data_ov00_020dc858
_020bc1c4: .word data_027e0fb8
@@ -14352,7 +14352,7 @@ _020bc95c: .word data_027e0e60
func_ov00_020bc960: ; 0x020bc960
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x18
ldr r4, _020bca44 ; =data_027e0f74
ldr r4, _020bca44 ; =gAdventureFlags
mov r8, #0
mov r7, r0
sub lr, r8, #2
@@ -14371,12 +14371,12 @@ func_ov00_020bc960: ; 0x020bc960
strb r8, [sp, #0x13]
strb r8, [sp, #0x14]
strb r8, [sp, #0x15]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020bca38
ldr r0, _020bca44 ; =data_027e0f74
ldr r0, _020bca44 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
bne _020bca38
mov r0, r7
@@ -14410,7 +14410,7 @@ _020bca38:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov00_020bc960
_020bca44: .word data_027e0f74
_020bca44: .word gAdventureFlags
_020bca48: .word data_027e0fe4
.global func_ov00_020bca4c
@@ -14649,7 +14649,7 @@ func_ov00_020bccc8: ; 0x020bccc8
add r0, sp, #0
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _020bcda4 ; =data_027e0f74
ldr r0, _020bcda4 ; =gAdventureFlags
mvn ip, #0
mov r3, #1
ldr r0, [r0]
@@ -14659,7 +14659,7 @@ func_ov00_020bccc8: ; 0x020bccc8
strb r2, [sp, #0xa]
strb r2, [sp, #0xb]
strb r4, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
ldr r1, _020bcda8 ; =gItemManager
str r0, [r5, #0x38]
ldr r0, [r1]
@@ -14698,7 +14698,7 @@ _020bcd94:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020bccc8
_020bcda4: .word data_027e0f74
_020bcda4: .word gAdventureFlags
_020bcda8: .word gItemManager
_020bcdac: .word data_027e103c
_020bcdb0: .word data_027e0d38
@@ -14712,16 +14712,16 @@ func_ov00_020bcdb8: ; 0x020bcdb8
bl func_ov00_020bbb64
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _020bcde8 ; =data_027e0f74
ldr r0, _020bcde8 ; =gAdventureFlags
ldr r1, [r4, #0x38]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x38]
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020bcdb8
_020bcde8: .word data_027e0f74
_020bcde8: .word gAdventureFlags
.global func_ov00_020bcdec
arm_func_start func_ov00_020bcdec
@@ -16492,10 +16492,10 @@ _020be338:
_020be37c:
cmp r4, #0
beq _020be39c
ldr r0, _020be408 ; =data_027e0f74
ldr r0, _020be408 ; =gAdventureFlags
mov r1, r4
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
_020be39c:
@@ -16529,7 +16529,7 @@ _020be3e4:
arm_func_end func_ov00_020be294
_020be400: .word data_027e0fc8
_020be404: .word data_027e0e60
_020be408: .word data_027e0f74
_020be408: .word gAdventureFlags
.global func_ov00_020be40c
arm_func_start func_ov00_020be40c
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
+51 -51
View File
@@ -10969,15 +10969,15 @@ func_ov00_020cc8dc: ; 0x020cc8dc
arm_func_start func_ov00_020cc908
func_ov00_020cc908: ; 0x020cc908
stmdb sp!, {r4, lr}
ldr r2, _020cc924 ; =data_027e0f74
ldr r2, _020cc924 ; =gAdventureFlags
mov r4, r0
ldr r0, [r2]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x218]
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020cc908
_020cc924: .word data_027e0f74
_020cc924: .word gAdventureFlags
.global func_ov00_020cc928
arm_func_start func_ov00_020cc928
@@ -10993,45 +10993,45 @@ func_ov00_020cc928: ; 0x020cc928
.global func_ov00_020cc940
arm_func_start func_ov00_020cc940
func_ov00_020cc940: ; 0x020cc940
ldr r1, _020cc958 ; =data_027e0f74
ldr r1, _020cc958 ; =gAdventureFlags
mov r2, r0
ldr r0, [r1]
ldr ip, _020cc95c ; =func_ov00_02097b9c
ldr ip, _020cc95c ; =_ZN14AdventureFlags18func_ov00_02097b9cEv
ldr r1, [r2, #0x218]
bx ip
.align 2, 0
arm_func_end func_ov00_020cc940
_020cc958: .word data_027e0f74
_020cc95c: .word func_ov00_02097b9c
_020cc958: .word gAdventureFlags
_020cc95c: .word _ZN14AdventureFlags18func_ov00_02097b9cEv
.global func_ov00_020cc960
arm_func_start func_ov00_020cc960
func_ov00_020cc960: ; 0x020cc960
ldr r1, _020cc978 ; =data_027e0f74
ldr r1, _020cc978 ; =gAdventureFlags
mov r2, r0
ldr r0, [r1]
ldr ip, _020cc97c ; =func_ov00_02097bcc
ldr ip, _020cc97c ; =_ZN14AdventureFlags18func_ov00_02097bccEv
ldr r1, [r2, #0x218]
bx ip
.align 2, 0
arm_func_end func_ov00_020cc960
_020cc978: .word data_027e0f74
_020cc97c: .word func_ov00_02097bcc
_020cc978: .word gAdventureFlags
_020cc97c: .word _ZN14AdventureFlags18func_ov00_02097bccEv
.global func_ov00_020cc980
arm_func_start func_ov00_020cc980
func_ov00_020cc980: ; 0x020cc980
stmdb sp!, {r3, lr}
ldr r1, _020cc9c0 ; =data_027e0f74
ldr r1, _020cc9c0 ; =gAdventureFlags
mov r2, r0
ldr r0, [r1]
ldr r1, [r2, #0x218]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _020cc9b8
ldr r0, _020cc9c0 ; =data_027e0f74
ldr r0, _020cc9c0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r3, pc}
@@ -11040,7 +11040,7 @@ _020cc9b8:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020cc980
_020cc9c0: .word data_027e0f74
_020cc9c0: .word gAdventureFlags
.global func_ov00_020cc9c4
arm_func_start func_ov00_020cc9c4
@@ -14741,10 +14741,10 @@ func_ov00_020cf678: ; 0x020cf678
ldrneb r0, [r0]
cmpne r0, #0
beq _020cf6d4
ldr r0, _020cf73c ; =data_027e0f74
ldr r0, _020cf73c ; =gAdventureFlags
mov r1, #0x82
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -14779,7 +14779,7 @@ _020cf734:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020cf678
_020cf73c: .word data_027e0f74
_020cf73c: .word gAdventureFlags
_020cf740: .word data_027e077c
_020cf744: .word data_02056be4
_020cf748: .word data_027e103c
@@ -15339,9 +15339,9 @@ _020cfd28:
mov r0, #0
ldmia sp!, {r3, pc}
_020cfd50:
ldr r0, _020cfdcc ; =data_027e0f74
ldr r0, _020cfdcc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020cfdb8
ldr r0, _020cfdd0 ; =data_027e0c68
@@ -15373,7 +15373,7 @@ _020cfdb8:
_020cfdc0: .word data_027e077c
_020cfdc4: .word data_027e103c
_020cfdc8: .word data_027e0d38
_020cfdcc: .word data_027e0f74
_020cfdcc: .word gAdventureFlags
_020cfdd0: .word data_027e0c68
_020cfdd4: .word data_027e0e28
_020cfdd8: .word data_ov09_0211f5b4
@@ -18337,10 +18337,10 @@ _020d22d0:
str r1, [r7, #0x58]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020d22ec:
ldr r0, _020d27c8 ; =data_027e0f74
ldr r0, _020d27c8 ; =gAdventureFlags
ldr r1, [r6, #4]
ldr r0, [r0]
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
add sp, sp, #8
mov r0, #2
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -18680,7 +18680,7 @@ _020d27a8:
_020d27bc: .word data_027e0c68
_020d27c0: .word data_027e0fe4
_020d27c4: .word data_ov00_020e8ae8
_020d27c8: .word data_027e0f74
_020d27c8: .word gAdventureFlags
_020d27cc: .word data_ov00_020df28c
_020d27d0: .word data_ov00_020df28c
_020d27d4: .word data_027e0fc8
@@ -18866,10 +18866,10 @@ _020d2a0c:
beq _020d2a8c
add r0, sp, #0
bl func_ov00_0209a4f4
ldr r0, _020d2b6c ; =data_027e0f74
ldr r0, _020d2b6c ; =gAdventureFlags
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02097bdc
bl _ZN14AdventureFlags18func_ov00_02097bccEi
cmp r0, #0
bne _020d2a68
add r0, sp, #0
@@ -18950,7 +18950,7 @@ _020d2b5c:
.align 2, 0
arm_func_end func_ov00_020d29d4
_020d2b68: .word data_027e0f64
_020d2b6c: .word data_027e0f74
_020d2b6c: .word gAdventureFlags
_020d2b70: .word data_027e0c68
_020d2b74: .word data_ov00_020e8ae8
@@ -19251,10 +19251,10 @@ func_ov00_020d2f08: ; 0x020d2f08
bne _020d2f84
add r0, sp, #0
bl func_ov00_0209a4f4
ldr r0, _020d2fec ; =data_027e0f74
ldr r0, _020d2fec ; =gAdventureFlags
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02097bdc
bl _ZN14AdventureFlags18func_ov00_02097bccEi
cmp r0, #0
bne _020d2f60
add r0, sp, #0
@@ -19304,7 +19304,7 @@ _020d2fc4:
.align 2, 0
arm_func_end func_ov00_020d2f08
_020d2fe8: .word data_027e0f64
_020d2fec: .word data_027e0f74
_020d2fec: .word gAdventureFlags
.global func_ov00_020d2ff0
arm_func_start func_ov00_020d2ff0
@@ -19664,9 +19664,9 @@ _020d33d0:
mov r1, #1
strb r2, [r4, #0x1b4]
bl _ZN5Actor10SetUnk_11cEc
ldr r0, _020d34d0 ; =data_027e0f74
ldr r0, _020d34d0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _020d3414
ldr r0, _020d34d4 ; =data_027e0c68
@@ -19692,7 +19692,7 @@ _020d3414:
mvnne r0, #0
strne r0, [sp, #4]
ldr r1, [r4, #0x48]
ldr r0, _020d34d0 ; =data_027e0f74
ldr r0, _020d34d0 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -19700,7 +19700,7 @@ _020d3414:
ldr r2, [r4, #0x50]
add r1, sp, #0
str r2, [sp, #0x28]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1bc]
add r0, sp, #0
bl func_ov00_0209a508
@@ -19728,7 +19728,7 @@ _020d34b8:
_020d34c4: .word data_027e0fc8
_020d34c8: .word data_027e0d38
_020d34cc: .word data_027e10a4
_020d34d0: .word data_027e0f74
_020d34d0: .word gAdventureFlags
_020d34d4: .word data_027e0c68
.global func_ov00_020d34d8
@@ -19743,16 +19743,16 @@ func_ov00_020d34d8: ; 0x020d34d8
ldr r0, [r4, #0x30]
cmp r0, #0
beq _020d350c
ldr r0, _020d3514 ; =data_027e0f74
ldr r0, _020d3514 ; =gAdventureFlags
ldr r1, [r4, #0x1bc]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_020d350c:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020d34d8
_020d3514: .word data_027e0f74
_020d3514: .word gAdventureFlags
.global func_ov00_020d3518
arm_func_start func_ov00_020d3518
@@ -20227,10 +20227,10 @@ func_ov00_020d3a04: ; 0x020d3a04
_020d3a4c:
cmp r5, #0
beq _020d3a6c
ldr r0, _020d3b08 ; =data_027e0f74
ldr r0, _020d3b08 ; =gAdventureFlags
mov r1, r5
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020d3afc
_020d3a6c:
@@ -20277,7 +20277,7 @@ _020d3afc:
.align 2, 0
arm_func_end func_ov00_020d3a04
_020d3b04: .word data_027e0e60
_020d3b08: .word data_027e0f74
_020d3b08: .word gAdventureFlags
_020d3b0c: .word data_027e0f90
_020d3b10: .word data_027e077c
_020d3b14: .word data_027e0d38
@@ -20340,10 +20340,10 @@ _020d3b94:
cmpeq r0, #6
ldmeqia sp!, {r4, pc}
_020d3bc4:
ldr r0, _020d3c74 ; =data_027e0f74
ldr r0, _020d3c74 ; =gAdventureFlags
ldrh r1, [r4, #0x26]
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _020d3bfc
ldrb r0, [r4, #0x29]
@@ -20390,7 +20390,7 @@ _020d3c50:
arm_func_end func_ov00_020d3b6c
_020d3c6c: .word data_027e0d38
_020d3c70: .word data_027e10a4
_020d3c74: .word data_027e0f74
_020d3c74: .word gAdventureFlags
.global func_ov00_020d3c78
arm_func_start func_ov00_020d3c78
@@ -20843,7 +20843,7 @@ func_ov00_020d4134: ; 0x020d4134
mvnne r0, #0
strne r0, [sp, #4]
ldr r1, [r5, #0x48]
ldr r0, _020d4238 ; =data_027e0f74
ldr r0, _020d4238 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r5, #0x4c]
ldr r0, [r0]
@@ -20851,7 +20851,7 @@ func_ov00_020d4134: ; 0x020d4134
ldr r2, [r5, #0x50]
add r1, sp, #0
str r2, [sp, #0x28]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x160]
ldr r1, _020d423c ; =gItemManager
mov r0, r5
@@ -20892,7 +20892,7 @@ _020d41f4:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020d4134
_020d4238: .word data_027e0f74
_020d4238: .word gAdventureFlags
_020d423c: .word gItemManager
.global func_ov00_020d4240
@@ -20907,10 +20907,10 @@ func_ov00_020d4240: ; 0x020d4240
ldrh r0, [r4, #0x22]
cmp r0, #2
bne _020d4274
ldr r0, _020d4284 ; =data_027e0f74
ldr r0, _020d4284 ; =gAdventureFlags
ldr r1, [r4, #0x160]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_020d4274:
mov r0, r4
bl func_ov00_020d3c80
@@ -20918,7 +20918,7 @@ _020d4274:
.align 2, 0
arm_func_end func_ov00_020d4240
_020d4280: .word data_027e0fc8
_020d4284: .word data_027e0f74
_020d4284: .word gAdventureFlags
.global func_ov00_020d4288
arm_func_start func_ov00_020d4288
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
+41 -41
View File
@@ -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
@@ -876,7 +876,7 @@ _020ef96c:
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
@@ -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
@@ -1662,10 +1662,10 @@ _020f0474:
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
@@ -1839,7 +1839,7 @@ _020f06e0:
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
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
+72 -72
View File
@@ -4429,14 +4429,14 @@ _020f128c:
ldr r0, [r4, #4]
cmp r0, #0
bne _020f1350
ldr r0, _020f139c ; =data_027e0f74
ldr r0, _020f139c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020f1350
ldr r0, _020f139c ; =data_027e0f74
ldr r0, _020f139c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _020f1350
ldr r0, _020f13a0 ; =data_027e0c68
@@ -4500,7 +4500,7 @@ _020f135c:
arm_func_end func_ov03_020f125c
_020f1394: .word data_027e077c
_020f1398: .word data_027e103c
_020f139c: .word data_027e0f74
_020f139c: .word gAdventureFlags
_020f13a0: .word data_027e0c68
_020f13a4: .word data_027e0e28
_020f13a8: .word data_027e0fc8
@@ -5197,9 +5197,9 @@ func_ov03_020f1d04: ; 0x020f1d04
cmp r4, #0
mov r4, #1
bne _020f1da8
ldr r0, _020f1db4 ; =data_027e0f74
ldr r0, _020f1db4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020f1da8
ldr r0, _020f1db8 ; =data_027e0c68
@@ -5233,7 +5233,7 @@ _020f1da8:
.align 2, 0
arm_func_end func_ov03_020f1d04
_020f1db0: .word data_027e0d38
_020f1db4: .word data_027e0f74
_020f1db4: .word gAdventureFlags
_020f1db8: .word data_027e0c68
_020f1dbc: .word data_027e0e28
_020f1dc0: .word data_ov09_0211f5b4
@@ -5683,9 +5683,9 @@ func_ov03_020f2294: ; 0x020f2294
bl func_ov03_020f26bc
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _020f2314 ; =data_027e0f74
ldr r0, _020f2314 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _020f22d0
ldr r0, _020f2318 ; =data_027e0f90
@@ -5713,7 +5713,7 @@ _020f22d0:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov03_020f2294
_020f2314: .word data_027e0f74
_020f2314: .word gAdventureFlags
_020f2318: .word data_027e0f90
_020f231c: .word data_027e103c
_020f2320: .word 0x0000019f
@@ -5726,9 +5726,9 @@ func_ov03_020f2324: ; 0x020f2324
bl func_ov03_020f26bc
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _020f23a4 ; =data_027e0f74
ldr r0, _020f23a4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _020f2360
ldr r0, _020f23a8 ; =data_027e0f90
@@ -5756,7 +5756,7 @@ _020f2360:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov03_020f2324
_020f23a4: .word data_027e0f74
_020f23a4: .word gAdventureFlags
_020f23a8: .word data_027e0f90
_020f23ac: .word data_027e103c
_020f23b0: .word 0x0000019f
@@ -8350,26 +8350,26 @@ func_ov03_020f3cd0: ; 0x020f3cd0
stmdb sp!, {r3, lr}
cmp r0, #2
bne _020f3d4c
ldr r0, _020f3d54 ; =data_027e0f74
ldr r0, _020f3d54 ; =gAdventureFlags
mov r1, #0x2b
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020f3d0c
ldr r0, _020f3d54 ; =data_027e0f74
ldr r0, _020f3d54 ; =gAdventureFlags
mov r1, #0xa7
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _020f3d14
_020f3d0c:
mov r0, #0
ldmia sp!, {r3, pc}
_020f3d14:
ldr r0, _020f3d54 ; =data_027e0f74
ldr r0, _020f3d54 ; =gAdventureFlags
mov r1, #0xb4
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020f3d4c
ldr r0, _020f3d58 ; =data_027e0d38
@@ -8385,7 +8385,7 @@ _020f3d4c:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov03_020f3cd0
_020f3d54: .word data_027e0f74
_020f3d54: .word gAdventureFlags
_020f3d58: .word data_027e0d38
.global func_ov03_020f3d5c
@@ -12242,10 +12242,10 @@ _020f5ee8: .word data_027e0c38
arm_func_start func_ov03_020f5eec
func_ov03_020f5eec: ; 0x020f5eec
stmdb sp!, {r4, r5, r6, lr}
ldr r1, _020f6150 ; =data_027e0f74
ldr r1, _020f6150 ; =gAdventureFlags
mov r6, r0
ldr r0, [r1]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _020f5f3c
ldr r0, _020f6154 ; =gItemManager
@@ -12408,7 +12408,7 @@ _020f6140:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov03_020f5eec
_020f6150: .word data_027e0f74
_020f6150: .word gAdventureFlags
_020f6154: .word gItemManager
_020f6158: .word data_027e0e28
_020f615c: .word 0x00001388
@@ -12455,9 +12455,9 @@ func_ov03_020f6190: ; 0x020f6190
ldr r0, [r4, #0x20]
cmp r0, #0x3c
bge _020f61ec
ldr r0, _020f61fc ; =data_027e0f74
ldr r0, _020f61fc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _020f61ec
_020f61e4:
@@ -12470,7 +12470,7 @@ _020f61ec:
arm_func_end func_ov03_020f6190
_020f61f4: .word data_027e0618
_020f61f8: .word data_027e103c
_020f61fc: .word data_027e0f74
_020f61fc: .word gAdventureFlags
.global func_ov03_020f6200
arm_func_start func_ov03_020f6200
@@ -13316,9 +13316,9 @@ _020f6bc8:
bl func_0203493c
b _020f6cfc
_020f6c88:
ldr r0, _020f6d30 ; =data_027e0f74
ldr r0, _020f6d30 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _020f6ce4
ldr r0, [r6, #0x1e8]
@@ -13340,9 +13340,9 @@ _020f6c88:
bl func_0203493c
b _020f6cfc
_020f6ce4:
ldr r0, _020f6d30 ; =data_027e0f74
ldr r0, _020f6d30 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
moveq r0, #0
streq r0, [r6, #0x1e8]
@@ -13362,7 +13362,7 @@ _020f6cfc:
arm_func_end func_ov03_020f6b18
_020f6d28: .word data_027e0d38
_020f6d2c: .word data_02050f54
_020f6d30: .word data_027e0f74
_020f6d30: .word gAdventureFlags
.global func_ov03_020f6d34
arm_func_start func_ov03_020f6d34
@@ -13515,9 +13515,9 @@ func_ov03_020f6ef8: ; 0x020f6ef8
cmp r0, #0
addgt sp, sp, #0x10
ldmgtia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _020f6ffc ; =data_027e0f74
ldr r0, _020f6ffc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _020f6f58
ldr r0, _020f7000 ; =data_027e0f90
@@ -13570,7 +13570,7 @@ _020f6f58:
arm_func_end func_ov03_020f6ef8
_020f6ff4: .word data_027e077c
_020f6ff8: .word data_027e0db0
_020f6ffc: .word data_027e0f74
_020f6ffc: .word gAdventureFlags
_020f7000: .word data_027e0f90
_020f7004: .word data_027e0cbc
_020f7008: .word data_027e0c38
@@ -14300,10 +14300,10 @@ _020f786c:
ble _020f7808
cmp r8, #2
bne _020f7908
ldr r0, _020f7bbc ; =data_027e0f74
ldr r0, _020f7bbc ; =gAdventureFlags
mov r1, #0xb7
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _020f7908
ldr r0, _020f7bb8 ; =data_027e0f7c
@@ -14353,7 +14353,7 @@ _020f7908:
mov r0, #1
orr r1, r1, #0x1000
ldr r11, _020f7bb0 ; =data_027e0d3c
ldr r10, _020f7bbc ; =data_027e0f74
ldr r10, _020f7bbc ; =gAdventureFlags
ldr r4, _020f7bb8 ; =data_027e0f7c
str r1, [sp, #0x28]
str r0, [sp, #0x20]
@@ -14370,7 +14370,7 @@ _020f7964:
add r0, r7, #0x37
add r1, r0, #0x100
ldr r0, [r10]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020f79d4
ldr r1, [r6, #8]
@@ -14525,7 +14525,7 @@ _020f7bac: .word data_027e1054
_020f7bb0: .word data_027e0d3c
_020f7bb4: .word data_027e0e60
_020f7bb8: .word data_027e0f7c
_020f7bbc: .word data_027e0f74
_020f7bbc: .word gAdventureFlags
_020f7bc0: .word data_027e0618
_020f7bc4: .word data_027e0d38
_020f7bc8: .word data_027e077c
@@ -16451,7 +16451,7 @@ _020f91c0:
blt _020f8f9c
_020f91d4:
ldr r4, _020f92ec ; =gItemManager
ldr r10, _020f92fc ; =data_027e0f74
ldr r10, _020f92fc ; =gAdventureFlags
mov r8, r7
add r9, r7, #0x20
mov r5, #0
@@ -16472,12 +16472,12 @@ _020f9204:
beq _020f92c8
ldr r0, [r10]
mov r1, #6
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020f9288
ldr r0, [r10]
ldr r1, _020f9300 ; =0x0000015f
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _020f9288
b _020f92c8
@@ -16534,7 +16534,7 @@ _020f92ec: .word gItemManager
_020f92f0: .word data_027e0f7c
_020f92f4: .word data_027e0d38
_020f92f8: .word data_ov00_020eec9c
_020f92fc: .word data_027e0f74
_020f92fc: .word gAdventureFlags
_020f9300: .word 0x0000015f
.global func_ov03_020f9304
@@ -16680,7 +16680,7 @@ func_ov03_020f9468: ; 0x020f9468
orr r1, r1, #0x1000
ldr r5, _020f9a64 ; =data_027e0f7c
ldr r4, _020f9a68 ; =data_027e0d3c
ldr r6, _020f9a6c ; =data_027e0f74
ldr r6, _020f9a6c ; =gAdventureFlags
str r1, [sp, #0x5c]
str r0, [sp, #0x54]
mov r10, #0
@@ -16692,7 +16692,7 @@ _020f94e0:
add r0, r10, #0x37
add r1, r0, #0x100
ldr r0, [r6]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _020f9550
ldr r0, [r5]
@@ -17067,7 +17067,7 @@ _020f9a5c: .word data_027e0618
_020f9a60: .word data_027e0d38
_020f9a64: .word data_027e0f7c
_020f9a68: .word data_027e0d3c
_020f9a6c: .word data_027e0f74
_020f9a6c: .word gAdventureFlags
_020f9a70: .word data_027e0c38
_020f9a74: .word gItemManager
_020f9a78: .word data_ov03_020ff634
@@ -17155,10 +17155,10 @@ _020f9ab0:
mov r2, #0x19
mov r3, #0x28
bl func_ov03_020f9db8
ldr r0, _020f9db4 ; =data_027e0f74
ldr r0, _020f9db4 ; =gAdventureFlags
mov r1, #0x32
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r1, #0xf
mov ip, #0x32
@@ -17286,7 +17286,7 @@ _020f9c24:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov03_020f9a7c
_020f9db4: .word data_027e0f74
_020f9db4: .word gAdventureFlags
.global func_ov03_020f9db8
arm_func_start func_ov03_020f9db8
@@ -19453,10 +19453,10 @@ _020fb194:
ldr r2, [r2, #0x10]
blx r2
_020fb1a4:
ldr r0, _020fb250 ; =data_027e0f74
ldr r0, _020fb250 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov05_02101ae8
ldr r0, _020fb250 ; =data_027e0f74
ldr r0, _020fb250 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov05_02101af8
ldrb r0, [r4, #0x54]
@@ -19499,7 +19499,7 @@ _020fb208:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov03_020fb148
_020fb250: .word data_027e0f74
_020fb250: .word gAdventureFlags
_020fb254: .word data_027e071c
.global func_ov03_020fb258
@@ -19979,7 +19979,7 @@ func_ov03_020fb5cc: ; 0x020fb5cc
add r0, sp, #0
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _020fb650 ; =data_027e0f74
ldr r0, _020fb650 ; =gAdventureFlags
mvn ip, #0
mov r3, #0x64
ldr r0, [r0]
@@ -19989,7 +19989,7 @@ func_ov03_020fb5cc: ; 0x020fb5cc
strb r2, [sp, #0xa]
strb r2, [sp, #0xb]
strb r2, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1cc]
add r0, sp, #0
bl func_ov00_0209a508
@@ -19997,7 +19997,7 @@ func_ov03_020fb5cc: ; 0x020fb5cc
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov03_020fb5cc
_020fb650: .word data_027e0f74
_020fb650: .word gAdventureFlags
.global func_ov03_020fb654
arm_func_start func_ov03_020fb654
@@ -20017,7 +20017,7 @@ func_ov03_020fb654: ; 0x020fb654
add r0, sp, #0
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _020fb6d0 ; =data_027e0f74
ldr r0, _020fb6d0 ; =gAdventureFlags
mvn ip, #0
mov r3, #0x64
ldr r0, [r0]
@@ -20027,7 +20027,7 @@ func_ov03_020fb654: ; 0x020fb654
strb r2, [sp, #0xa]
strb r2, [sp, #0xb]
strb r2, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1cc]
add r0, sp, #0
bl func_ov00_0209a508
@@ -20035,7 +20035,7 @@ func_ov03_020fb654: ; 0x020fb654
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov03_020fb654
_020fb6d0: .word data_027e0f74
_020fb6d0: .word gAdventureFlags
.global func_ov03_020fb6d4
arm_func_start func_ov03_020fb6d4
@@ -20251,16 +20251,16 @@ _020fb9a4:
strb r0, [r4, #0x1bc]
ldmia sp!, {r4, pc}
_020fb9b4:
ldr r0, _020fbb04 ; =data_027e0f74
ldr r0, _020fbb04 ; =gAdventureFlags
ldr r1, [r4, #0x1cc]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _020fb9e4
ldr r0, _020fbb04 ; =data_027e0f74
ldr r0, _020fbb04 ; =gAdventureFlags
ldr r1, [r4, #0x1cc]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x1cc]
_020fb9e4:
@@ -20346,7 +20346,7 @@ _020fbaf0:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov03_020fb970
_020fbb04: .word data_027e0f74
_020fbb04: .word gAdventureFlags
_020fbb08: .word data_027e0d38
_020fbb0c: .word data_ov00_020eec68
_020fbb10: .word data_ov00_020eec9c
@@ -20450,16 +20450,16 @@ _020fbc30:
mov r0, r4
mov r1, #6
bl func_ov03_020fb970
ldr r0, _020fbca4 ; =data_027e0f74
ldr r0, _020fbca4 ; =gAdventureFlags
ldr r1, [r4, #0x1cc]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _020fbca4 ; =data_027e0f74
ldr r0, _020fbca4 ; =gAdventureFlags
ldr r1, [r4, #0x1cc]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x1cc]
ldmia sp!, {r4, pc}
@@ -20473,7 +20473,7 @@ _020fbc98:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov03_020fbb34
_020fbca4: .word data_027e0f74
_020fbca4: .word gAdventureFlags
.global func_ov03_020fbca8
arm_func_start func_ov03_020fbca8
@@ -20693,10 +20693,10 @@ func_ov03_020fbef0: ; 0x020fbef0
beq _020fbf20
b _020fbf2c
_020fbf0c:
ldr r0, _020fbf34 ; =data_027e0f74
ldr r0, _020fbf34 ; =gAdventureFlags
mov r1, #0x56
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
ldmia sp!, {r3, pc}
_020fbf20:
bl func_ov52_02195754
@@ -20707,7 +20707,7 @@ _020fbf2c:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov03_020fbef0
_020fbf34: .word data_027e0f74
_020fbf34: .word gAdventureFlags
.global func_ov03_020fbf38
arm_func_start func_ov03_020fbf38
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 _ZN11ItemManager15LoadFanfareItemEj
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager8GiveItemEjjj
.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
+76 -76
View File
@@ -1813,7 +1813,7 @@ _0210223c:
ldr r0, [ip, #0x2c]
str r0, [lr, #0x2c]
_02102310:
ldmia sb!, {r0, r1, r2, r3}
ldmia r9!, {r0, r1, r2, r3}
stmia r8!, {r0, r1, r2, r3}
subs r7, r7, #1
bne _02102310
@@ -1955,9 +1955,9 @@ _02102498:
movne r1, r8
cmp r1, #0
beq _02102544
ldr r0, _021026bc ; =data_027e0f74
ldr r0, _021026bc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02102538
ldr r0, _021026c0 ; =data_027e1038
@@ -2055,10 +2055,10 @@ _02102678:
cmp r6, #0
cmpeq r8, #0
bne _0210269c
ldr r0, _021026bc ; =data_027e0f74
ldr r0, _021026bc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov05_02101ae8
ldr r0, _021026bc ; =data_027e0f74
ldr r0, _021026bc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov05_02101af8
_0210269c:
@@ -2072,7 +2072,7 @@ _021026ac: .word data_ov00_020ec7dc
_021026b0: .word data_027e0d38
_021026b4: .word data_027e0e5c
_021026b8: .word data_027e0c54
_021026bc: .word data_027e0f74
_021026bc: .word gAdventureFlags
_021026c0: .word data_027e1038
_021026c4: .word data_027e0ff8
_021026c8: .word data_027e071c
@@ -3706,11 +3706,11 @@ func_ov05_02103bb0: ; 0x02103bb0
arm_func_start func_ov05_02103bc8
func_ov05_02103bc8: ; 0x02103bc8
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _02103c64 ; =data_027e0f74
ldr r1, _02103c64 ; =gAdventureFlags
mov r5, r0
ldr r0, [r1]
mov r4, r2
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
movne r0, #1
strneb r0, [r5, #0x24]
@@ -3748,7 +3748,7 @@ _02103c20:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov05_02103bc8
_02103c64: .word data_027e0f74
_02103c64: .word gAdventureFlags
_02103c68: .word data_027e0618
.global func_ov05_02103c6c
@@ -4763,10 +4763,10 @@ _0210481c:
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0210485c:
ldr r0, _02104a30 ; =data_027e0f74
ldr r0, _02104a30 ; =gAdventureFlags
ldr r1, _02104a34 ; =0x0000015f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _021048a8
ldr r0, _02104a38 ; =gItemManager
@@ -4783,10 +4783,10 @@ _0210485c:
str r4, [sp]
bl func_ov05_02104744
_021048a8:
ldr r0, _02104a30 ; =data_027e0f74
ldr r0, _02104a30 ; =gAdventureFlags
mov r1, #0x82
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addeq sp, sp, #0x34
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
@@ -4836,10 +4836,10 @@ _0210493c:
cmp r0, #0
addne sp, sp, #0x34
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02104a30 ; =data_027e0f74
ldr r0, _02104a30 ; =gAdventureFlags
ldr r1, _02104a44 ; =0x00000125
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _02104a04
ldr r4, _02104a2c ; =data_027e0d3c
@@ -4886,7 +4886,7 @@ _02104a04:
arm_func_end func_ov05_021047c8
_02104a28: .word data_027e1054
_02104a2c: .word data_027e0d3c
_02104a30: .word data_027e0f74
_02104a30: .word gAdventureFlags
_02104a34: .word 0x0000015f
_02104a38: .word gItemManager
_02104a3c: .word data_027e0f7c
@@ -5150,9 +5150,9 @@ func_ov05_02104d74: ; 0x02104d74
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
ldr r0, _02104e40 ; =data_027e0f74
ldr r0, _02104e40 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
addne sp, sp, #0x18
ldmneia sp!, {r4, pc}
@@ -5196,7 +5196,7 @@ _02104e0c:
.align 2, 0
arm_func_end func_ov05_02104d74
_02104e3c: .word data_027e0fc8
_02104e40: .word data_027e0f74
_02104e40: .word gAdventureFlags
_02104e44: .word data_027e0f64
_02104e48: .word data_027e0f94
_02104e4c: .word data_027e0de4
@@ -5436,9 +5436,9 @@ func_ov05_02105140: ; 0x02105140
ldr r0, [r0]
bl func_ov30_0218411c
_021051b8:
ldr r0, _021052f8 ; =data_027e0f74
ldr r0, _021052f8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _021052fc ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -5527,7 +5527,7 @@ _021052e8: .word data_027e0d38
_021052ec: .word gOverlayManager
_021052f0: .word 0x0000001e
_021052f4: .word data_027e10b4
_021052f8: .word data_027e0f74
_021052f8: .word gAdventureFlags
_021052fc: .word data_027e0c68
_02105300: .word data_027e077c
@@ -9909,12 +9909,12 @@ func_ov05_02108e8c: ; 0x02108e8c
ldmneia sp!, {r4, pc}
bl func_ov05_021071f8
mov r1, #0
ldr r2, _02108f30 ; =data_027e0f74
ldr r2, _02108f30 ; =gAdventureFlags
strh r1, [r0, #0x32]
ldr r0, [r2]
mov r3, r1
mov r2, #1
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
mov r0, r4
bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
ldmia sp!, {r4, pc}
@@ -9939,7 +9939,7 @@ _02108ee8:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov05_02108e8c
_02108f30: .word data_027e0f74
_02108f30: .word gAdventureFlags
_02108f34: .word data_027e071c
.global func_ov05_02108f38
@@ -10215,9 +10215,9 @@ _021092f8:
ldr r0, [r5, #0x38]
cmp r0, #0
blt _021094f4
ldr r0, _02109514 ; =data_027e0f74
ldr r0, _02109514 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _021094f4
ldr r1, [r5, #0x74]
@@ -10359,7 +10359,7 @@ _021094f4:
arm_func_end func_ov05_021092bc
_0210950c: .word data_027e071c
_02109510: .word data_ov05_021127b0
_02109514: .word data_027e0f74
_02109514: .word gAdventureFlags
_02109518: .word data_027e0f64
_0210951c: .word data_ov00_020eec68
_02109520: .word data_ov05_02112770
@@ -10509,7 +10509,7 @@ func_ov05_021096bc: ; 0x021096bc
add r0, sp, #0
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _02109764 ; =data_027e0f74
ldr r0, _02109764 ; =gAdventureFlags
mvn ip, #0
mov r3, #0x14
ldr r0, [r0]
@@ -10519,7 +10519,7 @@ func_ov05_021096bc: ; 0x021096bc
strb r2, [sp, #0xa]
strb r2, [sp, #0xb]
strb r2, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x38]
cmp r0, #0
blt _02109750
@@ -10542,7 +10542,7 @@ _02109750:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov05_021096bc
_02109764: .word data_027e0f74
_02109764: .word gAdventureFlags
.global func_ov05_02109768
arm_func_start func_ov05_02109768
@@ -12038,9 +12038,9 @@ func_ov05_0210ab1c: ; 0x0210ab1c
mov r0, r6
bl func_ov05_021107fc
_0210ab84:
ldr r0, _0210ad70 ; =data_027e0f74
ldr r0, _0210ad70 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
bne _0210aba8
cmp r5, #0
@@ -12169,7 +12169,7 @@ _0210ad54:
arm_func_end func_ov05_0210ab1c
_0210ad68: .word data_027e0fe4
_0210ad6c: .word data_027e0d38
_0210ad70: .word data_027e0f74
_0210ad70: .word gAdventureFlags
_0210ad74: .word gItemManager
_0210ad78: .word 0x00000aab
_0210ad7c: .word 0x0000071c
@@ -12191,9 +12191,9 @@ func_ov05_0210ad88: ; 0x0210ad88
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r4, r0
beq _0210ade0
ldr r0, _0210b284 ; =data_027e0f74
ldr r0, _0210b284 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0210ade0
mov r0, r5
@@ -12511,7 +12511,7 @@ _0210b264:
.align 2, 0
arm_func_end func_ov05_0210ad88
_0210b280: .word data_027e0fe4
_0210b284: .word data_027e0f74
_0210b284: .word gAdventureFlags
_0210b288: .word data_02050f54
_0210b28c: .word 0x0000ffff
_0210b290: .word data_027e0e60
@@ -12551,9 +12551,9 @@ _0210b2fc:
bl _ZN13PlayerControl16CheckNotTouchingEv
cmp r0, #0
bne _0210b324
ldr r0, _0210b3b8 ; =data_027e0f74
ldr r0, _0210b3b8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _0210b32c
_0210b324:
@@ -12600,7 +12600,7 @@ _0210b3a0:
arm_func_end func_ov05_0210b2a4
_0210b3b0: .word data_027e0fe4
_0210b3b4: .word data_027e0fb8
_0210b3b8: .word data_027e0f74
_0210b3b8: .word gAdventureFlags
.global func_ov05_0210b3bc
arm_func_start func_ov05_0210b3bc
@@ -13210,9 +13210,9 @@ func_ov05_0210bb98: ; 0x0210bb98
bl func_ov00_020840c4
movs r4, r0
beq _0210bc04
ldr r0, _0210bd5c ; =data_027e0f74
ldr r0, _0210bd5c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0210bc04
mov r0, r5
@@ -13315,7 +13315,7 @@ _0210bd48:
.align 2, 0
arm_func_end func_ov05_0210bb98
_0210bd58: .word data_027e0e60
_0210bd5c: .word data_027e0f74
_0210bd5c: .word gAdventureFlags
_0210bd60: .word data_027e0fb8
_0210bd64: .word data_ov05_021129d4
_0210bd68: .word data_ov05_021129c4
@@ -13362,9 +13362,9 @@ _0210bdec:
bl _ZN13PlayerControl16CheckNotTouchingEv
cmp r0, #0
bne _0210be14
ldr r0, _0210bf48 ; =data_027e0f74
ldr r0, _0210bf48 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _0210be1c
_0210be14:
@@ -13453,7 +13453,7 @@ _0210beb8:
arm_func_end func_ov05_0210bd70
_0210bf40: .word data_027e0e60
_0210bf44: .word data_027e0fb8
_0210bf48: .word data_027e0f74
_0210bf48: .word gAdventureFlags
_0210bf4c: .word 0x00000155
.global func_ov05_0210bf50
@@ -15497,9 +15497,9 @@ _0210db2c:
beq _0210db70
add r0, r6, #6
bl func_ov00_020d054c
ldr r0, _0210df68 ; =data_027e0f74
ldr r0, _0210df68 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0210db90
ldr r0, _0210df6c ; =data_027e0c68
@@ -15517,9 +15517,9 @@ _0210db88:
add r0, r6, #6
bl func_ov00_020d0594
_0210db90:
ldr r0, _0210df68 ; =data_027e0f74
ldr r0, _0210df68 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
moveq r0, #0
streqb r0, [r6, #0x92]
@@ -15535,10 +15535,10 @@ _0210db90:
mov r0, #0
strb r0, [r6, #0x92]
_0210dbd4:
ldr r0, _0210df68 ; =data_027e0f74
ldr r0, _0210df68 ; =gAdventureFlags
mov r4, #0
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _0210dbf8
ldrb r0, [r6, #0x92]
@@ -15652,9 +15652,9 @@ _0210dd24:
_0210dd68:
cmp r4, #0
bne _0210dd9c
ldr r0, _0210df68 ; =data_027e0f74
ldr r0, _0210df68 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _0210dd9c
_0210dd84:
@@ -15713,9 +15713,9 @@ _0210de24:
strb r1, [r6, #0x94]
bl func_ov00_020d054c
_0210de50:
ldr r0, _0210df68 ; =data_027e0f74
ldr r0, _0210df68 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
add r0, r6, #0x1e
beq _0210de70
@@ -15798,7 +15798,7 @@ _0210df58: .word data_027e0d38
_0210df5c: .word data_027e0d3c
_0210df60: .word data_027e077c
_0210df64: .word data_027e103c
_0210df68: .word data_027e0f74
_0210df68: .word gAdventureFlags
_0210df6c: .word data_027e0c68
_0210df70: .word data_027e0fc8
_0210df74: .word data_027e0db0
@@ -16393,10 +16393,10 @@ _0210e72c:
mov r2, r4
bl func_ov00_020bc960
_0210e760:
ldr r0, _0210e898 ; =data_027e0f74
ldr r0, _0210e898 ; =gAdventureFlags
mov r4, #0
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0210e7b8
ldr r0, _0210e878 ; =data_027e0fb8
@@ -16475,7 +16475,7 @@ _0210e888: .word data_027e0fa0
_0210e88c: .word data_027e0fd0
_0210e890: .word data_027e0f94
_0210e894: .word data_027e0e60
_0210e898: .word data_027e0f74
_0210e898: .word gAdventureFlags
_0210e89c: .word 0x66666667
_0210e8a0: .word data_027e0fac
_0210e8a4: .word data_ov00_020eec9c
@@ -17363,14 +17363,14 @@ _0210f4f0:
_0210f52c:
cmp r0, #2
bne _0210f5d8
ldr r0, _0210f6d8 ; =data_027e0f74
ldr r0, _0210f6d8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0210f55c
ldr r0, _0210f6d8 ; =data_027e0f74
ldr r0, _0210f6d8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
beq _0210f57c
_0210f55c:
@@ -17478,7 +17478,7 @@ _0210f6c8: .word data_ov00_020eec9c
_0210f6cc: .word data_027e103c
_0210f6d0: .word data_ov05_02112a7c
_0210f6d4: .word data_ov05_02112a9c
_0210f6d8: .word data_027e0f74
_0210f6d8: .word gAdventureFlags
.global func_ov05_0210f6dc
arm_func_start func_ov05_0210f6dc
@@ -18635,9 +18635,9 @@ _021106ac:
cmp r5, #0
beq _02110784
_021106d4:
ldr r0, _021107dc ; =data_027e0f74
ldr r0, _021107dc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _021107e0 ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -18708,7 +18708,7 @@ _021107cc: .word data_ov05_02112b74
_021107d0: .word data_ov05_02112b84
_021107d4: .word data_ov05_02112b64
_021107d8: .word data_ov05_02112acc
_021107dc: .word data_027e0f74
_021107dc: .word gAdventureFlags
_021107e0: .word data_027e0c68
_021107e4: .word data_ov09_0211f5b4
_021107e8: .word data_ov05_02112ba4
@@ -19651,9 +19651,9 @@ func_ov05_021113dc: ; 0x021113dc
add sp, sp, #0x58
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_02111450:
ldr r0, _02111a5c ; =data_027e0f74
ldr r0, _02111a5c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02111548
ldr r0, _02111a60 ; =data_027e0d38
@@ -19862,10 +19862,10 @@ _02111744:
mov r0, r5
mov r2, #0
bl func_ov05_0210f808
ldr r1, _02111a5c ; =data_027e0f74
ldr r1, _02111a5c ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
bne _02111868
ldr r3, _02111a78 ; =data_ov05_02112c04
@@ -20063,7 +20063,7 @@ _02111a3c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov05_021113dc
_02111a5c: .word data_027e0f74
_02111a5c: .word gAdventureFlags
_02111a60: .word data_027e0d38
_02111a64: .word data_027e0618
_02111a68: .word data_027e0fb8
@@ -20237,9 +20237,9 @@ func_ov05_02111c70: ; 0x02111c70
mov r9, r1
cmp r0, #0
bne _02111cac
ldr r0, _02111e10 ; =data_027e0f74
ldr r0, _02111e10 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02111cac
cmp r9, #0
@@ -20343,7 +20343,7 @@ _02111df8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov05_02111c70
_02111e10: .word data_027e0f74
_02111e10: .word gAdventureFlags
_02111e14: .word data_027e0d38
_02111e18: .word data_027e0f68
_02111e1c: .word data_027e0f64
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
+27 -27
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
@@ -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
@@ -5077,9 +5077,9 @@ _02115750:
ldr r10, [sp, #0xc]
add r9, sp, #0x7c
ldmia r10!, {r0, r1, r2, r3}
stmia sb!, {r0, r1, r2, r3}
stmia r9!, {r0, r1, r2, r3}
ldmia r10!, {r0, r1, r2, r3}
stmia sb!, {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}
@@ -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
@@ -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
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
+28 -28
View File
@@ -8651,9 +8651,9 @@ _02119c78:
bl func_ov00_020b510c
cmp r0, #0
beq _02119d0c
ldr r0, _02119dd8 ; =data_027e0f74
ldr r0, _02119dd8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02119d0c
ldr r0, _02119ddc ; =data_027e0fc0
@@ -8736,7 +8736,7 @@ _02119dc8: .word data_027e0fd4
_02119dcc: .word data_ov00_020eec9c
_02119dd0: .word data_027e0fac
_02119dd4: .word data_027e0fcc
_02119dd8: .word data_027e0f74
_02119dd8: .word gAdventureFlags
_02119ddc: .word data_027e0fc0
_02119de0: .word data_027e0e58
@@ -8824,9 +8824,9 @@ _02119f04:
cmp r0, #0
subgt r0, r0, #1
strgth r0, [r6, #8]
ldr r0, _0211a3d4 ; =data_027e0f74
ldr r0, _0211a3d4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02119f58
ldrsh r4, [r6, #8]
@@ -9151,7 +9151,7 @@ _0211a378:
_0211a3c8: .word data_027e0f94
_0211a3cc: .word data_027e0fac
_0211a3d0: .word data_ov12_02137c64
_0211a3d4: .word data_027e0f74
_0211a3d4: .word gAdventureFlags
_0211a3d8: .word 0x66666667
_0211a3dc: .word data_027e0fcc
_0211a3e0: .word data_027e0f64
@@ -10100,9 +10100,9 @@ func_ov12_0211af70: ; 0x0211af70
cmp r0, #1
cmpne r0, #0x33
bne _0211b018
ldr r0, _0211b0c4 ; =data_027e0f74
ldr r0, _0211b0c4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
bne _0211b018
ldr r0, _0211b0c8 ; =data_027e0764
@@ -10173,7 +10173,7 @@ _0211b0b8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov12_0211af70
_0211b0c4: .word data_027e0f74
_0211b0c4: .word gAdventureFlags
_0211b0c8: .word data_027e0764
.global func_ov12_0211b0cc
@@ -24531,10 +24531,10 @@ func_ov12_02126bc0: ; 0x02126bc0
cmp r0, #1
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _02126c38 ; =data_027e0f74
ldr r0, _02126c38 ; =gAdventureFlags
mov r4, #0
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _02126c3c ; =data_ov00_020ee698
ldreq r0, [r0, #0x2c]
@@ -24558,7 +24558,7 @@ _02126c30:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_02126bc0
_02126c38: .word data_027e0f74
_02126c38: .word gAdventureFlags
_02126c3c: .word data_ov00_020ee698
_02126c40: .word data_027e05f8
@@ -38487,10 +38487,10 @@ func_ov12_021320f4: ; 0x021320f4
mov r1, #1
strb r2, [r4, #0x1b4]
bl _ZN5Actor10SetUnk_11cEc
ldr r0, _021321dc ; =data_027e0f74
ldr r0, _021321dc ; =gAdventureFlags
ldr r5, [r4, #0x30]
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _02132144
ldr r0, _021321e0 ; =data_027e0c68
@@ -38530,10 +38530,10 @@ _02132144:
moveq r0, #1
streqb r0, [sp, #0x10]
_021321b4:
ldr r0, _021321dc ; =data_027e0f74
ldr r0, _021321dc ; =gAdventureFlags
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1bc]
add r0, sp, #0
bl func_ov00_0209a508
@@ -38543,7 +38543,7 @@ _021321d0:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_021320f4
_021321dc: .word data_027e0f74
_021321dc: .word gAdventureFlags
_021321e0: .word data_027e0c68
.global func_ov12_021321e4
@@ -38557,16 +38557,16 @@ func_ov12_021321e4: ; 0x021321e4
ldrne r0, [r4, #0x30]
cmpne r0, #0
beq _02132214
ldr r0, _0213221c ; =data_027e0f74
ldr r0, _0213221c ; =gAdventureFlags
ldr r1, [r4, #0x1bc]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02132214:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov12_021321e4
_0213221c: .word data_027e0f74
_0213221c: .word gAdventureFlags
.global func_ov12_02132220
arm_func_start func_ov12_02132220
@@ -40384,16 +40384,16 @@ _02133a54: .word 0x00000132
func_ov12_02133a58: ; 0x02133a58
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0xc
ldr r1, _02133b64 ; =data_027e0f74
ldr r1, _02133b64 ; =gAdventureFlags
mov r6, r0
ldr r0, [r1]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
addne sp, sp, #0xc
ldmneia sp!, {r3, r4, r5, r6, pc}
ldr r0, _02133b64 ; =data_027e0f74
ldr r0, _02133b64 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
ldreq r0, _02133b68 ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -40451,7 +40451,7 @@ func_ov12_02133a58: ; 0x02133a58
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov12_02133a58
_02133b64: .word data_027e0f74
_02133b64: .word gAdventureFlags
_02133b68: .word data_027e0c68
_02133b6c: .word data_ov12_021354b0
_02133b70: .word data_ov12_021354ac
@@ -41126,9 +41126,9 @@ func_ov12_02134378: ; 0x02134378
ldrsh r0, [r4, #0x34]
cmp r0, #0
ldmgtia sp!, {r4, pc}
ldr r0, _021343b8 ; =data_027e0f74
ldr r0, _021343b8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -41136,7 +41136,7 @@ func_ov12_02134378: ; 0x02134378
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov12_02134378
_021343b8: .word data_027e0f74
_021343b8: .word gAdventureFlags
.global func_ov12_021343bc
arm_func_start func_ov12_021343bc
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
+149 -149
View File
@@ -5248,11 +5248,11 @@ _02123ba4: .word data_027e0f64
arm_func_start func_ov14_02123ba8
func_ov14_02123ba8: ; 0x02123ba8
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _02123c50 ; =data_027e0f74
ldr r2, _02123c50 ; =gAdventureFlags
mov r5, r0
ldr r0, [r2]
mov r4, r1
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _02123c2c
ldr r0, [r5, #0x130]
@@ -5284,18 +5284,18 @@ _02123c20:
strb r0, [r5, #0x118]
ldmia sp!, {r3, r4, r5, pc}
_02123c2c:
ldr r0, _02123c50 ; =data_027e0f74
ldr r0, _02123c50 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _02123c50 ; =data_027e0f74
ldr r0, _02123c50 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov14_02123ba8
_02123c50: .word data_027e0f74
_02123c50: .word gAdventureFlags
.global func_ov14_02123c54
arm_func_start func_ov14_02123c54
@@ -6268,14 +6268,14 @@ _02124948:
ldrb r0, [r5, #0x17e]
cmp r0, #0
beq _021249a4
ldr r0, _02124c64 ; =data_027e0f74
ldr r0, _02124c64 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _021249a4
ldr r0, _02124c64 ; =data_027e0f74
ldr r0, _02124c64 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
bne _021249a4
mov r1, #0
@@ -6408,14 +6408,14 @@ _02124b50:
bl _ZN5Actor18func_ov00_020c195cEv
b _02124c2c
_02124b5c:
ldr r0, _02124c64 ; =data_027e0f74
ldr r0, _02124c64 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02124b84
ldr r0, _02124c64 ; =data_027e0f74
ldr r0, _02124c64 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
beq _02124b8c
_02124b84:
@@ -6481,7 +6481,7 @@ _02124c54: .word data_027e0e60
_02124c58: .word 0x00000333
_02124c5c: .word data_ov14_02153bfc
_02124c60: .word data_ov14_0215ac9c
_02124c64: .word data_027e0f74
_02124c64: .word gAdventureFlags
_02124c68: .word data_027e0f64
_02124c6c: .word data_027e0fc8
@@ -6494,14 +6494,14 @@ func_ov14_02124c70: ; 0x02124c70
mov r4, r1
cmp r0, #2
bne _02124cb8
ldr r0, _02124d90 ; =data_027e0f74
ldr r0, _02124d90 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02124cb0
ldr r0, _02124d90 ; =data_027e0f74
ldr r0, _02124d90 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
beq _02124cb8
_02124cb0:
@@ -6511,10 +6511,10 @@ _02124cb8:
ldrb r0, [r5, #0x17f]
cmp r0, #0
beq _02124cf4
ldr r0, _02124d90 ; =data_027e0f74
ldr r0, _02124d90 ; =gAdventureFlags
ldr r1, [r5, #0x178]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02124cf4
mov r0, r5
@@ -6524,14 +6524,14 @@ _02124cb8:
blx r2
ldmia sp!, {r3, r4, r5, pc}
_02124cf4:
ldr r0, _02124d90 ; =data_027e0f74
ldr r0, _02124d90 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02124d7c
ldr r0, _02124d90 ; =data_027e0f74
ldr r0, _02124d90 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
bne _02124d7c
ldr r0, _02124d94 ; =data_027e077c
@@ -6570,7 +6570,7 @@ _02124d7c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov14_02124c70
_02124d90: .word data_027e0f74
_02124d90: .word gAdventureFlags
_02124d94: .word data_027e077c
.global func_ov14_02124d98
@@ -7262,15 +7262,15 @@ _02125620:
ldrb r0, [r4, #0x71]
cmp r0, #0
beq _0212567c
ldr r0, _021258a8 ; =data_027e0f74
ldr r0, _021258a8 ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _021258a8 ; =data_027e0f74
ldr r0, _021258a8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
ldr r1, _021258ac ; =data_ov14_02153c04
ldrh r1, [r1, #4]
cmp r0, r1
@@ -7294,9 +7294,9 @@ _02125698:
ldrb r0, [r4, #0x71]
cmp r0, #0
beq _021256dc
ldr r0, _021258a8 ; =data_027e0f74
ldr r0, _021258a8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
ldr r1, _021258ac ; =data_ov14_02153c04
ldrh r1, [r1, #6]
cmp r0, r1
@@ -7337,15 +7337,15 @@ _02125738:
ldrb r0, [r4, #0x71]
cmp r0, #0
beq _02125794
ldr r0, _021258a8 ; =data_027e0f74
ldr r0, _021258a8 ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _021258a8 ; =data_027e0f74
ldr r0, _021258a8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
ldr r1, _021258ac ; =data_ov14_02153c04
ldrh r1, [r1, #0xa]
cmp r0, r1
@@ -7369,9 +7369,9 @@ _021257b0:
ldrb r0, [r4, #0x71]
cmp r0, #0
beq _021257f4
ldr r0, _021258a8 ; =data_027e0f74
ldr r0, _021258a8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
ldr r1, _021258ac ; =data_ov14_02153c04
ldrh r1, [r1, #0xc]
cmp r0, r1
@@ -7400,9 +7400,9 @@ _02125810:
blx r3
ldmia sp!, {r4, pc}
_0212582c:
ldr r0, _021258a8 ; =data_027e0f74
ldr r0, _021258a8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -7435,7 +7435,7 @@ _02125890:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov14_0212559c
_021258a8: .word data_027e0f74
_021258a8: .word gAdventureFlags
_021258ac: .word data_ov14_02153c04
_021258b0: .word data_027e0e60
@@ -7554,7 +7554,7 @@ _021259c4:
str r2, [sp, #0xb4]
strb r1, [sp, #0xb9]
ldr r1, [r4, #0x18]
ldr r0, _02125c14 ; =data_027e0f74
ldr r0, _02125c14 ; =gAdventureFlags
str r1, [sp, #0xd0]
ldr r1, [r4, #0x1c]
ldr r0, [r0]
@@ -7564,7 +7564,7 @@ _021259c4:
str r2, [sp, #0xd8]
ldrb r2, [r4, #0x36]
strb r2, [sp, #0xc0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
ldr r1, _02125c18 ; =data_027e0e60
str r0, [r4, #0x68]
ldr r0, [r1]
@@ -7610,7 +7610,7 @@ _02125aa8:
mov r2, #0x1e
ldrh r3, [r0, #0xc]
mov r1, #6
ldr r0, _02125c14 ; =data_027e0f74
ldr r0, _02125c14 ; =gAdventureFlags
str r3, [sp, #4]
strb r2, [sp, #9]
strb r1, [sp, #0xa]
@@ -7622,7 +7622,7 @@ _02125aa8:
str r2, [sp, #0x24]
ldr r2, [r4, #0x20]
str r2, [sp, #0x28]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x68]
add r0, sp, #0
bl func_ov00_0209a508
@@ -7702,7 +7702,7 @@ _02125c04:
.align 2, 0
arm_func_end func_ov14_0212595c
_02125c10: .word data_ov14_02153c04
_02125c14: .word data_027e0f74
_02125c14: .word gAdventureFlags
_02125c18: .word data_027e0e60
_02125c1c: .word data_027e0ffc
_02125c20: .word 0x000001af
@@ -9039,10 +9039,10 @@ _02126b6c:
ldrb r0, [r5, #0x7c]
cmp r0, #0
beq _02126b90
ldr r0, _02127024 ; =data_027e0f74
ldr r0, _02127024 ; =gAdventureFlags
ldr r1, [r5, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02127004
_02126b90:
@@ -9171,10 +9171,10 @@ _02126d58:
ldrb r0, [r5, #0x7c]
cmp r0, #0
beq _02126d7c
ldr r0, _02127024 ; =data_027e0f74
ldr r0, _02127024 ; =gAdventureFlags
ldr r1, [r5, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02127004
_02126d7c:
@@ -9362,7 +9362,7 @@ _02127004:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov14_02126b04
_02127024: .word data_027e0f74
_02127024: .word gAdventureFlags
_02127028: .word data_ov14_02153c38
_0212702c: .word data_027e0ffc
_02127030: .word 0x000001b3
@@ -9444,10 +9444,10 @@ _0212713c:
ldrb r0, [r4, #0x7c]
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02127184 ; =data_027e0f74
ldr r0, _02127184 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r1, #1
@@ -9461,7 +9461,7 @@ _0212713c:
.align 2, 0
arm_func_end func_ov14_02127034
_02127180: .word data_027e0e60
_02127184: .word data_027e0f74
_02127184: .word gAdventureFlags
.global func_ov14_02127188
arm_func_start func_ov14_02127188
@@ -9572,10 +9572,10 @@ _021272e4:
strb r1, [sp, #0xd1]
str r0, [sp, #0x150]
_0212731c:
ldr r0, _021276ac ; =data_027e0f74
ldr r0, _021276ac ; =gAdventureFlags
add r1, sp, #0xbc
ldr r0, [r0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x64]
add r0, sp, #0xbc
bl func_ov00_0209a508
@@ -9708,14 +9708,14 @@ _021274f4:
moveq r0, #0
strb r0, [sp, #0x1c]
ldrb r1, [r5, #0x86]
ldr r0, _021276ac ; =data_027e0f74
ldr r0, _021276ac ; =gAdventureFlags
strb r1, [sp, #0x1d]
ldrb r3, [r5, #0x87]
ldr r0, [r0]
add r1, sp, #0xc
strb r3, [sp, #0x1f]
str r2, [sp, #0xa0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x64]
add r0, sp, #0xc
bl func_ov00_0209a508
@@ -9729,10 +9729,10 @@ _02127548:
ldrneb r0, [r5, #0x7c]
cmpne r0, #0
beq _021276a0
ldr r0, _021276ac ; =data_027e0f74
ldr r0, _021276ac ; =gAdventureFlags
mov r1, #2
ldr r0, [r0]
bl func_ov00_02098064
bl _ZN14AdventureFlags18func_ov00_02098064Ei
cmp r4, #0
bne _021276a0
ldrb r0, [r5, #0x7d]
@@ -9819,7 +9819,7 @@ _021276a0:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov14_02127188
_021276ac: .word data_027e0f74
_021276ac: .word gAdventureFlags
_021276b0: .word data_027e0e60
_021276b4: .word data_027e0ffc
_021276b8: .word 0x000001b5
@@ -10515,10 +10515,10 @@ func_ov14_02127eb8: ; 0x02127eb8
ldrh r1, [r0, #0x24]
cmp r1, #1
bne _02127edc
ldr r2, _02127ef0 ; =data_027e0f74
ldr r2, _02127ef0 ; =gAdventureFlags
ldrh r1, [r0, #0x26]
ldr r0, [r2]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
ldmia sp!, {r3, pc}
_02127edc:
ldr r2, _02127ef4 ; =data_027e0e60
@@ -10528,7 +10528,7 @@ _02127edc:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_02127eb8
_02127ef0: .word data_027e0f74
_02127ef0: .word gAdventureFlags
_02127ef4: .word data_027e0e60
.global func_ov14_02127ef8
@@ -11057,16 +11057,16 @@ _0212859c: ; jump table
b _021286f8 ; case 19
b _02128770 ; case 20
_021285f0:
ldr r0, _02128994 ; =data_027e0f74
ldr r0, _02128994 ; =gAdventureFlags
ldr r1, [r7, #0xd0]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _02128994 ; =data_027e0f74
ldr r0, _02128994 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_0209809c
bl _ZN14AdventureFlags18func_ov00_0209809cEv
cmp r0, #0
addne sp, sp, #0x18
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
@@ -11236,10 +11236,10 @@ _02128868:
cmp r0, #0
addne sp, sp, #0x18
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _02128994 ; =data_027e0f74
ldr r0, _02128994 ; =gAdventureFlags
ldr r1, [r7, #0xd0]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
str r1, [r7, #0xd0]
mov r0, r7
@@ -11263,10 +11263,10 @@ _021288d0:
cmp r0, #0
addne sp, sp, #0x18
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _02128994 ; =data_027e0f74
ldr r0, _02128994 ; =gAdventureFlags
ldr r1, [r7, #0xd0]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
str r1, [r7, #0xd0]
mov r0, r7
@@ -11305,7 +11305,7 @@ _02128984: .word data_027e104c
_02128988: .word data_027e0c68
_0212898c: .word data_027e0ffc
_02128990: .word 0x000001b2
_02128994: .word data_027e0f74
_02128994: .word gAdventureFlags
_02128998: .word 0x0b60b60b
_0212899c: .word data_02050f54
_021289a0: .word data_027e0f90
@@ -11350,10 +11350,10 @@ _02128a18:
bl _ZN10PlayerBase10SetVisibleEb
b _02128d64
_02128a2c:
ldr r0, _02128d74 ; =data_027e0f74
ldr r0, _02128d74 ; =gAdventureFlags
ldr r1, [r4, #0xd0]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
ldr r1, [r4, #4]
mov r0, #0x1e
bic r1, r1, #4
@@ -11465,7 +11465,7 @@ _02128a84:
ldrb ip, [sp, #0x62]
ldrb r3, [sp, #0x63]
ldrb r2, [sp, #0x64]
ldr r0, _02128d74 ; =data_027e0f74
ldr r0, _02128d74 ; =gAdventureFlags
add r1, sp, #0x68
ldr r0, [r0]
strb r5, [sp, #0xf4]
@@ -11473,7 +11473,7 @@ _02128a84:
strb ip, [sp, #0xf6]
strb r3, [sp, #0xf7]
strb r2, [sp, #0xf8]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0xd0]
add r0, sp, #0x68
bl func_ov00_0209a508
@@ -11575,7 +11575,7 @@ _02128d64:
.align 2, 0
arm_func_end func_ov14_021289a4
_02128d70: .word data_027e0f90
_02128d74: .word data_027e0f74
_02128d74: .word gAdventureFlags
_02128d78: .word data_027e0ffc
_02128d7c: .word data_027e0f64
_02128d80: .word 0x00001266
@@ -16548,9 +16548,9 @@ func_ov14_0212cd08: ; 0x0212cd08
ldrh r1, [r4, #0x24]
cmp r1, #0
beq _0212ce10
ldr r0, _0212ce54 ; =data_027e0f74
ldr r0, _0212ce54 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0212ce30
_0212ce10:
@@ -16574,7 +16574,7 @@ _0212ce30:
.align 2, 0
arm_func_end func_ov14_0212cd08
_0212ce50: .word 0x00000666
_0212ce54: .word data_027e0f74
_0212ce54: .word gAdventureFlags
.global func_ov14_0212ce58
arm_func_start func_ov14_0212ce58
@@ -18501,9 +18501,9 @@ _0212e608:
ldrh r1, [r4, #0x28]
cmp r1, #0
beq _0212e694
ldr r0, _0212e6e8 ; =data_027e0f74
ldr r0, _0212e6e8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0212e6b4
_0212e694:
@@ -18531,7 +18531,7 @@ _0212e6d8: .word data_027e0f68
_0212e6dc: .word 0x000007fc
_0212e6e0: .word 0x00000ccd
_0212e6e4: .word 0x00002666
_0212e6e8: .word data_027e0f74
_0212e6e8: .word gAdventureFlags
.global func_ov14_0212e6ec
arm_func_start func_ov14_0212e6ec
@@ -18553,9 +18553,9 @@ _0212e704: ; jump table
b _0212e884 ; case 7
b _0212e8b4 ; case 8
_0212e728:
ldr r0, _0212e8cc ; =data_027e0f74
ldr r0, _0212e8cc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_0209809c
bl _ZN14AdventureFlags18func_ov00_0209809cEv
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -18669,7 +18669,7 @@ _0212e8b4:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov14_0212e6ec
_0212e8cc: .word data_027e0f74
_0212e8cc: .word gAdventureFlags
_0212e8d0: .word data_027e0c68
_0212e8d4: .word data_027e103c
_0212e8d8: .word data_027e077c
@@ -18747,11 +18747,11 @@ _0212e97c:
str r1, [sp, #0x34]
mov r0, #2
str r0, [sp]
ldr r0, _0212eb38 ; =data_027e0f74
ldr r0, _0212eb38 ; =gAdventureFlags
str r1, [sp, #4]
ldr r0, [r0]
mov r3, r2
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
ldr r0, [r4, #0x1c]
ldr r3, [r4, #0x20]
ldr r1, [r4, #0x18]
@@ -18807,12 +18807,12 @@ _0212ea9c:
mov r0, #2
str r0, [sp]
mov r1, #0xa
ldr r0, _0212eb38 ; =data_027e0f74
ldr r0, _0212eb38 ; =gAdventureFlags
str r2, [sp, #4]
ldr r0, [r0]
mov r2, r1
mov r3, r1
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
b _0212eb18
_0212eacc:
mov r1, #0
@@ -18845,7 +18845,7 @@ _0212eb28: .word data_027e103c
_0212eb2c: .word data_027e0f64
_0212eb30: .word 0x00001555
_0212eb34: .word 0x000004cd
_0212eb38: .word data_027e0f74
_0212eb38: .word gAdventureFlags
_0212eb3c: .word data_027e0f90
_0212eb40: .word data_027e0fe4
_0212eb44: .word data_027e0c68
@@ -20576,10 +20576,10 @@ _02130198:
cmp r0, #0
beq _02130268
_02130254:
ldr r0, _021304c0 ; =data_027e0f74
ldr r0, _021304c0 ; =gAdventureFlags
add r1, sp, #0xd8
ldr r0, [r0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r6, #0x70]
_02130268:
ldrb r0, [r6, #0xaa]
@@ -20670,10 +20670,10 @@ _02130318:
cmp r0, #0
beq _021303c0
_021303ac:
ldr r0, _021304c0 ; =data_027e0f74
ldr r0, _021304c0 ; =gAdventureFlags
add r1, sp, #0x28
ldr r0, [r0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r6, #0x70]
_021303c0:
ldrb r0, [r6, #0xab]
@@ -20748,7 +20748,7 @@ _021304ac:
arm_func_end func_ov14_0213012c
_021304b8: .word data_027e0e58
_021304bc: .word data_027e0e60
_021304c0: .word data_027e0f74
_021304c0: .word gAdventureFlags
_021304c4: .word data_027e0ffc
_021304c8: .word 0x000002a2
@@ -20916,15 +20916,15 @@ func_ov14_0213067c: ; 0x0213067c
cmpne r1, #0
beq _021306d4
_02130698:
ldr r2, _021306dc ; =data_027e0f74
ldr r2, _021306dc ; =gAdventureFlags
ldr r1, [r0, #0x70]
ldr r0, [r2]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
bne _021306c4
ldr r0, _021306dc ; =data_027e0f74
ldr r0, _021306dc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _021306cc
_021306c4:
@@ -20938,7 +20938,7 @@ _021306d4:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_0213067c
_021306dc: .word data_027e0f74
_021306dc: .word gAdventureFlags
.global func_ov14_021306e0
arm_func_start func_ov14_021306e0
@@ -20951,15 +20951,15 @@ func_ov14_021306e0: ; 0x021306e0
cmpne r1, #0
beq _02130738
_021306fc:
ldr r2, _02130740 ; =data_027e0f74
ldr r2, _02130740 ; =gAdventureFlags
ldr r1, [r0, #0x70]
ldr r0, [r2]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
bne _02130728
ldr r0, _02130740 ; =data_027e0f74
ldr r0, _02130740 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _02130730
_02130728:
@@ -20973,7 +20973,7 @@ _02130738:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov14_021306e0
_02130740: .word data_027e0f74
_02130740: .word gAdventureFlags
.global func_ov14_02130744
arm_func_start func_ov14_02130744
@@ -21501,25 +21501,25 @@ _02130e3c:
blx r3
b _02130f68
_02130e7c:
ldr r0, _02130f84 ; =data_027e0f74
ldr r0, _02130f84 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _02130eec
ldr r0, _02130f84 ; =data_027e0f74
ldr r0, _02130f84 ; =gAdventureFlags
ldr r1, [r4, #0x70]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02130f68
ldr r0, _02130f84 ; =data_027e0f74
ldr r0, _02130f84 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
blo _02130f68
ldr r0, _02130f84 ; =data_027e0f74
ldr r0, _02130f84 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
bne _02130eec
mov r0, r4
@@ -21572,7 +21572,7 @@ _02130f74: .word 0x00000333
_02130f78: .word data_027e077c
_02130f7c: .word 0xfffff333
_02130f80: .word 0x00000266
_02130f84: .word data_027e0f74
_02130f84: .word gAdventureFlags
.global func_ov14_02130f88
arm_func_start func_ov14_02130f88
@@ -21696,7 +21696,7 @@ _02131100:
str r2, [sp, #0x38]
strb r1, [sp, #0x3d]
ldr r1, [r4, #0x80]
ldr r0, _0213140c ; =data_027e0f74
ldr r0, _0213140c ; =gAdventureFlags
str r1, [sp, #0x54]
ldr r1, [r4, #0x84]
ldr r0, [r0]
@@ -21706,7 +21706,7 @@ _02131100:
str r2, [sp, #0x5c]
ldrb r2, [r4, #0x36]
strb r2, [sp, #0x44]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x70]
mov r1, #0
ldr r0, _02131410 ; =data_027e0e60
@@ -21888,7 +21888,7 @@ _021313fc: .word data_027e0764
_02131400: .word data_ov14_02157314
_02131404: .word data_027e0e58
_02131408: .word 0x0000025b
_0213140c: .word data_027e0f74
_0213140c: .word gAdventureFlags
_02131410: .word data_027e0e60
_02131414: .word 0xfffff333
@@ -22665,9 +22665,9 @@ func_ov14_02131d80: ; 0x02131d80
cmp r0, #0
addeq sp, sp, #4
ldmeqia sp!, {r3, r4, pc}
ldr r0, _02131eb8 ; =data_027e0f74
ldr r0, _02131eb8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
addne sp, sp, #4
ldmneia sp!, {r3, r4, pc}
@@ -22742,7 +22742,7 @@ _02131ea0:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov14_02131d80
_02131eb8: .word data_027e0f74
_02131eb8: .word gAdventureFlags
_02131ebc: .word 0xfffffe66
.global func_ov14_02131ec0
@@ -23563,7 +23563,7 @@ _02132958:
mov r3, #0x3c
mov r2, #0x1e
mov r1, #6
ldr r0, _02132a84 ; =data_027e0f74
ldr r0, _02132a84 ; =gAdventureFlags
str r3, [sp, #8]
strb r2, [sp, #0xd]
strb r1, [sp, #0xe]
@@ -23575,7 +23575,7 @@ _02132958:
str r2, [sp, #0x28]
ldr r2, [r5, #0x20]
str r2, [sp, #0x2c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
add r0, sp, #4
bl func_ov00_0209a508
_021329bc:
@@ -23635,7 +23635,7 @@ _02132a74: .word data_027e0ffc
_02132a78: .word 0x000001a9
_02132a7c: .word data_ov14_02153df8
_02132a80: .word data_027e0e58
_02132a84: .word data_027e0f74
_02132a84: .word gAdventureFlags
_02132a88: .word 0x000001bd
.global func_ov14_02132a8c
@@ -24196,16 +24196,16 @@ _02133170:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_021331ac:
ldr r0, _0213339c ; =data_027e0f74
ldr r0, _0213339c ; =gAdventureFlags
ldr r1, [r5, #0x94]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldr r0, _0213339c ; =data_027e0f74
ldr r0, _0213339c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
addlo sp, sp, #0x18
ldmloia sp!, {r4, r5, r6, r7, r8, pc}
@@ -24332,7 +24332,7 @@ _02133394:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov14_02133128
_0213339c: .word data_027e0f74
_0213339c: .word gAdventureFlags
_021333a0: .word data_027e0ffc
_021333a4: .word data_027e0f64
_021333a8: .word data_027e0e58
@@ -24452,7 +24452,7 @@ _021334f0:
str r2, [sp, #0x20]
strb r1, [sp, #0x25]
ldr r1, [r5, #0x18]
ldr r0, _021336f8 ; =data_027e0f74
ldr r0, _021336f8 ; =gAdventureFlags
str r1, [sp, #0x3c]
ldr r1, [r5, #0x1c]
ldr r0, [r0]
@@ -24462,7 +24462,7 @@ _021334f0:
str r2, [sp, #0x44]
ldrb r2, [r5, #0x36]
strb r2, [sp, #0x2c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x94]
mov r1, #0
add r0, sp, #0x1c
@@ -24578,7 +24578,7 @@ _021336e8: .word data_027e0e58
_021336ec: .word 0x00000195
_021336f0: .word data_027e0ffc
_021336f4: .word 0x0000033e
_021336f8: .word data_027e0f74
_021336f8: .word gAdventureFlags
_021336fc: .word 0x0000018f
_02133700: .word 0x00000192
_02133704: .word 0x00000193
@@ -29449,12 +29449,12 @@ func_ov14_02137648: ; 0x02137648
arm_func_start func_ov14_02137650
func_ov14_02137650: ; 0x02137650
stmdb sp!, {r4, r5, r6, lr}
ldr r3, _0213774c ; =data_027e0f74
ldr r3, _0213774c ; =gAdventureFlags
mov r4, r0
ldr r0, [r3]
mov r6, r1
mov r5, r2
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _02137750 ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -29518,7 +29518,7 @@ _02137744:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov14_02137650
_0213774c: .word data_027e0f74
_0213774c: .word gAdventureFlags
_02137750: .word data_027e0c68
_02137754: .word data_027e077c
_02137758: .word data_027e0fc8
@@ -32245,9 +32245,9 @@ func_ov14_0213996c: ; 0x0213996c
ldrh r1, [r4, #0x24]
cmp r1, #0
ble _0213999c
ldr r0, _02139a48 ; =data_027e0f74
ldr r0, _02139a48 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
streqb r0, [r4, #0x118]
@@ -32256,9 +32256,9 @@ _0213999c:
ldrh r1, [r4, #0x26]
cmp r1, #0
ble _021399c4
ldr r0, _02139a48 ; =data_027e0f74
ldr r0, _02139a48 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
strneb r0, [r4, #0x118]
@@ -32299,7 +32299,7 @@ _021399c4:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov14_0213996c
_02139a48: .word data_027e0f74
_02139a48: .word gAdventureFlags
_02139a4c: .word data_027e0d0c
.global func_ov14_02139a50
@@ -32799,7 +32799,7 @@ _0213a048:
strb r0, [sp, #9]
str r1, [sp, #4]
ldr r1, [r4, #0x14]
ldr r0, _0213a148 ; =data_027e0f74
ldr r0, _0213a148 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r4, #0x18]
ldr r0, [r0]
@@ -32807,16 +32807,16 @@ _0213a048:
ldr r2, [r4, #0x1c]
add r1, sp, #0
str r2, [sp, #0x28]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x158]
add r0, sp, #0
bl func_ov00_0209a508
add sp, sp, #0xb0
ldmia sp!, {r4, pc}
_0213a0c4:
ldr r0, _0213a148 ; =data_027e0f74
ldr r0, _0213a148 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0xb0
ldmeqia sp!, {r4, pc}
@@ -32840,10 +32840,10 @@ _0213a114:
cmp r0, #0x1e
addle sp, sp, #0xb0
ldmleia sp!, {r4, pc}
ldr r0, _0213a148 ; =data_027e0f74
ldr r0, _0213a148 ; =gAdventureFlags
ldr r1, [r4, #0x158]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mov r0, r4
bl _ZN5Actor4KillEv
_0213a13c:
@@ -32852,7 +32852,7 @@ _0213a13c:
.align 2, 0
arm_func_end func_ov14_02139fdc
_0213a144: .word data_027e077c
_0213a148: .word data_027e0f74
_0213a148: .word gAdventureFlags
.global func_ov14_0213a14c
arm_func_start func_ov14_0213a14c
asm/ov14/ov14_0213b778.inc
+76 -76
View File
@@ -14,9 +14,71 @@
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager8GiveItemEjjj
.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
+162 -162
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 _ZN11ItemManager8GiveItemEjjj
.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
+670 -670
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
+84 -84
View File
@@ -1344,7 +1344,7 @@ _0215c32c:
strb r2, [sp, #0x61]
strb r0, [sp, #0x62]
ldr r0, [r5, #0x1c]
ldr r1, _0215c658 ; =data_027e0f74
ldr r1, _0215c658 ; =gAdventureFlags
add r0, r0, #0x33
add r3, r0, #0x1300
ldr r0, [r1]
@@ -1354,7 +1354,7 @@ _0215c32c:
str r2, [sp, #0x78]
str r3, [sp, #0x7c]
str r4, [sp, #0x80]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x6c]
add r0, sp, #0x58
bl func_ov00_0209a508
@@ -1547,7 +1547,7 @@ _0215c648:
.align 2, 0
arm_func_end func_ov17_0215c2bc
_0215c654: .word data_027e0e60
_0215c658: .word data_027e0f74
_0215c658: .word gAdventureFlags
_0215c65c: .word data_027e0e58
_0215c660: .word data_027e0ffc
_0215c664: .word 0x000014cd
@@ -7471,16 +7471,16 @@ _02161258:
ldrb r0, [r4, #0x7c]
cmp r0, #0
beq _0216127c
ldr r0, _021612a8 ; =data_027e0f74
ldr r0, _021612a8 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
_0216127c:
ldr r0, _021612a8 ; =data_027e0f74
ldr r0, _021612a8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xa
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _021612ac ; =data_027e0fc8
@@ -7491,7 +7491,7 @@ _0216127c:
.align 2, 0
arm_func_end func_ov17_021611cc
_021612a4: .word data_027e0f90
_021612a8: .word data_027e0f74
_021612a8: .word gAdventureFlags
_021612ac: .word data_027e0fc8
.global func_ov17_021612b0
@@ -7572,7 +7572,7 @@ _02161334:
strb r0, [sp, #0xb]
strb r1, [sp, #9]
ldr r1, [r5, #0x18]
ldr r0, _021614ec ; =data_027e0f74
ldr r0, _021614ec ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r5, #0x1c]
ldr r0, [r0]
@@ -7582,7 +7582,7 @@ _02161334:
str r2, [sp, #0x28]
ldrb r2, [r5, #0x36]
strb r2, [sp, #0x10]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x64]
add r0, sp, #0
bl func_ov00_0209a508
@@ -7654,7 +7654,7 @@ _021614dc:
.align 2, 0
arm_func_end func_ov17_021612b0
_021614e8: .word data_ov17_0216b0d8
_021614ec: .word data_027e0f74
_021614ec: .word gAdventureFlags
_021614f0: .word data_027e0e60
.global func_ov17_021614f4
@@ -7926,10 +7926,10 @@ _02161864:
mov r1, #0x1b4
bl func_ov00_020cecd8
_02161894:
ldr r0, _02161914 ; =data_027e0f74
ldr r0, _02161914 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _021618f4
ldrb r2, [r4, #0x15]
@@ -7962,7 +7962,7 @@ _02161908:
.align 2, 0
arm_func_end func_ov17_02161824
_02161910: .word data_027e0ffc
_02161914: .word data_027e0f74
_02161914: .word gAdventureFlags
.global func_ov17_02161918
arm_func_start func_ov17_02161918
@@ -8254,9 +8254,9 @@ func_ov17_02161c84: ; 0x02161c84
ldrh r1, [r4, #0x26]
cmp r1, #0
beq _02161cb0
ldr r0, _02161cc0 ; =data_027e0f74
ldr r0, _02161cc0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #1
ldmneia sp!, {r4, pc}
@@ -8267,7 +8267,7 @@ _02161cb0:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov17_02161c84
_02161cc0: .word data_027e0f74
_02161cc0: .word gAdventureFlags
.global func_ov17_02161cc4
arm_func_start func_ov17_02161cc4
@@ -8277,9 +8277,9 @@ func_ov17_02161cc4: ; 0x02161cc4
ldrh r1, [r4, #0x26]
cmp r1, #0
beq _02161cf0
ldr r0, _02161d00 ; =data_027e0f74
ldr r0, _02161d00 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #1
ldmneia sp!, {r4, pc}
@@ -8290,7 +8290,7 @@ _02161cf0:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov17_02161cc4
_02161d00: .word data_027e0f74
_02161d00: .word gAdventureFlags
.global func_ov17_02161d04
arm_func_start func_ov17_02161d04
@@ -8300,9 +8300,9 @@ func_ov17_02161d04: ; 0x02161d04
ldrh r1, [r4, #0x26]
cmp r1, #0
beq _02161d30
ldr r0, _02161d4c ; =data_027e0f74
ldr r0, _02161d4c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -8316,7 +8316,7 @@ _02161d30:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov17_02161d04
_02161d4c: .word data_027e0f74
_02161d4c: .word gAdventureFlags
.global func_ov17_02161d50
arm_func_start func_ov17_02161d50
@@ -13128,10 +13128,10 @@ _02165824:
bl func_ov17_02165c48
b _02165930
_02165858:
ldr r0, _0216594c ; =data_027e0f74
ldr r0, _0216594c ; =gAdventureFlags
ldr r1, [r5, #0x164]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _02165930
ldr r0, [r5, #0x15c]
@@ -13198,7 +13198,7 @@ _02165930:
arm_func_end func_ov17_021657bc
_02165944: .word data_027e0ffc
_02165948: .word 0x0000047c
_0216594c: .word data_027e0f74
_0216594c: .word gAdventureFlags
.global func_ov17_02165950
arm_func_start func_ov17_02165950
@@ -13239,10 +13239,10 @@ _021659b0:
bl func_ov17_02165c48
b _02165c00
_021659d4:
ldr r0, _02165c20 ; =data_027e0f74
ldr r0, _02165c20 ; =gAdventureFlags
ldr r1, [r5, #0x164]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _02165a34
ldr r0, [r5, #0x15c]
@@ -13267,15 +13267,15 @@ _02165a20:
bl func_ov17_02165c48
b _02165c00
_02165a34:
ldr r0, _02165c20 ; =data_027e0f74
ldr r0, _02165c20 ; =gAdventureFlags
ldr r1, [r5, #0x164]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02165c00
ldr r0, _02165c20 ; =data_027e0f74
ldr r0, _02165c20 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
bne _02165bf4
ldr r0, [r5, #0x15c]
@@ -13396,7 +13396,7 @@ _02165c00:
arm_func_end func_ov17_02165950
_02165c18: .word data_027e0ffc
_02165c1c: .word 0x0000047c
_02165c20: .word data_027e0f74
_02165c20: .word gAdventureFlags
_02165c24: .word data_027e0e58
_02165c28: .word 0x000001e3
_02165c2c: .word 0x000001e1
@@ -13464,7 +13464,7 @@ _02165ce4:
mov r0, #0x64
mov r2, #0x1f
str r0, [sp, #4]
ldr r0, _02165e40 ; =data_027e0f74
ldr r0, _02165e40 ; =gAdventureFlags
strb r2, [sp, #9]
strb r1, [sp, #0xa]
strb r1, [sp, #0xb]
@@ -13476,7 +13476,7 @@ _02165ce4:
str r2, [sp, #0x24]
ldr r2, [r4, #0x50]
str r2, [sp, #0x28]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x164]
add r0, sp, #0
bl func_ov00_0209a508
@@ -13548,7 +13548,7 @@ _02165e2c:
arm_func_end func_ov17_02165c48
_02165e38: .word data_027e0f6c
_02165e3c: .word data_027e0e58
_02165e40: .word data_027e0f74
_02165e40: .word gAdventureFlags
_02165e44: .word data_027e0e60
.global func_ov17_02165e48
@@ -13749,9 +13749,9 @@ _021660a0:
ldrneb r0, [r4, #0x2a]
cmpne r0, #0
beq _02166114
ldr r0, _021661e4 ; =data_027e0f74
ldr r0, _021661e4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0216610c
mov r0, r4
@@ -13764,9 +13764,9 @@ _0216610c:
mov r0, #0
ldmia sp!, {r4, pc}
_02166114:
ldr r0, _021661e4 ; =data_027e0f74
ldr r0, _021661e4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0216613c
mov r0, r4
@@ -13791,9 +13791,9 @@ _0216614c:
ldrneb r0, [r4, #0x2a]
cmpne r0, #0
beq _021661a8
ldr r0, _021661e4 ; =data_027e0f74
ldr r0, _021661e4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _021661a0
mov r0, r4
@@ -13806,9 +13806,9 @@ _021661a0:
mov r0, #0
ldmia sp!, {r4, pc}
_021661a8:
ldr r0, _021661e4 ; =data_027e0f74
ldr r0, _021661e4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _021661d0
mov r0, r4
@@ -13825,7 +13825,7 @@ _021661d8:
.align 2, 0
arm_func_end func_ov17_02166068
_021661e0: .word data_027e0e60
_021661e4: .word data_027e0f74
_021661e4: .word gAdventureFlags
.global func_ov17_021661e8
arm_func_start func_ov17_021661e8
@@ -15717,14 +15717,14 @@ _02167af4:
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
_02167b30:
ldr r0, _02167cc4 ; =data_027e0f74
ldr r0, _02167cc4 ; =gAdventureFlags
ldr r1, [r5, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
ldr r0, _02167cc4 ; =data_027e0f74
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
ldr r0, _02167cc4 ; =gAdventureFlags
ldr r1, [r5, #0x64]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r4, r5, pc}
@@ -15791,9 +15791,9 @@ _02167bd4:
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
_02167c48:
ldr r0, _02167cc4 ; =data_027e0f74
ldr r0, _02167cc4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02167ca4
ldr r0, [r4, #0x48]
@@ -15826,7 +15826,7 @@ _02167cbc:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov17_02167aac
_02167cc4: .word data_027e0f74
_02167cc4: .word gAdventureFlags
_02167cc8: .word data_027e0fe4
_02167ccc: .word data_027e0fb8
_02167cd0: .word data_027e0f64
@@ -15864,7 +15864,7 @@ _02167d1c:
mov r2, #0x1e
mov r3, #0
mov r1, #3
ldr r0, _02167e4c ; =data_027e0f74
ldr r0, _02167e4c ; =gAdventureFlags
str ip, [sp, #0x40]
strb r2, [sp, #0x45]
strb r3, [sp, #0x47]
@@ -15878,7 +15878,7 @@ _02167d1c:
ldr r2, [r4, #0x20]
str r2, [sp, #0x64]
strb r3, [sp, #0x52]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x64]
add r0, sp, #0x3c
bl func_ov00_0209a508
@@ -15937,7 +15937,7 @@ _02167e40:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov17_02167cd4
_02167e4c: .word data_027e0f74
_02167e4c: .word gAdventureFlags
_02167e50: .word data_027e0fe8
_02167e54: .word 0x41525257
_02167e58: .word data_027e0ffc
@@ -18156,10 +18156,10 @@ func_ov17_02169a58: ; 0x02169a58
cmp r0, #2
addne sp, sp, #0x18
ldmneia sp!, {r4, pc}
ldr r0, _02169b3c ; =data_027e0f74
ldr r0, _02169b3c ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02169b08
ldr r0, _02169b40 ; =data_027e0fe4
@@ -18202,7 +18202,7 @@ _02169b08:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov17_02169a58
_02169b3c: .word data_027e0f74
_02169b3c: .word gAdventureFlags
_02169b40: .word data_027e0fe4
_02169b44: .word data_027e0f64
@@ -18230,9 +18230,9 @@ _02169b74:
ldr r1, [r4, #0x64]
cmp r1, r0
beq _02169c98
ldr r0, _02169ca4 ; =data_027e0f74
ldr r0, _02169ca4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x64]
b _02169c98
@@ -18281,7 +18281,7 @@ _02169c1c:
strb r2, [sp, #0xa]
strb r1, [sp, #0xb]
ldr r1, [r4, #0x18]
ldr r0, _02169ca4 ; =data_027e0f74
ldr r0, _02169ca4 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r2, [r4, #0x1c]
add r1, sp, #0
@@ -18295,7 +18295,7 @@ _02169c1c:
ldr r2, [r4, #0x20]
str r2, [r4, #0x78]
ldr r0, [r0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x64]
add r0, sp, #0
bl func_ov00_0209a508
@@ -18305,7 +18305,7 @@ _02169c98:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov17_02169b48
_02169ca4: .word data_027e0f74
_02169ca4: .word gAdventureFlags
_02169ca8: .word data_027e0ffc
_02169cac: .word 0x0000034e
_02169cb0: .word 0x0000034f
@@ -18659,16 +18659,16 @@ func_ov17_0216a06c: ; 0x0216a06c
ldrb r0, [r5, #0x7c]
cmp r0, #0
beq _0216a0cc
ldr r0, _0216a0f4 ; =data_027e0f74
ldr r0, _0216a0f4 ; =gAdventureFlags
ldr r1, [r5, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
_0216a0cc:
ldr r0, _0216a0f4 ; =data_027e0f74
ldr r0, _0216a0f4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xa
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _0216a0f8 ; =data_027e0fc8
@@ -18678,7 +18678,7 @@ _0216a0cc:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov17_0216a06c
_0216a0f4: .word data_027e0f74
_0216a0f4: .word gAdventureFlags
_0216a0f8: .word data_027e0fc8
.global func_ov17_0216a0fc
@@ -18759,7 +18759,7 @@ _0216a180:
strb r0, [sp, #0xb]
strb r1, [sp, #9]
ldr r1, [r5, #0x18]
ldr r0, _0216a340 ; =data_027e0f74
ldr r0, _0216a340 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r5, #0x1c]
ldr r0, [r0]
@@ -18769,7 +18769,7 @@ _0216a180:
str r2, [sp, #0x28]
ldrb r2, [r5, #0x36]
strb r2, [sp, #0x10]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x64]
add r0, sp, #0
bl func_ov00_0209a508
@@ -18843,7 +18843,7 @@ _0216a330:
.align 2, 0
arm_func_end func_ov17_0216a0fc
_0216a33c: .word data_ov17_0216b1f8
_0216a340: .word data_027e0f74
_0216a340: .word gAdventureFlags
_0216a344: .word data_027e0e60
.global func_ov17_0216a348
@@ -19104,10 +19104,10 @@ _0216a674:
add sp, sp, #8
ldmia sp!, {r4, pc}
_0216a6b0:
ldr r0, _0216a730 ; =data_027e0f74
ldr r0, _0216a730 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _0216a710
ldrb r2, [r4, #0x15]
@@ -19140,7 +19140,7 @@ _0216a724:
.align 2, 0
arm_func_end func_ov17_0216a634
_0216a72c: .word data_027e0ffc
_0216a730: .word data_027e0f74
_0216a730: .word gAdventureFlags
.global func_ov17_0216a734
arm_func_start func_ov17_0216a734
@@ -19528,15 +19528,15 @@ _0216ac3c:
blx r3
ldmia sp!, {r4, pc}
_0216ac6c:
ldr r0, _0216ace8 ; =data_027e0f74
ldr r0, _0216ace8 ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0216ace8 ; =data_027e0f74
ldr r0, _0216ace8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
ldmloia sp!, {r4, pc}
mov r0, r4
@@ -19547,10 +19547,10 @@ _0216ac6c:
blx r3
ldmia sp!, {r4, pc}
_0216acb4:
ldr r0, _0216ace8 ; =data_027e0f74
ldr r0, _0216ace8 ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -19562,7 +19562,7 @@ _0216acb4:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov17_0216abfc
_0216ace8: .word data_027e0f74
_0216ace8: .word gAdventureFlags
.global func_ov17_0216acec
arm_func_start func_ov17_0216acec
@@ -19619,7 +19619,7 @@ _0216ad7c:
mov r2, #0x1e
mov r1, #6
str r0, [sp, #0x1c]
ldr r0, _0216af2c ; =data_027e0f74
ldr r0, _0216af2c ; =gAdventureFlags
strb r2, [sp, #0x21]
strb r1, [sp, #0x22]
ldr r1, [r4, #0x18]
@@ -19630,7 +19630,7 @@ _0216ad7c:
str r2, [sp, #0x3c]
ldr r2, [r4, #0x20]
str r2, [sp, #0x40]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x68]
add r0, sp, #0x18
bl func_ov00_0209a508
@@ -19727,7 +19727,7 @@ _0216af20:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov17_0216ad30
_0216af2c: .word data_027e0f74
_0216af2c: .word gAdventureFlags
_0216af30: .word data_027e0e58
_0216af34: .word data_027e0ffc
_0216af38: .word data_ov17_0216b230
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
+196 -196
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
+36 -36
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
@@ -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
@@ -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
+43 -43
View File
@@ -132,11 +132,11 @@ _0216d844: .word func_ov20_0216da18
func_ov20_0216d848: ; 0x0216d848
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
ldr r1, _0216d9fc ; =data_027e0f74
ldr r1, _0216d9fc ; =gAdventureFlags
mov r10, r0
ldr r0, [r1]
mov r1, #0x1d
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addne sp, sp, #0x44
movne r0, #0
@@ -243,7 +243,7 @@ _0216d968:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216d848
_0216d9fc: .word data_027e0f74
_0216d9fc: .word gAdventureFlags
_0216da00: .word data_ov20_02178320
_0216da04: .word 0x46425331
_0216da08: .word data_027e0fe8
@@ -291,11 +291,11 @@ func_ov20_0216da64: ; 0x0216da64
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
bl _ZN5Actor4KillEv
ldr r0, _0216dabc ; =data_027e0f74
ldr r0, _0216dabc ; =gAdventureFlags
mov r1, #0x1d
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldr r0, _0216dac0 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
@@ -313,7 +313,7 @@ _0216da98:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov20_0216da64
_0216dabc: .word data_027e0f74
_0216dabc: .word gAdventureFlags
_0216dac0: .word gItemManager
.global func_ov20_0216dac4
@@ -2058,10 +2058,10 @@ _0216f42c:
add r0, r4, #0x2b8
add r0, r0, #0x800
bl func_ov00_020b7e6c
ldr r0, _0216f4b0 ; =data_027e0f74
ldr r0, _0216f4b0 ; =gAdventureFlags
mov r1, #6
ldr r0, [r0]
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
mov r0, r4
bl func_ov00_020cc960
mov r0, r4
@@ -2089,7 +2089,7 @@ _0216f4a0: .word 0x0000100b
_0216f4a4: .word 0x0000100c
_0216f4a8: .word 0x0000100d
_0216f4ac: .word 0x0000030d
_0216f4b0: .word data_027e0f74
_0216f4b0: .word gAdventureFlags
.global func_ov20_0216f4b4
arm_func_start func_ov20_0216f4b4
@@ -6463,15 +6463,15 @@ _02172dac: ; jump table
ldmia sp!, {r4, pc} ; case 9
b _02173000 ; case 10
_02172dd8:
ldr r0, _02173018 ; =data_027e0f74
ldr r0, _02173018 ; =gAdventureFlags
ldr r1, [r4, #0x6c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02173018 ; =data_027e0f74
ldr r0, _02173018 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_0209809c
bl _ZN14AdventureFlags18func_ov00_0209809cEv
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -6517,9 +6517,9 @@ _02172e54:
ldr r1, [r1, r2, lsl #5]
cmp r1, r0
beq _02172eb8
ldr r0, _02173018 ; =data_027e0f74
ldr r0, _02173018 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02172ed4
_02172eb8:
@@ -6620,7 +6620,7 @@ _02173000:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov20_02172d94
_02173018: .word data_027e0f74
_02173018: .word gAdventureFlags
_0217301c: .word data_027e0c68
_02173020: .word data_ov20_021788f8
_02173024: .word 0x00000187
@@ -6898,7 +6898,7 @@ _021732a8:
ldrb ip, [sp, #0x62]
ldrb r3, [sp, #0x63]
ldrb r2, [sp, #0x64]
ldr r0, _02173564 ; =data_027e0f74
ldr r0, _02173564 ; =gAdventureFlags
ldr r6, [sp, #0x5c]
ldr r0, [r0]
add r1, sp, #0x68
@@ -6908,7 +6908,7 @@ _021732a8:
strb ip, [sp, #0xf6]
strb r3, [sp, #0xf7]
strb r2, [sp, #0xf8]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x6c]
add r0, sp, #0x68
bl func_ov00_0209a508
@@ -6952,10 +6952,10 @@ _021734ac:
bl func_02036edc
b _0217354c
_021734c0:
ldr r0, _02173564 ; =data_027e0f74
ldr r0, _02173564 ; =gAdventureFlags
ldr r1, [r4, #0x6c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mov r1, #1
mvn r3, #0
mov r0, r4
@@ -6966,10 +6966,10 @@ _021734c0:
_021734ec:
cmp r2, #0
bne _0217350c
ldr r0, _02173564 ; =data_027e0f74
ldr r0, _02173564 ; =gAdventureFlags
ldr r1, [r4, #0x6c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x6c]
_0217350c:
@@ -6984,10 +6984,10 @@ _0217350c:
str r0, [r4, #4]
b _0217354c
_02173534:
ldr r0, _02173564 ; =data_027e0f74
ldr r0, _02173564 ; =gAdventureFlags
ldr r1, [r4, #0x6c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x6c]
_0217354c:
@@ -6999,7 +6999,7 @@ _0217354c:
_02173558: .word data_027e0f64
_0217355c: .word 0x00001555
_02173560: .word 0x00000333
_02173564: .word data_027e0f74
_02173564: .word gAdventureFlags
_02173568: .word data_027e0c68
_0217356c: .word data_ov00_020eec9c
_02173570: .word 0x0000036b
@@ -8070,9 +8070,9 @@ func_ov20_02174254: ; 0x02174254
ldrh r1, [r4, #0x20]
cmp r1, #0
beq _021742bc
ldr r0, _02174308 ; =data_027e0f74
ldr r0, _02174308 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
strneb r0, [r4, #0x118]
@@ -8100,7 +8100,7 @@ _021742fc:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov20_02174254
_02174308: .word data_027e0f74
_02174308: .word gAdventureFlags
_0217430c: .word data_027e0e58
_02174310: .word 0x000001d7
@@ -9915,7 +9915,7 @@ _02175a54:
str r1, [sp, #0xf0]
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02175f1c ; =data_027e0f74
ldr r0, _02175f1c ; =gAdventureFlags
ldr r5, [sp, #0xd4]
ldr r3, [sp, #0xd8]
ldr r2, [sp, #0xdc]
@@ -9924,16 +9924,16 @@ _02175a54:
str r5, [sp, #0x10c]
str r3, [sp, #0x110]
str r2, [sp, #0x114]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x158]
add r0, sp, #0xec
bl func_ov00_0209a508
add sp, sp, #0x19c
ldmia sp!, {r4, r5, pc}
_02175ae0:
ldr r0, _02175f1c ; =data_027e0f74
ldr r0, _02175f1c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0x19c
ldmeqia sp!, {r4, r5, pc}
@@ -10207,10 +10207,10 @@ _02175ec8:
cmp r0, #0
addeq sp, sp, #0x19c
ldmeqia sp!, {r4, r5, pc}
ldr r0, _02175f1c ; =data_027e0f74
ldr r0, _02175f1c ; =gAdventureFlags
ldr r1, [r4, #0x158]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mov r0, r4
bl _ZN5Actor4KillEv
add sp, sp, #0x19c
@@ -10220,7 +10220,7 @@ _02175ec8:
_02175f10: .word data_027e0f94
_02175f14: .word data_027e0e60
_02175f18: .word data_027e077c
_02175f1c: .word data_027e0f74
_02175f1c: .word gAdventureFlags
_02175f20: .word data_027e0ffc
_02175f24: .word 0x00000391
_02175f28: .word data_027e0fe4
@@ -10510,10 +10510,10 @@ func_ov20_02176234: ; 0x02176234
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0217635c ; =data_027e0f74
ldr r0, _0217635c ; =gAdventureFlags
mov r1, #0xa
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02176294
ldr r0, _02176360 ; =data_027e0f68
@@ -10564,10 +10564,10 @@ _021762c8:
mov r1, #1
strb r1, [r4, #0x4d5]
strb r1, [r4, #0x4d6]
ldr r0, _0217635c ; =data_027e0f74
ldr r0, _0217635c ; =gAdventureFlags
mov r1, #0x3f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
streqb r0, [r4, #0x4d5]
@@ -10582,7 +10582,7 @@ _021762c8:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov20_02176234
_0217635c: .word data_027e0f74
_0217635c: .word gAdventureFlags
_02176360: .word data_027e0f68
_02176364: .word data_027e0fec
_02176368: .word data_ov20_02177aa0
@@ -10729,10 +10729,10 @@ _021764c4:
add sp, sp, #0x14
ldmia sp!, {r3, r4, r5, r6, pc}
_021764d0:
ldr r0, _021766a4 ; =data_027e0f74
ldr r0, _021766a4 ; =gAdventureFlags
mov r1, #0xa
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _021764f8
ldr r0, [r4, #0x18]
@@ -10858,7 +10858,7 @@ _02176694:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov20_02176460
_021766a4: .word data_027e0f74
_021766a4: .word gAdventureFlags
_021766a8: .word data_027e0ffc
_021766ac: .word 0x00000366
_021766b0: .word data_027e0e58
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
+41 -41
View File
@@ -1175,15 +1175,15 @@ _0216e614:
ldrb r0, [r4, #0x64]
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0216e770 ; =data_027e0f74
ldr r0, _0216e770 ; =gAdventureFlags
ldr r1, [r4, #0x70]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0216e770 ; =data_027e0f74
ldr r0, _0216e770 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
ldmloia sp!, {r4, pc}
mov r0, r4
@@ -1238,15 +1238,15 @@ _0216e700:
ldrb r0, [r4, #0x64]
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0216e770 ; =data_027e0f74
ldr r0, _0216e770 ; =gAdventureFlags
ldr r1, [r4, #0x70]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0216e770 ; =data_027e0f74
ldr r0, _0216e770 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
ldmloia sp!, {r4, pc}
mov r0, r4
@@ -1266,7 +1266,7 @@ _0216e754:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov22_0216e594
_0216e770: .word data_027e0f74
_0216e770: .word gAdventureFlags
_0216e774: .word 0xffffe4cd
.global func_ov22_0216e778
@@ -1320,7 +1320,7 @@ _0216e7f0:
strb r0, [sp, #0xe3]
strb r1, [sp, #0xe1]
ldrb r1, [r4, #0x66]
ldr r0, _0216ec88 ; =data_027e0f74
ldr r0, _0216ec88 ; =gAdventureFlags
ldr r3, [r4, #0x20]
sub r1, r1, #1
mov r5, r1, lsl #0xc
@@ -1335,7 +1335,7 @@ _0216e7f0:
ldr r0, [r0]
add r1, sp, #0xd8
strb r2, [sp, #0xe8]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x70]
add r0, sp, #0xd8
bl func_ov00_0209a508
@@ -1483,7 +1483,7 @@ _0216ea68:
mov r2, #0x64
mov r1, #6
mov r3, #0x69
ldr r0, _0216ec88 ; =data_027e0f74
ldr r0, _0216ec88 ; =gAdventureFlags
strb r2, [sp, #0x31]
strb r1, [sp, #0x32]
str r3, [sp, #0x2c]
@@ -1500,7 +1500,7 @@ _0216ea68:
str r2, [sp, #0x48]
str r3, [sp, #0x4c]
str r5, [sp, #0x50]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x70]
add r0, sp, #0x28
bl func_ov00_0209a508
@@ -1620,7 +1620,7 @@ _0216ec74:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216e778
_0216ec88: .word data_027e0f74
_0216ec88: .word gAdventureFlags
_0216ec8c: .word data_027e0e60
_0216ec90: .word data_027e0ffc
_0216ec94: .word 0x00000335
@@ -2770,10 +2770,10 @@ _0216fb14:
strb r0, [r5, #0x69f]
b _0216fcd0
_0216fb20:
ldr r0, _0216fd5c ; =data_027e0f74
ldr r0, _0216fd5c ; =gAdventureFlags
mov r1, #0x53
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0216fbc4
add r1, sp, #0x50
@@ -2869,10 +2869,10 @@ _0216fbc4:
mov r4, #2
b _0216fcd0
_0216fca4:
ldr r0, _0216fd5c ; =data_027e0f74
ldr r0, _0216fd5c ; =gAdventureFlags
mov r1, #0x63
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0216fcd0
mov r0, r4
@@ -2920,7 +2920,7 @@ _0216fd04:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov22_0216fa7c
_0216fd5c: .word data_027e0f74
_0216fd5c: .word gAdventureFlags
_0216fd60: .word data_02050f54
_0216fd64: .word 0x534e4d42
_0216fd68: .word func_ov22_0216f5a8
@@ -4702,11 +4702,11 @@ _021714b0: .word data_ov22_0217966c
arm_func_start func_ov22_021714b4
func_ov22_021714b4: ; 0x021714b4
stmdb sp!, {r4, lr}
ldr r1, _02171628 ; =data_027e0f74
ldr r1, _02171628 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x7d
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _021714e4
mov r0, #0
@@ -4803,7 +4803,7 @@ _021715f8:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov22_021714b4
_02171628: .word data_027e0f74
_02171628: .word gAdventureFlags
_0217162c: .word 0x00000b33
_02171630: .word data_ov22_02179430
_02171634: .word 0x00000333
@@ -9441,10 +9441,10 @@ func_ov22_02175238: ; 0x02175238
ldrh r0, [r4, #0x24]
cmp r0, #1
bne _02175320
ldr r0, _02175340 ; =data_027e0f74
ldr r0, _02175340 ; =gAdventureFlags
mov r1, #0xd
ldr r0, [r0]
bl func_ov00_02097c18
bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
cmp r0, #0
mov r0, r4
ldr r3, [r0]
@@ -9473,7 +9473,7 @@ _02175320:
.align 2, 0
arm_func_end func_ov22_02175238
_0217533c: .word 0x00000e66
_02175340: .word data_027e0f74
_02175340: .word gAdventureFlags
.global func_ov22_02175344
arm_func_start func_ov22_02175344
@@ -10319,10 +10319,10 @@ _02175d78:
blx r3
ldmia sp!, {r4, pc}
_02175da4:
ldr r0, _02175e2c ; =data_027e0f74
ldr r0, _02175e2c ; =gAdventureFlags
ldr r1, [r4, #0x38]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _02175dd8
mov r0, r4
@@ -10333,15 +10333,15 @@ _02175da4:
blx r3
ldmia sp!, {r4, pc}
_02175dd8:
ldr r0, _02175e2c ; =data_027e0f74
ldr r0, _02175e2c ; =gAdventureFlags
ldr r1, [r4, #0x38]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02175e2c ; =data_027e0f74
ldr r0, _02175e2c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
ldmloia sp!, {r4, pc}
add r0, r4, #0x3c
@@ -10356,7 +10356,7 @@ _02175dd8:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov22_02175d40
_02175e2c: .word data_027e0f74
_02175e2c: .word gAdventureFlags
.global func_ov22_02175e30
arm_func_start func_ov22_02175e30
@@ -10401,7 +10401,7 @@ _02175e80:
strb r2, [sp, #9]
strb r1, [sp, #0xa]
ldr r1, [r5, #0x18]
ldr r0, _02175f58 ; =data_027e0f74
ldr r0, _02175f58 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r5, #0x1c]
ldr r0, [r0]
@@ -10411,7 +10411,7 @@ _02175e80:
add r1, sp, #0
str r3, [sp, #0x28]
strb r2, [sp, #0x10]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x38]
add r0, sp, #0
bl func_ov00_0209a508
@@ -10441,7 +10441,7 @@ _02175f48:
.align 2, 0
arm_func_end func_ov22_02175e30
_02175f54: .word 0xffffe333
_02175f58: .word data_027e0f74
_02175f58: .word gAdventureFlags
.global func_ov22_02175f5c
arm_func_start func_ov22_02175f5c
@@ -13441,10 +13441,10 @@ func_ov22_0217843c: ; 0x0217843c
blx r1
mov r0, #5
str r0, [r4, #0x12c]
ldr r0, _021784f4 ; =data_027e0f74
ldr r0, _021784f4 ; =gAdventureFlags
mov r1, #0x7d
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
streqb r0, [r4, #0x118]
@@ -13456,7 +13456,7 @@ _021784e4: .word data_ov22_0217898c
_021784e8: .word data_ov22_0217a3cc
_021784ec: .word data_ov22_0217a3d0
_021784f0: .word data_ov22_02178980
_021784f4: .word data_027e0f74
_021784f4: .word gAdventureFlags
.global func_ov22_021784f8
arm_func_start func_ov22_021784f8
@@ -13494,10 +13494,10 @@ func_ov22_021784f8: ; 0x021784f8
blx r1
mov r0, #5
str r0, [r4, #0x12c]
ldr r0, _021785b0 ; =data_027e0f74
ldr r0, _021785b0 ; =gAdventureFlags
mov r1, #0x7d
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
streqb r0, [r4, #0x118]
@@ -13509,7 +13509,7 @@ _021785a0: .word data_ov22_0217898c
_021785a4: .word data_ov22_02178980
_021785a8: .word data_ov22_0217a3d8
_021785ac: .word data_ov22_0217a3dc
_021785b0: .word data_027e0f74
_021785b0: .word gAdventureFlags
.global func_ov22_021785b4
arm_func_start func_ov22_021785b4
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
+76 -76
View File
@@ -5232,9 +5232,9 @@ _02171a38:
add sp, sp, #0x4c
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
_02171a94:
ldr r0, _02172090 ; =data_027e0f74
ldr r0, _02172090 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02171b10
mov r0, #2
@@ -5636,7 +5636,7 @@ _02172080: .word 0x0000038b
_02172084: .word data_ov23_0217a2c4
_02172088: .word data_027e0fb8
_0217208c: .word 0x0000059a
_02172090: .word data_027e0f74
_02172090: .word gAdventureFlags
_02172094: .word 0x00000666
_02172098: .word 0x00000333
_0217209c: .word data_027e0d38
@@ -9387,7 +9387,7 @@ _02175270:
mvn r3, #0
mov r2, #0x32
str r3, [sp, #4]
ldr r0, _02175344 ; =data_027e0f74
ldr r0, _02175344 ; =gAdventureFlags
strb r2, [sp, #9]
strb r1, [sp, #0xa]
strb r1, [sp, #0xb]
@@ -9402,7 +9402,7 @@ _02175270:
str r3, [sp, #0x28]
strb r2, [sp, #0x14]
strb r2, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x168]
cmp r0, #0
bge _021752e4
@@ -9439,7 +9439,7 @@ _02175334: .word data_027e103c
_02175338: .word data_027e0fc8
_0217533c: .word data_ov23_0217a62c
_02175340: .word data_ov23_0217a61c
_02175344: .word data_027e0f74
_02175344: .word gAdventureFlags
_02175348: .word data_027e0c68
_0217534c: .word 0x0069032f
@@ -9450,9 +9450,9 @@ func_ov23_02175350: ; 0x02175350
ldrh r1, [r0, #0x24]
cmp r1, #0
beq _02175378
ldr r0, _02175380 ; =data_027e0f74
ldr r0, _02175380 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, pc}
@@ -9461,7 +9461,7 @@ _02175378:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov23_02175350
_02175380: .word data_027e0f74
_02175380: .word gAdventureFlags
.global func_ov23_02175384
arm_func_start func_ov23_02175384
@@ -9522,9 +9522,9 @@ _02175440:
ldrh r1, [r6, #0x22]
cmp r1, #0
beq _02175470
ldr r0, _02175710 ; =data_027e0f74
ldr r0, _02175710 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02175694
_02175470:
@@ -9668,10 +9668,10 @@ _02175664:
mov r0, r6
mov r1, #1
bl func_ov23_02175178
ldr r0, _02175710 ; =data_027e0f74
ldr r0, _02175710 ; =gAdventureFlags
ldr r1, [r6, #0x168]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r6, #0x168]
_02175694:
@@ -9709,7 +9709,7 @@ _021756d4:
arm_func_end func_ov23_02175384
_02175708: .word data_027e0fc8
_0217570c: .word 0x66666667
_02175710: .word data_027e0f74
_02175710: .word gAdventureFlags
_02175714: .word data_027e077c
_02175718: .word data_ov23_0217a61c
@@ -9737,10 +9737,10 @@ _02175760:
ldr r0, [r6, #0x130]
cmp r0, #4
bne _021757b4
ldr r0, _02175870 ; =data_027e0f74
ldr r0, _02175870 ; =gAdventureFlags
ldr r1, [r6, #0x168]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _021757b4
ldrb r0, [r6, #0x11c]
@@ -9749,10 +9749,10 @@ _02175760:
mov r0, r6
mov r1, #1
bl func_ov23_02175178
ldr r0, _02175870 ; =data_027e0f74
ldr r0, _02175870 ; =gAdventureFlags
ldr r1, [r6, #0x168]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r6, #0x168]
_021757b4:
@@ -9807,7 +9807,7 @@ _02175844:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov23_0217571c
_02175870: .word data_027e0f74
_02175870: .word gAdventureFlags
_02175874: .word data_027e0fc8
.global func_ov23_02175878
@@ -10503,9 +10503,9 @@ func_ov23_02176100: ; 0x02176100
ldrb r0, [r0, #4]
cmp r0, #0
bne _0217614c
ldr r0, _0217618c ; =data_027e0f74
ldr r0, _0217618c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _02176154
_0217614c:
@@ -10528,7 +10528,7 @@ _02176154:
.align 2, 0
arm_func_end func_ov23_02176100
_02176188: .word data_027e0c68
_0217618c: .word data_027e0f74
_0217618c: .word gAdventureFlags
.global func_ov23_02176190
arm_func_start func_ov23_02176190
@@ -10613,9 +10613,9 @@ func_ov23_0217625c: ; 0x0217625c
cmp r0, #0
addgt sp, sp, #0x10
ldmgtia sp!, {r4, pc}
ldr r0, _021763a4 ; =data_027e0f74
ldr r0, _021763a4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
addne sp, sp, #0x10
ldmneia sp!, {r4, pc}
@@ -10682,7 +10682,7 @@ _02176380:
.align 2, 0
arm_func_end func_ov23_0217625c
_021763a0: .word data_027e0db0
_021763a4: .word data_027e0f74
_021763a4: .word gAdventureFlags
_021763a8: .word data_027e077c
_021763ac: .word data_02056be4
_021763b0: .word data_027e0618
@@ -11042,10 +11042,10 @@ _02176838:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
_02176870:
ldr r0, _02176a28 ; =data_027e0f74
ldr r0, _02176a28 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _021768a8
mov r0, r4
@@ -11057,22 +11057,22 @@ _02176870:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
_021768a8:
ldr r0, _02176a28 ; =data_027e0f74
ldr r0, _02176a28 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, pc}
ldr r0, _02176a28 ; =data_027e0f74
ldr r0, _02176a28 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
addlo sp, sp, #0xc
ldmloia sp!, {r3, r4, pc}
ldr r0, _02176a28 ; =data_027e0f74
ldr r0, _02176a28 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
bne _02176904
ldr r0, _02176a2c ; =data_027e0ffc
@@ -11111,10 +11111,10 @@ _0217693c:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
_02176974:
ldr r0, _02176a28 ; =data_027e0f74
ldr r0, _02176a28 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _021769ac
mov r0, r4
@@ -11126,16 +11126,16 @@ _02176974:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
_021769ac:
ldr r0, _02176a28 ; =data_027e0f74
ldr r0, _02176a28 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, pc}
ldr r0, _02176a28 ; =data_027e0f74
ldr r0, _02176a28 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
addlo sp, sp, #0xc
ldmloia sp!, {r3, r4, pc}
@@ -11160,7 +11160,7 @@ _02176a20:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov23_021767f4
_02176a28: .word data_027e0f74
_02176a28: .word gAdventureFlags
_02176a2c: .word data_027e0ffc
_02176a30: .word 0x000003fe
_02176a34: .word data_ov23_0217a7b0
@@ -11206,7 +11206,7 @@ _02176aa0:
str r2, [sp, #0xc0]
strb r1, [sp, #0xc5]
ldr r1, [r4, #0x18]
ldr r0, _02176bb0 ; =data_027e0f74
ldr r0, _02176bb0 ; =gAdventureFlags
str r1, [sp, #0xdc]
ldr r1, [r4, #0x1c]
ldr r0, [r0]
@@ -11216,7 +11216,7 @@ _02176aa0:
str r2, [sp, #0xe4]
ldrb r2, [r4, #0x36]
strb r2, [sp, #0xcc]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x64]
add r0, sp, #0xbc
bl func_ov00_0209a508
@@ -11249,7 +11249,7 @@ _02176b50:
mov r2, #0x1e
mov r1, #6
str r0, [sp, #0x10]
ldr r0, _02176bb0 ; =data_027e0f74
ldr r0, _02176bb0 ; =gAdventureFlags
strb r2, [sp, #0x15]
strb r1, [sp, #0x16]
ldr r1, [r4, #0x18]
@@ -11260,7 +11260,7 @@ _02176b50:
str r2, [sp, #0x30]
ldr r2, [r4, #0x20]
str r2, [sp, #0x34]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x64]
add r0, sp, #0xc
bl func_ov00_0209a508
@@ -11270,7 +11270,7 @@ _02176ba4:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov23_02176a3c
_02176bb0: .word data_027e0f74
_02176bb0: .word gAdventureFlags
_02176bb4: .word data_ov23_0217a7b0
.global func_ov23_02176bb8
@@ -11755,10 +11755,10 @@ _02177178:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
_021771ac:
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r1, [r4, #0x44]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _021771e4
mov r0, r4
@@ -11770,22 +11770,22 @@ _021771ac:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
_021771e4:
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r1, [r4, #0x44]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #4
ldmeqia sp!, {r3, r4, pc}
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
addlo sp, sp, #4
ldmloia sp!, {r3, r4, pc}
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
bne _0217724c
mov r1, #4
@@ -11824,10 +11824,10 @@ _02177288:
add r0, r4, #0x58
bl func_ov00_020b7e6c
_021772b0:
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r1, [r4, #0x44]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
addeq sp, sp, #4
ldmeqia sp!, {r3, r4, pc}
@@ -11854,10 +11854,10 @@ _021772ec:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
_02177320:
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r1, [r4, #0x44]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _02177358
mov r0, r4
@@ -11869,22 +11869,22 @@ _02177320:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
_02177358:
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r1, [r4, #0x44]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #4
ldmeqia sp!, {r3, r4, pc}
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
addlo sp, sp, #4
ldmloia sp!, {r3, r4, pc}
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
bne _021773c0
mov r1, #4
@@ -11923,10 +11923,10 @@ _021773fc:
add r0, r4, #0x58
bl func_ov00_020b7e6c
_02177424:
ldr r0, _02177460 ; =data_027e0f74
ldr r0, _02177460 ; =gAdventureFlags
ldr r1, [r4, #0x44]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
addeq sp, sp, #4
ldmeqia sp!, {r3, r4, pc}
@@ -11941,7 +11941,7 @@ _02177458:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov23_0217712c
_02177460: .word data_027e0f74
_02177460: .word gAdventureFlags
_02177464: .word data_027e0e58
_02177468: .word 0x0000015f
_0217746c: .word 0xfffffd9a
@@ -11997,7 +11997,7 @@ _021774dc:
strb r2, [sp, #0xb9]
strb r1, [sp, #0xba]
ldr r1, [r5, #0x38]
ldr r0, _02177674 ; =data_027e0f74
ldr r0, _02177674 ; =gAdventureFlags
str r1, [sp, #0xd0]
ldr r1, [r5, #0x3c]
ldr r0, [r0]
@@ -12007,7 +12007,7 @@ _021774dc:
add r1, sp, #0xb0
str r3, [sp, #0xd8]
strb r2, [sp, #0xc0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x44]
add r0, sp, #0xb0
bl func_ov00_0209a508
@@ -12052,7 +12052,7 @@ _021775c0:
strb r2, [sp, #9]
strb r1, [sp, #0xa]
ldr r1, [r5, #0x38]
ldr r0, _02177674 ; =data_027e0f74
ldr r0, _02177674 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r5, #0x3c]
ldr r0, [r0]
@@ -12062,7 +12062,7 @@ _021775c0:
add r1, sp, #0
str r3, [sp, #0x28]
strb r2, [sp, #0x10]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x44]
add r0, sp, #0
bl func_ov00_0209a508
@@ -12088,7 +12088,7 @@ _02177664:
.align 2, 0
arm_func_end func_ov23_02177474
_02177670: .word 0xfffff19a
_02177674: .word data_027e0f74
_02177674: .word gAdventureFlags
_02177678: .word data_027e0ffc
_0217767c: .word 0x000003f5
_02177680: .word 0x000003f6
@@ -12958,14 +12958,14 @@ _021780ec:
mov r0, #0
ldmia sp!, {r4, pc}
_021780f4:
ldr r0, _02178160 ; =data_027e0f74
ldr r0, _02178160 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0217811c
ldr r0, _02178160 ; =data_027e0f74
ldr r0, _02178160 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097750
bl _ZN14AdventureFlags18func_ov00_02097750Ev
cmp r0, #0
beq _02178124
_0217811c:
@@ -12990,7 +12990,7 @@ _0217814c:
_02178154: .word data_027e0fd8
_02178158: .word data_027e0fd0
_0217815c: .word data_027e0fd4
_02178160: .word data_027e0f74
_02178160: .word gAdventureFlags
.global func_ov23_02178164
arm_func_start func_ov23_02178164
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
+42 -42
View File
@@ -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,7 +846,7 @@ _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
@@ -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
@@ -1027,10 +1027,10 @@ _0216e3d0:
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
@@ -1069,7 +1069,7 @@ _0216e438:
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
@@ -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
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
+96 -96
View File
@@ -90,16 +90,16 @@ _0216d734:
mov r0, r4
str r1, [r4, #0x920]
bl func_ov25_0216d7d8
ldr r0, _0216d7d0 ; =data_027e0f74
ldr r0, _0216d7d0 ; =gAdventureFlags
mov r1, #0x150
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r4
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov25_0216d714
_0216d7d0: .word data_027e0f74
_0216d7d0: .word gAdventureFlags
.global func_ov25_0216d7d4
arm_func_start func_ov25_0216d7d4
@@ -569,11 +569,11 @@ func_ov25_0216de24: ; 0x0216de24
func_ov25_0216de38: ; 0x0216de38
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _0216dfe8 ; =data_027e0f74
ldr r1, _0216dfe8 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x35
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0216de80
ldrh r0, [r4, #0x20]
@@ -685,7 +685,7 @@ _0216dfd0:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov25_0216de38
_0216dfe8: .word data_027e0f74
_0216dfe8: .word gAdventureFlags
_0216dfec: .word data_ov25_02179be0
_0216dff0: .word data_027e0e60
@@ -2975,12 +2975,12 @@ _0216fdf8:
_0216feb0:
mov r0, #2
stmia sp, {r0, r2}
ldr r0, _0216ff14 ; =data_027e0f74
ldr r0, _0216ff14 ; =gAdventureFlags
mov r1, #0xf
ldr r0, [r0]
mov r3, r1
mov r2, #0x1e
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
_0216fed0:
add sp, sp, #0x80
ldmia sp!, {r4, r5, r6, pc}
@@ -3001,7 +3001,7 @@ _0216ff04: .word data_027e0f64
_0216ff08: .word 0x00001555
_0216ff0c: .word data_027e0c68
_0216ff10: .word 0x0071001e
_0216ff14: .word data_027e0f74
_0216ff14: .word gAdventureFlags
.global func_ov25_0216ff18
arm_func_start func_ov25_0216ff18
@@ -3922,12 +3922,12 @@ _02170bf0:
add r1, r4, #0x48
bl func_ov25_02171508
mov r1, #0
ldr r0, _02170d68 ; =data_027e0f74
ldr r0, _02170d68 ; =gAdventureFlags
strb r1, [r4, #0x11a]
ldr r0, [r0]
mov r1, #0x35
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r4
mov r1, #0x19
bl func_ov25_0216f898
@@ -3957,9 +3957,9 @@ _02170cb8:
ldr r0, [r0]
mov r2, #0x1000
bl func_ov00_020bb810
ldr r0, _02170d68 ; =data_027e0f74
ldr r0, _02170d68 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_020980ac
bl _ZN14AdventureFlags18func_ov00_020980acEv
cmp r0, #0
beq _02170d10
ldr r0, _02170d6c ; =data_027e0f64
@@ -4001,7 +4001,7 @@ _02170d58: .word data_027e0fb8
_02170d5c: .word data_027e0fac
_02170d60: .word data_ov25_0217a880
_02170d64: .word data_027e0ff0
_02170d68: .word data_027e0f74
_02170d68: .word gAdventureFlags
_02170d6c: .word data_027e0f64
.global func_ov25_02170d70
@@ -6506,11 +6506,11 @@ _02172e74:
ldr r0, _02173224 ; =data_ov25_0217953c
ldr r1, _02173228 ; =func_ov25_021729ac
str r0, [r5, #0x408]
ldr r0, _0217322c ; =data_027e0f74
ldr r0, _0217322c ; =gAdventureFlags
str r1, [r5, #0x414]
ldr r0, [r0]
mov r1, #0x3e
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02172eb8
mov r0, r5
@@ -6529,10 +6529,10 @@ _02172eb8:
ldrh r0, [r5, #0x20]
cmp r0, #0
bne _02173088
ldr r0, _0217322c ; =data_027e0f74
ldr r0, _0217322c ; =gAdventureFlags
mov r1, #0x23
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r0, r5
beq _02172f2c
@@ -6554,10 +6554,10 @@ _02172f2c:
mov r1, #2
bl func_ov25_02173ab4
_02172f34:
ldr r0, _0217322c ; =data_027e0f74
ldr r0, _0217322c ; =gAdventureFlags
mov r1, #0x25
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02172fa4
mvn r1, #0
@@ -6583,10 +6583,10 @@ _02172f34:
add r2, r5, #0x48
bl func_ov00_020c4048
_02172fa4:
ldr r0, _0217322c ; =data_027e0f74
ldr r0, _0217322c ; =gAdventureFlags
mov r1, #0x26
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02173014
mvn r1, #0
@@ -6612,10 +6612,10 @@ _02172fa4:
add r2, r5, #0x48
bl func_ov00_020c4048
_02173014:
ldr r0, _0217322c ; =data_027e0f74
ldr r0, _0217322c ; =gAdventureFlags
mov r1, #0x34
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02173210
mvn r1, #0
@@ -6655,10 +6655,10 @@ _021730a4:
_021730ac:
mov r4, #0x26
_021730b0:
ldr r0, _0217322c ; =data_027e0f74
ldr r0, _0217322c ; =gAdventureFlags
mov r1, r4
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r0, r5
beq _021730dc
@@ -6764,7 +6764,7 @@ _0217321c: .word data_ov25_021795a0
_02173220: .word data_027e0f6c
_02173224: .word data_ov25_0217953c
_02173228: .word func_ov25_021729ac
_0217322c: .word data_027e0f74
_0217322c: .word gAdventureFlags
_02173230: .word data_027e0fe8
_02173234: .word 0x43425331
@@ -7570,11 +7570,11 @@ _02173c58:
add r0, r0, #0x400
str r1, [r4, #0x12c]
bl func_ov25_02175598
ldr r0, _0217401c ; =data_027e0f74
ldr r0, _0217401c ; =gAdventureFlags
mov r1, #0x150
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r4, r5, r6, pc}
_02173c9c:
add r0, r4, #0x1d8
@@ -7583,11 +7583,11 @@ _02173c9c:
ldr r1, [r4, #0x1e8]
mov r2, #0x1000
str r2, [r1, #0x10]
ldr r0, _0217401c ; =data_027e0f74
ldr r0, _0217401c ; =gAdventureFlags
mov r1, #0x150
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r4, r5, r6, pc}
_02173ccc:
add r0, r4, #0x1d8
@@ -7602,11 +7602,11 @@ _02173ccc:
mov r0, r4
str r1, [r4, #0x12c]
bl _ZN5Actor14ResetWallTouchEv
ldr r0, _0217401c ; =data_027e0f74
ldr r0, _0217401c ; =gAdventureFlags
mov r1, #0x150
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r4, r5, r6, pc}
_02173d14:
add r0, r4, #0x1d8
@@ -7621,11 +7621,11 @@ _02173d14:
mov r0, r4
str r1, [r4, #0x12c]
bl _ZN5Actor14ResetWallTouchEv
ldr r0, _0217401c ; =data_027e0f74
ldr r0, _0217401c ; =gAdventureFlags
mov r1, #0x150
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r4, r5, r6, pc}
_02173d5c:
add r0, r4, #0x1d8
@@ -7647,10 +7647,10 @@ _02173d5c:
mov r0, #0x2000
rsblt r0, r0, #0
strh r0, [r4, #0x78]
ldr r0, _0217401c ; =data_027e0f74
ldr r0, _0217401c ; =gAdventureFlags
strb r2, [r4, #0x285]
ldr r0, [r0]
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r4, r5, r6, pc}
_02173dbc:
add r0, r4, #0x1d8
@@ -7740,11 +7740,11 @@ _02173e74:
rsblt r0, r0, #0
strh r0, [r4, #0x78]
mov r2, #0
ldr r0, _0217401c ; =data_027e0f74
ldr r0, _0217401c ; =gAdventureFlags
strb r2, [r4, #0x285]
ldr r0, [r0]
mov r1, #0x150
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r4, r5, r6, pc}
_02173f0c:
ldr r0, _02174034 ; =data_027e0c68
@@ -7777,11 +7777,11 @@ _02173f0c:
rsblt r0, r0, #0
strh r0, [r4, #0x78]
mov r2, #0
ldr r0, _0217401c ; =data_027e0f74
ldr r0, _0217401c ; =gAdventureFlags
strb r2, [r4, #0x285]
ldr r0, [r0]
mov r1, #0x150
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r4, r5, r6, pc}
_02173f9c:
bl func_ov25_02175464
@@ -7822,7 +7822,7 @@ _0217400c:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov25_02173ab4
_0217401c: .word data_027e0f74
_0217401c: .word gAdventureFlags
_02174020: .word data_027e0764
_02174024: .word 0x000e0059
_02174028: .word 0x000e005a
@@ -7945,17 +7945,17 @@ _0217419c:
bl func_ov25_0217358c
cmp r0, #0
beq _021741f4
ldr r0, _02175074 ; =data_027e0f74
ldr r0, _02175074 ; =gAdventureFlags
ldr r1, _02175078 ; =0x00000152
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _021741e8
ldr r0, _02175074 ; =data_027e0f74
ldr r0, _02175074 ; =gAdventureFlags
ldr r1, _02175078 ; =0x00000152
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r4
mov r1, #0x11
bl func_ov25_02173ab4
@@ -8037,10 +8037,10 @@ _021742e8:
_021742f0:
mov r5, #0x26
_021742f4:
ldr r0, _02175074 ; =data_027e0f74
ldr r0, _02175074 ; =gAdventureFlags
mov r1, r5
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02175114
ldrh r0, [r4, #0x20]
@@ -8803,25 +8803,25 @@ _02174e3c: ; jump table
b _02174e64 ; case 2
b _02174e7c ; case 3
_02174e4c:
ldr r0, _02175074 ; =data_027e0f74
ldr r0, _02175074 ; =gAdventureFlags
mov r1, #0x25
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
b _02174e90
_02174e64:
ldr r0, _02175074 ; =data_027e0f74
ldr r0, _02175074 ; =gAdventureFlags
mov r1, #0x26
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
b _02174e90
_02174e7c:
ldr r0, _02175074 ; =data_027e0f74
ldr r0, _02175074 ; =gAdventureFlags
mov r1, #0x34
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_02174e90:
mov r0, r4
mov r1, #0
@@ -8836,11 +8836,11 @@ _02174e90:
mov r0, r4
mov r1, #1
bl _ZN5Actor10SetUnk_11cEc
ldr r0, _02175074 ; =data_027e0f74
ldr r0, _02175074 ; =gAdventureFlags
mov r1, #0x150
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r4
mov r1, #0x15
bl func_ov25_02173ab4
@@ -8951,7 +8951,7 @@ _0217503c:
b _02175114
.align 2, 0
arm_func_end func_ov25_02174100
_02175074: .word data_027e0f74
_02175074: .word gAdventureFlags
_02175078: .word 0x00000152
_0217507c: .word data_027e0e60
_02175080: .word 0xb60b60b7
@@ -9217,15 +9217,15 @@ func_ov25_021753e0: ; 0x021753e0
arm_func_start func_ov25_0217540c
func_ov25_0217540c: ; 0x0217540c
stmdb sp!, {r4, lr}
ldr r2, _02175428 ; =data_027e0f74
ldr r2, _02175428 ; =gAdventureFlags
mov r4, r0
ldr r0, [r2]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x580]
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov25_0217540c
_02175428: .word data_027e0f74
_02175428: .word gAdventureFlags
.global func_ov25_0217542c
arm_func_start func_ov25_0217542c
@@ -9241,45 +9241,45 @@ func_ov25_0217542c: ; 0x0217542c
.global func_ov25_02175444
arm_func_start func_ov25_02175444
func_ov25_02175444: ; 0x02175444
ldr r1, _0217545c ; =data_027e0f74
ldr r1, _0217545c ; =gAdventureFlags
mov r2, r0
ldr r0, [r1]
ldr ip, _02175460 ; =func_ov00_02097b9c
ldr ip, _02175460 ; =_ZN14AdventureFlags18func_ov00_02097b9cEv
ldr r1, [r2, #0x580]
bx ip
.align 2, 0
arm_func_end func_ov25_02175444
_0217545c: .word data_027e0f74
_02175460: .word func_ov00_02097b9c
_0217545c: .word gAdventureFlags
_02175460: .word _ZN14AdventureFlags18func_ov00_02097b9cEv
.global func_ov25_02175464
arm_func_start func_ov25_02175464
func_ov25_02175464: ; 0x02175464
ldr r1, _0217547c ; =data_027e0f74
ldr r1, _0217547c ; =gAdventureFlags
mov r2, r0
ldr r0, [r1]
ldr ip, _02175480 ; =func_ov00_02097bcc
ldr ip, _02175480 ; =_ZN14AdventureFlags18func_ov00_02097bccEv
ldr r1, [r2, #0x580]
bx ip
.align 2, 0
arm_func_end func_ov25_02175464
_0217547c: .word data_027e0f74
_02175480: .word func_ov00_02097bcc
_0217547c: .word gAdventureFlags
_02175480: .word _ZN14AdventureFlags18func_ov00_02097bccEv
.global func_ov25_02175484
arm_func_start func_ov25_02175484
func_ov25_02175484: ; 0x02175484
stmdb sp!, {r3, lr}
ldr r1, _021754c4 ; =data_027e0f74
ldr r1, _021754c4 ; =gAdventureFlags
mov r2, r0
ldr r0, [r1]
ldr r1, [r2, #0x580]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _021754bc
ldr r0, _021754c4 ; =data_027e0f74
ldr r0, _021754c4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r3, pc}
@@ -9288,7 +9288,7 @@ _021754bc:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov25_02175484
_021754c4: .word data_027e0f74
_021754c4: .word gAdventureFlags
.global func_ov25_021754c8
arm_func_start func_ov25_021754c8
@@ -10217,7 +10217,7 @@ _021760ec:
add r0, sp, #0x8c
bl func_ov00_0209a4f4
mov r3, #0
ldr r0, _02176338 ; =data_027e0f74
ldr r0, _02176338 ; =gAdventureFlags
mvn ip, #0
mov r5, #0x64
mov r2, #1
@@ -10228,7 +10228,7 @@ _021760ec:
strb r3, [sp, #0x96]
strb r3, [sp, #0x97]
strb r2, [sp, #0xa3]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1d0]
add r0, sp, #0x8c
bl func_ov00_0209a508
@@ -10253,13 +10253,13 @@ _0217613c:
_02176178:
mov r0, #1
str r0, [sp]
ldr r0, _02176338 ; =data_027e0f74
ldr r0, _02176338 ; =gAdventureFlags
str r3, [sp, #4]
mov r1, #0xf
ldr r0, [r0]
mov r3, r1
mov r2, #0x1e
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
mov r2, #0
ldr r0, _02176348 ; =data_027e0db0
mov r3, r2
@@ -10318,20 +10318,20 @@ _021761b8:
_02176274:
mov r0, #1
str r0, [sp]
ldr r0, _02176338 ; =data_027e0f74
ldr r0, _02176338 ; =gAdventureFlags
str r3, [sp, #4]
mov r1, #0xf
ldr r0, [r0]
mov r3, r1
mov r2, #0x1e
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
add sp, sp, #0x13c
ldmia sp!, {r4, r5, r6, r7, pc}
_021762a0:
ldr r0, _02176338 ; =data_027e0f74
ldr r0, _02176338 ; =gAdventureFlags
ldr r1, [r4, #0x1d0]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
add sp, sp, #0x13c
ldmia sp!, {r4, r5, r6, r7, pc}
_021762b8:
@@ -10376,7 +10376,7 @@ _02176330:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov25_02176088
_02176338: .word data_027e0f74
_02176338: .word gAdventureFlags
_0217633c: .word data_027e0fc8
_02176340: .word data_027e0c68
_02176344: .word 0x00710012
@@ -10479,10 +10479,10 @@ _02176464:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_02176480:
ldr r0, _02176958 ; =data_027e0f74
ldr r0, _02176958 ; =gAdventureFlags
ldr r1, [r4, #0x1d0]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc}
@@ -10564,9 +10564,9 @@ _02176588:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_021765b8:
ldr r0, _02176958 ; =data_027e0f74
ldr r0, _02176958 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_020980ac
bl _ZN14AdventureFlags18func_ov00_020980acEv
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc}
@@ -10586,9 +10586,9 @@ _021765e4:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_02176608:
ldr r0, _02176958 ; =data_027e0f74
ldr r0, _02176958 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_020980ac
bl _ZN14AdventureFlags18func_ov00_020980acEv
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc}
@@ -10603,16 +10603,16 @@ _02176608:
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_02176648:
ldr r0, _02176958 ; =data_027e0f74
ldr r0, _02176958 ; =gAdventureFlags
ldr r1, [r4, #0x1d0]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc}
ldr r0, _02176958 ; =data_027e0f74
ldr r0, _02176958 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
addne sp, sp, #0x24
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
@@ -10823,7 +10823,7 @@ _0217694c:
.align 2, 0
arm_func_end func_ov25_021763a4
_02176954: .word data_027e0e60
_02176958: .word data_027e0f74
_02176958: .word gAdventureFlags
_0217695c: .word data_027e0c68
_02176960: .word data_027e0fe4
_02176964: .word data_027e0f64
@@ -10835,12 +10835,12 @@ func_ov25_0217696c: ; 0x0217696c
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r2, #0
ldr r0, _021769b4 ; =data_027e0f74
ldr r0, _021769b4 ; =gAdventureFlags
str r2, [r5, #0x154]
mov r4, r1
ldr r0, [r0]
ldr r1, [r5, #0x1d0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _021769a0
mov r0, r5
@@ -10853,7 +10853,7 @@ _021769a0:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov25_0217696c
_021769b4: .word data_027e0f74
_021769b4: .word gAdventureFlags
.global func_ov25_021769b8
arm_func_start func_ov25_021769b8
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
+80 -80
View File
@@ -1304,15 +1304,15 @@ func_ov26_0216e4c0: ; 0x0216e4c0
.global func_ov26_0216e4d0
arm_func_start func_ov26_0216e4d0
func_ov26_0216e4d0: ; 0x0216e4d0
ldr r0, _0216e4e4 ; =data_027e0f74
ldr ip, _0216e4e8 ; =func_ov00_02097760
ldr r0, _0216e4e4 ; =gAdventureFlags
ldr ip, _0216e4e8 ; =_ZN14AdventureFlags3GetEj
mov r1, #0x11
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov26_0216e4d0
_0216e4e4: .word data_027e0f74
_0216e4e8: .word func_ov00_02097760
_0216e4e4: .word gAdventureFlags
_0216e4e8: .word _ZN14AdventureFlags3GetEj
.global func_ov26_0216e4ec
thumb_func_start func_ov26_0216e4ec
@@ -1950,9 +1950,9 @@ _0216ebec:
ldrsh r0, [r0, #0x5c]
cmp r0, #0
bgt _0216ec8c
ldr r0, _0216eca4 ; =data_027e0f74
ldr r0, _0216eca4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0216ec8c
ldr r0, _0216eca8 ; =data_027e071c
@@ -1985,7 +1985,7 @@ _0216ec94:
arm_func_end func_ov26_0216ebc0
_0216ec9c: .word data_027e0e60
_0216eca0: .word data_027e0c68
_0216eca4: .word data_027e0f74
_0216eca4: .word gAdventureFlags
_0216eca8: .word data_027e071c
_0216ecac: .word data_027e077c
_0216ecb0: .word data_02056be4
@@ -4685,9 +4685,9 @@ _02171020:
bl func_ov26_02170938
b _02171718
_0217103c:
ldr r0, _02171740 ; =data_027e0f74
ldr r0, _02171740 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
bne _02171718
mov r0, r5
@@ -5174,7 +5174,7 @@ _02171718:
_02171734: .word data_027e0764
_02171738: .word data_027e0ffc
_0217173c: .word 0x000001c1
_02171740: .word data_027e0f74
_02171740: .word gAdventureFlags
_02171744: .word data_ov00_020e8398
_02171748: .word data_027e0ff0
_0217174c: .word data_027e0f94
@@ -5643,7 +5643,7 @@ _02171d5c:
b _02171dc0
_02171d8c:
ldr r1, [r4, #4]
ldr r0, _02171dd0 ; =data_027e0f74
ldr r0, _02171dd0 ; =gAdventureFlags
bic r1, r1, #4
str r1, [r4, #4]
ldr r2, [r4, #0xb4]
@@ -5651,7 +5651,7 @@ _02171d8c:
ldr r0, [r0]
ldr r1, [r1, r2, lsl #2]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
b _02171dc0
_02171db8:
mov r0, #0xf
@@ -5663,7 +5663,7 @@ _02171dc0:
arm_func_end func_ov26_02171d28
_02171dc8: .word data_ov26_02179440
_02171dcc: .word data_027e0ffc
_02171dd0: .word data_027e0f74
_02171dd0: .word gAdventureFlags
_02171dd4: .word data_ov26_0217944c
.global func_ov26_02171dd8
@@ -5713,12 +5713,12 @@ _02171e20:
func_ov26_02171e4c: ; 0x02171e4c
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _02171e8c ; =data_027e0f74
ldr r0, _02171e8c ; =gAdventureFlags
ldr r2, [r4, #0xb4]
ldr r1, _02171e90 ; =data_ov26_0217944c
ldr r0, [r0]
ldr r1, [r1, r2, lsl #2]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #1
ldmneia sp!, {r4, pc}
@@ -5729,7 +5729,7 @@ func_ov26_02171e4c: ; 0x02171e4c
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02171e4c
_02171e8c: .word data_027e0f74
_02171e8c: .word gAdventureFlags
_02171e90: .word data_ov26_0217944c
_02171e94: .word data_027e0e60
@@ -6340,7 +6340,7 @@ _02172698:
str r2, [sp, #4]
strb r1, [sp, #9]
ldr r1, [r4, #0x18]
ldr r0, _021727a8 ; =data_027e0f74
ldr r0, _021727a8 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r4, #0x1c]
ldr r0, [r0]
@@ -6350,7 +6350,7 @@ _02172698:
str r2, [sp, #0x28]
ldrb r2, [r4, #0x36]
strb r2, [sp, #0x10]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x64]
add r0, sp, #0
bl func_ov00_0209a508
@@ -6369,10 +6369,10 @@ _02172704:
_0217271c:
cmp r2, #0
bne _0217273c
ldr r0, _021727a8 ; =data_027e0f74
ldr r0, _021727a8 ; =gAdventureFlags
ldr r1, [r4, #0x64]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x64]
_0217273c:
@@ -6407,7 +6407,7 @@ _0217279c:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02172648
_021727a8: .word data_027e0f74
_021727a8: .word gAdventureFlags
_021727ac: .word 0xfffff666
_021727b0: .word data_027e0e60
@@ -6869,9 +6869,9 @@ _02172d60: ; jump table
b _02172f60 ; case 9
b _02172f90 ; case 10
_02172d8c:
ldr r0, _02172fb8 ; =data_027e0f74
ldr r0, _02172fb8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_0209809c
bl _ZN14AdventureFlags18func_ov00_0209809cEv
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -7022,7 +7022,7 @@ _02172f90:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02172d48
_02172fb8: .word data_027e0f74
_02172fb8: .word gAdventureFlags
_02172fbc: .word data_027e0c68
_02172fc0: .word data_027e103c
_02172fc4: .word data_027e077c
@@ -7079,10 +7079,10 @@ _02173010:
str r1, [sp, #0xe0]
mov r0, #2
stmia sp, {r0, r1}
ldr r0, _021732ac ; =data_027e0f74
ldr r0, _021732ac ; =gAdventureFlags
mov r3, r2
ldr r0, [r0]
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
mvn r0, #0
str r0, [sp]
mov r0, #2
@@ -7132,12 +7132,12 @@ _02173130:
mov r0, #2
str r0, [sp]
mov r1, #0xa
ldr r0, _021732ac ; =data_027e0f74
ldr r0, _021732ac ; =gAdventureFlags
str r2, [sp, #4]
ldr r0, [r0]
mov r2, r1
mov r3, r1
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
b _02173288
_02173160:
mov r1, #0
@@ -7165,11 +7165,11 @@ _02173160:
_021731b8:
mov r1, #0
strh r1, [r4, #0x64]
ldr r0, _021732ac ; =data_027e0f74
ldr r0, _021732ac ; =gAdventureFlags
mov r1, #0x82
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldr r0, _021732bc ; =gItemManager
mov r1, #0x60
ldr r0, [r0]
@@ -7177,7 +7177,7 @@ _021731b8:
add r0, sp, #0xc
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _021732ac ; =data_027e0f74
ldr r0, _021732ac ; =gAdventureFlags
mvn ip, #0
mov r3, #0xf
ldr r0, [r0]
@@ -7189,7 +7189,7 @@ _021731b8:
strb r2, [sp, #0x18]
strb r2, [sp, #0x19]
strb r2, [sp, #0x22]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x6c]
add r0, sp, #0xc
bl func_ov00_0209a508
@@ -7208,10 +7208,10 @@ _02173250:
blx func_0203fe60
b _02173288
_02173260:
ldr r0, _021732ac ; =data_027e0f74
ldr r0, _021732ac ; =gAdventureFlags
ldr r1, [r4, #0x6c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
ldr r0, _021732c8 ; =data_027e1054
str r1, [r4, #0x6c]
@@ -7230,7 +7230,7 @@ _0217329c: .word data_027e0f64
_021732a0: .word 0x00001555
_021732a4: .word 0x00001733
_021732a8: .word 0xfffff99a
_021732ac: .word data_027e0f74
_021732ac: .word gAdventureFlags
_021732b0: .word data_027e0f90
_021732b4: .word data_027e0fe4
_021732b8: .word data_027e0c68
@@ -7289,11 +7289,11 @@ _0217334c: .word func_ov26_02173350
arm_func_start func_ov26_02173350
func_ov26_02173350: ; 0x02173350
stmdb sp!, {r4, lr}
ldr r1, _021733a8 ; =data_027e0f74
ldr r1, _021733a8 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x82
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
ldreq r0, _021733ac ; =data_027e0618
ldreqb r0, [r0, #0x101]
@@ -7312,7 +7312,7 @@ func_ov26_02173350: ; 0x02173350
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02173350
_021733a8: .word data_027e0f74
_021733a8: .word gAdventureFlags
_021733ac: .word data_027e0618
.global func_ov26_021733b0
@@ -7612,9 +7612,9 @@ func_ov26_02173758: ; 0x02173758
ldr r0, [r5, #8]
cmp r0, #8
bne _021737b4
ldr r0, _021737d4 ; =data_027e0f74
ldr r0, _021737d4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _021737b4
mov r1, #0
@@ -7637,7 +7637,7 @@ _021737b4:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov26_02173758
_021737d4: .word data_027e0f74
_021737d4: .word gAdventureFlags
.global func_ov26_021737d8
arm_func_start func_ov26_021737d8
@@ -7775,9 +7775,9 @@ func_ov26_02173944: ; 0x02173944
mov r5, #0
cmp r1, #0
beq _02173988
ldr r0, _02173ab4 ; =data_027e0f74
ldr r0, _02173ab4 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0217398c
_02173988:
@@ -7864,7 +7864,7 @@ _02173a90:
.align 2, 0
arm_func_end func_ov26_02173944
_02173ab0: .word data_027e104c
_02173ab4: .word data_027e0f74
_02173ab4: .word gAdventureFlags
_02173ab8: .word data_ov26_0217947c
_02173abc: .word data_ov26_02179480
@@ -9513,9 +9513,9 @@ _021749e4: ; jump table
b _02174c20 ; case 11
b _02174c48 ; case 12
_02174a18:
ldr r0, _02174ca0 ; =data_027e0f74
ldr r0, _02174ca0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_0209809c
bl _ZN14AdventureFlags18func_ov00_0209809cEv
cmp r0, #0
bne _02174c48
mov r0, r6
@@ -9692,7 +9692,7 @@ _02174c90: .word data_027e0d78
_02174c94: .word data_027e104c
_02174c98: .word data_ov26_02179520
_02174c9c: .word data_ov26_0217ac20
_02174ca0: .word data_027e0f74
_02174ca0: .word gAdventureFlags
_02174ca4: .word data_027e077c
_02174ca8: .word data_027e0c68
@@ -9760,11 +9760,11 @@ _02174d14:
str r0, [sp]
mov r1, #0
mov r2, #0xa
ldr r0, _02174fec ; =data_027e0f74
ldr r0, _02174fec ; =gAdventureFlags
str r1, [sp, #4]
ldr r0, [r0]
mov r3, r2
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
mvn r0, #0
str r0, [sp]
mov r0, #2
@@ -9794,10 +9794,10 @@ _02174d14:
mov r0, #1
strb r0, [sp, #0x1d]
strb r0, [sp, #0x1f]
ldr r0, _02174fec ; =data_027e0f74
ldr r0, _02174fec ; =gAdventureFlags
add r1, sp, #0xc
ldr r0, [r0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x68]
add r0, sp, #0xc
bl func_ov00_0209a508
@@ -9844,10 +9844,10 @@ _02174ea4:
mov r1, #1
ldr r0, [r0]
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _02174fec ; =data_027e0f74
ldr r0, _02174fec ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
ldr r0, _02174ff8 ; =data_027e1048
str r1, [r4, #0x68]
@@ -9880,10 +9880,10 @@ _02174f30:
bl func_ov09_0211a52c
b _02174fcc
_02174f58:
ldr r0, _02174fec ; =data_027e0f74
ldr r0, _02174fec ; =gAdventureFlags
ldr r1, [r4, #0x68]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
ldr r0, _02174ff8 ; =data_027e1048
str r1, [r4, #0x68]
@@ -9922,7 +9922,7 @@ _02174fdc: .word data_027e103c
_02174fe0: .word data_027e0f64
_02174fe4: .word 0x0000071c
_02174fe8: .word 0x0000199a
_02174fec: .word data_027e0f74
_02174fec: .word gAdventureFlags
_02174ff0: .word data_027e0f90
_02174ff4: .word data_027e0c68
_02174ff8: .word data_027e1048
@@ -10067,9 +10067,9 @@ func_ov26_02175194: ; 0x02175194
ldrh r1, [r4, #0x2a]
cmp r1, #0
beq _021751c0
ldr r0, _021751ec ; =data_027e0f74
ldr r0, _021751ec ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -10088,7 +10088,7 @@ _021751e4:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02175194
_021751ec: .word data_027e0f74
_021751ec: .word gAdventureFlags
.global func_ov26_021751f0
arm_func_start func_ov26_021751f0
@@ -13288,14 +13288,14 @@ func_ov26_021778e8: ; 0x021778e8
bl func_ov00_0209d90c
mov r4, r0
ldr r5, [r4, #4]
ldr r0, _021779d4 ; =data_027e0f74
ldr r0, _021779d4 ; =gAdventureFlags
str r5, [sp, #8]
ldr r2, [r4, #8]
ldr r0, [r0]
mov r1, #0x82
str r2, [sp, #4]
rsb r6, r2, #0xc0
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _021779ac
bl func_ov26_02177880
@@ -13331,7 +13331,7 @@ _021779ac:
arm_func_end func_ov26_021778e8
_021779cc: .word gItemManager
_021779d0: .word data_027e0f7c
_021779d4: .word data_027e0f74
_021779d4: .word gAdventureFlags
_021779d8: .word data_027e0d3c
.global func_ov26_021779dc
@@ -13407,11 +13407,11 @@ func_ov26_02177a70: ; 0x02177a70
arm_func_start func_ov26_02177a98
func_ov26_02177a98: ; 0x02177a98
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
ldr r1, _02177b84 ; =data_027e0f74
ldr r1, _02177b84 ; =gAdventureFlags
mov r5, r0
ldr r0, [r1]
mov r1, #0x16
bl func_ov00_02097c18
bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
@@ -13468,7 +13468,7 @@ _02177b40:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov26_02177a98
_02177b84: .word data_027e0f74
_02177b84: .word gAdventureFlags
_02177b88: .word data_ov26_0217aea4
_02177b8c: .word data_ov26_021795c8
@@ -14477,23 +14477,23 @@ _02178784:
blx r3
b _02178968
_021787b4:
ldr r0, _02178980 ; =data_027e0f74
ldr r0, _02178980 ; =gAdventureFlags
ldr r1, [r5, #0x40]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02178968
ldr r0, _02178980 ; =data_027e0f74
ldr r0, _02178980 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xf
bne _021787e8
bl func_ov26_02178994
bl func_ov05_0210a018
_021787e8:
ldr r0, _02178980 ; =data_027e0f74
ldr r0, _02178980 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x3c
blo _02178968
mov r0, r5
@@ -14579,10 +14579,10 @@ _02178924:
bl func_ov00_020bb68c
b _02178968
_02178938:
ldr r0, _02178980 ; =data_027e0f74
ldr r0, _02178980 ; =gAdventureFlags
ldr r1, [r5, #0x40]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _02178968
mov r0, r5
@@ -14600,7 +14600,7 @@ _02178968:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov26_0217873c
_02178980: .word data_027e0f74
_02178980: .word gAdventureFlags
_02178984: .word 0x0000019a
_02178988: .word 0xffffeccd
_0217898c: .word data_027e0ffc
@@ -14648,7 +14648,7 @@ _021789e0:
strb r3, [sp, #0x21]
strb r2, [sp, #0x22]
bl func_ov26_02178c94
ldr r0, _02178b30 ; =data_027e0f74
ldr r0, _02178b30 ; =gAdventureFlags
ldr lr, [sp, #0xc]
ldr ip, [sp, #0x10]
ldr r3, [sp, #0x14]
@@ -14659,7 +14659,7 @@ _021789e0:
str ip, [sp, #0x3c]
str r3, [sp, #0x40]
strb r2, [sp, #0x28]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x40]
mov lr, #0
str lr, [r4, #0x44]
@@ -14727,7 +14727,7 @@ _02178b24:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_021789a4
_02178b30: .word data_027e0f74
_02178b30: .word gAdventureFlags
_02178b34: .word data_027e0f64
_02178b38: .word data_027e0fc8
@@ -15259,10 +15259,10 @@ func_ov26_02179114: ; 0x02179114
add r1, r4, #0x38
ldr r0, [r0]
bl func_ov00_02093a5c
ldr r0, _0217923c ; =data_027e0f74
ldr r0, _0217923c ; =gAdventureFlags
mov r1, #0xc9
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
ldreq r0, [r4, #4]
biceq r0, r0, #1
@@ -15273,7 +15273,7 @@ func_ov26_02179114: ; 0x02179114
arm_func_end func_ov26_02179114
_02179234: .word 0x00004ccd
_02179238: .word data_027e0f6c
_0217923c: .word data_027e0f74
_0217923c: .word gAdventureFlags
.global func_ov26_02179240
arm_func_start func_ov26_02179240
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
+128 -128
View File
@@ -129,25 +129,25 @@ func_ov27_0216d7f4: ; 0x0216d7f4
func_ov27_0216d810: ; 0x0216d810
stmdb sp!, {r4, lr}
sub sp, sp, #0x38
ldr r1, _0216da0c ; =data_027e0f74
ldr r1, _0216da0c ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x62
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addeq sp, sp, #0x38
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0216da0c ; =data_027e0f74
ldr r0, _0216da0c ; =gAdventureFlags
mov r1, #0x81
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0216d86c
ldr r0, _0216da0c ; =data_027e0f74
ldr r0, _0216da0c ; =gAdventureFlags
ldr r1, _0216da10 ; =0x00000186
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0216d878
_0216d86c:
@@ -155,10 +155,10 @@ _0216d86c:
mov r0, #0
ldmia sp!, {r4, pc}
_0216d878:
ldr r0, _0216da0c ; =data_027e0f74
ldr r0, _0216da0c ; =gAdventureFlags
mov r1, #0xf4
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
movne r0, #1
@@ -258,7 +258,7 @@ _0216d878:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov27_0216d810
_0216da0c: .word data_027e0f74
_0216da0c: .word gAdventureFlags
_0216da10: .word 0x00000186
_0216da14: .word data_ov27_02178d08
_0216da18: .word func_ov27_0216d6d4
@@ -399,7 +399,7 @@ _0216db58:
mov r0, #0
strb r0, [sp, #0x368]
strb r0, [sp, #0x36a]
ldr r0, _0216e928 ; =data_027e0f74
ldr r0, _0216e928 ; =gAdventureFlags
str r2, [sp, #0x358]
ldr r0, [r0]
str r7, [sp, #0x374]
@@ -407,16 +407,16 @@ _0216db58:
str r1, [sp, #0x70]
str r1, [sp, #0x37c]
add r1, sp, #0x354
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x1b4]
add r0, sp, #0x354
bl func_ov00_0209a508
b _0216e8fc
_0216dc58:
ldr r0, _0216e928 ; =data_027e0f74
ldr r0, _0216e928 ; =gAdventureFlags
ldr r1, [r5, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r5, #0x1b4]
mov r1, #5
@@ -805,7 +805,7 @@ _0216e204:
mov r2, #0x32
str r3, [sp, #0x2a8]
strb r2, [sp, #0x2ad]
ldr r0, _0216e928 ; =data_027e0f74
ldr r0, _0216e928 ; =gAdventureFlags
strb r1, [sp, #0x2ae]
strb r1, [sp, #0x2af]
ldr r1, [r5, #0x48]
@@ -820,7 +820,7 @@ _0216e204:
str r6, [sp, #0x2cc]
strb r3, [sp, #0x2b8]
strb r2, [sp, #0x2ba]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x1b4]
mov r0, r5
mov r1, #0xd
@@ -941,7 +941,7 @@ _0216e2b8:
ldrb r3, [sp, #0x1ef]
ldrb r2, [sp, #0x1f0]
str r0, [sp, #0x26c]
ldr r0, _0216e928 ; =data_027e0f74
ldr r0, _0216e928 ; =gAdventureFlags
ldr r1, [sp, #0x1d4]
ldr r10, [sp, #0x1dc]
ldr r9, [sp, #0x1e0]
@@ -962,7 +962,7 @@ _0216e2b8:
strb r3, [sp, #0x283]
strb r2, [sp, #0x284]
strb r11, [sp, #0x20a]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x488]
add r0, sp, #0x1f4
bl func_ov00_0209a508
@@ -1079,7 +1079,7 @@ _0216e4f4:
ldrb r3, [sp, #0xd7]
ldrb r2, [sp, #0xd8]
str r0, [sp, #0x154]
ldr r0, _0216e928 ; =data_027e0f74
ldr r0, _0216e928 ; =gAdventureFlags
ldr r1, [sp, #0xbc]
ldr ip, [sp, #0xc4]
ldr r11, [sp, #0xc8]
@@ -1099,7 +1099,7 @@ _0216e4f4:
strb r3, [sp, #0x16b]
strb r2, [sp, #0x16c]
strb lr, [sp, #0xf2]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x1b4]
ldr r0, _0216e920 ; =data_027e0c68
ldr r2, _0216e974 ; =0x00060009
@@ -1171,10 +1171,10 @@ _0216e764:
strb r0, [r5, #0x4b3]
b _0216e8fc
_0216e7c4:
ldr r0, _0216e928 ; =data_027e0f74
ldr r0, _0216e928 ; =gAdventureFlags
ldr r1, [r5, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
mov r0, r5
str r1, [r5, #0x1b4]
@@ -1265,7 +1265,7 @@ _0216e918: .word data_027e0d0c
_0216e91c: .word data_027e0e60
_0216e920: .word data_027e0c68
_0216e924: .word 0x00060003
_0216e928: .word data_027e0f74
_0216e928: .word gAdventureFlags
_0216e92c: .word data_027e0764
_0216e930: .word data_027e0ffc
_0216e934: .word 0x00000236
@@ -1528,7 +1528,7 @@ _0216eb54:
str r2, [sp, #0xbc]
str r1, [sp, #0x114]
str r0, [sp, #0x104]
ldr r0, _0216ed50 ; =data_027e0f74
ldr r0, _0216ed50 ; =gAdventureFlags
ldrb r6, [sp, #0x78]
ldrb r5, [sp, #0x79]
ldrb lr, [sp, #0x7a]
@@ -1545,7 +1545,7 @@ _0216eb54:
strb ip, [sp, #0x10f]
strb r3, [sp, #0x110]
strb r2, [sp, #0x96]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
add r1, r4, #0x88
str r0, [r4, #0x1b4]
mov r0, r4
@@ -1567,7 +1567,7 @@ _0216ed38:
_0216ed44: .word data_027e0e60
_0216ed48: .word data_027e0f64
_0216ed4c: .word 0x00001333
_0216ed50: .word data_027e0f74
_0216ed50: .word gAdventureFlags
.global func_ov27_0216ed54
arm_func_start func_ov27_0216ed54
@@ -1851,10 +1851,10 @@ _0216f0f0:
ldrb r0, [r6, #0x4b2]
cmp r0, #0
bne _0216f1c4
ldr r0, _0216f340 ; =data_027e0f74
ldr r0, _0216f340 ; =gAdventureFlags
mov r1, #0x51
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0216f1c4
ldrsh r0, [r6, #0x78]
@@ -1998,7 +1998,7 @@ _0216f330: .word 0x0000019d
_0216f334: .word 0x5342454d
_0216f338: .word 0x524f5045
_0216f33c: .word 0x000001bd
_0216f340: .word data_027e0f74
_0216f340: .word gAdventureFlags
_0216f344: .word 0x00006aab
.global func_ov27_0216f348
@@ -3624,7 +3624,7 @@ _02170978:
ldr lr, [sp]
add r0, r0, #0x33
add r5, r0, #0x1300
ldr r1, _02170a30 ; =data_027e0f74
ldr r1, _02170a30 ; =gAdventureFlags
ldr ip, [sp, #8]
mov r3, #0
mov r2, #1
@@ -3636,7 +3636,7 @@ _02170978:
str ip, [sp, #0x34]
strb r3, [sp, #0x20]
strb r2, [sp, #0x22]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x488]
mov r0, r4
add r1, r4, #0x1b4
@@ -3650,7 +3650,7 @@ _02170978:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov27_02170934
_02170a30: .word data_027e0f74
_02170a30: .word gAdventureFlags
.global func_ov27_02170a34
arm_func_start func_ov27_02170a34
@@ -4573,23 +4573,23 @@ _021716e8: .word data_027e0764
arm_func_start func_ov27_021716ec
func_ov27_021716ec: ; 0x021716ec
stmdb sp!, {r4, lr}
ldr r0, _02171728 ; =data_027e0f74
ldr r0, _02171728 ; =gAdventureFlags
mov r4, r1
ldr r0, [r0]
ldr r1, [r4]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02171728 ; =data_027e0f74
ldr r0, _02171728 ; =gAdventureFlags
ldr r1, [r4]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4]
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov27_021716ec
_02171728: .word data_027e0f74
_02171728: .word gAdventureFlags
.global func_ov27_0217172c
arm_func_start func_ov27_0217172c
@@ -4698,7 +4698,7 @@ func_ov27_0217184c: ; 0x0217184c
strb r0, [sp, #0x8b]
strb r1, [sp, #0x89]
ldr r1, [r4, #0x48]
ldr r0, _02171ae0 ; =data_027e0f74
ldr r0, _02171ae0 ; =gAdventureFlags
str r1, [sp, #0xa0]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -4710,7 +4710,7 @@ func_ov27_0217184c: ; 0x0217184c
str r5, [sp, #0xa8]
strb r3, [sp, #0x94]
strb r2, [sp, #0x96]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mvn r1, #0
str r0, [r4, #0x1b4]
cmp r0, r1
@@ -4814,7 +4814,7 @@ _021718e0:
str r2, [sp, #0xbc]
str r1, [sp, #0x114]
str r0, [sp, #0xfc]
ldr r0, _02171ae0 ; =data_027e0f74
ldr r0, _02171ae0 ; =gAdventureFlags
ldrb r6, [sp, #0x78]
ldrb r5, [sp, #0x79]
ldrb lr, [sp, #0x7a]
@@ -4835,7 +4835,7 @@ _021718e0:
strb ip, [sp, #0x10f]
strb r3, [sp, #0x110]
strb r2, [sp, #0x96]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mvn r1, #0
str r0, [r4, #0x488]
cmp r0, r1
@@ -4851,7 +4851,7 @@ _02171ad0:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov27_0217184c
_02171ae0: .word data_027e0f74
_02171ae0: .word gAdventureFlags
_02171ae4: .word data_027e0f64
_02171ae8: .word 0x00001333
@@ -5225,7 +5225,7 @@ func_ov27_02171f3c: ; 0x02171f3c
cmp r0, #0
beq _0217245c
ldrh r1, [r1, #0x78]
ldr r0, _02172478 ; =data_027e0f74
ldr r0, _02172478 ; =gAdventureFlags
mov r3, #0
mov r1, r1, asr #0x4
mov r5, r1, lsl #0x1
@@ -5240,7 +5240,7 @@ func_ov27_02171f3c: ; 0x02171f3c
str r5, [sp, #0x7c]
str r3, [sp, #0x80]
str r2, [sp, #0x84]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
add r0, sp, #0x7c
str r0, [sp]
mov r1, #4
@@ -5270,7 +5270,7 @@ _02172018:
cmp r0, #0
bne _021720c4
ldr r1, [r6, #0x38c]
ldr r0, _02172478 ; =data_027e0f74
ldr r0, _02172478 ; =gAdventureFlags
ldrh r1, [r1, #0x78]
mov r3, #0
ldr r2, _0217247c ; =data_02050f54
@@ -5286,7 +5286,7 @@ _02172018:
str r5, [sp, #0x70]
str r3, [sp, #0x74]
str r2, [sp, #0x78]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
add r0, sp, #0x70
str r0, [sp]
mov r1, #2
@@ -5549,7 +5549,7 @@ _0217245c:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov27_02171f3c
_02172478: .word data_027e0f74
_02172478: .word gAdventureFlags
_0217247c: .word data_02050f54
_02172480: .word 0x0000019a
_02172484: .word data_027e0e60
@@ -6096,10 +6096,10 @@ _02172be8:
subge r0, r2, #0x9000
strge r0, [r4, #0x50]
_02172c40:
ldr r0, _02172ce0 ; =data_027e0f74
ldr r0, _02172ce0 ; =gAdventureFlags
mov r1, #0xc7
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
@@ -6138,7 +6138,7 @@ _02172cd0: .word 0xffffd666
_02172cd4: .word 0xffff6666
_02172cd8: .word 0xffffe99a
_02172cdc: .word 0x00000999
_02172ce0: .word data_027e0f74
_02172ce0: .word gAdventureFlags
_02172ce4: .word 0xffffee66
.global func_ov27_02172ce8
@@ -6272,11 +6272,11 @@ func_ov27_02172e1c: ; 0x02172e1c
ldreqb r0, [r4, #0x5b4]
cmpeq r0, #1
bne _02172e64
ldr r0, _02172ea4 ; =data_027e0f74
ldr r0, _02172ea4 ; =gAdventureFlags
mov r1, #0x81
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_02172e64:
add r0, r4, #0x11c
add r0, r0, #0x400
@@ -6296,7 +6296,7 @@ _02172e64:
arm_func_end func_ov27_02172e1c
_02172e9c: .word data_ov27_02179784
_02172ea0: .word data_027e0f6c
_02172ea4: .word data_027e0f74
_02172ea4: .word gAdventureFlags
.global func_ov27_02172ea8
arm_func_start func_ov27_02172ea8
@@ -6314,11 +6314,11 @@ func_ov27_02172ea8: ; 0x02172ea8
ldreqb r0, [r4, #0x5b4]
cmpeq r0, #1
bne _02172ef0
ldr r0, _02172f38 ; =data_027e0f74
ldr r0, _02172f38 ; =gAdventureFlags
mov r1, #0x81
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_02172ef0:
add r0, r4, #0x11c
add r0, r0, #0x400
@@ -6340,7 +6340,7 @@ _02172ef0:
arm_func_end func_ov27_02172ea8
_02172f30: .word data_ov27_02179784
_02172f34: .word data_027e0f6c
_02172f38: .word data_027e0f74
_02172f38: .word gAdventureFlags
.global func_ov27_02172f3c
arm_func_start func_ov27_02172f3c
@@ -6356,34 +6356,34 @@ _02172f44: .word func_ov14_02144d00
func_ov27_02172f48: ; 0x02172f48
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x2c
ldr r1, _02173108 ; =data_027e0f74
ldr r1, _02173108 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
ldr r1, _0217310c ; =0x00000186
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addne sp, sp, #0x2c
movne r0, #0
ldmneia sp!, {r3, r4, pc}
ldr r0, _02173108 ; =data_027e0f74
ldr r0, _02173108 ; =gAdventureFlags
mov r1, #0x62
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _02172fac
ldr r0, _02173108 ; =data_027e0f74
ldr r0, _02173108 ; =gAdventureFlags
mov r1, #0x81
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addeq sp, sp, #0x2c
moveq r0, #0
ldmeqia sp!, {r3, r4, pc}
_02172fac:
ldr r0, _02173108 ; =data_027e0f74
ldr r0, _02173108 ; =gAdventureFlags
mov r1, #0x81
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
moveq r0, #1
@@ -6469,7 +6469,7 @@ _02172fac:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov27_02172f48
_02173108: .word data_027e0f74
_02173108: .word gAdventureFlags
_0217310c: .word 0x00000186
_02173110: .word data_ov27_02178f1c
_02173114: .word data_ov27_021798bc
@@ -6920,9 +6920,9 @@ func_ov27_02173710: ; 0x02173710
ldrb r0, [r1, #4]
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _021737ac ; =data_027e0f74
ldr r0, _021737ac ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -6957,7 +6957,7 @@ _02173798:
.align 2, 0
arm_func_end func_ov27_02173710
_021737a8: .word data_027e0c68
_021737ac: .word data_027e0f74
_021737ac: .word gAdventureFlags
_021737b0: .word data_ov27_0217970c
_021737b4: .word 0x00060008
@@ -8116,7 +8116,7 @@ func_ov27_02174454: ; 0x02174454
ldrb r3, [sp, #0x6f]
ldrb r2, [sp, #0x70]
str r0, [sp, #0xf8]
ldr r0, _02174700 ; =data_027e0f74
ldr r0, _02174700 ; =gAdventureFlags
str r1, [sp, #0xe8]
ldr r1, [sp, #0x60]
str r6, [sp, #0xf0]
@@ -8141,7 +8141,7 @@ func_ov27_02174454: ; 0x02174454
strb r2, [sp, #0x104]
strb r11, [sp, #0x88]
strb r7, [sp, #0x8a]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1b4]
add r0, sp, #0x74
bl func_ov00_0209a508
@@ -8156,7 +8156,7 @@ _021746f0: .word data_027e0c68
_021746f4: .word 0x00060015
_021746f8: .word data_027e0e60
_021746fc: .word data_027e0f64
_02174700: .word data_027e0f74
_02174700: .word gAdventureFlags
.global func_ov27_02174704
arm_func_start func_ov27_02174704
@@ -8249,16 +8249,16 @@ func_ov27_021747d4: ; 0x021747d4
bl func_0202b154
cmp r0, #0
beq _021748c8
ldr r0, _021748dc ; =data_027e0f74
ldr r0, _021748dc ; =gAdventureFlags
ldr r1, [r5, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02174860
ldr r0, _021748dc ; =data_027e0f74
ldr r0, _021748dc ; =gAdventureFlags
ldr r1, [r5, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02174860:
mvn r0, #0
str r0, [r5, #0x1b4]
@@ -8295,7 +8295,7 @@ _021748c8:
arm_func_end func_ov27_021747d4
_021748d4: .word data_027e0e60
_021748d8: .word 0x00000222
_021748dc: .word data_027e0f74
_021748dc: .word gAdventureFlags
_021748e0: .word 0x00000266
_021748e4: .word data_027e0d0c
@@ -8592,10 +8592,10 @@ _02174c30:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02174c68
ldr r0, _02174d2c ; =data_027e0f74
ldr r0, _02174d2c ; =gAdventureFlags
ldr r1, _02174d30 ; =0x0000013e
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
@@ -8605,10 +8605,10 @@ _02174c68:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02174c98
ldr r0, _02174d2c ; =data_027e0f74
ldr r0, _02174d2c ; =gAdventureFlags
ldr r1, _02174d34 ; =0x0000013f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, pc}
@@ -8618,32 +8618,32 @@ _02174c98:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02174cc8
ldr r0, _02174d2c ; =data_027e0f74
ldr r0, _02174d2c ; =gAdventureFlags
mov r1, #0x140
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #2
ldmeqia sp!, {r3, r4, r5, pc}
_02174cc8:
ldr r0, _02174d2c ; =data_027e0f74
ldr r0, _02174d2c ; =gAdventureFlags
ldr r1, _02174d30 ; =0x0000013e
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #3
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _02174d2c ; =data_027e0f74
ldr r0, _02174d2c ; =gAdventureFlags
ldr r1, _02174d34 ; =0x0000013f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #4
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _02174d2c ; =data_027e0f74
ldr r0, _02174d2c ; =gAdventureFlags
mov r1, #0x140
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #5
moveq r0, #6
@@ -8654,7 +8654,7 @@ _02174d20:
.align 2, 0
arm_func_end func_ov27_02174bdc
_02174d28: .word gItemManager
_02174d2c: .word data_027e0f74
_02174d2c: .word gAdventureFlags
_02174d30: .word 0x0000013e
_02174d34: .word 0x0000013f
@@ -9310,34 +9310,34 @@ func_ov27_02175570: ; 0x02175570
ldr r0, [r2]
add r1, r1, #0x400
bl func_ov00_02093af0
ldr r0, _02175654 ; =data_027e0f74
ldr r0, _02175654 ; =gAdventureFlags
mov r1, #0xab
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
streqb r0, [r4, #0x4e3]
beq _02175610
ldr r0, _02175654 ; =data_027e0f74
ldr r0, _02175654 ; =gAdventureFlags
mov r1, #0xac
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #1
streqb r0, [r4, #0x4e3]
beq _02175610
ldr r0, _02175654 ; =data_027e0f74
ldr r0, _02175654 ; =gAdventureFlags
mov r1, #0xad
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #2
streqb r0, [r4, #0x4e3]
beq _02175610
ldr r0, _02175654 ; =data_027e0f74
ldr r0, _02175654 ; =gAdventureFlags
mov r1, #0xae
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #3
streqb r0, [r4, #0x4e3]
@@ -9363,7 +9363,7 @@ _02175610:
.align 2, 0
arm_func_end func_ov27_02175570
_02175650: .word data_027e0f6c
_02175654: .word data_027e0f74
_02175654: .word gAdventureFlags
_02175658: .word data_027e0c68
_0217565c: .word 0x00060023
@@ -10364,7 +10364,7 @@ _02176294:
ldrb r5, [sp, #0x62]
ldrb lr, [sp, #0x63]
ldrb ip, [sp, #0x64]
ldr r0, _02176444 ; =data_027e0f74
ldr r0, _02176444 ; =gAdventureFlags
str r3, [sp, #0xe4]
ldr r3, [sp, #0x58]
str r1, [sp, #0xe8]
@@ -10380,7 +10380,7 @@ _02176294:
strb ip, [sp, #0xf8]
str r3, [sp, #0xfc]
strb r2, [sp, #0x7e]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1b4]
ldr r0, _02176438 ; =data_027e0c68
ldr r2, _02176448 ; =0x00060025
@@ -10398,7 +10398,7 @@ _02176434: .word 0x0000019a
_02176438: .word data_027e0c68
_0217643c: .word 0x00060024
_02176440: .word data_027e0f64
_02176444: .word data_027e0f74
_02176444: .word gAdventureFlags
_02176448: .word 0x00060025
.global func_ov27_0217644c
@@ -10502,7 +10502,7 @@ _02176494:
ldrb r5, [sp, #0x62]
ldrb lr, [sp, #0x63]
ldrb ip, [sp, #0x64]
ldr r0, _02176720 ; =data_027e0f74
ldr r0, _02176720 ; =gAdventureFlags
str r3, [sp, #0xe4]
ldr r3, [sp, #0x58]
str r1, [sp, #0xe8]
@@ -10518,7 +10518,7 @@ _02176494:
strb ip, [sp, #0xf8]
str r3, [sp, #0xfc]
strb r2, [sp, #0x7e]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1b4]
ldr r0, _02176724 ; =data_027e0c68
ldr r2, _02176728 ; =0x00060025
@@ -10593,7 +10593,7 @@ _0217670c:
.align 2, 0
arm_func_end func_ov27_0217644c
_0217671c: .word data_027e0f64
_02176720: .word data_027e0f74
_02176720: .word gAdventureFlags
_02176724: .word data_027e0c68
_02176728: .word 0x00060025
@@ -10650,16 +10650,16 @@ func_ov27_021767a8: ; 0x021767a8
add r0, r4, #0x1d8
str r1, [r4, #0x138]
bl func_ov14_02145f0c
ldr r0, _021769e8 ; =data_027e0f74
ldr r0, _021769e8 ; =gAdventureFlags
ldr r1, [r4, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _021767ec
ldr r0, _021769e8 ; =data_027e0f74
ldr r0, _021769e8 ; =gAdventureFlags
ldr r1, [r4, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_021767ec:
mvn r0, #0
str r0, [r4, #0x1b4]
@@ -10751,7 +10751,7 @@ _021767ec:
ldrb r6, [sp, #0x62]
ldrb r5, [sp, #0x63]
ldrb lr, [sp, #0x64]
ldr r0, _021769e8 ; =data_027e0f74
ldr r0, _021769e8 ; =gAdventureFlags
str ip, [sp, #0xe4]
ldr ip, [sp, #0x58]
str r3, [sp, #0xe8]
@@ -10771,7 +10771,7 @@ _021767ec:
strb lr, [sp, #0xf8]
str ip, [sp, #0xfc]
strb r3, [sp, #0x7e]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1b4]
mov r0, #0
strb r0, [r4, #0x1ac]
@@ -10791,7 +10791,7 @@ _021769bc:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov27_021767a8
_021769e8: .word data_027e0f74
_021769e8: .word gAdventureFlags
_021769ec: .word data_027e0f64
_021769f0: .word 0x00001333
_021769f4: .word 0x000005dc
@@ -10814,16 +10814,16 @@ func_ov27_02176a00: ; 0x02176a00
blx r1
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _02176aa4 ; =data_027e0f74
ldr r0, _02176aa4 ; =gAdventureFlags
ldr r1, [r4, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02176a5c
ldr r0, _02176aa4 ; =data_027e0f74
ldr r0, _02176aa4 ; =gAdventureFlags
ldr r1, [r4, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02176a5c:
mvn r0, #0
str r0, [r4, #0x1b4]
@@ -10846,7 +10846,7 @@ _02176a94:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov27_02176a00
_02176aa4: .word data_027e0f74
_02176aa4: .word gAdventureFlags
_02176aa8: .word data_027e0dbc
.global func_ov27_02176aac
@@ -11552,16 +11552,16 @@ _021773f4:
strb r1, [r0, #0x7a]
b _02177664
_02177460:
ldr r0, _02177680 ; =data_027e0f74
ldr r0, _02177680 ; =gAdventureFlags
ldr r1, [r4, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02177664
ldr r0, _02177680 ; =data_027e0f74
ldr r0, _02177680 ; =gAdventureFlags
ldr r1, [r4, #0x1b4]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x1b4]
add sp, sp, #0x118
@@ -11670,12 +11670,12 @@ _0217749c:
strb r3, [sp, #0xf7]
strb r2, [sp, #0xf8]
str r1, [sp, #0xfc]
ldr r0, _02177680 ; =data_027e0f74
ldr r0, _02177680 ; =gAdventureFlags
mov r2, #1
ldr r0, [r0]
add r1, sp, #0x68
strb r2, [sp, #0x7e]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x1b4]
add r0, sp, #0x68
bl func_ov00_0209a508
@@ -11692,7 +11692,7 @@ _02177670: .word data_027e0f90
_02177674: .word data_027e103c
_02177678: .word data_027e0fb8
_0217767c: .word data_027e0cbc
_02177680: .word data_027e0f74
_02177680: .word gAdventureFlags
_02177684: .word data_027e0f64
_02177688: .word 0x00001333
_0217768c: .word 0x000005dc
@@ -12493,10 +12493,10 @@ func_ov27_0217804c: ; 0x0217804c
blx ip
mov r0, #1
strb r0, [r4, #0x490]
ldr r0, _02178194 ; =data_027e0f74
ldr r0, _02178194 ; =gAdventureFlags
mov r1, #0xe8
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02178150
mov r0, #1
@@ -12530,7 +12530,7 @@ _0217817c:
_02178188: .word data_ov27_021790dc
_0217818c: .word data_ov27_021790ec
_02178190: .word 0x00000ccd
_02178194: .word data_027e0f74
_02178194: .word gAdventureFlags
_02178198: .word data_027e0f6c
.global func_ov27_0217819c
@@ -13053,10 +13053,10 @@ func_ov27_02178870: ; 0x02178870
ldrh r0, [r1, #2]
cmp r0, #0xf
bne _021788a8
ldr r0, _021788b0 ; =data_027e0f74
ldr r0, _021788b0 ; =gAdventureFlags
mov r1, #0xe8
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -13068,7 +13068,7 @@ _021788a8:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov27_02178870
_021788b0: .word data_027e0f74
_021788b0: .word gAdventureFlags
.global func_ov27_021788b4
arm_func_start func_ov27_021788b4
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
+149 -149
View File
@@ -161,11 +161,11 @@ func_ov28_0216d6e0: ; 0x0216d6e0
mov r2, #0
strb r2, [r4, #0x8e5]
ldr r1, _0216d904 ; =data_ov28_02179b00
ldr r0, _0216d908 ; =data_027e0f74
ldr r0, _0216d908 ; =gAdventureFlags
str r4, [r1, #0x20]
ldr r0, [r0]
mov r1, #0x57
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r4
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
@@ -174,7 +174,7 @@ _0216d8f8: .word data_ov28_02178968
_0216d8fc: .word data_027e0fec
_0216d900: .word data_ov28_02178a64
_0216d904: .word data_ov28_02179b00
_0216d908: .word data_027e0f74
_0216d908: .word gAdventureFlags
.global func_ov28_0216d90c
arm_func_start func_ov28_0216d90c
@@ -182,17 +182,17 @@ func_ov28_0216d90c: ; 0x0216d90c
stmdb sp!, {r4, lr}
ldr r1, _0216d9d8 ; =data_ov28_02178968
mov r4, r0
ldr r0, _0216d9dc ; =data_027e0f74
ldr r0, _0216d9dc ; =gAdventureFlags
str r1, [r4]
ldr r0, [r0]
mov r1, #0x56
mov r2, #0
bl func_ov00_0209779c
ldr r0, _0216d9dc ; =data_027e0f74
bl _ZN14AdventureFlags3SetEjb
ldr r0, _0216d9dc ; =gAdventureFlags
mov r1, #0x57
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldr r1, _0216d9e0 ; =data_ov28_02179b00
mov r2, #0
add r0, r4, #0x830
@@ -233,7 +233,7 @@ func_ov28_0216d90c: ; 0x0216d90c
.align 2, 0
arm_func_end func_ov28_0216d90c
_0216d9d8: .word data_ov28_02178968
_0216d9dc: .word data_027e0f74
_0216d9dc: .word gAdventureFlags
_0216d9e0: .word data_ov28_02179b00
.global func_ov28_0216d9e4
@@ -242,17 +242,17 @@ func_ov28_0216d9e4: ; 0x0216d9e4
stmdb sp!, {r4, lr}
ldr r1, _0216dab8 ; =data_ov28_02178968
mov r4, r0
ldr r0, _0216dabc ; =data_027e0f74
ldr r0, _0216dabc ; =gAdventureFlags
str r1, [r4]
ldr r0, [r0]
mov r1, #0x56
mov r2, #0
bl func_ov00_0209779c
ldr r0, _0216dabc ; =data_027e0f74
bl _ZN14AdventureFlags3SetEjb
ldr r0, _0216dabc ; =gAdventureFlags
mov r1, #0x57
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldr r1, _0216dac0 ; =data_ov28_02179b00
mov r2, #0
add r0, r4, #0x830
@@ -295,7 +295,7 @@ func_ov28_0216d9e4: ; 0x0216d9e4
.align 2, 0
arm_func_end func_ov28_0216d9e4
_0216dab8: .word data_ov28_02178968
_0216dabc: .word data_027e0f74
_0216dabc: .word gAdventureFlags
_0216dac0: .word data_ov28_02179b00
.global func_ov28_0216dac4
@@ -542,17 +542,17 @@ func_ov28_0216dce8: ; 0x0216dce8
mov r0, r4
bl func_ov28_0216dac4
mov r1, #0
ldr r0, _0216dec4 ; =data_027e0f74
ldr r0, _0216dec4 ; =gAdventureFlags
strb r1, [r4, #0x8e7]
ldr r0, [r0]
mov r1, #0x56
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0216de78
ldr r0, _0216dec4 ; =data_027e0f74
ldr r0, _0216dec4 ; =gAdventureFlags
mov r1, #0x100
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0216de94
_0216de78:
@@ -579,17 +579,17 @@ _0216deb4: .word data_ov28_02178b60
_0216deb8: .word data_ov28_02178b64
_0216debc: .word data_ov28_02178b70
_0216dec0: .word data_ov28_02178b74
_0216dec4: .word data_027e0f74
_0216dec4: .word gAdventureFlags
.global func_ov28_0216dec8
arm_func_start func_ov28_0216dec8
func_ov28_0216dec8: ; 0x0216dec8
stmdb sp!, {r4, lr}
ldr r1, _0216df04 ; =data_027e0f74
ldr r1, _0216df04 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x57
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0216def8
ldrb r0, [r4, #0x478]
@@ -602,7 +602,7 @@ _0216def8:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_0216dec8
_0216df04: .word data_027e0f74
_0216df04: .word gAdventureFlags
_0216df08: .word 0x006f000c
.global func_ov28_0216df0c
@@ -1478,9 +1478,9 @@ func_ov28_0216ead4: ; 0x0216ead4
cmp r0, #0
movle r0, #0
strleb r0, [r5, #0x8e8]
ldr r0, _0216eebc ; =data_027e0f74
ldr r0, _0216eebc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
movne r0, #0
strneb r0, [r5, #0x285]
@@ -1735,7 +1735,7 @@ _0216edf8:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov28_0216ead4
_0216eebc: .word data_027e0f74
_0216eebc: .word gAdventureFlags
_0216eec0: .word 0x00000333
_0216eec4: .word 0x00000e39
_0216eec8: .word 0x0000011f
@@ -2572,17 +2572,17 @@ func_ov28_0216f918: ; 0x0216f918
ldr r1, _0216fb2c ; =0x000009c4
cmp r0, r1
blo _0216f964
ldr r0, _0216fb30 ; =data_027e0f74
ldr r0, _0216fb30 ; =gAdventureFlags
ldr r1, _0216fb34 ; =0x00000176
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0216f964
ldr r0, _0216fb30 ; =data_027e0f74
ldr r0, _0216fb30 ; =gAdventureFlags
ldr r1, _0216fb34 ; =0x00000176
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r4, #0x29
b _0216fad8
_0216f964:
@@ -2709,7 +2709,7 @@ _0216fb20:
.align 2, 0
arm_func_end func_ov28_0216f918
_0216fb2c: .word 0x000009c4
_0216fb30: .word data_027e0f74
_0216fb30: .word gAdventureFlags
_0216fb34: .word 0x00000176
_0216fb38: .word 0x000005dc
_0216fb3c: .word data_027e0764
@@ -3016,10 +3016,10 @@ _0216febc:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _0216fef4
ldr r0, _0216ffb8 ; =data_027e0f74
ldr r0, _0216ffb8 ; =gAdventureFlags
ldr r1, _0216ffbc ; =0x0000013e
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
@@ -3029,10 +3029,10 @@ _0216fef4:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _0216ff24
ldr r0, _0216ffb8 ; =data_027e0f74
ldr r0, _0216ffb8 ; =gAdventureFlags
ldr r1, _0216ffc0 ; =0x0000013f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, pc}
@@ -3042,32 +3042,32 @@ _0216ff24:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _0216ff54
ldr r0, _0216ffb8 ; =data_027e0f74
ldr r0, _0216ffb8 ; =gAdventureFlags
mov r1, #0x140
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #2
ldmeqia sp!, {r3, r4, r5, pc}
_0216ff54:
ldr r0, _0216ffb8 ; =data_027e0f74
ldr r0, _0216ffb8 ; =gAdventureFlags
ldr r1, _0216ffbc ; =0x0000013e
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #3
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _0216ffb8 ; =data_027e0f74
ldr r0, _0216ffb8 ; =gAdventureFlags
ldr r1, _0216ffc0 ; =0x0000013f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #4
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _0216ffb8 ; =data_027e0f74
ldr r0, _0216ffb8 ; =gAdventureFlags
mov r1, #0x140
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #5
moveq r0, #6
@@ -3078,7 +3078,7 @@ _0216ffac:
.align 2, 0
arm_func_end func_ov28_0216fe68
_0216ffb4: .word gItemManager
_0216ffb8: .word data_027e0f74
_0216ffb8: .word gAdventureFlags
_0216ffbc: .word 0x0000013e
_0216ffc0: .word 0x0000013f
@@ -3500,16 +3500,16 @@ func_ov28_021704b0: ; 0x021704b0
blx r1
cmp r0, #0
beq _02170618
ldr r0, _02170624 ; =data_027e0f74
ldr r0, _02170624 ; =gAdventureFlags
ldr r1, _02170628 ; =0x00000126
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _02170524
ldr r0, _02170624 ; =data_027e0f74
ldr r0, _02170624 ; =gAdventureFlags
ldr r1, _0217062c ; =0x0000012a
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02170524
ldr r0, _02170630 ; =data_027e0e60
@@ -3520,16 +3520,16 @@ func_ov28_021704b0: ; 0x021704b0
bl func_ov00_02084b38
b _02170604
_02170524:
ldr r0, _02170624 ; =data_027e0f74
ldr r0, _02170624 ; =gAdventureFlags
ldr r1, _02170634 ; =0x00000127
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _02170570
ldr r0, _02170624 ; =data_027e0f74
ldr r0, _02170624 ; =gAdventureFlags
ldr r1, _02170638 ; =0x0000012b
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02170570
ldr r0, _02170630 ; =data_027e0e60
@@ -3540,16 +3540,16 @@ _02170524:
bl func_ov00_02084b38
b _02170604
_02170570:
ldr r0, _02170624 ; =data_027e0f74
ldr r0, _02170624 ; =gAdventureFlags
mov r1, #0x128
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _021705bc
ldr r0, _02170624 ; =data_027e0f74
ldr r0, _02170624 ; =gAdventureFlags
mov r1, #0x12c
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _021705bc
ldr r0, _02170630 ; =data_027e0e60
@@ -3560,16 +3560,16 @@ _02170570:
bl func_ov00_02084b38
b _02170604
_021705bc:
ldr r0, _02170624 ; =data_027e0f74
ldr r0, _02170624 ; =gAdventureFlags
ldr r1, _0217063c ; =0x00000129
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _02170604
ldr r0, _02170624 ; =data_027e0f74
ldr r0, _02170624 ; =gAdventureFlags
ldr r1, _02170640 ; =0x0000012d
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02170604
ldr r0, _02170630 ; =data_027e0e60
@@ -3590,7 +3590,7 @@ _02170618:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_021704b0
_02170624: .word data_027e0f74
_02170624: .word gAdventureFlags
_02170628: .word 0x00000126
_0217062c: .word 0x0000012a
_02170630: .word data_027e0e60
@@ -4756,12 +4756,12 @@ func_ov28_021713c8: ; 0x021713c8
cmp r0, #0
beq _02171440
mov r2, #1
ldr r0, _02171480 ; =data_027e0f74
ldr r0, _02171480 ; =gAdventureFlags
strb r2, [r4, #0x1ac]
mov r1, #0
ldr r0, [r0]
mov r3, r1
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
ldr r0, _02171484 ; =data_027e0f64
mov r1, #0
ldr r0, [r0]
@@ -4790,7 +4790,7 @@ _02171450:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_021713c8
_02171480: .word data_027e0f74
_02171480: .word gAdventureFlags
_02171484: .word data_027e0f64
.global func_ov28_02171488
@@ -4990,9 +4990,9 @@ _021716f8:
cmp r0, #5
addne sp, sp, #0x18
ldmneia sp!, {r4, pc}
ldr r0, _021718c0 ; =data_027e0f74
ldr r0, _021718c0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _021718c4 ; =data_027e077c
ldreq r1, [r0]
@@ -5045,12 +5045,12 @@ _021716f8:
strb r2, [r4, #0x514]
strb r1, [r4, #0x1ac]
bl func_ov28_02170ad4
ldr r0, _021718c0 ; =data_027e0f74
ldr r0, _021718c0 ; =gAdventureFlags
mov r1, #1
ldr r0, [r0]
mov r2, r1
mov r3, #0
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
mov r0, #0xa000
str r0, [sp]
mov r0, #0xa800
@@ -5075,12 +5075,12 @@ _02171858:
cmp r0, #0
beq _021718b0
mov r2, #1
ldr r0, _021718c0 ; =data_027e0f74
ldr r0, _021718c0 ; =gAdventureFlags
strb r2, [r4, #0x1ac]
mov r1, #0
ldr r0, [r0]
mov r3, r1
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
ldr r0, _021718d4 ; =data_027e0f64
mov r1, #0
ldr r0, [r0]
@@ -5097,7 +5097,7 @@ _021718b0:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_021716a0
_021718c0: .word data_027e0f74
_021718c0: .word gAdventureFlags
_021718c4: .word data_027e077c
_021718c8: .word data_027e0c68
_021718cc: .word data_027e0fc8
@@ -5138,10 +5138,10 @@ _0217192c:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02171964
ldr r0, _02171a28 ; =data_027e0f74
ldr r0, _02171a28 ; =gAdventureFlags
ldr r1, _02171a2c ; =0x0000013e
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
@@ -5151,10 +5151,10 @@ _02171964:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02171994
ldr r0, _02171a28 ; =data_027e0f74
ldr r0, _02171a28 ; =gAdventureFlags
ldr r1, _02171a30 ; =0x0000013f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, pc}
@@ -5164,32 +5164,32 @@ _02171994:
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _021719c4
ldr r0, _02171a28 ; =data_027e0f74
ldr r0, _02171a28 ; =gAdventureFlags
mov r1, #0x140
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #2
ldmeqia sp!, {r3, r4, r5, pc}
_021719c4:
ldr r0, _02171a28 ; =data_027e0f74
ldr r0, _02171a28 ; =gAdventureFlags
ldr r1, _02171a2c ; =0x0000013e
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #3
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _02171a28 ; =data_027e0f74
ldr r0, _02171a28 ; =gAdventureFlags
ldr r1, _02171a30 ; =0x0000013f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #4
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _02171a28 ; =data_027e0f74
ldr r0, _02171a28 ; =gAdventureFlags
mov r1, #0x140
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #5
moveq r0, #6
@@ -5200,7 +5200,7 @@ _02171a1c:
.align 2, 0
arm_func_end func_ov28_021718d8
_02171a24: .word gItemManager
_02171a28: .word data_027e0f74
_02171a28: .word gAdventureFlags
_02171a2c: .word 0x0000013e
_02171a30: .word 0x0000013f
@@ -5742,15 +5742,15 @@ _02172140: .word data_02050f54
.global func_ov28_02172144
arm_func_start func_ov28_02172144
func_ov28_02172144: ; 0x02172144
ldr r0, _02172158 ; =data_027e0f74
ldr ip, _0217215c ; =func_ov00_02097760
ldr r0, _02172158 ; =gAdventureFlags
ldr ip, _0217215c ; =_ZN14AdventureFlags3GetEj
mov r1, #0x31
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov28_02172144
_02172158: .word data_027e0f74
_0217215c: .word func_ov00_02097760
_02172158: .word gAdventureFlags
_0217215c: .word _ZN14AdventureFlags3GetEj
.global func_ov28_02172160
arm_func_start func_ov28_02172160
@@ -6143,15 +6143,15 @@ _02172654: .word data_02050f54
.global func_ov28_02172658
arm_func_start func_ov28_02172658
func_ov28_02172658: ; 0x02172658
ldr r0, _0217266c ; =data_027e0f74
ldr ip, _02172670 ; =func_ov00_02097760
ldr r0, _0217266c ; =gAdventureFlags
ldr ip, _02172670 ; =_ZN14AdventureFlags3GetEj
mov r1, #0x2f
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov28_02172658
_0217266c: .word data_027e0f74
_02172670: .word func_ov00_02097760
_0217266c: .word gAdventureFlags
_02172670: .word _ZN14AdventureFlags3GetEj
.global func_ov28_02172674
arm_func_start func_ov28_02172674
@@ -7102,10 +7102,10 @@ func_ov28_02173210: ; 0x02173210
mov r0, r4
strb r1, [r4, #0x26c]
bl func_ov28_02173178
ldr r0, _021732b4 ; =data_027e0f74
ldr r0, _021732b4 ; =gAdventureFlags
mov r1, #0x100
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _02173278
bl func_ov28_02174948
@@ -7132,7 +7132,7 @@ _02173294:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_02173210
_021732b4: .word data_027e0f74
_021732b4: .word gAdventureFlags
_021732b8: .word data_ov28_021782ec
.global func_ov28_021732bc
@@ -7276,9 +7276,9 @@ _02173440:
ldr r0, [r4, #0x130]
cmp r0, #4
beq _021734e0
ldr r0, _02173500 ; =data_027e0f74
ldr r0, _02173500 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _02173504 ; =data_027e077c
ldreq r1, [r0]
@@ -7319,7 +7319,7 @@ _021734f8:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov28_021733ec
_02173500: .word data_027e0f74
_02173500: .word gAdventureFlags
_02173504: .word data_027e077c
_02173508: .word data_027e0fc8
_0217350c: .word data_027e0c68
@@ -7490,9 +7490,9 @@ func_ov28_021736d0: ; 0x021736d0
cmp r0, #0
movle r0, #0
strleb r0, [r4, #0x26d]
ldr r0, _02173740 ; =data_027e0f74
ldr r0, _02173740 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _02173744 ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -7510,7 +7510,7 @@ func_ov28_021736d0: ; 0x021736d0
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_021736d0
_02173740: .word data_027e0f74
_02173740: .word gAdventureFlags
_02173744: .word data_027e0c68
.global func_ov28_02173748
@@ -7572,16 +7572,16 @@ func_ov28_021737cc: ; 0x021737cc
ldrb r0, [r0, #0x11a]
cmp r0, #0
bne _02173850
ldr r0, _02173860 ; =data_027e0f74
ldr r0, _02173860 ; =gAdventureFlags
mov r1, #0xe3
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02173850
ldr r0, _02173860 ; =data_027e0f74
ldr r0, _02173860 ; =gAdventureFlags
mov r1, #0xe7
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _02173850
ldr r0, _02173864 ; =data_ov09_0211f5b4
@@ -7595,7 +7595,7 @@ _02173850:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_021737cc
_02173860: .word data_027e0f74
_02173860: .word gAdventureFlags
_02173864: .word data_ov09_0211f5b4
.global func_ov28_02173868
@@ -7665,9 +7665,9 @@ func_ov28_021738e0: ; 0x021738e0
blx r1
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02173944 ; =data_027e0f74
ldr r0, _02173944 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _02173948 ; =data_027e0fc8
@@ -7685,7 +7685,7 @@ func_ov28_021738e0: ; 0x021738e0
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_021738e0
_02173944: .word data_027e0f74
_02173944: .word gAdventureFlags
_02173948: .word data_027e0fc8
_0217394c: .word data_ov09_0211f5b4
@@ -8435,7 +8435,7 @@ func_ov28_021742b0: ; 0x021742b0
mvn r3, #0
mov r2, #0x1e
mov r1, #6
ldr r0, _02174380 ; =data_027e0f74
ldr r0, _02174380 ; =gAdventureFlags
str r3, [sp, #4]
strb r2, [sp, #9]
strb r1, [sp, #0xa]
@@ -8450,7 +8450,7 @@ func_ov28_021742b0: ; 0x021742b0
str r3, [sp, #0x28]
strb r2, [sp, #0x10]
strb r2, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
ldr r1, _02174384 ; =data_027e0e60
str r0, [r4, #0x228]
ldr r0, [r1]
@@ -8466,7 +8466,7 @@ func_ov28_021742b0: ; 0x021742b0
arm_func_end func_ov28_021742b0
_02174378: .word 0x00000666
_0217437c: .word data_ov28_021794e4
_02174380: .word data_027e0f74
_02174380: .word gAdventureFlags
_02174384: .word data_027e0e60
.global func_ov28_02174388
@@ -8474,17 +8474,17 @@ _02174384: .word data_027e0e60
func_ov28_02174388: ; 0x02174388
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x14
ldr r1, _021744b0 ; =data_027e0f74
ldr r1, _021744b0 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
ldr r1, [r4, #0x228]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0x14
ldmeqia sp!, {r3, r4, pc}
ldr r0, _021744b0 ; =data_027e0f74
ldr r0, _021744b0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x19
addls sp, sp, #0x14
ldmlsia sp!, {r3, r4, pc}
@@ -8538,10 +8538,10 @@ _02174428:
str r0, [r4, #0x238]
ldmia sp!, {r3, r4, pc}
_02174488:
ldr r0, _021744b0 ; =data_027e0f74
ldr r0, _021744b0 ; =gAdventureFlags
ldr r1, [r4, #0x228]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
mov r0, r4
str r1, [r4, #0x228]
@@ -8550,7 +8550,7 @@ _02174488:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov28_02174388
_021744b0: .word data_027e0f74
_021744b0: .word gAdventureFlags
_021744b4: .word data_027e0e58
_021744b8: .word data_ov00_020eec9c
_021744bc: .word data_02050f54
@@ -8587,9 +8587,9 @@ func_ov28_02174504: ; 0x02174504
ldrsh r0, [r0, #0xc]
cmp r0, #5
ldmleia sp!, {r4, pc}
ldr r0, _0217454c ; =data_027e0f74
ldr r0, _0217454c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _02174550 ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -8601,7 +8601,7 @@ func_ov28_02174504: ; 0x02174504
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_02174504
_0217454c: .word data_027e0f74
_0217454c: .word gAdventureFlags
_02174550: .word data_027e0c68
.global func_ov28_02174554
@@ -8622,7 +8622,7 @@ func_ov28_02174554: ; 0x02174554
mov r3, #0
mov r2, #0x14
mov r1, #0x1e
ldr r0, _02174668 ; =data_027e0f74
ldr r0, _02174668 ; =gAdventureFlags
str r2, [sp, #4]
strb r3, [sp, #0xa]
strb r3, [sp, #0xb]
@@ -8636,7 +8636,7 @@ func_ov28_02174554: ; 0x02174554
ldr r2, [r4, #0x50]
str r2, [sp, #0x28]
strb r3, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x22c]
mvn ip, #0
mov r3, #0x1e
@@ -8647,7 +8647,7 @@ func_ov28_02174554: ; 0x02174554
strb r2, [sp, #0xa]
strb r1, [sp, #0xb]
ldr r1, [r4, #0x48]
ldr r0, _02174668 ; =data_027e0f74
ldr r0, _02174668 ; =gAdventureFlags
str r1, [sp, #0x20]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -8661,7 +8661,7 @@ func_ov28_02174554: ; 0x02174554
strb ip, [sp, #0x16]
strb r3, [sp, #0x14]
str r2, [sp, #0x94]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x230]
mov r0, r4
mov r1, #0
@@ -8678,23 +8678,23 @@ func_ov28_02174554: ; 0x02174554
.align 2, 0
arm_func_end func_ov28_02174554
_02174664: .word data_027e0ffc
_02174668: .word data_027e0f74
_02174668: .word gAdventureFlags
_0217466c: .word data_ov28_021794e4
.global func_ov28_02174670
arm_func_start func_ov28_02174670
func_ov28_02174670: ; 0x02174670
stmdb sp!, {r4, lr}
ldr r1, _021746c8 ; =data_027e0f74
ldr r1, _021746c8 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
ldr r1, [r4, #0x230]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _021746c8 ; =data_027e0f74
ldr r0, _021746c8 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0xa
ldmlsia sp!, {r4, pc}
mov r0, r4
@@ -8708,7 +8708,7 @@ func_ov28_02174670: ; 0x02174670
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_02174670
_021746c8: .word data_027e0f74
_021746c8: .word gAdventureFlags
.global func_ov28_021746cc
arm_func_start func_ov28_021746cc
@@ -8804,10 +8804,10 @@ func_ov28_0217475c: ; 0x0217475c
ldr r0, [r0]
mov r3, #2
bl func_ov00_0207c1b0
ldr r0, _02174828 ; =data_027e0f74
ldr r0, _02174828 ; =gAdventureFlags
ldr r1, [r4, #0x230]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x230]
rsb r1, r0, #0x400
@@ -8819,7 +8819,7 @@ func_ov28_0217475c: ; 0x0217475c
arm_func_end func_ov28_0217475c
_02174820: .word data_027e0e58
_02174824: .word 0x000001a5
_02174828: .word data_027e0f74
_02174828: .word gAdventureFlags
_0217482c: .word data_ov00_020eec9c
.global func_ov28_02174830
@@ -9018,10 +9018,10 @@ _02174a58: .word data_ov00_020eec68
arm_func_start func_ov28_02174a5c
func_ov28_02174a5c: ; 0x02174a5c
stmdb sp!, {r4, lr}
ldr r1, _02174b90 ; =data_027e0f74
ldr r1, _02174b90 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, [r4, #4]
@@ -9100,7 +9100,7 @@ _02174b40:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_02174a5c
_02174b90: .word data_027e0f74
_02174b90: .word gAdventureFlags
_02174b94: .word data_ov00_020eec68
_02174b98: .word data_027e077c
_02174b9c: .word data_027e0c68
@@ -9139,16 +9139,16 @@ func_ov28_02174bd8: ; 0x02174bd8
bl func_ov28_02175028
ldr r0, _02174c04 ; =data_ov09_0211f5b4
blx func_ov03_020f4048
ldr r0, _02174c08 ; =data_027e0f74
ldr r0, _02174c08 ; =gAdventureFlags
mov r1, #0x100
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov28_02174bd8
_02174c04: .word data_ov09_0211f5b4
_02174c08: .word data_027e0f74
_02174c08: .word gAdventureFlags
.global func_ov28_02174c0c
arm_func_start func_ov28_02174c0c
@@ -9371,10 +9371,10 @@ _02174ec0: .word data_ov28_02179c54
arm_func_start func_ov28_02174ec4
func_ov28_02174ec4: ; 0x02174ec4
stmdb sp!, {r4, lr}
ldr r1, _02174f38 ; =data_027e0f74
ldr r1, _02174f38 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
ldreq r0, _02174f3c ; =data_027e0c68
ldreqb r0, [r0, #4]
@@ -9403,7 +9403,7 @@ _02174f30:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_02174ec4
_02174f38: .word data_027e0f74
_02174f38: .word gAdventureFlags
_02174f3c: .word data_027e0c68
_02174f40: .word data_ov28_02179c2c
@@ -10691,16 +10691,16 @@ func_ov28_02175f48: ; 0x02175f48
bl func_ov28_02175ae0
mov r0, #0
str r0, [r4, #0x5f4]
ldr r0, _021761ec ; =data_027e0f74
ldr r0, _021761ec ; =gAdventureFlags
mov r1, #0x124
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _021760ac
ldr r0, _021761ec ; =data_027e0f74
ldr r0, _021761ec ; =gAdventureFlags
mov r1, #0xb5
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #1
streqb r0, [r4, #0x7ad]
@@ -10732,10 +10732,10 @@ _021760a4:
mov r0, #1
ldmia sp!, {r4, pc}
_021760ac:
ldr r0, _021761ec ; =data_027e0f74
ldr r0, _021761ec ; =gAdventureFlags
ldr r1, _021761f0 ; =0x00000123
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r1, #0
beq _0217612c
@@ -10820,7 +10820,7 @@ _021761dc: .word data_ov28_021798ec
_021761e0: .word data_ov28_021798f0
_021761e4: .word data_ov28_02178360
_021761e8: .word func_ov28_021754e4
_021761ec: .word data_027e0f74
_021761ec: .word gAdventureFlags
_021761f0: .word 0x00000123
.global func_ov28_021761f4
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
+6 -6
View File
@@ -628,9 +628,9 @@ func_ov29_0216ddb0: ; 0x0216ddb0
cmp r0, #0
addeq sp, sp, #4
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc}
ldr r0, _0216dfec ; =data_027e0f74
ldr r0, _0216dfec ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
addne sp, sp, #4
ldmneia sp!, {r3, r4, r5, r6, r7, r8, pc}
@@ -772,7 +772,7 @@ _0216df70:
.align 2, 0
arm_func_end func_ov29_0216ddb0
_0216dfe8: .word data_ov29_0217a4ac
_0216dfec: .word data_027e0f74
_0216dfec: .word gAdventureFlags
_0216dff0: .word data_ov29_0217a504
_0216dff4: .word data_027e104c
_0216dff8: .word data_ov00_020eec9c
@@ -11284,10 +11284,10 @@ func_ov29_02176e94: ; 0x02176e94
arm_func_start func_ov29_02176ea8
func_ov29_02176ea8: ; 0x02176ea8
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _02176fac ; =data_027e0f74
ldr r1, _02176fac ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
@@ -11354,7 +11354,7 @@ _02176f60:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov29_02176ea8
_02176fac: .word data_027e0f74
_02176fac: .word gAdventureFlags
_02176fb0: .word data_ov29_0217a4ac
_02176fb4: .word gItemManager
_02176fb8: .word data_027e103c
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
+39 -39
View File
@@ -2422,9 +2422,9 @@ _0217dca8:
add sp, sp, #0xbc
ldmia sp!, {r3, r4, r5, r6, pc}
_0217dccc:
ldr r0, _0217df4c ; =data_027e0f74
ldr r0, _0217df4c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
addne sp, sp, #0xbc
ldmneia sp!, {r3, r4, r5, r6, pc}
@@ -2496,17 +2496,17 @@ _0217dd8c:
mov r0, r4
str r2, [r1, #0x10]
bl func_ov30_02183e30
ldr r0, _0217df4c ; =data_027e0f74
ldr r0, _0217df4c ; =gAdventureFlags
mov r1, #0x46
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0217de10
ldr r0, _0217df4c ; =data_027e0f74
ldr r0, _0217df4c ; =gAdventureFlags
mov r1, #0x46
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_0217de10:
mov r0, r5
mov r1, #4
@@ -2562,17 +2562,17 @@ _0217de88:
mov r0, r4
str r2, [r1, #0x10]
bl func_ov30_02183e30
ldr r0, _0217df4c ; =data_027e0f74
ldr r0, _0217df4c ; =gAdventureFlags
mov r1, #0x46
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0217df0c
ldr r0, _0217df4c ; =data_027e0f74
ldr r0, _0217df4c ; =gAdventureFlags
mov r1, #0x46
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_0217df0c:
mov r0, r5
mov r1, #4
@@ -2594,7 +2594,7 @@ _0217df40:
.align 2, 0
arm_func_end func_ov30_0217dbc8
_0217df48: .word data_027e0f64
_0217df4c: .word data_027e0f74
_0217df4c: .word gAdventureFlags
_0217df50: .word 0x43485334
_0217df54: .word data_027e0ffc
@@ -2764,9 +2764,9 @@ _0217e160:
add sp, sp, #0xcc
ldmia sp!, {r4, r5, r6, r7, pc}
_0217e184:
ldr r0, _0217e3c0 ; =data_027e0f74
ldr r0, _0217e3c0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
addne sp, sp, #0xcc
ldmneia sp!, {r4, r5, r6, r7, pc}
@@ -2918,7 +2918,7 @@ _0217e3b8:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov30_0217e0b0
_0217e3c0: .word data_027e0f74
_0217e3c0: .word gAdventureFlags
_0217e3c4: .word data_027e0f64
_0217e3c8: .word data_027e0c68
_0217e3cc: .word 0x000e0055
@@ -3989,17 +3989,17 @@ _0217f1e8: ; jump table
b _0217f2f4 ; case 2
b _0217f470 ; case 3
_0217f1f8:
ldr r0, _0217f544 ; =data_027e0f74
ldr r0, _0217f544 ; =gAdventureFlags
mov r1, #0x158
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0217f23c
ldr r0, _0217f544 ; =data_027e0f74
ldr r0, _0217f544 ; =gAdventureFlags
mov r1, #0x158
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r7
mov r1, #0xe
mov r2, #0
@@ -4213,7 +4213,7 @@ _0217f53c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov30_0217f1c4
_0217f544: .word data_027e0f74
_0217f544: .word gAdventureFlags
_0217f548: .word data_027e0e60
_0217f54c: .word data_027e0ffc
_0217f550: .word data_ov00_020e8398
@@ -5415,10 +5415,10 @@ func_ov30_02180548: ; 0x02180548
bl func_ov00_02082d08
cmp r0, #7
bne _02180594
ldr r0, _021805a4 ; =data_027e0f74
ldr r0, _021805a4 ; =gAdventureFlags
mov r1, #0x14
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, pc}
@@ -5429,7 +5429,7 @@ _02180594:
arm_func_end func_ov30_02180548
_0218059c: .word data_027e0d38
_021805a0: .word data_027e0e60
_021805a4: .word data_027e0f74
_021805a4: .word gAdventureFlags
_021805a8: .word data_ov30_021887ac
.global func_ov30_021805ac
@@ -5447,10 +5447,10 @@ func_ov30_021805ac: ; 0x021805ac
bl func_ov00_02082d08
cmp r0, #7
bne _021805f8
ldr r0, _02180608 ; =data_027e0f74
ldr r0, _02180608 ; =gAdventureFlags
mov r1, #0x14
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, pc}
@@ -5461,7 +5461,7 @@ _021805f8:
arm_func_end func_ov30_021805ac
_02180600: .word data_027e0d38
_02180604: .word data_027e0e60
_02180608: .word data_027e0f74
_02180608: .word gAdventureFlags
_0218060c: .word data_ov30_021887b4
.global func_ov30_02180610
@@ -7363,7 +7363,7 @@ _02181944:
_0218195c:
ldr r9, _021819e8 ; =data_ov30_021887d0
add lr, sp, #0x20
ldmia sb!, {r0, r1, r2, r3}
ldmia r9!, {r0, r1, r2, r3}
mov ip, lr
stmia lr!, {r0, r1, r2, r3}
ldr r9, [r9]
@@ -8157,9 +8157,9 @@ func_ov30_021823f8: ; 0x021823f8
ldrh r1, [r4, #0x24]
cmp r1, #0
ble _02182424
ldr r0, _02182450 ; =data_027e0f74
ldr r0, _02182450 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -8167,9 +8167,9 @@ _02182424:
ldrh r1, [r4, #0x26]
cmp r1, #0
ble _02182448
ldr r0, _02182450 ; =data_027e0f74
ldr r0, _02182450 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -8178,7 +8178,7 @@ _02182448:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov30_021823f8
_02182450: .word data_027e0f74
_02182450: .word gAdventureFlags
.global func_ov30_02182454
arm_func_start func_ov30_02182454
@@ -10133,10 +10133,10 @@ _02183df4:
ldr r0, _02183e28 ; =0x43485334
cmp r1, r0
bne _02183e20
ldr r0, _02183e2c ; =data_027e0f74
ldr r0, _02183e2c ; =gAdventureFlags
mov r1, #0x35
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -10146,7 +10146,7 @@ _02183e20:
.align 2, 0
arm_func_end func_ov30_02183db8
_02183e28: .word 0x43485334
_02183e2c: .word data_027e0f74
_02183e2c: .word gAdventureFlags
.global func_ov30_02183e30
arm_func_start func_ov30_02183e30
@@ -13096,17 +13096,17 @@ _0218622c:
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0218623c:
ldr r0, _021863e0 ; =data_027e0f74
ldr r0, _021863e0 ; =gAdventureFlags
mov r1, #0x11c
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _02186280
ldr r0, _021863e0 ; =data_027e0f74
ldr r0, _021863e0 ; =gAdventureFlags
mov r1, #0x11c
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r6
mov r1, #2
mov r2, #0
@@ -13210,7 +13210,7 @@ _021863cc:
_021863d4: .word data_027e0f94
_021863d8: .word 0x43485334
_021863dc: .word 0x43485336
_021863e0: .word data_027e0f74
_021863e0: .word gAdventureFlags
.global func_ov30_021863e4
arm_func_start func_ov30_021863e4
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
+47 -47
View File
@@ -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
@@ -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
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
+38 -38
View File
@@ -6947,15 +6947,15 @@ _02181720:
blx r3
b _02181cb4
_0218174c:
ldr r0, _02181cdc ; =data_027e0f74
ldr r0, _02181cdc ; =gAdventureFlags
ldr r1, [r4, #0x60]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02181cb4
ldr r0, _02181cdc ; =data_027e0f74
ldr r0, _02181cdc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
blo _02181cb4
mov r0, r4
@@ -6982,10 +6982,10 @@ _021817c4:
add r0, r4, #0x200
bl func_ov00_020b7e6c
_021817cc:
ldr r0, _02181cdc ; =data_027e0f74
ldr r0, _02181cdc ; =gAdventureFlags
ldr r1, [r4, #0x60]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
beq _02181cb4
mov r0, r4
@@ -6996,10 +6996,10 @@ _021817cc:
blx r3
b _02181cb4
_02181800:
ldr r0, _02181cdc ; =data_027e0f74
ldr r0, _02181cdc ; =gAdventureFlags
ldr r1, [r4, #0x60]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02181cb4
ldrsh r0, [r4, #0x74]
@@ -7049,9 +7049,9 @@ _02181848:
str ip, [r4, #0x94]
str ip, [r4, #0x98]
_021818cc:
ldr r0, _02181cdc ; =data_027e0f74
ldr r0, _02181cdc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x2d
blo _02181cb4
ldr r0, _02181cec ; =data_027e0ffc
@@ -7112,9 +7112,9 @@ _021819a0:
bl Approach_thunk
b _02181cb4
_021819b4:
ldr r0, _02181cdc ; =data_027e0f74
ldr r0, _02181cdc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_0209809c
bl _ZN14AdventureFlags18func_ov00_0209809cEv
cmp r0, #0
bne _02181cb4
mov r0, r4
@@ -7214,14 +7214,14 @@ _02181afc:
b _02181cb4
_02181b28:
bl func_ov32_021829ec
ldr r0, _02181cdc ; =data_027e0f74
ldr r0, _02181cdc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097738
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _02181cb4
ldr r0, _02181cdc ; =data_027e0f74
ldr r0, _02181cdc ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097bbc
bl _ZN14AdventureFlags18func_ov00_02097bbcEv
cmp r0, #0
bne _02181cb4
ldrsh r0, [r4, #0x76]
@@ -7330,7 +7330,7 @@ _02181cb4:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov32_021816ac
_02181cdc: .word data_027e0f74
_02181cdc: .word gAdventureFlags
_02181ce0: .word 0x0000019a
_02181ce4: .word data_027e0e58
_02181ce8: .word data_027e0764
@@ -7397,7 +7397,7 @@ _02181db0:
mov r3, #0x69
mov r2, #0x1e
mov r1, #6
ldr r0, _0218227c ; =data_027e0f74
ldr r0, _0218227c ; =gAdventureFlags
str r3, [sp, #0x128]
strb r2, [sp, #0x12d]
strb r1, [sp, #0x12e]
@@ -7412,7 +7412,7 @@ _02181db0:
ldr r0, [r0]
add r1, sp, #0x124
strb r2, [sp, #0x134]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x60]
add r0, sp, #0x124
bl func_ov00_0209a508
@@ -7461,7 +7461,7 @@ _02181ea4:
mov r3, #0x69
mov r2, #0x1e
mov r1, #6
ldr r0, _0218227c ; =data_027e0f74
ldr r0, _0218227c ; =gAdventureFlags
str r3, [sp, #0x78]
strb r2, [sp, #0x7d]
strb r1, [sp, #0x7e]
@@ -7474,7 +7474,7 @@ _02181ea4:
str r2, [sp, #0x94]
str r3, [sp, #0x98]
str ip, [sp, #0x9c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x60]
mov ip, #7
ldr r0, _02182280 ; =data_027e0ffc
@@ -7605,10 +7605,10 @@ _02182080:
str r1, [sp, #0x28]
mov r0, #2
stmia sp, {r0, r1}
ldr r0, _0218227c ; =data_027e0f74
ldr r0, _0218227c ; =gAdventureFlags
mov r3, r2
ldr r0, [r0]
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
mvn r0, #0
str r0, [sp]
mov r0, #2
@@ -7695,11 +7695,11 @@ _02182214:
mov r0, #2
stmia sp, {r0, r3}
mov r1, #0xa
ldr r0, _0218227c ; =data_027e0f74
ldr r0, _0218227c ; =gAdventureFlags
mov r2, r1
ldr r0, [r0]
mov r3, r1
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
b _0218226c
_0218223c:
ldr r0, _02182294 ; =data_027e077c
@@ -7721,7 +7721,7 @@ _0218226c:
.align 2, 0
arm_func_end func_ov32_02181d00
_02182278: .word 0xffffeccd
_0218227c: .word data_027e0f74
_0218227c: .word gAdventureFlags
_02182280: .word data_027e0ffc
_02182284: .word 0x0000039b
_02182288: .word data_027e0e58
@@ -8515,15 +8515,15 @@ func_ov32_02182c40: ; 0x02182c40
mvn r0, #0
cmp r1, r0
beq _02182d68
ldr r0, _02182d7c ; =data_027e0f74
ldr r0, _02182d7c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
bne _02182cbc
ldr r0, _02182d7c ; =data_027e0f74
ldr r0, _02182d7c ; =gAdventureFlags
ldr r1, [r5, #0xb0]
ldr r0, [r0]
bl func_ov00_02097bac
bl _ZN14AdventureFlags18func_ov00_02097bacEv
cmp r0, #0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
@@ -8536,9 +8536,9 @@ func_ov32_02182c40: ; 0x02182c40
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_02182cbc:
ldr r0, _02182d7c ; =data_027e0f74
ldr r0, _02182d7c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
bne _02182ce4
ldr r0, _02182d80 ; =data_027e0ffc
@@ -8547,9 +8547,9 @@ _02182cbc:
mov r3, #0
bl func_ov00_020ceacc
_02182ce4:
ldr r0, _02182d7c ; =data_027e0f74
ldr r0, _02182d7c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02098058
bl _ZN14AdventureFlags18func_ov00_02098058Ev
cmp r0, #0x1e
blo _02182d68
add r0, r5, #0x110
@@ -8591,7 +8591,7 @@ _02182d68:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov32_02182c40
_02182d7c: .word data_027e0f74
_02182d7c: .word gAdventureFlags
_02182d80: .word data_027e0ffc
_02182d84: .word 0x0000039f
_02182d88: .word data_027e0f68
@@ -8628,7 +8628,7 @@ func_ov32_02182db4: ; 0x02182db4
mov r3, #0xa0
mov r2, #0x1e
mov r1, #6
ldr r0, _02182e98 ; =data_027e0f74
ldr r0, _02182e98 ; =gAdventureFlags
str r3, [sp, #0x10]
strb r2, [sp, #0x15]
strb r1, [sp, #0x16]
@@ -8641,7 +8641,7 @@ func_ov32_02182db4: ; 0x02182db4
str r2, [sp, #0x2c]
str r3, [sp, #0x30]
str ip, [sp, #0x34]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r6, #0xb0]
add r0, sp, #0xc
bl func_ov00_0209a508
@@ -8677,7 +8677,7 @@ _02182e80:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov32_02182db4
_02182e98: .word data_027e0f74
_02182e98: .word gAdventureFlags
_02182e9c: .word data_027e0ffc
.global func_ov32_02182ea0
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
+6 -6
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
@@ -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
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
+54 -54
View File
@@ -3424,12 +3424,12 @@ _0217eb50:
ldr r0, [r0, #8]
add r3, sp, #0x30
bl func_ov00_020888e8
ldr r0, _0217ebb0 ; =data_027e0f74
ldr r0, _0217ebb0 ; =gAdventureFlags
mov r1, #1
ldr r0, [r0]
mov r2, r1
mov r3, #0
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
_0217eb94:
mov r0, r5
mov r1, r4
@@ -3440,7 +3440,7 @@ _0217eb94:
arm_func_end func_ov35_0217e9ec
_0217eba8: .word data_027e0f64
_0217ebac: .word 0x00001e94
_0217ebb0: .word data_027e0f74
_0217ebb0: .word gAdventureFlags
.global func_ov35_0217ebb4
arm_func_start func_ov35_0217ebb4
@@ -3595,10 +3595,10 @@ func_ov35_0217ed90: ; 0x0217ed90
movne r0, #0
ldmneia sp!, {r3, r4, pc}
_0217edc0:
ldr r0, _0217f044 ; =data_027e0f74
ldr r0, _0217f044 ; =gAdventureFlags
mov r1, #0x1f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0217ee08
ldrb r0, [r4, #0x2a]
@@ -3761,7 +3761,7 @@ _0217ef90:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov35_0217ed90
_0217f044: .word data_027e0f74
_0217f044: .word gAdventureFlags
_0217f048: .word 0x00001333
_0217f04c: .word data_027e0fe8
_0217f050: .word 0x52594453
@@ -4067,7 +4067,7 @@ _0217f2f8:
ldr r8, [sp, #0x434]
str r1, [sp, #0x4b4]
ldr r1, [sp, #0x438]
ldr r0, _021800a4 ; =data_027e0f74
ldr r0, _021800a4 ; =gAdventureFlags
str ip, [sp, #0x4b8]
ldr ip, [sp, #0x43c]
str r11, [sp, #0x4bc]
@@ -4108,7 +4108,7 @@ _0217f2f8:
strb r5, [sp, #0x4fe]
strb r3, [sp, #0x4ff]
strb r2, [sp, #0x500]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mvn r1, #0
str r0, [r4, #0x544]
cmp r0, r1
@@ -4655,7 +4655,7 @@ _0217fd30:
ldr r2, [sp, #0x320]
str r1, [sp, #0x3a0]
ldr r1, [sp, #0x324]
ldr r0, _021800a4 ; =data_027e0f74
ldr r0, _021800a4 ; =gAdventureFlags
str ip, [sp, #0x3a4]
ldr ip, [sp, #0x328]
str r11, [sp, #0x3a8]
@@ -4696,7 +4696,7 @@ _0217fd30:
strb r5, [sp, #0x3e7]
strb r3, [sp, #0x3e8]
str r2, [sp, #0x3ec]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mvn r1, #0
str r0, [r4, #0x544]
cmp r0, r1
@@ -4787,7 +4787,7 @@ _0217fee0:
str r1, [sp, #0x50]
bl func_ov00_0209a4f4
mov r1, #3
ldr r0, _021800a4 ; =data_027e0f74
ldr r0, _021800a4 ; =gAdventureFlags
mvn r2, #0
str r2, [sp, #0x244]
mov r2, #0x32
@@ -4802,7 +4802,7 @@ _0217fee0:
ldr r1, [sp, #0x50]
str r1, [sp, #0x268]
add r1, sp, #0x240
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mvn r1, #0
str r0, [r4, #0x544]
cmp r0, r1
@@ -4861,7 +4861,7 @@ _02180084:
.align 2, 0
arm_func_end func_ov35_0217f234
_021800a0: .word data_027e0f64
_021800a4: .word data_027e0f74
_021800a4: .word gAdventureFlags
_021800a8: .word data_027e0c68
_021800ac: .word data_027e0fc8
_021800b0: .word data_027e071c
@@ -5015,11 +5015,11 @@ _0218010c:
add r0, r0, r3
str r0, [r4, #0x50c]
str r1, [r4, #0x510]
ldr r0, _021800a4 ; =data_027e0f74
ldr r0, _021800a4 ; =gAdventureFlags
str r2, [r4, #0x514]
ldr r0, [r0]
add r1, sp, #0x190
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mvn r1, #0
str r0, [r4, #0x544]
cmp r0, r1
@@ -5289,7 +5289,7 @@ _021805ac:
ldr r9, [sp, #0xa4]
ldr r2, [sp, #0xa8]
ldr r1, [sp, #0xac]
ldr r0, _021800a4 ; =data_027e0f74
ldr r0, _021800a4 ; =gAdventureFlags
ldr ip, [sp, #0xb0]
ldr r11, [sp, #0xb4]
ldr r10, [sp, #0xb8]
@@ -5327,7 +5327,7 @@ _021805ac:
strb r5, [sp, #0x16f]
strb r3, [sp, #0x170]
str r2, [sp, #0x174]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mvn r1, #0
str r0, [r4, #0x544]
cmp r0, r1
@@ -5587,12 +5587,12 @@ _02180b64: .word data_027e0fc8
arm_func_start func_ov35_02180b68
func_ov35_02180b68: ; 0x02180b68
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _02180bb0 ; =data_027e0f74
ldr r2, _02180bb0 ; =gAdventureFlags
mov r5, r0
mov r4, r1
ldr r0, [r2]
ldr r1, [r5, #0x544]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
bne _02180b98
ldrb r0, [r5, #0x562]
@@ -5607,7 +5607,7 @@ _02180b98:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov35_02180b68
_02180bb0: .word data_027e0f74
_02180bb0: .word gAdventureFlags
.global func_ov35_02180bb4
arm_func_start func_ov35_02180bb4
@@ -5650,11 +5650,11 @@ func_ov35_02180bf0: ; 0x02180bf0
arm_func_start func_ov35_02180c18
func_ov35_02180c18: ; 0x02180c18
stmdb sp!, {r4, lr}
ldr r1, _02180c48 ; =data_027e0f74
ldr r1, _02180c48 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
ldr r1, [r4, #0x544]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -5663,7 +5663,7 @@ func_ov35_02180c18: ; 0x02180c18
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov35_02180c18
_02180c48: .word data_027e0f74
_02180c48: .word gAdventureFlags
.global func_ov35_02180c4c
arm_func_start func_ov35_02180c4c
@@ -6064,16 +6064,16 @@ _021811b4:
cmp r0, #0
addne sp, sp, #0x10
ldmneia sp!, {r4, pc}
ldr r0, _02181268 ; =data_027e0f74
ldr r0, _02181268 ; =gAdventureFlags
ldr r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _021811f0
ldr r0, _02181268 ; =data_027e0f74
ldr r0, _02181268 ; =gAdventureFlags
ldr r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_021811f0:
mvn r1, #0
ldr r0, _0218126c ; =data_027e0fc8
@@ -6107,7 +6107,7 @@ _021811f0:
arm_func_end func_ov35_021810bc
_02181260: .word data_027e0f64
_02181264: .word data_027e071c
_02181268: .word data_027e0f74
_02181268: .word gAdventureFlags
_0218126c: .word data_027e0fc8
_02181270: .word data_ov35_02185c70
_02181274: .word data_ov35_02185ce0
@@ -6581,16 +6581,16 @@ func_ov35_0218187c: ; 0x0218187c
bl func_0202e58c
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
ldr r0, _02181988 ; =data_027e0f74
ldr r0, _02181988 ; =gAdventureFlags
ldr r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _021818ec
ldr r0, _02181988 ; =data_027e0f74
ldr r0, _02181988 ; =gAdventureFlags
ldr r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_021818ec:
mvn r0, #0
str r0, [r4, #0x544]
@@ -6633,7 +6633,7 @@ _021818ec:
.align 2, 0
arm_func_end func_ov35_0218187c
_02181984: .word data_027e0c54
_02181988: .word data_027e0f74
_02181988: .word gAdventureFlags
_0218198c: .word data_02050f54
_02181990: .word 0xffffe4cd
@@ -6733,16 +6733,16 @@ _02181ad0:
cmp r0, #0
addne sp, sp, #0x14
ldmneia sp!, {r3, r4, pc}
ldr r0, _02181b50 ; =data_027e0f74
ldr r0, _02181b50 ; =gAdventureFlags
ldr r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02181b24
ldr r0, _02181b50 ; =data_027e0f74
ldr r0, _02181b50 ; =gAdventureFlags
ldr r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02181b24:
mvn r2, #0
mov r0, r4
@@ -6757,7 +6757,7 @@ _02181b40: .word data_027e0ffc
_02181b44: .word data_027e0c54
_02181b48: .word func_ov35_0217e9ec
_02181b4c: .word data_027e0f64
_02181b50: .word data_027e0f74
_02181b50: .word gAdventureFlags
.global func_ov35_02181b54
arm_func_start func_ov35_02181b54
@@ -7114,16 +7114,16 @@ _02182038:
cmp r0, #0
addeq sp, sp, #0x8c
ldmeqia sp!, {r4, r5, pc}
ldr r0, _021820a4 ; =data_027e0f74
ldr r0, _021820a4 ; =gAdventureFlags
ldr r1, [r5, #0x544]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02182078
ldr r0, _021820a4 ; =data_027e0f74
ldr r0, _021820a4 ; =gAdventureFlags
ldr r1, [r5, #0x544]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02182078:
mvn r2, #0
mov r0, r5
@@ -7138,7 +7138,7 @@ _02182094: .word 0x00001333
_02182098: .word data_ov35_02185c70
_0218209c: .word data_ov35_02185cd0
_021820a0: .word data_027e0f64
_021820a4: .word data_027e0f74
_021820a4: .word gAdventureFlags
.global func_ov35_021820a8
arm_func_start func_ov35_021820a8
@@ -7701,11 +7701,11 @@ _02182830: .word data_027e0fc8
func_ov35_02182834: ; 0x02182834
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _02182938 ; =data_027e0f74
ldr r1, _02182938 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x1f
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addne sp, sp, #0x18
ldmneia sp!, {r4, pc}
@@ -7737,37 +7737,37 @@ func_ov35_02182834: ; 0x02182834
cmp r0, #0x3c
addlt sp, sp, #0x18
ldmltia sp!, {r4, pc}
ldr r0, _02182938 ; =data_027e0f74
ldr r0, _02182938 ; =gAdventureFlags
ldr r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _021828f4
ldr r0, _02182938 ; =data_027e0f74
ldr r0, _02182938 ; =gAdventureFlags
ldr r1, [r4, #0x544]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_021828f4:
mvn r1, #0
ldr r0, _02182938 ; =data_027e0f74
ldr r0, _02182938 ; =gAdventureFlags
str r1, [r4, #0x544]
ldr r0, [r0]
mov r1, #0x1f
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
ldr r0, _02182944 ; =gItemManager
mov r1, #0x1d
ldr r0, [r0]
blx _ZN11ItemManager7AddItemEi
ldr r0, _02182938 ; =data_027e0f74
ldr r0, _02182938 ; =gAdventureFlags
mov r1, #8
ldr r0, [r0]
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov35_02182834
_02182938: .word data_027e0f74
_02182938: .word gAdventureFlags
_0218293c: .word 0x0000099a
_02182940: .word data_027e0e58
_02182944: .word gItemManager
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
+103 -103
View File
@@ -1609,19 +1609,19 @@ func_ov36_0217d294: ; 0x0217d294
func_ov36_0217d2a0: ; 0x0217d2a0
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x70
ldr r1, _0217d680 ; =data_027e0f74
ldr r1, _0217d680 ; =gAdventureFlags
mov r5, r0
ldr r0, [r1]
mov r1, #0x7e
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addne sp, sp, #0x70
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _0217d680 ; =data_027e0f74
ldr r0, _0217d680 ; =gAdventureFlags
mov r1, #0xe
ldr r0, [r0]
bl func_ov00_02097c18
bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
cmp r0, #0
addne sp, sp, #0x70
movne r0, #0
@@ -1699,23 +1699,23 @@ _0217d368:
str r0, [r5, #0xb4]
add r1, r6, #0x800
str r1, [r5, #0x860]
ldr r0, _0217d680 ; =data_027e0f74
ldr r0, _0217d680 ; =gAdventureFlags
mov r1, #0xeb
ldr r0, [r0]
str lr, [sp, #0x38]
str ip, [sp, #0x3c]
str r3, [sp, #0x40]
bl func_ov00_0209779c
ldr r0, _0217d680 ; =data_027e0f74
bl _ZN14AdventureFlags3SetEjb
ldr r0, _0217d680 ; =gAdventureFlags
mov r1, #0xec
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
ldr r0, _0217d680 ; =data_027e0f74
bl _ZN14AdventureFlags3SetEjb
ldr r0, _0217d680 ; =gAdventureFlags
mov r1, #0xed
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
add r0, r5, #0x158
bl func_ov36_0217c704
ldr r1, _0217d69c ; =func_ov36_0217c24c
@@ -1836,21 +1836,21 @@ _0217d56c:
mov r2, #3
mov r3, #0
bl func_ov00_02084b38
ldr r0, _0217d680 ; =data_027e0f74
ldr r0, _0217d680 ; =gAdventureFlags
mov r1, #0xeb
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
ldr r0, _0217d680 ; =data_027e0f74
bl _ZN14AdventureFlags3SetEjb
ldr r0, _0217d680 ; =gAdventureFlags
ldr r1, _0217d6b4 ; =0x0000011e
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
ldr r0, _0217d680 ; =data_027e0f74
bl _ZN14AdventureFlags3SetEjb
ldr r0, _0217d680 ; =gAdventureFlags
ldr r1, _0217d6b8 ; =0x0000011f
ldr r0, [r0]
mov r2, #0
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
mov r0, r5
mov r1, #0
bl func_ov36_0217d6bc
@@ -1859,7 +1859,7 @@ _0217d56c:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov36_0217d2a0
_0217d680: .word data_027e0f74
_0217d680: .word gAdventureFlags
_0217d684: .word data_027e0fe8
_0217d688: .word 0x4c4f4e44
_0217d68c: .word data_027e0fe4
@@ -2120,10 +2120,10 @@ func_ov36_0217da08: ; 0x0217da08
ldmneia sp!, {r4, pc}
tst r0, #1
bne _0217da58
ldr r0, _0217da68 ; =data_027e0f74
ldr r0, _0217da68 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
bne _0217da58
mov r0, #0x10000
@@ -2140,7 +2140,7 @@ _0217da60:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov36_0217da08
_0217da68: .word data_027e0f74
_0217da68: .word gAdventureFlags
.global func_ov36_0217da6c
arm_func_start func_ov36_0217da6c
@@ -2701,16 +2701,16 @@ _0217e260:
cmp r0, #0x1000000
addne sp, sp, #0x44
ldmneia sp!, {r3, r4, r5, r6, pc}
ldr r0, _0217e3d0 ; =data_027e0f74
ldr r0, _0217e3d0 ; =gAdventureFlags
ldr r1, [r5, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _0217e2a4
ldr r0, _0217e3d0 ; =data_027e0f74
ldr r0, _0217e3d0 ; =gAdventureFlags
ldr r1, [r5, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_0217e2a4:
mvn r1, #0
ldr r0, _0217e3a4 ; =data_027e0fc8
@@ -2792,7 +2792,7 @@ _0217e3c0: .word data_027e0f64
_0217e3c4: .word 0x00000112
_0217e3c8: .word data_027e0ffc
_0217e3cc: .word 0x000002c2
_0217e3d0: .word data_027e0f74
_0217e3d0: .word gAdventureFlags
_0217e3d4: .word data_027e0fe4
_0217e3d8: .word 0x504c444d
_0217e3dc: .word 0x0000199a
@@ -5469,7 +5469,7 @@ _02180860:
mov r2, #2
strb r2, [sp, #0x2e]
ldr r1, [r1]
ldr r0, _0218099c ; =data_027e0f74
ldr r0, _0218099c ; =gAdventureFlags
ldr r4, [r1, #4]
ldr r0, [r0]
ldr r1, [r4, #0x26c]
@@ -5481,7 +5481,7 @@ _02180860:
ldr r3, [r4, #0x274]
str r3, [sp, #0x4c]
strb r2, [sp, #0x3a]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r7, #0x66c]
add r0, sp, #0x24
bl func_ov00_0209a508
@@ -5520,7 +5520,7 @@ _0218098c: .word data_02050f54
_02180990: .word 0x000004cd
_02180994: .word data_027e0e60
_02180998: .word data_027e0f64
_0218099c: .word data_027e0f74
_0218099c: .word gAdventureFlags
_021809a0: .word data_027e0c68
_021809a4: .word 0x0069032e
_021809a8: .word data_027e0ffc
@@ -5705,16 +5705,16 @@ _02180bd0:
ldr r3, [r3, #0x7c]
blx r3
_02180c58:
ldr r0, _02180d18 ; =data_027e0f74
ldr r0, _02180d18 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02180c80
ldr r0, _02180d18 ; =data_027e0f74
ldr r0, _02180d18 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02180c80:
mvn r0, #0
add sp, sp, #0x3c
@@ -5760,7 +5760,7 @@ _02180d08: .word data_027e0ffc
_02180d0c: .word 0x000002c7
_02180d10: .word 0x000002c1
_02180d14: .word data_027e0fc8
_02180d18: .word data_027e0f74
_02180d18: .word gAdventureFlags
.global func_ov36_02180d1c
arm_func_start func_ov36_02180d1c
@@ -6032,16 +6032,16 @@ _021810d0:
bl func_0202e58c
cmp r0, #0
beq _02181128
ldr r0, _02181540 ; =data_027e0f74
ldr r0, _02181540 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _0218110c
ldr r0, _02181540 ; =data_027e0f74
ldr r0, _02181540 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_0218110c:
mvn r2, #0
mov r0, r4
@@ -6070,16 +6070,16 @@ _02181138:
cmp r0, #1
bhi _021811a4
_0218116c:
ldr r0, _02181540 ; =data_027e0f74
ldr r0, _02181540 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02181194
ldr r0, _02181540 ; =data_027e0f74
ldr r0, _02181540 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02181194:
mvn r0, #0
add sp, sp, #0x118
@@ -6223,7 +6223,7 @@ _021811a4:
ldrb r3, [sp, #0x63]
ldrb r2, [sp, #0x64]
str r0, [sp, #0xe0]
ldr r0, _02181540 ; =data_027e0f74
ldr r0, _02181540 ; =gAdventureFlags
str r1, [sp, #0xc4]
ldr r1, [sp, #0x48]
str r9, [sp, #0xcc]
@@ -6249,7 +6249,7 @@ _021811a4:
strb r2, [sp, #0xf8]
strb r11, [sp, #0x7c]
strb r10, [sp, #0x7e]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x66c]
cmp r0, #0
add r0, sp, #0x68
@@ -6325,7 +6325,7 @@ _021814ec:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_0218108c
_02181540: .word data_027e0f74
_02181540: .word gAdventureFlags
_02181544: .word gItemManager
_02181548: .word data_027e0f64
_0218154c: .word 0x000004cd
@@ -6443,7 +6443,7 @@ _0218166c:
ldrb r3, [sp, #0x63]
ldrb r2, [sp, #0x64]
str r0, [sp, #0xdc]
ldr r0, _0218178c ; =data_027e0f74
ldr r0, _0218178c ; =gAdventureFlags
str r1, [sp, #0xbc]
ldr r1, [sp, #0x44]
str r10, [sp, #0xc4]
@@ -6471,7 +6471,7 @@ _0218166c:
strb r3, [sp, #0xf7]
strb r2, [sp, #0xf8]
strb r11, [sp, #0x7c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x66c]
add r0, sp, #0x68
bl func_ov00_0209a508
@@ -6482,7 +6482,7 @@ _0218166c:
arm_func_end func_ov36_0218156c
_02181784: .word data_ov36_02186cdc
_02181788: .word data_027e0f64
_0218178c: .word data_027e0f74
_0218178c: .word gAdventureFlags
.global func_ov36_02181790
arm_func_start func_ov36_02181790
@@ -6496,10 +6496,10 @@ func_ov36_02181790: ; 0x02181790
add r0, r4, #0x158
bl func_ov36_0217c7e8
_021817b0:
ldr r0, _021818a4 ; =data_027e0f74
ldr r0, _021818a4 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02181848
ldr r0, [r4, #0x168]
@@ -6519,16 +6519,16 @@ _021817f4:
bl func_0202e58c
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _021818a4 ; =data_027e0f74
ldr r0, _021818a4 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02181830
ldr r0, _021818a4 ; =data_027e0f74
ldr r0, _021818a4 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02181830:
mvn r2, #0
add r0, r4, #0x158
@@ -6562,7 +6562,7 @@ _02181848:
.align 2, 0
arm_func_end func_ov36_02181790
_021818a0: .word data_ov36_02186ce0
_021818a4: .word data_027e0f74
_021818a4: .word gAdventureFlags
_021818a8: .word data_027e0ffc
_021818ac: .word 0x000002c6
_021818b0: .word data_027e0f64
@@ -6609,10 +6609,10 @@ _021818fc:
moveq r1, #0x19
add r0, r4, #0x158
bl func_ov36_0217ca34
ldr r0, _02181b88 ; =data_027e0f74
ldr r0, _02181b88 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
ldr r0, _02181b8c ; =data_ov00_020eec68
mov r1, #5
bl func_ov00_020d716c
@@ -6695,7 +6695,7 @@ _021818fc:
ldrb r3, [sp, #0x63]
ldrb r2, [sp, #0x64]
str r0, [sp, #0xdc]
ldr r0, _02181b88 ; =data_027e0f74
ldr r0, _02181b88 ; =gAdventureFlags
ldr r1, [sp, #0x44]
ldr r10, [sp, #0x4c]
ldr r9, [sp, #0x50]
@@ -6718,7 +6718,7 @@ _021818fc:
strb r3, [sp, #0xf7]
strb r2, [sp, #0xf8]
strb r11, [sp, #0x7c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x66c]
ldr r1, [r4, #0x168]
mov r2, #0
@@ -6756,7 +6756,7 @@ _02181b40:
arm_func_end func_ov36_021818b4
_02181b80: .word data_027e103c
_02181b84: .word data_027e0d0c
_02181b88: .word data_027e0f74
_02181b88: .word gAdventureFlags
_02181b8c: .word data_ov00_020eec68
_02181b90: .word data_027e0f64
_02181b94: .word 0x0000038e
@@ -6778,9 +6778,9 @@ func_ov36_02181ba8: ; 0x02181ba8
ldr r0, [r1, #0x10]
cmp r0, #0
bne _02181c58
ldr r0, _02181f08 ; =data_027e0f74
ldr r0, _02181f08 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_0209809c
bl _ZN14AdventureFlags18func_ov00_0209809cEv
cmp r0, #0
addne sp, sp, #0x14
ldmneia sp!, {r3, r4, pc}
@@ -6938,10 +6938,10 @@ _02181dc8:
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
_02181e34:
ldr r0, _02181f08 ; =data_027e0f74
ldr r0, _02181f08 ; =gAdventureFlags
ldr r1, _02181f34 ; =0x0000011e
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
ldreq r0, [r4, #0x6c0]
cmpeq r0, #0
@@ -6956,15 +6956,15 @@ _02181e34:
ldr r0, [r0]
mov r2, #0
bl func_ov00_0207c5d4
ldr r0, _02181f08 ; =data_027e0f74
ldr r0, _02181f08 ; =gAdventureFlags
ldr r1, _02181f34 ; =0x0000011e
ldr r0, [r0]
mov r2, #1
bl func_ov00_0209779c
ldr r0, _02181f08 ; =data_027e0f74
bl _ZN14AdventureFlags3SetEjb
ldr r0, _02181f08 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r0, #0
str r0, [r4, #0x66c]
ldr r0, _02181f34 ; =0x0000011e
@@ -6993,7 +6993,7 @@ _02181e34:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov36_02181ba8
_02181f08: .word data_027e0f74
_02181f08: .word gAdventureFlags
_02181f0c: .word data_027e0ffc
_02181f10: .word 0x000002cb
_02181f14: .word 0x000001ad
@@ -7166,7 +7166,7 @@ _02181ffc:
ldr r0, [r4, #0x758]
str r0, [sp, #0x1b0]
ldr r1, [r4, #0x75c]
ldr r0, _02182948 ; =data_027e0f74
ldr r0, _02182948 ; =gAdventureFlags
str r1, [sp, #0x1b4]
ldr r1, [r4, #0x760]
ldr r0, [r0]
@@ -7219,15 +7219,15 @@ _02181ffc:
ldrb r3, [r4, #0x7b0]
strb r3, [sp, #0x208]
strb r2, [sp, #0x18c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x66c]
add r0, sp, #0x178
bl func_ov00_0209a508
_02182270:
ldr r0, _02182948 ; =data_027e0f74
ldr r0, _02182948 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
addeq sp, sp, #0x228
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
@@ -7338,10 +7338,10 @@ _021823ec:
strb r0, [r4, #0x8aa]
mov r0, #0
str r0, [r4, #0x138]
ldr r0, _02182948 ; =data_027e0f74
ldr r0, _02182948 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
add r0, sp, #0xc8
bl func_ov00_0209a4f4
mov r1, #2
@@ -7416,7 +7416,7 @@ _0218248c:
ldrb r8, [sp, #0xc2]
ldrb r7, [sp, #0xc3]
ldrb r6, [sp, #0xc4]
ldr r0, _02182948 ; =data_027e0f74
ldr r0, _02182948 ; =gAdventureFlags
str r5, [sp, #0x144]
ldr r5, [sp, #0xb8]
str r1, [sp, #0x148]
@@ -7439,7 +7439,7 @@ _0218248c:
strb r7, [sp, #0x157]
strb r6, [sp, #0x158]
strb r5, [sp, #0xdc]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x66c]
ldr r0, [r4, #0x878]
tst r0, #0x40
@@ -7634,10 +7634,10 @@ _0218287c:
cmp r0, #0
addeq sp, sp, #0x228
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, _02182948 ; =data_027e0f74
ldr r0, _02182948 ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
str r1, [r4, #0x66c]
ldr r0, _0218294c ; =data_027e0f90
@@ -7684,7 +7684,7 @@ _02182940:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov36_02181fd0
_02182948: .word data_027e0f74
_02182948: .word gAdventureFlags
_0218294c: .word data_027e0f90
_02182950: .word 0x00000bb8
_02182954: .word data_027e0f64
@@ -7757,16 +7757,16 @@ _021829ec:
bic r2, r2, #0x200000
str r2, [r4, #0x878]
bl func_ov36_0217ca34
ldr r0, _02182c7c ; =data_027e0f74
ldr r0, _02182c7c ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02182a7c
ldr r0, _02182c7c ; =data_027e0f74
ldr r0, _02182c7c ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02182a7c:
mvn r1, #0
add r0, sp, #0x74
@@ -7858,7 +7858,7 @@ _02182a7c:
ldrb lr, [sp, #0x6e]
ldrb ip, [sp, #0x6f]
ldrb r3, [sp, #0x70]
ldr r0, _02182c7c ; =data_027e0f74
ldr r0, _02182c7c ; =gAdventureFlags
ldr r10, [sp, #0x5c]
ldr r9, [sp, #0x60]
ldr r8, [sp, #0x64]
@@ -7876,7 +7876,7 @@ _02182a7c:
strb ip, [sp, #0x103]
strb r3, [sp, #0x104]
strb r2, [sp, #0x88]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x66c]
mov r0, r4
bl _ZN5Actor20KillPickupItemActorsEv
@@ -7898,7 +7898,7 @@ _02182c6c: .word data_027e0ffc
_02182c70: .word data_027e0fc8
_02182c74: .word data_ov00_020eec68
_02182c78: .word data_027e0d0c
_02182c7c: .word data_027e0f74
_02182c7c: .word gAdventureFlags
_02182c80: .word 0x0000038e
_02182c84: .word 0x00000dac
@@ -8146,23 +8146,23 @@ func_ov36_02182f88: ; 0x02182f88
cmp r0, #0x3c
addlt sp, sp, #0x18
ldmltia sp!, {r4, pc}
ldr r0, _0218306c ; =data_027e0f74
ldr r0, _0218306c ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02183030
ldr r0, _0218306c ; =data_027e0f74
ldr r0, _0218306c ; =gAdventureFlags
ldr r1, [r4, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02183030:
mvn r1, #0
ldr r0, _0218306c ; =data_027e0f74
ldr r0, _0218306c ; =gAdventureFlags
str r1, [r4, #0x66c]
ldr r0, [r0]
mov r1, #0xe
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
ldr r1, [r4, #0x6b8]
mov r2, #0
mov r0, r4
@@ -8174,7 +8174,7 @@ _02183030:
arm_func_end func_ov36_02182f88
_02183064: .word 0x0000099a
_02183068: .word data_027e0e58
_0218306c: .word data_027e0f74
_0218306c: .word gAdventureFlags
.global func_ov36_02183070
arm_func_start func_ov36_02183070
@@ -8727,7 +8727,7 @@ _02183614:
ldrb r3, [sp, #0x97]
ldrb r2, [sp, #0x98]
str r0, [sp, #0x118]
ldr r0, _02183a24 ; =data_027e0f74
ldr r0, _02183a24 ; =gAdventureFlags
str r1, [sp, #0x100]
ldr r1, [sp, #0x80]
str r9, [sp, #0x108]
@@ -8750,7 +8750,7 @@ _02183614:
strb r2, [sp, #0x12c]
strb r11, [sp, #0xb0]
strb r10, [sp, #0xb2]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x66c]
cmp r0, #0
blt _021838ec
@@ -8845,7 +8845,7 @@ _02183a14: .word data_027e0f64
_02183a18: .word 0x000004cd
_02183a1c: .word 0x00001e84
_02183a20: .word 0x0000038e
_02183a24: .word data_027e0f74
_02183a24: .word gAdventureFlags
_02183a28: .word 0x00000333
.global func_ov36_02183a2c
@@ -10016,18 +10016,18 @@ _02184a5c:
func_ov36_02184a64: ; 0x02184a64
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x118
ldr r2, _02184dd8 ; =data_027e0f74
ldr r2, _02184dd8 ; =gAdventureFlags
mov r5, r0
mov r6, r1
ldr r0, [r2]
ldr r1, [r5, #0x66c]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02184a9c
ldr r0, _02184dd8 ; =data_027e0f74
ldr r0, _02184dd8 ; =gAdventureFlags
ldr r1, [r5, #0x66c]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_02184a9c:
add r0, sp, #0x68
bl func_ov00_0209a4f4
@@ -10211,7 +10211,7 @@ _02184c94:
ldr r8, [sp, #0x58]
ldr r4, [sp, #0x5c]
str r1, [sp, #0xdc]
ldr r11, _02184dd8 ; =data_027e0f74
ldr r11, _02184dd8 ; =gAdventureFlags
str r0, [sp, #0xe0]
ldr r0, [r11]
add r1, sp, #0x68
@@ -10226,7 +10226,7 @@ _02184c94:
strb r3, [sp, #0xf8]
strb r2, [sp, #0x7c]
strb r2, [sp, #0x7e]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
mvn r1, #0
str r0, [r5, #0x66c]
cmp r0, r1
@@ -10243,7 +10243,7 @@ _02184dc8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02184a64
_02184dd8: .word data_027e0f74
_02184dd8: .word gAdventureFlags
_02184ddc: .word data_027e0f64
_02184de0: .word data_027e0e60
_02184de4: .word 0x0000038e
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
+3 -3
View File
@@ -3662,10 +3662,10 @@ _0217f0ac:
add r0, r4, #0x3bc
add r0, r0, #0x2c00
bl func_ov00_020b7e6c
ldr r0, _0217f11c ; =data_027e0f74
ldr r0, _0217f11c ; =gAdventureFlags
mov r1, #0xf
ldr r0, [r0]
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
mov r0, r4
bl func_ov00_020cc960
mov r0, r4
@@ -3685,7 +3685,7 @@ _0217f10c: .word 0x00001023
_0217f110: .word 0x00001024
_0217f114: .word 0x00001025
_0217f118: .word 0x0000030d
_0217f11c: .word data_027e0f74
_0217f11c: .word gAdventureFlags
.global func_ov37_0217f120
arm_func_start func_ov37_0217f120
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
asm/ov38.s
+43 -43
View File
@@ -1346,18 +1346,18 @@ func_ov38_0217cf90: ; 0x0217cf90
ldr r1, _0217d504 ; =gItemManager
mov r2, #0
ldr r3, [r1]
ldr r1, _0217d508 ; =data_027e0f74
ldr r1, _0217d508 ; =gAdventureFlags
strh r2, [r3, #0xba]
mov r10, r0
ldr r0, [r1]
mov r1, #0xf7
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0217cfdc
ldr r0, _0217d508 ; =data_027e0f74
ldr r0, _0217d508 ; =gAdventureFlags
mov r1, #0x11
ldr r0, [r0]
bl func_ov00_02097c18
bl _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
cmp r0, #0
beq _0217cff0
_0217cfdc:
@@ -1697,7 +1697,7 @@ _0217d360:
.align 2, 0
arm_func_end func_ov38_0217cf90
_0217d504: .word gItemManager
_0217d508: .word data_027e0f74
_0217d508: .word gAdventureFlags
_0217d50c: .word data_ov38_021889b8
_0217d510: .word func_ov38_0217cc2c
_0217d514: .word data_ov38_02188a24
@@ -8893,9 +8893,9 @@ func_ov38_02183aa4: ; 0x02183aa4
mvn r0, #0
cmp r1, r0
beq _02183ae0
ldr r0, _02183b5c ; =data_027e0f74
ldr r0, _02183b5c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
bne _02183b04
_02183ae0:
@@ -8903,9 +8903,9 @@ _02183ae0:
mvn r0, #0
cmp r1, r0
beq _02183b48
ldr r0, _02183b5c ; =data_027e0f74
ldr r0, _02183b5c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _02183b48
_02183b04:
@@ -8935,7 +8935,7 @@ _02183b48:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov38_02183aa4
_02183b5c: .word data_027e0f74
_02183b5c: .word gAdventureFlags
.global func_ov38_02183b60
arm_func_start func_ov38_02183b60
@@ -9543,7 +9543,7 @@ _02184374:
strh r0, [sp, #0x7c]
ldr r7, _02184560 ; =0x021793cc
str r8, [sp, #0x18]
ldmia sb!, {r0, r1, r2, r3}
ldmia r9!, {r0, r1, r2, r3}
stmia r8!, {r0, r1, r2, r3}
ldr r0, [r7]
mov r4, #0
@@ -11442,7 +11442,7 @@ func_ov38_02185e38: ; 0x02185e38
str r2, [r1, #0x210]
bl func_ov00_0209a4f4
mov r2, #0
ldr r0, _02185eb4 ; =data_027e0f74
ldr r0, _02185eb4 ; =gAdventureFlags
mvn ip, #0
mov r3, #0x32
ldr r0, [r0]
@@ -11451,7 +11451,7 @@ func_ov38_02185e38: ; 0x02185e38
strb r3, [sp, #9]
strb r2, [sp, #0xa]
strb r2, [sp, #0xb]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x2e8]
ldr r1, _02185eb8 ; =data_ov38_02188ca0
add r0, sp, #0
@@ -11465,7 +11465,7 @@ func_ov38_02185e38: ; 0x02185e38
.align 2, 0
arm_func_end func_ov38_02185e38
_02185eb0: .word data_ov38_021891e0
_02185eb4: .word data_027e0f74
_02185eb4: .word gAdventureFlags
_02185eb8: .word data_ov38_02188ca0
.global func_ov38_02185ebc
@@ -11609,7 +11609,7 @@ _02185f5c:
ldr r0, [r2, #0x1d4]
str r0, [sp, #0x124]
ldr r1, [r2, #0x1d8]
ldr r0, _02186a34 ; =data_027e0f74
ldr r0, _02186a34 ; =gAdventureFlags
str r1, [sp, #0x128]
ldr r1, [r2, #0x1dc]
ldr r0, [r0]
@@ -11627,12 +11627,12 @@ _02185f5c:
ldrb r2, [r2, #0x1e4]
strb r2, [sp, #0x134]
str r3, [sp, #0x138]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x2ec]
ldr r0, _02186a34 ; =data_027e0f74
ldr r0, _02186a34 ; =gAdventureFlags
ldr r1, [r4, #0x2e8]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
add r0, sp, #0xa4
str r1, [r4, #0x2e8]
@@ -12204,10 +12204,10 @@ _021869a8:
add sp, sp, #0x154
ldmia sp!, {r4, r5, pc}
_021869dc:
ldr r0, _02186a34 ; =data_027e0f74
ldr r0, _02186a34 ; =gAdventureFlags
ldr r1, [r4, #0x2ec]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
ldr r0, _02186a60 ; =data_02057200
str r1, [r4, #0x2ec]
@@ -12228,7 +12228,7 @@ _02186a24: .word 0x00000333
_02186a28: .word data_027e0f64
_02186a2c: .word data_ov38_02189360
_02186a30: .word data_ov38_021893d4
_02186a34: .word data_027e0f74
_02186a34: .word gAdventureFlags
_02186a38: .word data_ov38_021892f0
_02186a3c: .word data_02050f54
_02186a40: .word 0x00000f9a
@@ -12368,10 +12368,10 @@ func_ov38_02186b08: ; 0x02186b08
mov r1, #0xce
mov r2, #0
bl func_ov00_020d70a4
ldr r0, _02186c80 ; =data_027e0f74
ldr r0, _02186c80 ; =gAdventureFlags
add r1, sp, #0x14
ldr r0, [r0]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x2e8]
ldr r1, _02186c78 ; =data_ov38_02188ca0
add r0, sp, #0x14
@@ -12393,7 +12393,7 @@ _02186c70: .word data_027e0fc8
_02186c74: .word gItemManager
_02186c78: .word data_ov38_02188ca0
_02186c7c: .word data_ov00_020eec68
_02186c80: .word data_027e0f74
_02186c80: .word gAdventureFlags
.global func_ov38_02186c84
arm_func_start func_ov38_02186c84
@@ -12922,10 +12922,10 @@ _021873c8:
add sp, sp, #0x8c
ldmia sp!, {r4, r5, pc}
_0218746c:
ldr r0, _02187510 ; =data_027e0f74
ldr r0, _02187510 ; =gAdventureFlags
ldr r1, [r4, #0x2e8]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
ldr r0, _0218750c ; =data_ov00_020eec68
mov r1, #0xcd
mov r2, #0
@@ -12965,7 +12965,7 @@ _02187500: .word 0xfffffac4
_02187504: .word 0x000073a0
_02187508: .word data_027e0fc8
_0218750c: .word data_ov00_020eec68
_02187510: .word data_027e0f74
_02187510: .word gAdventureFlags
_02187514: .word data_ov38_02188ca0
_02187518: .word gItemManager
_0218751c: .word data_02057200
@@ -12983,7 +12983,7 @@ func_ov38_02187520: ; 0x02187520
str r2, [r1, #0x210]
bl func_ov00_0209a4f4
mov r3, #0
ldr r0, _021875c0 ; =data_027e0f74
ldr r0, _021875c0 ; =gAdventureFlags
mvn lr, #0
mov ip, #0x32
mov r2, #1
@@ -12994,7 +12994,7 @@ func_ov38_02187520: ; 0x02187520
strb r3, [sp, #0xa]
strb r3, [sp, #0xb]
strb r2, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x2e8]
ldr r0, [r4, #0xff4]
bl func_ov29_0216fe04
@@ -13015,7 +13015,7 @@ func_ov38_02187520: ; 0x02187520
.align 2, 0
arm_func_end func_ov38_02187520
_021875bc: .word data_ov38_021891e0
_021875c0: .word data_027e0f74
_021875c0: .word gAdventureFlags
_021875c4: .word data_027e0f64
_021875c8: .word data_ov38_02188ca0
@@ -13027,10 +13027,10 @@ func_ov38_021875cc: ; 0x021875cc
ldr r1, [r1, #0x130]
cmp r1, #4
bne _021875f4
ldr r2, _02187620 ; =data_027e0f74
ldr r2, _02187620 ; =gAdventureFlags
ldr r1, [r0, #0x2e8]
ldr r0, [r2]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
ldmia sp!, {r3, pc}
_021875f4:
ldr r0, _02187624 ; =data_ov38_021891e0
@@ -13046,7 +13046,7 @@ _021875f4:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov38_021875cc
_02187620: .word data_027e0f74
_02187620: .word gAdventureFlags
_02187624: .word data_ov38_021891e0
_02187628: .word data_027e0fc8
@@ -13191,7 +13191,7 @@ func_ov38_0218762c: ; 0x0218762c
str r5, [r0, #0x1a0]
str r1, [sp, #0xb0]
ldr r1, [sp, #0x14]
ldr r3, _02187954 ; =data_027e0f74
ldr r3, _02187954 ; =gAdventureFlags
str r1, [sp, #0xb4]
ldr r1, [sp, #0x18]
str r9, [sp, #0x68]
@@ -13234,7 +13234,7 @@ func_ov38_0218762c: ; 0x0218762c
strb r3, [sp, #0xcb]
ldr r3, [sp, #0x38]
strb r3, [sp, #0xcc]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
ldr r1, _0218795c ; =data_027e0fc8
str r0, [r4, #0x2e8]
ldr r0, [r1]
@@ -13257,7 +13257,7 @@ _02187944: .word data_ov38_021891e0
_02187948: .word data_027e0f64
_0218794c: .word data_ov38_02189360
_02187950: .word data_ov38_021893d4
_02187954: .word data_027e0f74
_02187954: .word gAdventureFlags
_02187958: .word 0x00000bb8
_0218795c: .word data_027e0fc8
_02187960: .word data_ov38_02188ca0
@@ -13654,26 +13654,26 @@ _02187f44:
ldr r0, [r0, #0x68]
cmp r0, #4
bne _02187fac
ldr r0, _02188094 ; =data_027e0f74
ldr r0, _02188094 ; =gAdventureFlags
ldr r1, [r5, #0x2e8]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
ldr r0, _02188098 ; =data_02057200
str r1, [r5, #0x2e8]
ldr r2, [r0]
ldr r1, [r0, #4]
ldr r0, _02188094 ; =data_027e0f74
ldr r0, _02188094 ; =gAdventureFlags
str r2, [r5, #0x2e0]
str r1, [r5, #0x2e4]
ldr r0, [r0]
mov r1, #0xf7
mov r2, #1
bl func_ov00_0209779c
ldr r0, _02188094 ; =data_027e0f74
bl _ZN14AdventureFlags3SetEjb
ldr r0, _02188094 ; =gAdventureFlags
mov r1, #0x11
ldr r0, [r0]
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
add sp, sp, #0x154
ldmia sp!, {r4, r5, pc}
_02187fac:
@@ -13737,7 +13737,7 @@ _02188084: .word data_ov38_021893d4
_02188088: .word data_ov38_021892f8
_0218808c: .word 0x00001a2c
_02188090: .word data_ov38_021893d8
_02188094: .word data_027e0f74
_02188094: .word gAdventureFlags
_02188098: .word data_02057200
_0218809c: .word data_027e0f94
_021880a0: .word 0x00006ccd
asm/ov39.inc
+5 -5
View File
@@ -72,7 +72,6 @@
.extern data_027e0e58
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
@@ -155,10 +154,10 @@
.extern func_ov00_02087fe0
.extern func_ov00_02088000
.extern func_ov00_02089318
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097968Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
@@ -260,5 +259,6 @@
.extern func_ov29_02177d90
.extern func_ov29_02177ff0
.extern func_ov29_02178060
.extern gAdventureFlags
.extern gItemManager
.extern strncpy
asm/ov39.s
+31 -31
View File
@@ -4921,7 +4921,7 @@ _02180004:
ldr r1, _02180f24 ; =data_027e0f64
mov r3, #0x32
mvn r4, #0
ldr r0, _02180f28 ; =data_027e0f74
ldr r0, _02180f28 ; =gAdventureFlags
ldr r1, [r1]
strb r3, [sp, #0x89]
strb r2, [sp, #0x8a]
@@ -4938,7 +4938,7 @@ _02180004:
ldr r3, [r4, #0x274]
str r3, [sp, #0xa8]
strb r2, [sp, #0x96]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
add r1, r5, #0x3ec
str r0, [r5, #0x190]
add r0, r1, #0x400
@@ -5882,10 +5882,10 @@ _02180e94:
cmp r0, #0
addne sp, sp, #0x130
ldmneia sp!, {r4, r5, r6, pc}
ldr r0, _02180f28 ; =data_027e0f74
ldr r0, _02180f28 ; =gAdventureFlags
ldr r1, [r5, #0x190]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r4, #0
mov r0, r5
mov r1, #8
@@ -5915,7 +5915,7 @@ _02180f14:
_02180f1c: .word data_027e071c
_02180f20: .word data_027e0fc8
_02180f24: .word data_027e0f64
_02180f28: .word data_027e0f74
_02180f28: .word gAdventureFlags
_02180f2c: .word 0x00001b33
_02180f30: .word 0x00000b33
_02180f34: .word 0x00000666
@@ -7524,7 +7524,7 @@ func_ov39_021824b4: ; 0x021824b4
strb r1, [sp, #0x17]
str r3, [sp, #0x10]
ldr r3, [r0, #4]
ldr r0, _021825b8 ; =data_027e0f74
ldr r0, _021825b8 ; =gAdventureFlags
ldr r1, [r3, #0x26c]
ldr r0, [r0]
str r1, [sp, #0x2c]
@@ -7535,7 +7535,7 @@ func_ov39_021824b4: ; 0x021824b4
add r1, sp, #0xc
str r3, [sp, #0x34]
strb r2, [sp, #0x22]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x190]
ldr r1, [r4, #0x158]
add r0, sp, #0xc
@@ -7550,7 +7550,7 @@ _021825a4:
arm_func_end func_ov39_021824b4
_021825b0: .word data_027e0ffc
_021825b4: .word data_027e0f64
_021825b8: .word data_027e0f74
_021825b8: .word gAdventureFlags
.global func_ov39_021825bc
arm_func_start func_ov39_021825bc
@@ -7614,11 +7614,11 @@ _02182670: .word data_027e0e60
func_ov39_02182674: ; 0x02182674
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _021827a8 ; =data_027e0f74
ldr r1, _021827a8 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
ldr r1, [r4, #0x190]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _021826e4
mov r1, #0
@@ -7628,12 +7628,12 @@ func_ov39_02182674: ; 0x02182674
cmp r0, #0
bne _021826e4
ldr r1, [r4, #0x158]
ldr r0, _021827a8 ; =data_027e0f74
ldr r0, _021827a8 ; =gAdventureFlags
orr r1, r1, #0x4000
str r1, [r4, #0x158]
ldr r0, [r0]
ldr r1, [r4, #0x190]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
mvn r1, #0
mov r0, r4
str r1, [r4, #0x190]
@@ -7693,7 +7693,7 @@ _0218273c:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov39_02182674
_021827a8: .word data_027e0f74
_021827a8: .word gAdventureFlags
_021827ac: .word data_ov29_0217bd28
.global func_ov39_021827b0
@@ -8618,12 +8618,12 @@ func_ov39_021833a4: ; 0x021833a4
str r0, [sp, #0x28]
ldr r0, [r3, #4]
bl func_ov00_02087d34
ldr r0, _02183520 ; =data_027e0f74
ldr r0, _02183520 ; =gAdventureFlags
mov r2, #1
ldr r0, [r0]
add r1, sp, #0
strb r2, [sp, #0x16]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x190]
ldr r1, [r4, #0x158]
ldr r0, _02183524 ; =data_ov00_020eec68
@@ -8643,7 +8643,7 @@ _02183510: .word 0x000006b8
_02183514: .word data_02050f54
_02183518: .word 0x00001022
_0218351c: .word data_027e0f64
_02183520: .word data_027e0f74
_02183520: .word gAdventureFlags
_02183524: .word data_ov00_020eec68
.global func_ov39_02183528
@@ -8948,10 +8948,10 @@ func_ov39_021838c4: ; 0x021838c4
add r2, r4, #0x48
mov r3, #0
bl func_ov00_020ceacc
ldr r0, _02183c20 ; =data_027e0f74
ldr r0, _02183c20 ; =gAdventureFlags
ldr r1, [r4, #0x190]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
add r0, sp, #0x74
bl func_ov00_0209a4f4
mvn r0, #0
@@ -9111,7 +9111,7 @@ func_ov39_021838c4: ; 0x021838c4
ldr r3, [sp]
add r0, r0, #0x66
add r5, r0, #0xe00
ldr r1, _02183c20 ; =data_027e0f74
ldr r1, _02183c20 ; =gAdventureFlags
ldr r2, [sp, #8]
ldr r0, [r1]
add r1, sp, #0x74
@@ -9119,7 +9119,7 @@ func_ov39_021838c4: ; 0x021838c4
str r3, [sp, #0x94]
str r5, [sp, #0x98]
str r2, [sp, #0x9c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x190]
ldr r1, [r4, #0x158]
add r0, sp, #0x74
@@ -9135,7 +9135,7 @@ _02183c10: .word data_027e0ffc
_02183c14: .word 0x00000321
_02183c18: .word data_027e0fc8
_02183c1c: .word 0x00000326
_02183c20: .word data_027e0f74
_02183c20: .word gAdventureFlags
_02183c24: .word data_027e0f64
_02183c28: .word 0x000009c4
@@ -9230,10 +9230,10 @@ func_ov39_02183ccc: ; 0x02183ccc
ldr r0, [r0]
ldr r0, [r0, #8]
bl func_ov00_020875f8
ldr r0, _02184314 ; =data_027e0f74
ldr r0, _02184314 ; =gAdventureFlags
ldr r1, [r7, #0x190]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
add r0, sp, #0xac
bl func_ov00_0209a4f4
mov r0, #1
@@ -9322,7 +9322,7 @@ func_ov39_02183ccc: ; 0x02183ccc
ldr r3, [sp, #0x38]
add r0, r0, #0x66
add r4, r0, #0xe00
ldr r1, _02184314 ; =data_027e0f74
ldr r1, _02184314 ; =gAdventureFlags
ldr r2, [sp, #0x40]
ldr r0, [r1]
add r1, sp, #0xac
@@ -9330,7 +9330,7 @@ func_ov39_02183ccc: ; 0x02183ccc
str r3, [sp, #0xcc]
str r4, [sp, #0xd0]
str r2, [sp, #0xd4]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
add r5, sp, #0x44
str r0, [r7, #0x190]
add r6, r7, #0x2b8
@@ -9596,7 +9596,7 @@ _02183f0c:
arm_func_end func_ov39_02183ccc
_0218430c: .word data_027e0f64
_02184310: .word 0x000009c4
_02184314: .word data_027e0f74
_02184314: .word gAdventureFlags
_02184318: .word data_02050f54
_0218431c: .word data_027e071c
_02184320: .word 0x000014cd
@@ -10095,14 +10095,14 @@ _02184a48:
cmp r0, #0xdc
addne sp, sp, #0x38
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _02184ab0 ; =data_027e0f74
ldr r0, _02184ab0 ; =gAdventureFlags
ldr r1, [r4, #0x190]
ldr r0, [r0]
bl func_ov00_02097bcc
ldr r0, _02184ab0 ; =data_027e0f74
bl _ZN14AdventureFlags18func_ov00_02097bccEv
ldr r0, _02184ab0 ; =gAdventureFlags
mov r1, #0x13
ldr r0, [r0]
bl func_ov00_02097968
bl _ZN14AdventureFlags18func_ov00_02097968Ei
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -10118,7 +10118,7 @@ _02184aa0: .word 0x00001015
_02184aa4: .word 0x00001016
_02184aa8: .word 0x00001017
_02184aac: .word 0x0000030d
_02184ab0: .word data_027e0f74
_02184ab0: .word gAdventureFlags
.global func_ov39_02184ab4
arm_func_start func_ov39_02184ab4
asm/ov40.inc
+59 -59
View File
@@ -3,6 +3,54 @@
.extern FastDivide
.extern _ZN11ItemManager7AddItemEi
.extern _ZN11ItemManager8GiveItemEjjj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.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_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 _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
@@ -33,7 +81,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f80
.extern data_027e0f90
@@ -215,16 +262,16 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_0209779c
.extern func_ov00_02097c08
.extern func_ov00_02097cf8
.extern func_ov00_02097db4
.extern func_ov00_02097e6c
.extern func_ov00_02097e7c
.extern func_ov00_02097ea4
.extern func_ov00_02097fd0
.extern func_ov00_02097ff4
.extern func_ov00_02098074
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN14AdventureFlags18func_ov00_02097c08Ev
.extern _ZN14AdventureFlags15Get_FlagsUnk_30Ei
.extern _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2
.extern _ZN14AdventureFlags18func_ov00_02097e6cEv
.extern _ZN14AdventureFlags18func_ov00_02097e7cEv
.extern _ZN14AdventureFlags18func_ov00_02097ea4Ev
.extern _ZN14AdventureFlags18func_ov00_02097fd0Ev
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern func_ov00_020985c4
.extern func_ov00_0209ed18
.extern func_ov00_0209ed2c
@@ -265,55 +312,7 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.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 _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 _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c42d8
.extern func_ov00_020c4588
@@ -370,6 +369,7 @@
.extern func_ov09_0211cc40
.extern func_ov09_0211cc74
.extern func_ov09_0211cc98
.extern gAdventureFlags
.extern gItemManager
.extern strcat
.extern strcmp
asm/ov40.s
+81 -81
View File
@@ -1131,17 +1131,17 @@ _0217ccdc:
bl func_0201e50c
ldmia sp!, {r4, pc}
_0217cd00:
ldr r0, _0217cd20 ; =data_027e0f74
ldr r0, _0217cd20 ; =gAdventureFlags
ldr r1, [r4, #8]
ldr r0, [r0]
bl func_ov00_02097fd0
bl _ZN14AdventureFlags18func_ov00_02097fd0Ev
ldr r1, [r4, #0xc]
bl func_0201e50c
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov40_0217ccb0
_0217cd1c: .word data_027e0fec
_0217cd20: .word data_027e0f74
_0217cd20: .word gAdventureFlags
.global func_ov40_0217cd24
arm_func_start func_ov40_0217cd24
@@ -1367,10 +1367,10 @@ _0217cff4:
mov r6, r0
b _0217d040
_0217d024:
ldr r0, _0217d0ac ; =data_027e0f74
ldr r0, _0217d0ac ; =gAdventureFlags
ldr r1, [r4, #8]
ldr r0, [r0]
bl func_ov00_02097fd0
bl _ZN14AdventureFlags18func_ov00_02097fd0Ev
ldr r1, [r4, #0xc]
bl func_0201e50c
mov r6, r0
@@ -1404,7 +1404,7 @@ _0217d040:
.align 2, 0
arm_func_end func_ov40_0217cfc4
_0217d0a8: .word data_027e0fec
_0217d0ac: .word data_027e0f74
_0217d0ac: .word gAdventureFlags
.global func_ov40_0217d0b0
arm_func_start func_ov40_0217d0b0
@@ -1435,10 +1435,10 @@ _0217d0e0:
mov r4, r0
b _0217d12c
_0217d110:
ldr r0, _0217d1a4 ; =data_027e0f74
ldr r0, _0217d1a4 ; =gAdventureFlags
ldr r1, [r5, #8]
ldr r0, [r0]
bl func_ov00_02097fd0
bl _ZN14AdventureFlags18func_ov00_02097fd0Ev
ldr r1, [r5, #0xc]
bl func_0201e50c
mov r4, r0
@@ -1477,7 +1477,7 @@ _0217d174:
.align 2, 0
arm_func_end func_ov40_0217d0b0
_0217d1a0: .word data_027e0fec
_0217d1a4: .word data_027e0f74
_0217d1a4: .word gAdventureFlags
.global func_ov40_0217d1a8
arm_func_start func_ov40_0217d1a8
@@ -1508,10 +1508,10 @@ _0217d1d8:
mov r4, r0
b _0217d224
_0217d208:
ldr r0, _0217d29c ; =data_027e0f74
ldr r0, _0217d29c ; =gAdventureFlags
ldr r1, [r5, #8]
ldr r0, [r0]
bl func_ov00_02097fd0
bl _ZN14AdventureFlags18func_ov00_02097fd0Ev
ldr r1, [r5, #0xc]
bl func_0201e50c
mov r4, r0
@@ -1550,7 +1550,7 @@ _0217d26c:
.align 2, 0
arm_func_end func_ov40_0217d1a8
_0217d298: .word data_027e0fec
_0217d29c: .word data_027e0f74
_0217d29c: .word gAdventureFlags
.global func_ov40_0217d2a0
arm_func_start func_ov40_0217d2a0
@@ -4414,12 +4414,12 @@ _0217f54c: ; jump table
b _0217f840 ; case 12
_0217f580:
ldr r1, [r3]
ldr r0, _0217f854 ; =data_027e0f74
ldr r0, _0217f854 ; =gAdventureFlags
mov r1, r1, lsl #0x8
ldr r0, [r0]
mov r1, r1, lsr #0x10
mov r2, #1
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f5a4:
@@ -4463,11 +4463,11 @@ _0217f600:
beq _0217f658
mov r3, #0
str r3, [sp]
ldr r0, _0217f854 ; =data_027e0f74
ldr r0, _0217f854 ; =gAdventureFlags
str r3, [sp, #4]
ldr r0, [r0]
mov r2, #0x64
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f658:
@@ -4530,13 +4530,13 @@ _0217f6f0:
mov r2, r3, lsl #0x11
mov r3, r0, lsl #0x11
mov r1, lr, lsl #0x11
ldr r0, _0217f854 ; =data_027e0f74
ldr r0, _0217f854 ; =gAdventureFlags
str ip, [sp, #4]
ldr r0, [r0]
mov r1, r1, lsr #0x10
mov r2, r2, lsr #0x10
mov r3, r3, lsr #0x10
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f75c:
@@ -4559,40 +4559,40 @@ _0217f75c:
mov r2, r3, lsl #0x11
mov r3, r0, lsl #0x11
mov r1, lr, lsl #0x11
ldr r0, _0217f854 ; =data_027e0f74
ldr r0, _0217f854 ; =gAdventureFlags
str ip, [sp, #4]
ldr r0, [r0]
mov r1, r1, lsr #0x10
mov r2, r2, lsr #0x10
mov r3, r3, lsr #0x10
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f7cc:
ldr r0, _0217f854 ; =data_027e0f74
ldr r0, _0217f854 ; =gAdventureFlags
mov r1, #0
ldr r0, [r0]
mov r3, r1
mov r2, #1
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f7ec:
ldr r0, _0217f854 ; =data_027e0f74
ldr r0, _0217f854 ; =gAdventureFlags
mov r1, #1
ldr r0, [r0]
mov r2, r1
mov r3, #0
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f80c:
ldr r0, _0217f854 ; =data_027e0f74
ldr r0, _0217f854 ; =gAdventureFlags
mov r1, #1
ldr r0, [r0]
mov r2, r1
mov r3, r1
bl func_ov00_02097ff4
bl _ZN14AdventureFlags18func_ov00_02097ff4Ebb
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f82c:
@@ -4610,7 +4610,7 @@ _0217f84c:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_0217f534
_0217f854: .word data_027e0f74
_0217f854: .word gAdventureFlags
_0217f858: .word gItemManager
_0217f85c: .word data_027e0d38
_0217f860: .word data_027e103c
@@ -8522,15 +8522,15 @@ func_ov40_021827b0: ; 0x021827b0
mov r0, #0
str r0, [r4, #0xc]
ldr r0, [r4, #0x10]
bl func_ov00_02097cf8
bl _ZN14AdventureFlags15Get_FlagsUnk_30Ei
ldr r2, _02182814 ; =0x00000187
mov r1, r0
cmp r1, r2
beq _021827e8
ldr r0, _02182818 ; =data_027e0f74
ldr r0, _02182818 ; =gAdventureFlags
mov r2, #1
ldr r0, [r0]
bl func_ov00_0209779c
bl _ZN14AdventureFlags3SetEjb
_021827e8:
ldr r0, [r4, #0x10]
cmp r0, #0x10
@@ -8547,7 +8547,7 @@ _02182804:
.align 2, 0
arm_func_end func_ov40_021827b0
_02182814: .word 0x00000187
_02182818: .word data_027e0f74
_02182818: .word gAdventureFlags
_0218281c: .word gItemManager
.global func_ov40_02182820
@@ -8696,7 +8696,7 @@ func_ov40_02182980: ; 0x02182980
mov r3, #0x47
mov r4, #0
sub r2, r3, #0x49
ldr r0, _02182a5c ; =data_027e0f74
ldr r0, _02182a5c ; =gAdventureFlags
mov r1, #0xff
str r2, [sp, #0x14]
str r3, [sp, #8]
@@ -8710,7 +8710,7 @@ func_ov40_02182980: ; 0x02182980
ldr r0, [r0]
ldr r1, [r5, #0x10]
add r2, sp, #8
bl func_ov00_02097db4
bl _ZN14AdventureFlags15Get_FlagsUnk_18EiP9FlagsUnk2
ldr r0, [sp, #0xc]
mov r1, #0x10
cmp r0, #0xfb
@@ -8721,11 +8721,11 @@ func_ov40_02182980: ; 0x02182980
beq _02182a3c
mov r3, #0
str r3, [sp]
ldr r0, _02182a5c ; =data_027e0f74
ldr r0, _02182a5c ; =gAdventureFlags
str r3, [sp, #4]
ldr r0, [r0]
mov r2, #0x64
bl func_ov00_02098074
bl _ZN14AdventureFlags18func_ov00_02098074Eisiib
b _02182a50
_02182a3c:
ldr r0, _02182a60 ; =data_027e0d38
@@ -8739,7 +8739,7 @@ _02182a50:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov40_02182980
_02182a5c: .word data_027e0f74
_02182a5c: .word gAdventureFlags
_02182a60: .word data_027e0d38
.global func_ov40_02182a64
@@ -9883,10 +9883,10 @@ func_ov40_021837ec: ; 0x021837ec
beq _021838c8
cmp r1, #1
bne _02183890
ldr r0, _02183a04 ; =data_027e0f74
ldr r0, _02183a04 ; =gAdventureFlags
ldr r1, [r5, #0x1c]
ldr r0, [r0]
bl func_ov00_02097fd0
bl _ZN14AdventureFlags18func_ov00_02097fd0Ev
ldr r1, [r5, #0x20]
bl func_0201e50c
ldr r1, [r6, #0x138]
@@ -9940,10 +9940,10 @@ _021838c8:
beq _02183934
cmp r0, #1
bne _02183934
ldr r0, _02183a04 ; =data_027e0f74
ldr r0, _02183a04 ; =gAdventureFlags
ldr r1, [r5, #0x34]
ldr r0, [r0]
bl func_ov00_02097fd0
bl _ZN14AdventureFlags18func_ov00_02097fd0Ev
ldr r1, [r5, #0x38]
bl func_0201e50c
ldr r1, [r6, #0x490]
@@ -9968,10 +9968,10 @@ _02183934:
beq _02183990
cmp r0, #1
bne _02183990
ldr r0, _02183a04 ; =data_027e0f74
ldr r0, _02183a04 ; =gAdventureFlags
ldr r1, [r5, #0x4c]
ldr r0, [r0]
bl func_ov00_02097fd0
bl _ZN14AdventureFlags18func_ov00_02097fd0Ev
ldr r1, [r5, #0x50]
bl func_0201e50c
ldr r1, [r6, #0x490]
@@ -9992,10 +9992,10 @@ _02183990:
beq _021839ec
cmp r0, #1
bne _021839ec
ldr r0, _02183a04 ; =data_027e0f74
ldr r0, _02183a04 ; =gAdventureFlags
ldr r1, [r5, #0x64]
ldr r0, [r0]
bl func_ov00_02097fd0
bl _ZN14AdventureFlags18func_ov00_02097fd0Ev
ldr r1, [r5, #0x68]
bl func_0201e50c
ldr r1, [r6, #0x490]
@@ -10019,7 +10019,7 @@ _021839ec:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov40_021837ec
_02183a04: .word data_027e0f74
_02183a04: .word gAdventureFlags
.global func_ov40_02183a08
arm_func_start func_ov40_02183a08
@@ -10524,7 +10524,7 @@ func_ov40_02184058: ; 0x02184058
mov r0, #0x1000
str r0, [r4, #0x88]
ldr r1, [r4, #0x7c]
ldr r0, _02184174 ; =data_027e0f74
ldr r0, _02184174 ; =gAdventureFlags
str r1, [r4, #0x8c]
ldr r1, [r4, #0x80]
str r1, [r4, #0x90]
@@ -10533,7 +10533,7 @@ func_ov40_02184058: ; 0x02184058
ldr r1, [r4, #0x88]
str r1, [r4, #0x98]
ldr r0, [r0]
bl func_ov00_02097c08
bl _ZN14AdventureFlags18func_ov00_02097c08Ev
cmp r0, #1
bgt _021840b8
beq _021840f4
@@ -10594,7 +10594,7 @@ _02184120:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov40_02184058
_02184174: .word data_027e0f74
_02184174: .word gAdventureFlags
_02184178: .word data_ov40_021881e8
.global func_ov40_0218417c
@@ -12523,9 +12523,9 @@ _021858f4:
ldr r0, [r0]
mov r1, #0xd
bl func_ov00_02082650
ldr r0, _02185b44 ; =data_027e0f74
ldr r0, _02185b44 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097c08
bl _ZN14AdventureFlags18func_ov00_02097c08Ev
sub r0, r0, #0x13
cmp r0, #9
addls pc, pc, r0, lsl #2
@@ -12605,9 +12605,9 @@ _02185a18:
ldr r0, [r0]
mov r1, #0xe
bl func_ov00_02082650
ldr r0, _02185b44 ; =data_027e0f74
ldr r0, _02185b44 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097c08
bl _ZN14AdventureFlags18func_ov00_02097c08Ev
sub r0, r0, #0x13
cmp r0, #9
addls pc, pc, r0, lsl #2
@@ -12685,7 +12685,7 @@ _02185b38:
.align 2, 0
arm_func_end func_ov40_02185878
_02185b40: .word data_027e0e60
_02185b44: .word data_027e0f74
_02185b44: .word gAdventureFlags
.global func_ov40_02185b48
arm_func_start func_ov40_02185b48
@@ -14007,23 +14007,23 @@ func_ov40_02186c44: ; 0x02186c44
stmdb sp!, {r3, lr}
cmp r1, #0x8f
bne _02186c7c
ldr r0, _02186c84 ; =data_027e0f74
ldr r0, _02186c84 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097e6c
bl _ZN14AdventureFlags18func_ov00_02097e6cEv
cmp r0, #0
beq _02186c7c
ldr r0, _02186c88 ; =data_ov00_020eec9c
mov r1, #4
bl func_ov00_020d77e4
ldr r0, _02186c84 ; =data_027e0f74
ldr r0, _02186c84 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097e7c
bl _ZN14AdventureFlags18func_ov00_02097e7cEv
_02186c7c:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov40_02186c44
_02186c84: .word data_027e0f74
_02186c84: .word gAdventureFlags
_02186c88: .word data_ov00_020eec9c
.global func_ov40_02186c8c
@@ -14310,14 +14310,14 @@ _02187058:
bl func_ov40_02186f94
b _02187094
_02187068:
ldr r0, _021870a0 ; =data_027e0f74
ldr r0, _021870a0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097e6c
bl _ZN14AdventureFlags18func_ov00_02097e6cEv
cmp r0, #0
beq _02187094
ldr r0, _021870a0 ; =data_027e0f74
ldr r0, _021870a0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097ea4
bl _ZN14AdventureFlags18func_ov00_02097ea4Ev
mov r0, r4
mov r1, #5
bl func_ov40_02186f94
@@ -14327,7 +14327,7 @@ _02187094:
.align 2, 0
arm_func_end func_ov40_02187004
_0218709c: .word data_027e05f8
_021870a0: .word data_027e0f74
_021870a0: .word gAdventureFlags
.global func_ov40_021870a4
arm_func_start func_ov40_021870a4
@@ -14359,14 +14359,14 @@ _021870f8:
bl func_ov40_02186f94
b _02187134
_02187108:
ldr r0, _02187140 ; =data_027e0f74
ldr r0, _02187140 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097e6c
bl _ZN14AdventureFlags18func_ov00_02097e6cEv
cmp r0, #0
beq _02187134
ldr r0, _02187140 ; =data_027e0f74
ldr r0, _02187140 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097ea4
bl _ZN14AdventureFlags18func_ov00_02097ea4Ev
mov r0, r4
mov r1, #5
bl func_ov40_02186f94
@@ -14376,7 +14376,7 @@ _02187134:
.align 2, 0
arm_func_end func_ov40_021870a4
_0218713c: .word data_027e0d78
_02187140: .word data_027e0f74
_02187140: .word gAdventureFlags
.global func_ov40_02187144
arm_func_start func_ov40_02187144
@@ -14656,9 +14656,9 @@ _02187464:
cmp r0, #0
moveq r0, #0
streq r0, [r10, #0x804]
ldr r0, _02187550 ; =data_027e0f74
ldr r0, _02187550 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097c08
bl _ZN14AdventureFlags18func_ov00_02097c08Ev
cmp r0, #0x15
cmpne r0, #0x16
moveq r0, #0
@@ -14712,7 +14712,7 @@ _021874c4:
arm_func_end func_ov40_02187410
_02187548: .word gItemManager
_0218754c: .word 0x91a2b3c5
_02187550: .word data_027e0f74
_02187550: .word gAdventureFlags
_02187554: .word data_ov40_02188330
_02187558: .word data_ov40_02188300
@@ -14907,14 +14907,14 @@ func_ov40_02187788: ; 0x02187788
ldrh r0, [r0, #2]
tst r0, #8
beq _021877e4
ldr r0, _021877f0 ; =data_027e0f74
ldr r0, _021877f0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097e6c
bl _ZN14AdventureFlags18func_ov00_02097e6cEv
cmp r0, #0
beq _021877e4
ldr r0, _021877f0 ; =data_027e0f74
ldr r0, _021877f0 ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097ea4
bl _ZN14AdventureFlags18func_ov00_02097ea4Ev
mov r0, r4
mov r1, #6
bl func_ov40_02187a28
@@ -14926,7 +14926,7 @@ _021877e4:
.align 2, 0
arm_func_end func_ov40_02187788
_021877ec: .word data_027e05f8
_021877f0: .word data_027e0f74
_021877f0: .word gAdventureFlags
.global func_ov40_021877f4
arm_func_start func_ov40_021877f4
@@ -14941,14 +14941,14 @@ func_ov40_021877f4: ; 0x021877f4
ldrh r0, [r0, #0x34]
tst r0, #1
beq _02187850
ldr r0, _0218785c ; =data_027e0f74
ldr r0, _0218785c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097e6c
bl _ZN14AdventureFlags18func_ov00_02097e6cEv
cmp r0, #0
beq _02187850
ldr r0, _0218785c ; =data_027e0f74
ldr r0, _0218785c ; =gAdventureFlags
ldr r0, [r0]
bl func_ov00_02097ea4
bl _ZN14AdventureFlags18func_ov00_02097ea4Ev
mov r0, r4
mov r1, #6
bl func_ov40_02187a28
@@ -14960,7 +14960,7 @@ _02187850:
.align 2, 0
arm_func_end func_ov40_021877f4
_02187858: .word data_027e0d78
_0218785c: .word data_027e0f74
_0218785c: .word gAdventureFlags
.global func_ov40_02187860
arm_func_start func_ov40_02187860
asm/ov41.inc
+2 -2
View File
@@ -73,7 +73,7 @@
.extern data_027e0e60
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f78
.extern data_027e0f90
.extern data_027e0f94
@@ -140,7 +140,7 @@
.extern func_ov00_0208cd48
.extern func_ov00_02093a5c
.extern func_ov00_02094824
.extern func_ov00_02097760
.extern _ZN14AdventureFlags3GetEj
.extern func_ov00_020a956c
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
asm/ov41.s
+36 -36
View File
@@ -1973,11 +1973,11 @@ _0218ae0c: .word 0x00000329
arm_func_start func_ov41_0218ae10
func_ov41_0218ae10: ; 0x0218ae10
stmdb sp!, {r4, lr}
ldr r1, _0218af14 ; =data_027e0f74
ldr r1, _0218af14 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #2
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
ldrne r0, _0218af18 ; =0x00640005
ldmneia sp!, {r4, pc}
@@ -2054,7 +2054,7 @@ _0218af0c:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov41_0218ae10
_0218af14: .word data_027e0f74
_0218af14: .word gAdventureFlags
_0218af18: .word 0x00640005
_0218af1c: .word 0x00640001
_0218af20: .word 0x00640097
@@ -2891,10 +2891,10 @@ _0218b9b4:
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0218ba48
ldr r0, _0218be10 ; =data_027e0f74
ldr r0, _0218be10 ; =gAdventureFlags
mov r1, #2
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0218ba48
mov r0, r4
@@ -3177,7 +3177,7 @@ _0218be00: .word data_027e0ffc
_0218be04: .word 0x00000329
_0218be08: .word data_ov00_020eec68
_0218be0c: .word gItemManager
_0218be10: .word data_027e0f74
_0218be10: .word gAdventureFlags
_0218be14: .word data_027e0fd0
_0218be18: .word data_027e0d04
_0218be1c: .word data_027e0c68
@@ -3519,16 +3519,16 @@ func_ov41_0218c204: ; 0x0218c204
ble _0218c3b0
cmp r1, #0x1800
bge _0218c3b0
ldr r0, _0218c3c8 ; =data_027e0f74
ldr r0, _0218c3c8 ; =gAdventureFlags
mov r1, #2
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0218c3b0
ldr r0, _0218c3c8 ; =data_027e0f74
ldr r0, _0218c3c8 ; =gAdventureFlags
mov r1, #1
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0218c3b0
ldr r0, _0218c3cc ; =data_027e0fe4
@@ -3611,7 +3611,7 @@ _0218c3b0:
_0218c3bc: .word data_027e0f94
_0218c3c0: .word data_027e0fc8
_0218c3c4: .word 0x0000319a
_0218c3c8: .word data_027e0f74
_0218c3c8: .word gAdventureFlags
_0218c3cc: .word data_027e0fe4
_0218c3d0: .word data_02050f54
@@ -3751,17 +3751,17 @@ _0218c55c:
arm_func_start func_ov41_0218c564
func_ov41_0218c564: ; 0x0218c564
stmdb sp!, {r4, lr}
ldr r1, _0218c5dc ; =data_027e0f74
ldr r1, _0218c5dc ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0xfe
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0218c5cc
ldr r0, _0218c5dc ; =data_027e0f74
ldr r0, _0218c5dc ; =gAdventureFlags
mov r1, #0xf6
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r0, r4
bne _0218c5c0
@@ -3784,7 +3784,7 @@ _0218c5cc:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov41_0218c564
_0218c5dc: .word data_027e0f74
_0218c5dc: .word gAdventureFlags
.global func_ov41_0218c5e0
arm_func_start func_ov41_0218c5e0
@@ -3989,10 +3989,10 @@ func_ov41_0218c834: ; 0x0218c834
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r4, r5, r6, pc}
ldr r0, _0218cbe0 ; =data_027e0f74
ldr r0, _0218cbe0 ; =gAdventureFlags
mov r1, #0xf6
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
addne sp, sp, #0x18
movne r0, #1
@@ -4022,10 +4022,10 @@ func_ov41_0218c834: ; 0x0218c834
bl _ZN5Actor14DistanceToLinkEv
cmp r0, #0x2000
ble _0218ca3c
ldr r0, _0218cbe0 ; =data_027e0f74
ldr r0, _0218cbe0 ; =gAdventureFlags
mov r1, #0xf6
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0218cbd0
cmp r4, #0
@@ -4219,7 +4219,7 @@ _0218cbd0:
.align 2, 0
arm_func_end func_ov41_0218c834
_0218cbdc: .word data_027e0f68
_0218cbe0: .word data_027e0f74
_0218cbe0: .word gAdventureFlags
_0218cbe4: .word data_027e0fc8
_0218cbe8: .word data_027e0fe4
_0218cbec: .word data_027e0e60
@@ -4283,16 +4283,16 @@ _0218cc70:
bl _ZN5Actor16XzDistanceToLinkEv
cmp r0, #0x4000
blt _0218ce78
ldr r0, _0218ce90 ; =data_027e0f74
ldr r0, _0218ce90 ; =gAdventureFlags
mov r1, #0xfe
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0218ccf0
ldr r0, _0218ce90 ; =data_027e0f74
ldr r0, _0218ce90 ; =gAdventureFlags
mov r1, #0xf6
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0218ccf0
ldr r0, [r4, #0x428]
@@ -4316,16 +4316,16 @@ _0218ccf0:
b _0218ce78
_0218cd14:
bl func_ov14_021452b0
ldr r0, _0218ce90 ; =data_027e0f74
ldr r0, _0218ce90 ; =gAdventureFlags
mov r1, #0xfe
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0218ce78
ldr r0, _0218ce90 ; =data_027e0f74
ldr r0, _0218ce90 ; =gAdventureFlags
mov r1, #0xf6
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
bne _0218ce78
ldr r0, [r4, #0x428]
@@ -4361,10 +4361,10 @@ _0218cda4:
blx r1
cmp r0, #0
beq _0218cdf0
ldr r0, _0218ce90 ; =data_027e0f74
ldr r0, _0218ce90 ; =gAdventureFlags
mov r1, #0xf6
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r0, r4
bne _0218cde8
@@ -4375,16 +4375,16 @@ _0218cde8:
mov r1, #2
bl func_ov41_0218c720
_0218cdf0:
ldr r0, _0218ce90 ; =data_027e0f74
ldr r0, _0218ce90 ; =gAdventureFlags
mov r1, #0xfe
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _0218ce78
ldr r0, _0218ce90 ; =data_027e0f74
ldr r0, _0218ce90 ; =gAdventureFlags
mov r1, #0xf6
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
ldreqb r0, [r4, #0x471]
cmpeq r0, #0
@@ -4420,7 +4420,7 @@ _0218ce78:
.align 2, 0
arm_func_end func_ov41_0218cc28
_0218ce8c: .word 0x00001001
_0218ce90: .word data_027e0f74
_0218ce90: .word gAdventureFlags
.global func_ov41_0218ce94
arm_func_start func_ov41_0218ce94
asm/ov42.inc
+2 -2
View File
@@ -59,7 +59,7 @@
.extern data_027e0e58
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern gAdventureFlags
.extern data_027e0f78
.extern data_027e0f94
.extern data_027e0fb8
@@ -115,7 +115,7 @@
.extern func_ov00_02083918
.extern func_ov00_0208726c
.extern func_ov00_02087400
.extern func_ov00_02097760
.extern _ZN14AdventureFlags3GetEj
.extern func_ov00_020a61ac
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
asm/ov42.s
+3 -3
View File
@@ -2155,10 +2155,10 @@ func_ov42_0218b084: ; 0x0218b084
bl func_ov42_0218b0dc
ldmia sp!, {r3, pc}
_0218b0a4:
ldr r0, _0218b0d8 ; =data_027e0f74
ldr r0, _0218b0d8 ; =gAdventureFlags
mov r1, #0x1f
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r0, #0x65
beq _0218b0cc
@@ -2171,7 +2171,7 @@ _0218b0cc:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov42_0218b084
_0218b0d8: .word data_027e0f74
_0218b0d8: .word gAdventureFlags
.global func_ov42_0218b0dc
arm_func_start func_ov42_0218b0dc
asm/ov43.inc
+58 -58
View File
@@ -1,8 +1,62 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.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_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.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 _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern data_02050f54
.extern data_027e0764
.extern data_027e0c68
@@ -11,7 +65,6 @@
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
@@ -21,7 +74,6 @@
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
.extern _ZTV11FilterActor
.extern data_ov00_020e9370
.extern data_ov00_020eec9c
.extern func_01ff9958
@@ -49,9 +101,9 @@
.extern func_ov00_02083770
.extern func_ov00_02087d34
.extern func_ov00_02093a1c
.extern func_ov00_02097810
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a9588
@@ -69,60 +121,7 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c1500
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.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 _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_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.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_020c45b0
@@ -204,3 +203,4 @@
.extern func_ov36_02183a50
.extern func_ov36_02183a74
.extern func_ov36_02184dec
.extern gAdventureFlags
asm/ov43.s
+11 -11
View File
@@ -3766,16 +3766,16 @@ _0218c870:
and r0, r1, r0
cmp r0, #0x1000000
bne _0218c970
ldr r0, _0218c9d0 ; =data_027e0f74
ldr r0, _0218c9d0 ; =gAdventureFlags
ldr r1, [r4, #0x218]
ldr r0, [r0]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
beq _0218c8b0
ldr r0, _0218c9d0 ; =data_027e0f74
ldr r0, _0218c9d0 ; =gAdventureFlags
ldr r1, [r4, #0x218]
ldr r0, [r0]
bl func_ov00_02097bcc
bl _ZN14AdventureFlags18func_ov00_02097bccEv
_0218c8b0:
mvn r0, #0
str r0, [r4, #0x218]
@@ -3856,7 +3856,7 @@ _0218c9c0: .word 0x00000133
_0218c9c4: .word data_02050f54
_0218c9c8: .word data_027e0ffc
_0218c9cc: .word 0x00000327
_0218c9d0: .word data_027e0f74
_0218c9d0: .word gAdventureFlags
.global func_ov43_0218c9d4
arm_func_start func_ov43_0218c9d4
@@ -3873,12 +3873,12 @@ func_ov43_0218c9d4: ; 0x0218c9d4
arm_func_start func_ov43_0218c9ec
func_ov43_0218c9ec: ; 0x0218c9ec
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _0218ca50 ; =data_027e0f74
ldr r2, _0218ca50 ; =gAdventureFlags
mov r5, r0
mov r4, r1
ldr r0, [r2]
ldr r1, [r5, #0x218]
bl func_ov00_02097b9c
bl _ZN14AdventureFlags18func_ov00_02097b9cEv
cmp r0, #0
bne _0218ca28
mov r0, #0x10000
@@ -3902,7 +3902,7 @@ _0218ca44:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov43_0218c9ec
_0218ca50: .word data_027e0f74
_0218ca50: .word gAdventureFlags
.global func_ov43_0218ca54
arm_func_start func_ov43_0218ca54
@@ -4045,7 +4045,7 @@ _0218cb34:
ldr r7, [sp, #0x4c]
str r1, [sp, #0xdc]
ldr r1, [sp, #0x50]
ldr r0, _0218cd2c ; =data_027e0f74
ldr r0, _0218cd2c ; =gAdventureFlags
str r7, [sp, #0xe0]
ldr r7, [sp, #0x54]
ldrb r6, [sp, #0x60]
@@ -4068,7 +4068,7 @@ _0218cb34:
strb r4, [sp, #0xf7]
strb r3, [sp, #0xf8]
strb r2, [sp, #0x7c]
bl func_ov00_02097810
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r5, #0x218]
add r0, sp, #0x68
bl func_ov00_0209a508
@@ -4096,7 +4096,7 @@ _0218cd1c: .word 0x50424652
_0218cd20: .word 0x50425a4b
_0218cd24: .word data_027e0fc8
_0218cd28: .word data_027e0f64
_0218cd2c: .word data_027e0f74
_0218cd2c: .word gAdventureFlags
_0218cd30: .word 0x00000333
.global func_ov43_0218cd34
asm/ov45.inc
+40 -40
View File
@@ -3,6 +3,44 @@
.extern _ZN11ItemManager16SetTreasureCountEjc
.extern _ZN11ItemManager19SetTreasureSalvagedEjj
.extern _ZN11ItemManager21AddTreasurePriceShownEj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.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_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.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 _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager16GetShipPartCountEjj
@@ -20,7 +58,6 @@
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f94
.extern data_027e0fb8
.extern data_027e0fc8
@@ -76,7 +113,7 @@
.extern func_ov00_0207c474
.extern func_ov00_0208726c
.extern func_ov00_02087338
.extern func_ov00_02097760
.extern _ZN14AdventureFlags3GetEj
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
.extern func_ov00_020a9aec
@@ -87,44 +124,6 @@
.extern func_ov00_020bce48
.extern func_ov00_020c0c08
.extern func_ov00_020c0e24
.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 _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.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 _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c5c2c
.extern func_ov00_020c5c98
.extern func_ov00_020c5d34
@@ -305,4 +304,5 @@
.extern func_ov26_021783b8
.extern func_ov26_02178408
.extern func_ov26_02178434
.extern gAdventureFlags
.extern gItemManager
asm/ov45.s
+9 -9
View File
@@ -213,10 +213,10 @@ func_ov45_02189764: ; 0x02189764
ldr r1, [r4, #0x50]
str r1, [r4, #0x488]
bl func_ov45_02189938
ldr r0, _0218988c ; =data_027e0f74
ldr r0, _0218988c ; =gAdventureFlags
ldr r1, _02189890 ; =0x0000010a
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
mov r0, r4
beq _02189868
@@ -246,7 +246,7 @@ _0218987c: .word func_ov45_02189594
_02189880: .word data_ov45_0218e278
_02189884: .word data_ov45_0218e4c0
_02189888: .word data_ov45_0218e4c4
_0218988c: .word data_027e0f74
_0218988c: .word gAdventureFlags
_02189890: .word 0x0000010a
_02189894: .word data_027e0fb8
@@ -1714,10 +1714,10 @@ func_ov45_0218aaf8: ; 0x0218aaf8
ldrb r0, [r4, #0x2a1]
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _0218ab48 ; =data_027e0f74
ldr r0, _0218ab48 ; =gAdventureFlags
mov r1, #0x15
ldr r0, [r0]
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -1731,7 +1731,7 @@ func_ov45_0218aaf8: ; 0x0218aaf8
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov45_0218aaf8
_0218ab48: .word data_027e0f74
_0218ab48: .word gAdventureFlags
.global func_ov45_0218ab4c
arm_func_start func_ov45_0218ab4c
@@ -2245,11 +2245,11 @@ _0218b0f8:
arm_func_start func_ov45_0218b100
func_ov45_0218b100: ; 0x0218b100
stmdb sp!, {r4, lr}
ldr r1, _0218b130 ; =data_027e0f74
ldr r1, _0218b130 ; =gAdventureFlags
mov r4, r0
ldr r0, [r1]
mov r1, #0x15
bl func_ov00_02097760
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -2258,7 +2258,7 @@ func_ov45_0218b100: ; 0x0218b100
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov45_0218b100
_0218b130: .word data_027e0f74
_0218b130: .word gAdventureFlags
.global func_ov45_0218b134
arm_func_start func_ov45_0218b134
asm/ov46.inc
+54 -54
View File
@@ -2,6 +2,57 @@
.extern Approach_thunk
.extern _ZN11ItemManager10GiveRupeesEjj
.extern _ZN11ItemManager16SetTreasureCountEjc
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.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_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 _ZNK11ItemManager16GetTreasureCountEj
@@ -17,7 +68,6 @@
.extern data_027e0e58
.extern data_027e0e60
.extern data_027e0f6c
.extern data_027e0f74
.extern data_027e0f94
.extern data_027e0fc8
.extern data_027e0fcc
@@ -77,8 +127,8 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern func_ov00_020a5e9c
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
@@ -91,58 +141,7 @@
.extern func_ov00_020bf008
.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 _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 _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.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 _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c5ec0
@@ -231,4 +230,5 @@
.extern func_ov26_02175f50
.extern func_ov26_02175f78
.extern func_ov34_0217bf5c
.extern gAdventureFlags
.extern gItemManager

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