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

Mangle MapManager

Browse Source
This commit is contained in:
Aetias
2024-04-21 12:28:25 +02:00
parent eea3400f08
commit 61de0cef49
130 changed files with 3160 additions and 3157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/itcm.inc
+9 -9
View File
@@ -52,15 +52,15 @@
.extern func_ov00_0207e968
.extern func_ov00_0207e96c
.extern func_ov00_02081ef4
.extern func_ov00_0208335c
.extern func_ov00_02083368
.extern func_ov00_020839d4
.extern func_ov00_020839f8
.extern func_ov00_02083ee0
.extern func_ov00_02083ef8
.extern func_ov00_020840c4
.extern func_ov00_02086284
.extern func_ov00_02086a84
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager17Get_MapData_Unk2aEv
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_
.extern _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_
.extern func_ov00_0208e4f8
.extern func_ov00_0208ed74
.extern func_ov00_0208ee00
asm/itcm.s
+25 -25
View File
@@ -5041,11 +5041,11 @@ func_01ffc118: ; 0x01ffc118
beq _01ffc530
ldr r1, [sp, #0x260]
ldr r0, [sp, #0x14]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
str r0, [sp, #0x4c]
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x268]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
add r1, r8, #0x800
str r0, [sp, #0x48]
mov r0, r1, asr #0xc
@@ -5055,10 +5055,10 @@ func_01ffc118: ; 0x01ffc118
sub r0, r0, r1, asr #12
str r0, [sp, #0x44]
ldr r0, [sp, #0x14]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #0x38]
ldr r0, [sp, #0x14]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp, #0x34]
ldr r1, [sp, #0x44]
ldr r0, [sp, #0x40]
@@ -5106,7 +5106,7 @@ _01ffc24c:
strb r0, [sp, #0x69]
ldr r0, [sp, #0x14]
strb r2, [sp, #0x68]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
beq _01ffc508
ldr r1, [r5, #4]
@@ -5240,7 +5240,7 @@ _01ffc398:
str r0, [sp, #0xc]
ldr r0, [sp, #0x14]
mov r2, ip
bl func_ov00_02086284
bl _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_
cmp r0, #0
mov r0, #1
beq _01ffc4dc
@@ -5434,7 +5434,7 @@ _01ffc73c:
str r0, [sp, #0xc]
ldr r0, [sp, #0x14]
mov r2, r6
bl func_ov00_02086284
bl _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_
cmp r0, #0
mov r1, r5, lsl #0x1
beq _01ffc840
@@ -6172,22 +6172,22 @@ func_01ffd1e0: ; 0x01ffd1e0
bl func_ov00_0208ee00
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x298]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
sub r0, r0, #1
str r0, [sp, #0x3c]
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x2a0]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
sub r0, r0, #1
str r0, [sp, #0x28]
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x2a4]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
add r0, r0, #1
str r0, [sp, #0x38]
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x2ac]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
add r0, r0, #1
str r0, [sp, #0x34]
mov r0, #0
@@ -6207,10 +6207,10 @@ func_01ffd1e0: ; 0x01ffd1e0
add r2, sp, #0x2b0
bl func_01ff9bf8
ldr r0, [sp, #0x14]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #0x30]
ldr r0, [sp, #0x14]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp, #0x2c]
ldr r1, [sp, #0x28]
ldr r0, [sp, #0x34]
@@ -6252,7 +6252,7 @@ _01ffd398:
strb r0, [sp, #0x5d]
ldr r0, [sp, #0x14]
strb r4, [sp, #0x5c]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
beq _01ffd650
ldr r1, [r5, #4]
@@ -6386,7 +6386,7 @@ _01ffd4e4:
add r2, sp, #0x26c
str r2, [sp, #0x10]
mov r2, ip
bl func_ov00_02086a84
bl _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_
cmp r0, #0
mov r0, #1
beq _01ffd624
@@ -6571,7 +6571,7 @@ _01ffd858:
add r1, sp, #0x230
str r1, [sp, #0x10]
mov r1, r4
bl func_ov00_02086a84
bl _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_
cmp r0, #0
mov r1, r5, lsl #0x1
beq _01ffd964
@@ -7092,7 +7092,7 @@ _01ffdfa8:
mov r1, r7
mov r2, r9
str r4, [sp, #0x31c]
bl func_ov00_02083ef8
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
ldr r1, [sp, #0x1d4]
add r0, r0, r8
cmp r1, r0
@@ -7222,25 +7222,25 @@ func_01ffe1cc: ; 0x01ffe1cc
bl func_ov00_0208ee00
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x48]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
str r0, [sp, #0x24]
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x50]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
mov r6, r0
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x54]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
mov r4, r0
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x5c]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
str r0, [sp, #0x20]
ldr r0, [sp, #0xc]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #0x1c]
ldr r0, [sp, #0xc]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp, #0x18]
ldr r0, [sp, #0x20]
cmp r6, r0
@@ -7274,7 +7274,7 @@ _01ffe314:
strb r0, [sp, #0x31]
ldr r0, [sp, #0xc]
strb r5, [sp, #0x30]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r7, r0
beq _01ffe43c
ldr r1, [r0]
@@ -9193,7 +9193,7 @@ func_01fffd04: ; 0x01fffd04
str r1, [sp, #0x30]
moveq r2, #0
add r1, sp, #0x2c
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r3, [r6, #0x4c]
ldr r1, [sp, #0x54]
ldr r2, [sp, #0x5c]
asm/main/main_02000000.inc
+4 -4
View File
@@ -375,10 +375,10 @@
.extern func_ov00_0207bcb4
.extern func_ov00_0207be84
.extern func_ov00_0207c0f0
.extern func_ov00_02082614
.extern func_ov00_020838e8
.extern func_ov00_02084740
.extern func_ov00_02086044
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_02086044Eiii
.extern func_ov00_02087d98
.extern func_ov00_02089068
.extern func_ov00_0208b180
asm/main/main_02000000.s
+4 -4
View File
@@ -58489,7 +58489,7 @@ func_0202bf58: ; 0x0202bf58
ldr ip, [r1, #8]
add r1, sp, #0xc
str ip, [sp, #8]
bl func_ov00_02086044
bl _ZN10MapManager18func_ov00_02086044Eiii
add sp, sp, #0x18
ldmia sp!, {r3, pc}
.align 2, 0
@@ -76862,7 +76862,7 @@ _020382e8:
ldr r0, [r0]
ldr r1, [r4, #4]
add r2, sp, #0
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
cmp r0, #0
beq _02038368
ldr r0, _020385a0 ; =data_027e0d38
@@ -76955,7 +76955,7 @@ _02038444:
_0203846c:
ldr r0, _0203859c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084740
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
ldr r2, [r4, #4]
ldr r0, _020385ac ; =data_ov00_020eec68
@@ -80340,7 +80340,7 @@ _0203acc0:
add r1, sp, #8
ldr r0, [r0]
and r2, r2, #0xff
bl func_ov00_02082614
bl _ZN10MapManager18func_ov00_02082614Eii
ldr r0, _0203ae94 ; =data_027e103c
add r1, sp, #8
ldr r0, [r0]
asm/ov00/Actor/Actor.inc
+7 -7
View File
@@ -1,4 +1,9 @@
#pragma once
.extern _ZN10MapManager18func_ov00_02083570Eii
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084c5cEii
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -10,6 +15,7 @@
.extern _ZN12ActorManager18func_ov00_020c39acEjPjb
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN9SysObjectdlEPv
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern data_02050f54
@@ -20,7 +26,6 @@
.extern data_027e0d0c
.extern data_027e0d3c
.extern data_027e0e60
.extern gAdventureFlags
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
@@ -47,13 +52,7 @@
.extern func_ov00_0207a188
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
.extern func_ov00_02083570
.extern func_ov00_02083ef8
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern func_ov00_02084c5c
.extern func_ov00_02087ef0
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern func_ov00_020bc46c
.extern func_ov00_020bc7f8
.extern func_ov00_020bc854
@@ -73,4 +72,5 @@
.extern func_ov14_0213dadc
.extern func_ov14_0213ddd4
.extern func_ov14_0213defc
.extern gAdventureFlags
.extern gItemManager
asm/ov00/Actor/Actor.s
+7 -7
View File
@@ -205,7 +205,7 @@ _020c1784: .word func_ov00_02087ef0
arm_func_start _ZN5Actor18func_ov00_020c1788Ev
_ZN5Actor18func_ov00_020c1788Ev: ; 0x020c1788
ldr r3, _020c17a0 ; =data_027e0e60
ldr ip, _020c17a4 ; =func_ov00_02083570
ldr ip, _020c17a4 ; =_ZN10MapManager18func_ov00_02083570Eii
ldrb r1, [r0, #0x10]
ldrb r2, [r0, #0x11]
ldr r0, [r3]
@@ -213,7 +213,7 @@ _ZN5Actor18func_ov00_020c1788Ev: ; 0x020c1788
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c1788Ev
_020c17a0: .word data_027e0e60
_020c17a4: .word func_ov00_02083570
_020c17a4: .word _ZN10MapManager18func_ov00_02083570Eii
.global _ZN5Actor8vfunc_2cEv
arm_func_start _ZN5Actor8vfunc_2cEv
@@ -682,14 +682,14 @@ _ZN5Actor18func_Ov00_020c1bfcEi: ; 0x020c1bfc
add r2, r0, r1
ldr r0, _020c1c18 ; =data_027e0e60
ldrb r1, [r2, #0x2a]
ldr ip, _020c1c1c ; =func_ov00_02084be0
ldr ip, _020c1c1c ; =_ZN10MapManager18func_ov00_02084be0Eii
ldrb r2, [r2, #0x28]
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end _ZN5Actor18func_Ov00_020c1bfcEi
_020c1c18: .word data_027e0e60
_020c1c1c: .word func_ov00_02084be0
_020c1c1c: .word _ZN10MapManager18func_ov00_02084be0Eii
.global _ZN5Actor18func_ov00_020c1c20Eiii
arm_func_start _ZN5Actor18func_ov00_020c1c20Eiii
@@ -701,7 +701,7 @@ _ZN5Actor18func_ov00_020c1c20Eiii: ; 0x020c1c20
ldrb r1, [ip, #0x2a]
ldrb r2, [ip, #0x28]
ldr r0, [r0]
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c1c20Eiii
@@ -2323,7 +2323,7 @@ _ZN5Actor18func_ov00_020c3094Ev: ; 0x020c3094
ldr ip, [r5, #0x5c]
mov r3, r4
str ip, [sp, #8]
bl func_ov00_02083ef8
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
ldr r1, [r5, #0x4c]
cmp r1, r0
movle r4, #1
@@ -2385,7 +2385,7 @@ _ZN5Actor18func_ov00_020c3158Ev: ; 0x020c3158
ldr r0, _020c317c ; =data_027e0e60
mov r2, #1
ldr r0, [r0]
bl func_ov00_02084c5c
bl _ZN10MapManager18func_ov00_02084c5cEii
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c3158Ev
asm/ov00/Actor/ActorManager.inc
+1 -1
View File
@@ -1,4 +1,5 @@
#pragma once
.extern _ZN10MapManager18func_ov00_020836ccEjP4AABBj
.extern _ZN5Actor10SetUnk_129Eb
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14StopLinkFollowEv
@@ -8,7 +9,6 @@
.extern data_027e0e60
.extern data_027e103c
.extern func_01ff9ec0
.extern func_ov00_020836cc
.extern func_ov00_0208e72c
.extern func_ov00_0208e7a4
.extern func_ov00_0208f318
asm/ov00/Actor/ActorManager.s
+2 -2
View File
@@ -620,7 +620,7 @@ _ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
add r2, sp, #0x14
ldr r0, [r0]
mov r3, #8
bl func_ov00_020836cc
bl _ZN10MapManager18func_ov00_020836ccEjP4AABBj
mov r5, r0
cmp r5, #0
addle sp, sp, #0xd4
@@ -708,7 +708,7 @@ _ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8
mov r10, r2
add r2, sp, #0xc
mov r3, #8
bl func_ov00_020836cc
bl _ZN10MapManager18func_ov00_020836ccEjP4AABBj
mov r5, r0
cmp r5, #0
addle sp, sp, #0xcc
asm/ov00/Item/ItemManager.inc
+6 -6
View File
@@ -1,9 +1,12 @@
#pragma once
.extern LoadTreasureItemFanfare
.extern _ZN10MapManager10GetNumKeysEv
.extern _ZN10MapManager10SetNumKeysEi
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern data_027e0e60
.extern gAdventureFlags
.extern data_027e0f78
.extern data_027e0fbc
.extern data_027e103c
@@ -12,15 +15,12 @@
.extern data_ov00_020eec68
.extern func_020196bc
.extern func_020196fc
.extern strcat
.extern func_ov00_02079ffc
.extern func_ov00_02084b08
.extern func_ov00_02084b14
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern func_ov00_020cf374
.extern func_ov00_020d73bc
.extern func_ov05_02104004
.extern func_ov09_0211c700
.extern func_ov09_0211ca20
.extern gAdventureFlags
.extern gItemManager
.extern strcat
asm/ov00/Item/ItemManager.s
+4 -4
View File
@@ -1114,13 +1114,13 @@ _020ae34c: .word data_027e103c
arm_func_start _ZNK11ItemManager18func_ov00_020ae350Ev
_ZNK11ItemManager18func_ov00_020ae350Ev: ; 0x020ae350
ldr r0, _020ae360 ; =data_027e0e60
ldr ip, _020ae364 ; =func_ov00_02084b14
ldr ip, _020ae364 ; =_ZN10MapManager10GetNumKeysEv
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end _ZNK11ItemManager18func_ov00_020ae350Ev
_020ae360: .word data_027e0e60
_020ae364: .word func_ov00_02084b14
_020ae364: .word _ZN10MapManager10GetNumKeysEv
.global _ZN11ItemManager8GiveKeysEj
thumb_func_start _ZN11ItemManager8GiveKeysEj
@@ -1129,7 +1129,7 @@ _ZN11ItemManager8GiveKeysEj: ; 0x020ae368
ldr r0, _020ae38c ; =data_027e0e60
add r4, r1, #0
ldr r0, [r0]
blx func_ov00_02084b14
blx _ZN10MapManager10GetNumKeysEv
add r1, r4, r0
cmp r1, #8
blt _020ae37c
@@ -1141,7 +1141,7 @@ _020ae37c:
_020ae382:
ldr r0, _020ae38c ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02084b08
blx _ZN10MapManager10SetNumKeysEi
pop {r4, pc}
.align 2, 0
thumb_func_end _ZN11ItemManager8GiveKeysEj
asm/ov00/Item/ItemManager_func_ov00_020ad790.inc
+1 -1
View File
@@ -32,7 +32,7 @@ _020ad800:
lda r0, data_027e0e60
ldr r4, [r6, #8]
ldr r0, [r0]
bl func_ov00_020849f8
bl _ZN10MapManager18func_ov00_020849f8Ei
cmp r0, #0
moveq r2, #1
ldr r1, [r6]
asm/ov00/Player/LinkStateFollow.inc
+3 -3
View File
@@ -1,4 +1,7 @@
#pragma once
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
@@ -14,9 +17,6 @@
.extern func_01fffcd8
.extern func_0202b308
.extern func_0202d95c
.extern func_ov00_02083a1c
.extern func_ov00_02083c7c
.extern func_ov00_020840c4
.extern func_ov04_0210ad94
.extern func_ov04_0210adb0
.extern func_ov04_0210adf8
asm/ov00/Player/LinkStateFollow.s
+4 -4
View File
@@ -33,7 +33,7 @@ _ZN15LinkStateFollow16MoveTowardTargetEv: ; 0x020a8f80
ldr r2, _020a9020 ; =data_027e0e60
add r1, r0, #0xc4
ldr r0, [r2]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r4, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, pc}
@@ -87,10 +87,10 @@ _020a904c:
ldr r4, [r1]
add r2, r5, #0x24
mov r1, r4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #0
mov r0, r4
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r4, r0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r1, [r0]
@@ -213,7 +213,7 @@ _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p: ; 0x020a9180
strb r1, [r3, #1]
ldr r2, [r3]
mov r1, r4
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
_020a91f0:
asm/ov00/Player/PlayerBase.inc
+3 -3
View File
@@ -20,9 +20,9 @@
.extern func_01ffec34
.extern func_01fffcec
.extern func_ov00_0207c5d4
.extern func_ov00_02082af4
.extern func_ov00_02083624
.extern func_ov00_02083ee0
.extern _ZN10MapManager18func_ov00_02082af4Ev
.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern func_ov00_0208ae94
.extern func_ov00_0208f030
.extern _ZN14AdventureFlags18func_ov00_02097700Ev
asm/ov00/Player/PlayerBase.s
+3 -3
View File
@@ -296,7 +296,7 @@ _ZN10PlayerBase8TeleportEP5Vec3psibb: ; 0x020a7df4
mov r2, r4
strb lr, [sp, #0x16]
str ip, [sp, #0x18]
bl func_ov00_02083624
bl _ZN10MapManager14GetEntrancePosEP5Vec3pi
str r6, [sp]
mov r0, #0
str r0, [sp, #4]
@@ -341,7 +341,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
str r3, [sp, #4]
ldr r3, [r5, #8]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr ip, [r5, #4]
ldr r2, _020a7f6c ; =data_027e0fac
cmp ip, r0
@@ -368,7 +368,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
beq _020a7f40
ldr r0, _020a7f68 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082af4
bl _ZN10MapManager18func_ov00_02082af4Ev
ldr r0, _020a7f80 ; =gAdventureFlags
ldr r0, [r0]
bl _ZN14AdventureFlags18func_ov00_02097700Ev
asm/ov00/Player/PlayerControl.inc
+10 -10
View File
@@ -1,8 +1,17 @@
#pragma once
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_02085108EPi
.extern _ZN10MapManager18func_ov00_02085594Ev
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZNK11ItemManager15GetEquippedItemEv
@@ -19,7 +28,6 @@
.extern data_027e0e2c
.extern data_027e0e60
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
@@ -44,16 +52,7 @@
.extern func_0202b2e8
.extern func_0202d95c
.extern func_ov00_02078b40
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083c7c
.extern func_ov00_020840c4
.extern func_ov00_02085108
.extern func_ov00_02085594
.extern func_ov00_0208b180
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern func_ov00_020a5e9c
.extern func_ov00_020b78a0
.extern func_ov00_020b7924
@@ -76,4 +75,5 @@
.extern func_ov15_0213dcb0
.extern func_ov15_0213dcb8
.extern func_ov24_02178348
.extern gAdventureFlags
.extern gItemManager
asm/ov00/Player/PlayerControl.s
+9 -9
View File
@@ -646,7 +646,7 @@ _020af620:
ldr r0, _020af6d8 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02085108
bl _ZN10MapManager18func_ov00_02085108EPi
cmp r0, #3
cmpne r0, #7
moveq r0, #1
@@ -725,7 +725,7 @@ _020af72c:
add r0, sp, #0
ldr r1, [r1]
mov r2, r6
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r0, [sp]
mov r2, #1
mov r1, #0
@@ -886,7 +886,7 @@ _020af97c:
ldr r0, _020afad0 ; =data_027e0e60
add r1, sp, #8
ldr r0, [r0]
bl func_ov00_02085108
bl _ZN10MapManager18func_ov00_02085108EPi
ldr r2, _020afad4 ; =data_027e0f94
mov r1, r0
ldr r0, [r2, #4]
@@ -1002,7 +1002,7 @@ _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p: ; 0x020afad8
ldr r0, _020afb68 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02085594
bl _ZN10MapManager18func_ov00_02085594Ev
cmp r0, #0
movne r0, #1
add sp, sp, #0xc
@@ -1139,7 +1139,7 @@ _020afcf4:
ldr r0, _020afe84 ; =data_027e0e60
add r1, r9, #0x9c
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
str r0, [r9, #0xa0]
cmp r0, #0
beq _020afd88
@@ -1184,7 +1184,7 @@ _020afd88:
strb r3, [r5]
strb r2, [r5, #1]
ldr r2, [r5]
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
mov r5, #2
mov r6, #3
_020afdc4:
@@ -1868,11 +1868,11 @@ _020b06e0:
add r0, sp, #0
ldr r1, [r1]
add r2, sp, #4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _020b0774 ; =data_027e0e60
ldrb r1, [sp]
ldr r0, [r0]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
ldr r1, [sp, #4]
ldr r2, _020b0774 ; =data_027e0e60
sub r0, r0, r1
@@ -1881,7 +1881,7 @@ _020b06e0:
ldrb r1, [sp, #1]
ldr r0, [r2]
str r3, [sp, #4]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
ldr r2, [sp, #0xc]
mov r1, r4
sub r0, r0, r2
asm/ov00/Save/AdventureFlags.inc
+1 -1
View File
@@ -8,7 +8,7 @@
.extern func_ov00_0207b2f0
.extern func_ov00_0207b334
.extern func_ov00_0207ba94
.extern func_ov00_020838f8
.extern _ZN10MapManager18func_ov00_020838f8EPi
.extern func_ov00_020980f4
.extern func_ov00_020980f8
.extern func_ov00_020980fc
asm/ov00/Save/AdventureFlags.s
+1 -1
View File
@@ -328,7 +328,7 @@ _ZN14AdventureFlags18func_ov00_02097968Ei: ; 0x02097968
ldr r0, _02097a40 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020838f8
bl _ZN10MapManager18func_ov00_020838f8EPi
strb r0, [sp, #0x26]
ldr r0, [r5, #0x44]
add r1, sp, #0x18
asm/ov00/ov00_020773c0.inc
+8 -8
View File
@@ -130,14 +130,14 @@
.extern __register_global_object
.extern func_ov00_0207bc48
.extern func_ov00_0207c170
.extern func_ov00_02082e1c
.extern func_ov00_0208306c
.extern func_ov00_02083394
.extern func_ov00_020833a0
.extern func_ov00_020833ac
.extern func_ov00_020833b8
.extern func_ov00_02083588
.extern func_ov00_020849c0
.extern _ZN10MapManager18func_ov00_02082e1cEPiS0_
.extern _ZN10MapManager18func_ov00_0208306cEv
.extern _ZN10MapManager13GetCourseMinXEv
.extern _ZN10MapManager13GetCourseMinZEv
.extern _ZN10MapManager13GetCourseMaxXEv
.extern _ZN10MapManager13GetCourseMaxZEv
.extern _ZN10MapManager18func_ov00_02083588Ev
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern func_ov00_02088074
.extern _ZN14AdventureFlags15Get_FlagsUnk_48Ei
.extern func_ov00_0209d738
asm/ov00/ov00_020773c0.s
+17 -17
View File
@@ -3878,7 +3878,7 @@ func_ov00_02078f80: ; 0x02078f80
ldr r1, _02078fa8 ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_02083588
bl _ZN10MapManager18func_ov00_02083588Ev
ldr r1, [r4, #0x44]
cmp r1, r0
movne r0, #1
@@ -4045,16 +4045,16 @@ func_ov00_0207914c: ; 0x0207914c
mov r0, r7
mov r9, r2
mov r8, r3
bl func_ov00_02083394
bl _ZN10MapManager13GetCourseMinXEv
mov r6, r0
mov r0, r7
bl func_ov00_020833a0
bl _ZN10MapManager13GetCourseMinZEv
mov r5, r0
mov r0, r7
bl func_ov00_020833ac
bl _ZN10MapManager13GetCourseMaxXEv
mov r4, r0
mov r0, r7
bl func_ov00_020833b8
bl _ZN10MapManager13GetCourseMaxZEv
ldr r1, [r10, #8]
sub r0, r0, r5
sub r1, r1, r5
@@ -4104,16 +4104,16 @@ func_ov00_0207920c: ; 0x0207920c
mov r0, r7
mov r9, r2
mov r8, r3
bl func_ov00_02083394
bl _ZN10MapManager13GetCourseMinXEv
mov r6, r0
mov r0, r7
bl func_ov00_020833a0
bl _ZN10MapManager13GetCourseMinZEv
mov r5, r0
mov r0, r7
bl func_ov00_020833ac
bl _ZN10MapManager13GetCourseMaxXEv
mov r4, r0
mov r0, r7
bl func_ov00_020833b8
bl _ZN10MapManager13GetCourseMaxZEv
sub r3, r4, r6
ldr r1, [r10, #8]
sub r0, r0, r5
@@ -4164,19 +4164,19 @@ _020792f4:
ldr r0, _020793b4 ; =data_027e0e60
ldr r6, [r0]
mov r0, r6
bl func_ov00_02083394
bl _ZN10MapManager13GetCourseMinXEv
mov r5, r0
mov r0, r6
bl func_ov00_020833a0
bl _ZN10MapManager13GetCourseMinZEv
mov r4, r0
mov r0, r6
bl func_ov00_020833ac
bl _ZN10MapManager13GetCourseMaxXEv
sub r2, r0, r5
mov r0, r6
mov r1, r2, asr #0x7
add r1, r2, r1, lsr #24
mov r6, r1, asr #0x8
bl func_ov00_020833b8
bl _ZN10MapManager13GetCourseMaxZEv
sub r0, r0, r4
mov r1, #0xc0
bl func_01ff9b4c
@@ -4344,13 +4344,13 @@ _02079564:
mov r1, r5
ldr r0, [r0]
mov r2, r4
bl func_ov00_02082e1c
bl _ZN10MapManager18func_ov00_02082e1cEPiS0_
cmp r0, #0
movne r0, #0
bne _02079614
ldr r0, _0207967c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020849c0
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
beq _020795f8
ldrb r0, [sp, #0x38]
@@ -4361,7 +4361,7 @@ _02079564:
mov r1, r5
ldr r0, [r0]
mov r2, r4
bl func_ov00_0208306c
bl _ZN10MapManager18func_ov00_0208306cEv
ldr r1, [r4]
mov r0, #0xc0000
mov r1, r1, lsl #0xc
@@ -4514,7 +4514,7 @@ func_ov00_0207977c: ; 0x0207977c
mov r1, r5
ldr r0, [r0]
mov r2, r4
bl func_ov00_02082e1c
bl _ZN10MapManager18func_ov00_02082e1cEPiS0_
cmp r0, #0
beq _0207984c
mov r0, r8
asm/ov00/ov00_0207af9c.s
+1000 -1000
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020980f4.inc
+17 -17
View File
@@ -2,6 +2,23 @@
.extern Approach_thunk
.extern Divide
.extern FastDivide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_b0Ev
.extern _ZN10MapManager17GetMapData_Unk_06Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18Get_MapData_Unk_d0Ev
.extern _ZN10MapManager18Get_MapData_Unk_d8Ev
.extern _ZN10MapManager18Set_MapData_Unk_16Eci
.extern _ZN10MapManager18func_ov00_02082424Ev
.extern _ZN10MapManager18func_ov00_02082538Ev
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02083908EcPi
.extern _ZN10MapManager18func_ov00_02083928EPci
.extern _ZN10MapManager18func_ov00_02083938Ei
.extern _ZN10MapManager18func_ov00_02083978EiP5Vec3p
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase12SetUpdatePosEb
.extern _ZN11ItemManager21LoadDungeonItemModelsEv
@@ -189,23 +206,6 @@
.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
asm/ov00/ov00_020980f4.s
+28 -28
View File
@@ -314,7 +314,7 @@ _0209848c:
ldrb r1, [r4, #0xe]
ldr r0, [r0]
add r2, sp, #0xc
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
ldr r0, _020985bc ; =data_027e0d38
mov r2, #1
ldr r0, [r0]
@@ -1482,7 +1482,7 @@ _020993b4:
ldrb r1, [r6, #0x2b]
ldr r0, [r0]
add r2, sp, #8
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
cmp r0, #0
addeq sp, sp, #0x20
ldmeqia sp!, {r4, r5, r6, pc}
@@ -5635,7 +5635,7 @@ _0209c93c:
ldr r0, _0209c954 ; =data_027e0e60
add r1, r4, #0xf8
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_0209c8f4
@@ -5746,11 +5746,11 @@ func_ov00_0209ca80: ; 0x0209ca80
ldr r0, _0209cbc0 ; =data_027e0e60
str r2, [r1]
ldr r0, [r0]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldr r1, _0209cbc0 ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr ip, _0209cbc4 ; =0x04000470
mov r1, #0
str r0, [ip]
@@ -5834,7 +5834,7 @@ func_ov00_0209cbd4: ; 0x0209cbd4
mov r5, r0
ldr r0, [r3]
mov r4, r2
bl func_ov00_02083978
bl _ZN10MapManager18func_ov00_02083978EiP5Vec3p
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, r4, r5, pc}
@@ -5892,7 +5892,7 @@ func_ov00_0209cc48: ; 0x0209cc48
ldrh r1, [r4, #0x1c]
ldrh r2, [r4, #0x1e]
ldr r0, [r0]
bl func_ov00_02082638
bl _ZN10MapManager16MapData_vfunc_b0Ev
ldr r0, _0209cce4 ; =data_027e0f68
ldrh r1, [r4, #0x1c]
ldr r0, [r0]
@@ -8279,7 +8279,7 @@ _0209e9c0:
ldr r0, _0209eafc ; =data_027e0e60
add r1, sp, #0xc
ldr r0, [r0]
bl func_ov00_02083928
bl _ZN10MapManager18func_ov00_02083928EPci
ldrb r0, [sp, #0x10]
add r2, r4, #0x168
strb r0, [r4, #0x162]
@@ -8293,7 +8293,7 @@ _0209e9c0:
ldr r0, _0209eafc ; =data_027e0e60
ldrb r1, [r4, #0x163]
ldr r0, [r0]
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
ldrh r0, [r4, #0x22]
cmp r0, #0
beq _0209ea30
@@ -8452,7 +8452,7 @@ _0209ec14:
ldrb r1, [r4, #0x162]
ldr r0, [r0]
mov r2, r3
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _0209ecd4 ; =data_027e0f64
ldrb r1, [r4, #0x165]
ldr r0, [r0]
@@ -8483,7 +8483,7 @@ _0209ec9c:
ldrb r1, [r4, #0x16c]
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
b _0209ecc8
_0209ecb4:
ldr r0, _0209ecd4 ; =data_027e0f64
@@ -8513,7 +8513,7 @@ _0209ecf0:
ldrb r1, [r0, #0x164]
ldr r0, [r2]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
ldmia sp!, {r3, pc}
_0209ed08:
mov r1, #1
@@ -12506,7 +12506,7 @@ _020a1de8:
ldrb r2, [r4, #0x29]
ldr r0, [r0]
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
b _020a1e4c
_020a1e0c:
bl func_ov00_020a1e58
@@ -12515,7 +12515,7 @@ _020a1e0c:
ldrb r2, [r4, #0x29]
ldr r0, [r0]
mov r3, #1
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, [r4, #0x158]
cmp r0, #0
bne _020a1e4c
@@ -12613,7 +12613,7 @@ func_ov00_020a1f24: ; 0x020a1f24
bne _020a1f90
ldr r0, _020a1fc8 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082538
bl _ZN10MapManager18func_ov00_02082538Ev
ldr r2, [r0]
ldr r1, _020a1fc8 ; =data_027e0e60
str r2, [r4, #0x18]
@@ -12622,7 +12622,7 @@ func_ov00_020a1f24: ; 0x020a1f24
ldr r0, [r0, #8]
str r0, [r4, #0x20]
ldr r0, [r1]
bl func_ov00_02082538
bl _ZN10MapManager18func_ov00_02082538Ev
ldr r1, [r0]
str r1, [r4, #0x24]
ldr r1, [r0, #4]
@@ -12738,14 +12738,14 @@ func_ov00_020a1fd0: ; 0x020a1fd0
_020a2118:
ldr r0, _020a2224 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082424
bl _ZN10MapManager18func_ov00_02082424Ev
rsb r0, r0, #0
sub r0, r0, #0x4000
cmp r4, r0
blt _020a21d0
ldr r0, _020a2224 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082424
bl _ZN10MapManager18func_ov00_02082424Ev
add r0, r4, r0
add r0, r0, #0x4000
mov r1, #0x4000
@@ -12836,7 +12836,7 @@ func_ov00_020a222c: ; 0x020a222c
ldr r0, _020a22b4 ; =data_027e0e60
strgt r1, [r4, #0x28]
ldr r0, [r0]
bl func_ov00_02082424
bl _ZN10MapManager18func_ov00_02082424Ev
ldr r1, [r4, #0x1c]
ldr r2, [r4, #0x28]
add r1, r1, #0x1000
@@ -12845,7 +12845,7 @@ func_ov00_020a222c: ; 0x020a222c
ldmgeia sp!, {r4, pc}
ldr r0, _020a22b4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082424
bl _ZN10MapManager18func_ov00_02082424Ev
ldr r1, [r4, #0x1c]
add r1, r1, #0x1000
add r0, r1, r0
@@ -13109,13 +13109,13 @@ _020a2614:
beq _020a2680
ldr r0, _020a26e0 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084984
bl _ZN10MapManager17GetMapData_Unk_06Ev
cmp r0, #0
bne _020a2680
ldr r0, _020a26e0 ; =data_027e0e60
mov r1, #0
ldr r0, [r0]
bl func_ov00_02083938
bl _ZN10MapManager18func_ov00_02083938Ei
bl func_ov00_02087d84
add r5, sp, #0x4c
mov r6, r0
@@ -13476,7 +13476,7 @@ _020a2b28:
mov r1, r3
ldr r0, [r0]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, [r4, #4]
ldr r1, [sp, #8]
ldr r2, [r2, #0x240]
@@ -13774,7 +13774,7 @@ _020a2f18:
ldrb r2, [r1, #0x1b8]
ldr r0, [r0]
add r1, sp, #0x10
bl func_ov00_02083928
bl _ZN10MapManager18func_ov00_02083928EPci
ldr r0, [sp, #0x10]
bl func_ov00_02087d84
add lr, sp, #0x38
@@ -13871,7 +13871,7 @@ _020a3074:
ldrb r2, [r1, #0x1b8]
ldr r0, [r0]
add r1, sp, #0x10
bl func_ov00_02083928
bl _ZN10MapManager18func_ov00_02083928EPci
ldr r0, [sp, #0x10]
bl func_ov00_02087d84
add lr, sp, #0x38
@@ -15292,7 +15292,7 @@ func_ov00_020a41e4: ; 0x020a41e4
ldr r1, _020a42c8 ; =data_027e0e60
str r0, [r6]
ldr r0, [r1]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
strb r0, [r6, #7]
str r7, [r6, #0xc]
ldr r0, [r5]
@@ -15354,7 +15354,7 @@ func_ov00_020a42cc: ; 0x020a42cc
ldr r1, _020a4344 ; =data_027e0e60
str r0, [r6]
ldr r0, [r1]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
strb r0, [r6, #7]
str r7, [r6, #0xc]
ldr r0, [r5]
@@ -16231,7 +16231,7 @@ func_ov00_020a4dd0: ; 0x020a4dd0
ldr r0, _020a4e08 ; =data_027e0e60
add r1, r4, #0x28
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020a4dd0
asm/ov00/ov00_020b1498.inc
+25 -25
View File
@@ -1,5 +1,30 @@
#pragma once
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager17Get_MapData_Unk2aEv
.extern _ZN10MapManager18func_ov00_020833c4Ev
.extern _ZN10MapManager18func_ov00_020833d0Ev
.extern _ZN10MapManager18func_ov00_020833dcEv
.extern _ZN10MapManager18func_ov00_020833e8Ev
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10MapManager18func_ov00_0208412cEv
.extern _ZN10MapManager18func_ov00_02084164Ev
.extern _ZN10MapManager18func_ov00_020853fcEv
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN10PlayerBase14GetEquipShieldEv
@@ -301,31 +326,6 @@
.extern func_ov00_0207e96c
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_0208335c
.extern func_ov00_02083368
.extern func_ov00_020833c4
.extern func_ov00_020833d0
.extern func_ov00_020833dc
.extern func_ov00_020833e8
.extern func_ov00_020836dc
.extern func_ov00_02083770
.extern func_ov00_020838e8
.extern func_ov00_020839d4
.extern func_ov00_020839f8
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083c7c
.extern func_ov00_02083e34
.extern func_ov00_02083ee0
.extern func_ov00_02083f44
.extern func_ov00_02083fb0
.extern func_ov00_02084088
.extern func_ov00_020840a0
.extern func_ov00_020840c4
.extern func_ov00_0208412c
.extern func_ov00_02084164
.extern func_ov00_020853fc
.extern func_ov00_020872e8
.extern func_ov00_02087e8c
.extern func_ov00_0208b180
asm/ov00/ov00_020b1498.s
+58 -58
View File
@@ -285,13 +285,13 @@ func_ov00_020b178c: ; 0x020b178c
mov r4, r0
ldrb r2, [sp, #0xd]
ldr r0, [r3]
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
cmp r0, r4
bgt _020b17d8
ldr r0, _020b17e8 ; =data_027e0e60
add r1, sp, #0xc
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r4, lr}
@@ -446,14 +446,14 @@ func_ov00_020b199c: ; 0x020b199c
bmi _020b19e4
ldr r0, _020b1a48 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
cmp r0, r6
ble _020b19e4
cmp r5, #0
blt _020b19e4
ldr r0, _020b1a48 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
cmp r0, r5
bgt _020b19f0
_020b19e4:
@@ -466,7 +466,7 @@ _020b19f0:
ldr r0, [r0]
strb r6, [sp]
strb r5, [sp, #1]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
beq _020b1a30
ldr r1, [r0]
@@ -481,7 +481,7 @@ _020b1a30:
ldr r0, _020b1a48 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02084164
bl _ZN10MapManager18func_ov00_02084164Ev
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
@@ -498,12 +498,12 @@ func_ov00_020b1a4c: ; 0x020b1a4c
mov r9, r0
ldr r0, [r2]
ldr r1, [r8]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _020b1b48 ; =data_027e0e60
mov r5, r0
ldr r0, [r1]
ldr r1, [r8, #8]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
mov r6, r0
ldr r0, [r8]
ldr r2, _020b1b4c ; =func_ov00_020b1940
@@ -572,7 +572,7 @@ func_ov00_020b1b54: ; 0x020b1b54
ldrb r1, [sp, #8]
ldrb r2, [sp, #9]
ldr r0, [r0]
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
cmp r0, #0x18
cmpne r0, #0x2c
cmpne r0, #0x2d
@@ -605,7 +605,7 @@ func_ov00_020b1ba4: ; 0x020b1ba4
add r0, sp, #0
add r2, sp, #4
str r3, [sp, #0xc]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp]
mov r0, r0, lsr #0x9
and r0, r0, #3
@@ -630,7 +630,7 @@ func_ov00_020b1bfc: ; 0x020b1bfc
ldr r0, [r1]
mov r1, r6
mov r2, r5
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
ldrb r2, [sp, #0x1c]
add r1, r5, #1
sub r3, sp, #4
@@ -1449,7 +1449,7 @@ func_ov00_020b2598: ; 0x020b2598
ldr r0, [r0]
ldr r1, [r4, #0x5c]
add r2, sp, #0
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
cmp r0, #0
beq _020b26b8
ldr r0, _020b2b94 ; =data_027e0d38
@@ -2303,7 +2303,7 @@ func_ov00_020b30e4: ; 0x020b30e4
ldr r0, _020b3270 ; =data_027e0e60
add r2, sp, #0
ldr r0, [r0]
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
cmp r0, #0
beq _020b325c
str r6, [r7, #0x5c]
@@ -3117,7 +3117,7 @@ _020b3ce4:
ldr r0, [r1]
add r1, sp, #0
mov r2, #1
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
mov r6, r0
cmp r6, r5
mov r0, r4
@@ -4612,7 +4612,7 @@ func_ov00_020b4d00: ; 0x020b4d00
ldr r1, [r1]
add r0, sp, #0
add r2, #0x20
blx func_ov00_02083a1c
blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r0, sp, #0
ldrb r1, [r0]
strb r1, [r4, #0x1c]
@@ -4651,7 +4651,7 @@ func_ov00_020b4d28: ; 0x020b4d28
ldr r0, [r0]
add r1, r2, r1
sub r1, r1, #0x1000
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r3, [r7, #0x20]
ldr r2, [r7, #0x2c]
ldr r1, _020b502c ; =data_027e0e60
@@ -4659,14 +4659,14 @@ func_ov00_020b4d28: ; 0x020b4d28
sub r2, r3, r2
ldr r0, [r1]
add r1, r2, #0x1000
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r2, [r9]
mov r1, r0
cmp r2, #0
ble _020b4dd0
ldr r0, _020b502c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
mov r8, r0
b _020b4e60
_020b4dd0:
@@ -4674,7 +4674,7 @@ _020b4dd0:
ldr r0, _020b502c ; =data_027e0e60
mov r1, r8
ldr r0, [r0]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
mov r8, r0
b _020b4e60
_020b4dec:
@@ -4699,24 +4699,24 @@ _020b4dec:
bne _020b4e4c
ldr r0, _020b502c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
mov r8, r0
b _020b4e60
_020b4e4c:
ldr r0, _020b502c ; =data_027e0e60
mov r1, r8
ldr r0, [r0]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
mov r8, r0
_020b4e60:
ldr r0, _020b502c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020833c4
bl _ZN10MapManager18func_ov00_020833c4Ev
cmp r8, r0
ble _020b4e88
ldr r0, _020b502c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020833dc
bl _ZN10MapManager18func_ov00_020833dcEv
cmp r8, r0
blt _020b4e90
_020b4e88:
@@ -4744,7 +4744,7 @@ _020b4ec8:
ldr r0, [r0]
add r1, r2, r1
sub r1, r1, #0x1000
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
ldr r3, [r7, #0x28]
ldr r2, [r7, #0x2c]
ldr r1, _020b502c ; =data_027e0e60
@@ -4752,14 +4752,14 @@ _020b4ec8:
sub r2, r3, r2
ldr r0, [r1]
add r1, r2, #0x1000
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
ldr r2, [r9, #8]
mov r1, r0
cmp r2, #0
ble _020b4f28
ldr r0, _020b502c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r8, r0
b _020b4fb8
_020b4f28:
@@ -4767,7 +4767,7 @@ _020b4f28:
ldr r0, _020b502c ; =data_027e0e60
mov r1, r8
ldr r0, [r0]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r8, r0
b _020b4fb8
_020b4f44:
@@ -4792,24 +4792,24 @@ _020b4f44:
bne _020b4fa4
ldr r0, _020b502c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r8, r0
b _020b4fb8
_020b4fa4:
ldr r0, _020b502c ; =data_027e0e60
mov r1, r8
ldr r0, [r0]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r8, r0
_020b4fb8:
ldr r0, _020b502c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020833d0
bl _ZN10MapManager18func_ov00_020833d0Ev
cmp r8, r0
ble _020b4fe0
ldr r0, _020b502c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020833e8
bl _ZN10MapManager18func_ov00_020833e8Ev
cmp r8, r0
blt _020b4fe8
_020b4fe0:
@@ -4857,7 +4857,7 @@ func_ov00_020b5034: ; 0x020b5034
strb r3, [ip]
strb r2, [ip, #1]
ldr r2, [ip]
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
ldr r7, [r5, #4]
mov r0, r6
mov r1, r5
@@ -5032,7 +5032,7 @@ func_ov00_020b5268: ; 0x020b5268
str r2, [sp, #0x30]
add r1, sp, #0x28
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, [r4, #4]
ldr r1, _020b5344 ; =0xfffff667
add r1, r2, r1
@@ -5529,7 +5529,7 @@ _020b5884:
ldr r2, [r2]
strb r4, [sp]
strb r3, [sp, #1]
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
ldr r0, [sp, #0x2c]
ldr r1, [sp, #0x28]
str r0, [sp, #8]
@@ -6109,7 +6109,7 @@ _020b61e0:
str r2, [r10, #8]
ldr r1, [r1]
add r2, r7, #0x20
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r2, [sp, #0x14]
ldr r0, _020b6ac8 ; =data_027e0e60
add r1, r7, #0x1c
@@ -6117,7 +6117,7 @@ _020b61e0:
ldrb r2, [sp, #0x15]
strb r2, [r7, #0x1d]
ldr r0, [r0]
bl func_ov00_02084088
bl _ZN10MapManager16MapData_vfunc_54Ev
ldrb r0, [r7, #0xbc]
cmp r0, #0
beq _020b62ec
@@ -6226,7 +6226,7 @@ _020b632c:
ldr r3, [r10, #8]
mov r2, #1
str r3, [sp, #0x7c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcc
add r0, r0, #0x1c00
ldr r2, _020b6ac4 ; =0x0000ffff
@@ -6288,10 +6288,10 @@ _020b64a4:
ldr r1, [r10]
ldr r8, [r0]
mov r0, r8
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
mov r1, r0
mov r0, r8
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
ldr r2, [r10]
mov r1, #0
sub r2, r0, r2
@@ -6333,7 +6333,7 @@ _020b6538:
ldr r0, _020b6ac8 ; =data_027e0e60
add r1, r7, #0xc4
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
ldr r1, [r0]
mov r9, r0
ldr r1, [r1, #0x54]
@@ -6545,7 +6545,7 @@ _020b6830:
add r0, sp, #0x1c
add r2, sp, #0x50
str r3, [sp, #0x58]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp, #0x1c]
mov r1, r0
mov r0, r0, lsr #0x5
@@ -6727,7 +6727,7 @@ func_ov00_020b6af0: ; 0x020b6af0
ldrb r1, [r0, #9]
cmp r1, #0
beq _020b6b84
bl func_ov00_0208412c
bl _ZN10MapManager18func_ov00_0208412cEv
ldr r1, _020b6b98 ; =data_027e0fe4
mov r4, r0
ldr r1, [r1]
@@ -6751,7 +6751,7 @@ func_ov00_020b6af0: ; 0x020b6af0
ldr r3, [r5, #8]
add r2, sp, #8
str r3, [sp, #0x10]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
addne sp, sp, #0x14
addne r0, r4, r6
@@ -7116,7 +7116,7 @@ _020b7000:
str r6, [sp, #8]
str r3, [sp, #0xc]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, [r4, #0x24]
ldr r1, [r4, #0x2c]
sub r1, r2, r1
@@ -7506,7 +7506,7 @@ _020b75b0:
add r1, sp, #0x14
strb r4, [sp]
strb r3, [sp, #1]
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
add r0, sp, #0x14
add r1, r6, #0x20
mov r2, r0
@@ -7520,7 +7520,7 @@ _020b75b0:
strb r1, [r3, #1]
ldr r2, [r3]
add r1, sp, #8
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
add r0, sp, #8
add r1, r6, #0x20
mov r2, r0
@@ -9932,7 +9932,7 @@ _020b9278:
ldr r1, [r0]
add r0, sp, #4
add r2, r9, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r0, [sp, #4]
strb r0, [r9, #0x288]
ldrb r0, [sp, #5]
@@ -10144,7 +10144,7 @@ _020b956c:
str r5, [sp, #0xc]
str r6, [sp, #0x10]
str r3, [sp, #0x14]
bl func_ov00_020853fc
bl _ZN10MapManager18func_ov00_020853fcEv
cmp r0, #0
ldrnesb r1, [r0, #0x12]
cmpne r1, #1
@@ -11670,7 +11670,7 @@ _020ba958:
str ip, [sp, #0xc]
str r3, [sp, #0x10]
str r7, [sp, #0x14]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [sp, #0x1c]
cmp r1, r0
movlt r0, #1
@@ -11739,7 +11739,7 @@ _020baab8:
str r7, [sp]
str r3, [sp, #4]
str r4, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [sp, #0x1c]
cmp r1, r0
movlt r0, #1
@@ -11955,7 +11955,7 @@ _020badf0:
str r3, [sp, #0x10]
ldr r3, [r6, #0x160]
str r3, [sp, #0x14]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r1, r0, #0x1000
str r1, [r6, #0x15c]
mov r0, r6
@@ -12023,7 +12023,7 @@ _020baef0:
str r3, [sp, #4]
ldr r3, [r6, #0x160]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0x1000
str r0, [r6, #0x15c]
_020baf50:
@@ -12102,7 +12102,7 @@ _020bb020:
add r1, sp, #0
mov r2, #1
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0x1000
str r0, [r5, #0x15c]
ldr r1, [r5, #0x158]
@@ -13919,7 +13919,7 @@ _020bc40c:
str lr, [sp]
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
ldr r1, _020bc468 ; =data_027e0fac
ldr r3, [sp, #0x10]
ldrsh r2, [r1]
@@ -14305,7 +14305,7 @@ func_ov00_020bc8b8: ; 0x020bc8b8
mov r4, r2
add r0, sp, #0
mov r2, r5
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r1, [sp]
add r2, r6, r4, lsl #1
add r0, r6, r4, lsl #2
@@ -14331,7 +14331,7 @@ func_ov00_020bc90c: ; 0x020bc90c
mov r4, r1
ldrb r1, [r2, #0x2c]
ldr r0, [r0]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [r4]
add r0, r6, r5, lsl #2
ldr r0, [r0, #0x30]
@@ -14340,7 +14340,7 @@ func_ov00_020bc90c: ; 0x020bc90c
ldr r0, _020bc95c ; =data_027e0e60
ldrb r1, [r1, #0x2d]
ldr r0, [r0]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
str r0, [r4, #8]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
@@ -16478,7 +16478,7 @@ _020be338:
ldrh r1, [r5, #0x22]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldrb r0, [r5, #0x2a]
asm/ov00/ov00_020c3e54.inc
+20 -20
View File
@@ -1,6 +1,26 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager17GetMapData_Unk_48Ev
.extern _ZN10MapManager17GetMapData_Unk_4cEv
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager18func_ov00_02083588Ev
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840dcEv
.extern _ZN10MapManager18func_ov00_02084164Ev
.extern _ZN10MapManager18func_ov00_02084838Ev
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern _ZN10MapManager20GetCourseData_Unk_1cEv
.extern _ZN10MapManager20GetCourseData_Unk_1dEv
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern _ZN11ItemManager15SetEquippedItemEi
@@ -500,26 +520,6 @@
.extern func_ov00_02081ef4
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_02082d28
.extern func_ov00_02082d34
.extern func_ov00_0208335c
.extern func_ov00_02083588
.extern func_ov00_020836dc
.extern func_ov00_020839d4
.extern func_ov00_020839f8
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083ee0
.extern func_ov00_02083f44
.extern func_ov00_02083fb0
.extern func_ov00_020840c4
.extern func_ov00_020840dc
.extern func_ov00_02084114
.extern func_ov00_02084120
.extern func_ov00_02084164
.extern func_ov00_02084838
.extern func_ov00_020849c0
.extern func_ov00_02087338
.extern func_ov00_0208766c
.extern func_ov00_020876bc
asm/ov00/ov00_020c3e54.s
+40 -40
View File
@@ -320,12 +320,12 @@ _020c40b4:
ldr r1, [r10, #8]
str r1, [r2, #0x5c]
ldr r0, [r0]
bl func_ov00_02082d28
bl _ZN10MapManager20GetCourseData_Unk_1cEv
ldr r2, [r6]
ldr r1, _020c42d4 ; =data_027e0e60
strb r0, [r2, #0x10]
ldr r0, [r1]
bl func_ov00_02082d34
bl _ZN10MapManager20GetCourseData_Unk_1dEv
ldr r2, [r6]
add r1, r5, #1
strb r0, [r2, #0x11]
@@ -933,7 +933,7 @@ _020c498c:
str lr, [sp, #8]
str ip, [sp, #0xc]
str r3, [sp, #0x10]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp, #4]
mov r0, r0, lsr #0x5
and r0, r0, #3
@@ -1611,19 +1611,19 @@ func_ov00_020c522c: ; 0x020c522c
mov r5, r1
ldr r1, [r6]
mov r0, r4
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
mov r1, r0
mov r0, r4
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [r5]
ldr r1, [r6, #4]
mov r0, r4
str r1, [r5, #4]
ldr r1, [r6, #8]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
mov r1, r0
mov r0, r4
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
str r0, [r5, #8]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
@@ -1643,15 +1643,15 @@ func_ov00_020c5288: ; 0x020c5288
strb r2, [sp, #1]
ldr r1, [r5]
mov r0, r4
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
strb r0, [sp]
ldr r1, [r5, #8]
mov r0, r4
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
strb r0, [sp, #1]
add r1, sp, #0
mov r0, r4
bl func_ov00_020840dc
bl _ZN10MapManager18func_ov00_020840dcEv
cmp r0, #0x1e
addeq sp, sp, #0x14
moveq r0, #1
@@ -1665,7 +1665,7 @@ func_ov00_020c5288: ; 0x020c5288
ldr r3, [r5, #8]
mov r1, r4
str r3, [sp, #0x10]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp, #4]
mov r0, r0, lsr #0x9
and r0, r0, #3
@@ -1687,12 +1687,12 @@ func_ov00_020c5330: ; 0x020c5330
mov r5, r1
ldrb r1, [r6, #1]
ldr r0, [r0]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
ldr r2, _020c5370 ; =data_027e0e60
mov r4, r0
ldrb r1, [r6]
ldr r0, [r2]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [r5]
mov r0, #0
stmib r5, {r0, r4}
@@ -1711,7 +1711,7 @@ func_ov00_020c5374: ; 0x020c5374
ldr r1, [r3]
mov r2, r0
add r0, sp, #0
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r0, [sp]
strb r0, [r4]
ldrb r0, [sp, #1]
@@ -4560,10 +4560,10 @@ func_ov00_020c7764: ; 0x020c7764
str ip, [sp, #8]
str r8, [sp, #0xc]
str r3, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r8, r0
mov r0, r4
bl func_ov00_02084120
bl _ZN10MapManager17GetMapData_Unk_4cEv
add r0, r8, r0
str r0, [sp, #0x18]
_020c77e0:
@@ -4725,7 +4725,7 @@ _020c79b0:
_020c7a38:
ldr r0, _020c7e9c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084838
bl _ZN10MapManager18func_ov00_02084838Ev
cmp r0, #0
beq _020c7c8c
cmp r7, #3
@@ -5111,10 +5111,10 @@ func_ov00_020c7f98: ; 0x020c7f98
str ip, [sp, #4]
str r7, [sp, #8]
str r3, [sp, #0xc]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r7, r0
mov r0, r4
bl func_ov00_02084120
bl _ZN10MapManager17GetMapData_Unk_4cEv
add r0, r7, r0
str r0, [sp, #0x14]
_020c7ffc:
@@ -7694,10 +7694,10 @@ func_ov00_020ca094: ; 0x020ca094
mov r0, r7
mov r2, #0
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r6, r0
mov r0, r7
bl func_ov00_02084120
bl _ZN10MapManager17GetMapData_Unk_4cEv
add r0, r6, r0
str r0, [r5, #0x4c]
_020ca108:
@@ -8585,7 +8585,7 @@ _020cab14:
ldr r0, _020cace8 ; =data_027e0e60
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_02084164
bl _ZN10MapManager18func_ov00_02084164Ev
cmp r0, #0
beq _020cab8c
ldrb r0, [sp, #4]
@@ -10375,7 +10375,7 @@ func_ov00_020cc180: ; 0x020cc180
add r1, sp, #0
str r2, [sp, #8]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r4, #0x4c]
cmp r1, r0
movge r0, #1
@@ -10465,7 +10465,7 @@ func_ov00_020cc27c: ; 0x020cc27c
add r0, sp, #0
add r2, sp, #4
str r3, [sp, #0xc]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp]
mov r0, r0, lsr #0x5
and r0, r0, #3
@@ -13793,7 +13793,7 @@ func_ov00_020cecd8: ; 0x020cecd8
mov r5, r1
mov r4, r2
mov r7, r3
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
ldr r2, [sp, #0x20]
mov r1, r4
mla r3, r2, r0, r7
@@ -13844,7 +13844,7 @@ func_ov00_020ced7c: ; 0x020ced7c
ldr r0, [r0]
mov r4, r3
mov r6, r1
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
mla r2, r4, r0, r5
ldr r3, [sp, #0x10]
ldr r0, _020cedb8 ; =data_ov00_020eec9c
@@ -14212,7 +14212,7 @@ func_ov00_020cf13c: ; 0x020cf13c
_020cf168:
ldr r0, _020cf1b0 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083588
bl _ZN10MapManager18func_ov00_02083588Ev
mov r2, r0
mov r0, r4
mov r1, r5
@@ -15361,7 +15361,7 @@ _020cfd50:
bne _020cfdb8
ldr r0, _020cfde0 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020849c0
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r3, pc}
@@ -19108,7 +19108,7 @@ func_ov00_020d2d38: ; 0x020d2d38
ldr r0, [r2]
mov r4, r1
add r1, r5, #0x20
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
ldr r1, [r0]
ldr r1, [r1, #0x78]
blx r1
@@ -19166,7 +19166,7 @@ func_ov00_020d2de8: ; 0x020d2de8
ldr r0, [r2]
mov r5, r1
add r1, r6, #0x20
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
mov r4, r0
add r0, sp, #0
bl func_02037628
@@ -20213,7 +20213,7 @@ func_ov00_020d3a04: ; 0x020d3a04
ldr r0, [r0]
mov r2, #0
ldrh r5, [r4, #0x24]
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _020d3afc
ldrb r0, [r4, #0x2a]
@@ -21209,7 +21209,7 @@ func_ov00_020d454c: ; 0x020d454c
add r1, sp, #0
str r2, [sp, #8]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r6, #0x15c]
ldr r1, [r6, #0x48]
mov r0, r5, lsl #0xc
@@ -21278,7 +21278,7 @@ _020d4660:
str r6, [sp, #0x58]
str r4, [sp, #0x60]
str r3, [sp, #0x5c]
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _020d484c ; =data_027e0e60
ldr r6, [sp, #0x58]
ldr r4, [sp, #0x5c]
@@ -21289,7 +21289,7 @@ _020d4660:
str r6, [sp, #0x2c]
str r4, [sp, #0x30]
str r3, [sp, #0x34]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, [sp, #0x58]
ldr r4, [sp, #0x5c]
ldr r3, [sp, #0x60]
@@ -21301,7 +21301,7 @@ _020d4660:
mov r2, #0
str r4, [sp, #0x24]
str r3, [sp, #0x28]
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
mov r4, r0
ldrb r0, [sp, #0x10]
ldrb r1, [sp, #0x11]
@@ -21367,7 +21367,7 @@ _020d4790:
str r2, [sp, #0xc]
mov r2, #0
str r8, [sp, #0x18]
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
ldr r1, [sp, #0xc]
subs r9, r0, r8
str r0, [sp, #4]
@@ -21761,7 +21761,7 @@ _020d4d08:
add r1, sp, #0x10
mov r2, #0
str r3, [sp, #0x18]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r4, r0
cmp r7, #0
beq _020d4d68
@@ -21774,7 +21774,7 @@ _020d4d68:
ldr r0, _020d4de0 ; =data_027e0e60
ldr r5, [r10, #0x4c]
ldr r0, [r0]
bl func_ov00_02084114
bl _ZN10MapManager17GetMapData_Unk_48Ev
cmp r0, r5
addlt r0, r4, #0x33
addlt r0, r0, #0x1300
@@ -22578,10 +22578,10 @@ func_ov00_020d573c: ; 0x020d573c
mov r0, r5
mov r2, #0
str r3, [sp, #0xc]
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
mov r4, r0
mov r0, r5
bl func_ov00_02084120
bl _ZN10MapManager17GetMapData_Unk_4cEv
add r0, r4, r0
str r0, [r10, #0x4c]
_020d57b0:
asm/ov02.inc
+1 -1
View File
@@ -115,7 +115,7 @@
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_0207b1fc
.extern func_ov00_020847e0
.extern _ZN10MapManager18func_ov00_020847e0Ev
.extern func_ov00_0208de04
.extern func_ov00_0208dec8
.extern func_ov00_0208def0
asm/ov02.s
+1 -1
View File
@@ -6631,7 +6631,7 @@ _020f430c:
bl func_ov00_020a1abc
ldr r0, _020f4ce8 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020847e0
bl _ZN10MapManager18func_ov00_020847e0Ev
str r0, [r7, #0x2c]
ldr r0, _020f4cec ; =data_027e0f8c
ldr r1, _020f4cf0 ; =0x020ecdf6
asm/ov03.inc
+18 -18
View File
@@ -266,24 +266,24 @@
.extern func_ov00_0207c0ac
.extern func_ov00_0207c0cc
.extern func_ov00_0207c5b0
.extern func_ov00_02082614
.extern func_ov00_02082acc
.extern func_ov00_02082d08
.extern func_ov00_02082d40
.extern func_ov00_02082d74
.extern func_ov00_0208306c
.extern func_ov00_0208315c
.extern func_ov00_02083394
.extern func_ov00_020833a0
.extern func_ov00_020833ac
.extern func_ov00_020833b8
.extern func_ov00_02083588
.extern func_ov00_020835a4
.extern func_ov00_020835b4
.extern func_ov00_020835c4
.extern func_ov00_020835f4
.extern func_ov00_020836cc
.extern func_ov00_020849c0
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager18func_ov00_02082accEv
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02082d40Ev
.extern _ZN10MapManager18func_ov00_02082d74Ei
.extern _ZN10MapManager18func_ov00_0208306cEv
.extern _ZN10MapManager18func_ov00_0208315cEPiS0_
.extern _ZN10MapManager13GetCourseMinXEv
.extern _ZN10MapManager13GetCourseMinZEv
.extern _ZN10MapManager13GetCourseMaxXEv
.extern _ZN10MapManager13GetCourseMaxZEv
.extern _ZN10MapManager18func_ov00_02083588Ev
.extern _ZN10MapManager18func_ov00_020835a4Ev
.extern _ZN10MapManager18func_ov00_020835b4Ev
.extern _ZN10MapManager18func_ov00_020835c4Eii
.extern _ZN10MapManager18func_ov00_020835f4Ei
.extern _ZN10MapManager18func_ov00_020836ccEjP4AABBj
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern func_ov00_0208b180
.extern func_ov00_0208b694
.extern func_ov00_0208b698
asm/ov03.s
+28 -28
View File
@@ -3625,18 +3625,18 @@ _020f08a4:
ldr r0, _020f0aa4 ; =data_027e0e60
ldr r5, [r0]
mov r0, r5
bl func_ov00_02083394
bl _ZN10MapManager13GetCourseMinXEv
mov r11, r0
mov r0, r5
bl func_ov00_020833a0
bl _ZN10MapManager13GetCourseMinZEv
str r0, [sp]
mov r0, r5
bl func_ov00_020833ac
bl _ZN10MapManager13GetCourseMaxXEv
sub r0, r0, r11
add r4, r0, r0, lsr #31
mov r0, r5
mov r5, r4, asr #0x1
bl func_ov00_020833b8
bl _ZN10MapManager13GetCourseMaxZEv
ldr r1, [sp]
sub r0, r0, r1
mov r1, r5, asr #0x6
@@ -3784,19 +3784,19 @@ func_ov03_020f0aa8: ; 0x020f0aa8
mov r1, r5
ldr r0, [r0]
mov r2, r4
bl func_ov00_0208315c
bl _ZN10MapManager18func_ov00_0208315cEPiS0_
add sp, sp, #0x40
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
_020f0b18:
ldr r0, _020f0b84 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082d40
bl _ZN10MapManager18func_ov00_02082d40Ev
ldr r1, _020f0b84 ; =data_027e0e60
mov r2, r0
ldr r0, [r1]
add r1, sp, #0
bl func_ov00_02082614
bl _ZN10MapManager18func_ov00_02082614Eii
ldr r0, _020f0b88 ; =data_027e0d3c
add r1, sp, #0
ldr r0, [r0]
@@ -3808,7 +3808,7 @@ _020f0b18:
mov r1, r5
ldr r0, [r0]
mov r2, r4
bl func_ov00_0208306c
bl _ZN10MapManager18func_ov00_0208306cEv
add sp, sp, #0x40
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
@@ -3900,7 +3900,7 @@ _020f0c7c:
add r2, sp, #0x24
ldr r0, [r0]
mov r3, #8
bl func_ov00_020836cc
bl _ZN10MapManager18func_ov00_020836ccEjP4AABBj
_020f0ca4:
cmp r0, #0
ble _020f0d74
@@ -9797,7 +9797,7 @@ func_ov03_020f4778: ; 0x020f4778
ldr r0, [r0]
add r1, sp, #4
lsr r2, r2, #0x18
blx func_ov00_02082614
blx _ZN10MapManager18func_ov00_02082614Eii
ldr r0, _020f47dc ; =data_027e0d38
mov r4, #4
ldr r0, [r0]
@@ -9822,7 +9822,7 @@ _020f47b6:
lsl r1, r5, #0x18
ldr r0, [r0]
lsr r1, r1, #0x18
blx func_ov00_02082d74
blx _ZN10MapManager18func_ov00_02082d74Ei
add r2, r0, #0
lsl r0, r5, #0x18
asr r0, r0, #0x18
@@ -10424,11 +10424,11 @@ _020f4ce8:
ldr r0, [r0]
add r1, #0x50
add r2, r4, #0
blx func_ov00_02082614
blx _ZN10MapManager18func_ov00_02082614Eii
ldr r0, _020f4d18 ; =data_027e0e60
add r1, r4, #0
ldr r0, [r0]
blx func_ov00_02082d74
blx _ZN10MapManager18func_ov00_02082d74Ei
add r5, #0x90
strh r0, [r5]
ldr r0, _020f4d1c ; =data_027e077c
@@ -10554,7 +10554,7 @@ func_ov03_020f4de0: ; 0x020f4de0
ldr r5, [r0]
ldr r0, _020f4e4c ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02083588
blx _ZN10MapManager18func_ov00_02083588Ev
ldr r1, _020f4e50 ; =data_ov00_020d878c
add r2, r0, #0
ldr r1, [r1]
@@ -10615,7 +10615,7 @@ func_ov03_020f4e5c: ; 0x020f4e5c
ldr r5, [r0]
ldr r0, _020f4f34 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02083588
blx _ZN10MapManager18func_ov00_02083588Ev
add r1, r4, #0
add r2, r0, #0
add r0, r5, #0
@@ -10623,7 +10623,7 @@ func_ov03_020f4e5c: ; 0x020f4e5c
bl func_ov00_02078e00
ldr r0, _020f4f34 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02082acc
blx _ZN10MapManager18func_ov00_02082accEv
add r0, r4, #0
add r0, #0x99
ldrb r0, [r0]
@@ -10731,7 +10731,7 @@ func_ov03_020f4f4c: ; 0x020f4f4c
ldr r4, [r0]
ldr r0, _020f4fac ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02083588
blx _ZN10MapManager18func_ov00_02083588Ev
add r1, r5, #0
add r2, r0, #0
add r0, r4, #0
@@ -10785,7 +10785,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8
ldrsb r1, [r5, r1]
ldr r0, [r0]
add r2, sp, #0
blx func_ov00_020835c4
blx _ZN10MapManager18func_ov00_020835c4Eii
ldr r0, _020f5000 ; =data_027e0d3c
mov r2, #0x93
ldrsb r2, [r5, r2]
@@ -10798,7 +10798,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8
ldr r0, _020f4ffc ; =data_027e0e60
ldrsb r1, [r5, r1]
ldr r0, [r0]
blx func_ov00_020835f4
blx _ZN10MapManager18func_ov00_020835f4Ei
add r1, r0, #0
add r0, r4, #0
blx func_ov00_020cf414
@@ -12832,7 +12832,7 @@ _020f6578:
bne _020f6600
ldr r0, _020f670c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083588
bl _ZN10MapManager18func_ov00_02083588Ev
cmp r0, #0
subgt r0, r0, #1
mov r4, #0
@@ -14234,7 +14234,7 @@ _020f7760:
bne _020f7794
ldr r0, _020f7bb4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020849c0
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
beq _020f79e0
_020f7794:
@@ -14864,16 +14864,16 @@ func_ov03_020f7f6c: ; 0x020f7f6c
beq _020f7fbc
ldr r0, _020f7fe4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083588
bl _ZN10MapManager18func_ov00_02083588Ev
cmp r0, #0
beq _020f7fbc
ldr r0, _020f7fe4 ; =data_027e0e60
ldr r7, [r0]
mov r0, r7
bl func_ov00_020835a4
bl _ZN10MapManager18func_ov00_020835a4Ev
mov r5, r0
mov r0, r7
bl func_ov00_020835b4
bl _ZN10MapManager18func_ov00_020835b4Ev
cmp r5, r0
movne r6, #1
_020f7fbc:
@@ -14911,7 +14911,7 @@ func_ov03_020f8008: ; 0x020f8008
stmdb sp!, {r3, lr}
ldr r0, _020f8020 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083588
bl _ZN10MapManager18func_ov00_02083588Ev
bl func_ov03_020f805c
ldmia sp!, {r3, pc}
.align 2, 0
@@ -14924,7 +14924,7 @@ func_ov03_020f8024: ; 0x020f8024
stmdb sp!, {r3, lr}
ldr r0, _020f803c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020835a4
bl _ZN10MapManager18func_ov00_020835a4Ev
bl func_ov03_020f805c
ldmia sp!, {r3, pc}
.align 2, 0
@@ -14937,7 +14937,7 @@ func_ov03_020f8040: ; 0x020f8040
stmdb sp!, {r3, lr}
ldr r0, _020f8058 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020835b4
bl _ZN10MapManager18func_ov00_020835b4Ev
bl func_ov03_020f805c
ldmia sp!, {r3, pc}
.align 2, 0
@@ -18003,7 +18003,7 @@ func_ov03_020fa528: ; 0x020fa528
bne _020fa568
ldr r0, _020fa5c8 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
add r0, r0, #0xab
mov r1, #1
strb r1, [r4, #0x14]
asm/ov04.inc
+23 -23
View File
@@ -1,4 +1,27 @@
#pragma once
.extern _ZN10MapManager10DestroyMapEv
.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi
.extern _ZN10MapManager16MapData_vfunc_44Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_9cEv
.extern _ZN10MapManager17GetCourseFilePathEPcS0_
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager17Get_MapData_Unk2aEv
.extern _ZN10MapManager18func_ov00_020825e4Eii
.extern _ZN10MapManager18func_ov00_02082808Ev
.extern _ZN10MapManager18func_ov00_02082914Ei
.extern _ZN10MapManager18func_ov00_02082b3cEi
.extern _ZN10MapManager18func_ov00_02083588Ev
.extern _ZN10MapManager18func_ov00_020838f8EPi
.extern _ZN10MapManager18func_ov00_02083b84Ev
.extern _ZN10MapManager18func_ov00_02083bacEv
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager18func_ov00_02084838Ev
.extern _ZN10MapManager18func_ov00_02084c6cEi
.extern _ZN10MapManager9CreateMapEiii
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager13UnequipPotionEv
.extern _ZN11ItemManager21ClearPrevEquippedItemEv
@@ -425,29 +448,6 @@
.extern func_ov00_0208046c
.extern func_ov00_02080de4
.extern func_ov00_02080edc
.extern func_ov00_0208240c
.extern func_ov00_020825c4
.extern func_ov00_020825e4
.extern func_ov00_020826c0
.extern func_ov00_020827c0
.extern func_ov00_020827f0
.extern func_ov00_02082808
.extern func_ov00_02082914
.extern func_ov00_02082b3c
.extern func_ov00_0208335c
.extern func_ov00_02083368
.extern func_ov00_0208344c
.extern func_ov00_02083588
.extern func_ov00_02083624
.extern func_ov00_020838f8
.extern func_ov00_02083b84
.extern func_ov00_02083bac
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083e34
.extern func_ov00_02083ee0
.extern func_ov00_02084838
.extern func_ov00_02084c6c
.extern func_ov00_02086ea0
.extern func_ov00_020872e8
.extern func_ov00_02087d84
asm/ov04.s
+34 -34
View File
@@ -923,7 +923,7 @@ _0210122a:
str r0, [sp, #4]
ldr r0, _02101388 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02083588
blx _ZN10MapManager18func_ov00_02083588Ev
str r0, [sp, #8]
ldr r0, _02101378 ; =data_027e0d38
ldr r0, [r0]
@@ -974,7 +974,7 @@ _02101292:
ldr r0, _02101388 ; =data_027e0e60
add r1, r5, #4
ldr r0, [r0]
blx func_ov00_02082b3c
blx _ZN10MapManager18func_ov00_02082b3cEi
cmp r6, #0
beq _021012f2
cmp r7, #1
@@ -984,7 +984,7 @@ _02101292:
_021012b0:
ldr r0, _02101388 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02083588
blx _ZN10MapManager18func_ov00_02083588Ev
add r1, r0, #0
ldr r0, [sp, #8]
cmp r1, r0
@@ -2207,7 +2207,7 @@ _02101bda:
ldr r0, _02101c0c ; =data_027e0e60
add r1, r7, #0
ldr r0, [r0]
blx func_ov00_0208344c
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
add r0, r5, #0
add r1, r7, #0
add r2, r5, #0
@@ -2743,7 +2743,7 @@ func_ov04_02101f90: ; 0x02101f90
add r4, r0, #0
blx func_ov00_02095fa4
add r0, r4, #0
blx func_ov00_020827c0
blx _ZN10MapManager10DestroyMapEv
ldr r5, [r4]
cmp r5, #0
beq _02101fb6
@@ -3108,13 +3108,13 @@ func_ov04_02102264: ; 0x02102264
ldrh r2, [r7, #0x24]
ldrh r3, [r7, #0x26]
ldr r1, [r7, #0x20]
blx func_ov00_020826c0
blx _ZN10MapManager9CreateMapEiii
add r0, r5, #0
blx func_ov00_020827f0
blx _ZN10MapManager16MapData_vfunc_44Ev
add r0, r5, #0
add r1, r7, #0
add r2, sp, #0x98
blx func_ov00_020825c4
blx _ZN10MapManager17GetCourseFilePathEPcS0_
mov r0, #0xf
mvn r0, r0
str r0, [sp]
@@ -3190,7 +3190,7 @@ _02102330:
str r0, [sp, #8]
ldr r1, [sp, #8]
add r0, r5, #0
blx func_ov00_020825e4
blx _ZN10MapManager18func_ov00_020825e4Eii
mov r0, #0xf
mvn r0, r0
str r0, [sp]
@@ -3308,7 +3308,7 @@ _02102382:
cmp r0, #3
bne _02102478
add r0, r5, #0
blx func_ov00_0208240c
blx _ZN10MapManager16MapData_vfunc_9cEv
ldr r0, _021024bc ; =data_027e0f64
mov r2, #0
ldr r0, [r0]
@@ -3377,7 +3377,7 @@ func_ov04_021024c4: ; 0x021024c4
blx r7
ldrb r1, [r4, #0x13]
add r0, r5, #0
blx func_ov00_02082914
blx _ZN10MapManager18func_ov00_02082914Ei
ldr r0, _021025b8 ; =data_027e0f6c
mov r1, #0
ldr r0, [r0]
@@ -3390,7 +3390,7 @@ func_ov04_021024c4: ; 0x021024c4
ldrb r2, [r4, #0x13]
add r0, r5, #0
add r1, sp, #0x10
blx func_ov00_02083624
blx _ZN10MapManager14GetEntrancePosEP5Vec3pi
ldr r0, _021025bc ; =data_027e0f90
ldrb r1, [r4, #0x13]
ldr r0, [r0]
@@ -3424,7 +3424,7 @@ func_ov04_021024c4: ; 0x021024c4
blx r1
add r0, r5, #0
add r1, r6, #0
blx func_ov00_02082808
blx _ZN10MapManager18func_ov00_02082808Ev
ldr r0, [r4, #8]
cmp r0, #1
bne _02102578
@@ -7458,7 +7458,7 @@ _021045bc:
ldr r0, _021046bc ; =data_027e0e60
add r1, sp, #0x30
ldr r0, [r0]
blx func_ov00_0208344c
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
mov r1, #0
ldr r0, [sp, #0x30]
str r1, [sp, #0x1c]
@@ -7528,7 +7528,7 @@ _02104682:
ldr r0, _021046bc ; =data_027e0e60
add r1, sp, #0x18
ldr r0, [r0]
blx func_ov00_020838f8
blx _ZN10MapManager18func_ov00_020838f8EPi
add r2, sp, #0x54
strb r0, [r2, #0xf]
ldr r0, [r6, #0x40]
@@ -9866,7 +9866,7 @@ func_ov04_021058cc: ; 0x021058cc
beq _021058f6
ldr r0, _02105948 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02084838
blx _ZN10MapManager18func_ov00_02084838Ev
cmp r0, #0
beq _021058f4
mov r6, #0x40
@@ -16582,7 +16582,7 @@ _02108c18:
ldrh r1, [r4, #0x14]
ldr r0, [r0]
lsr r1, r1, #4
blx func_ov00_02083b84
blx _ZN10MapManager18func_ov00_02083b84Ev
add r7, r0, #0
ldrh r0, [r4, #0x14]
lsr r2, r0, #0x1f
@@ -16605,7 +16605,7 @@ _02108c18:
ldr r0, _02108d20 ; =data_027e0e60
lsr r1, r7, #4
ldr r0, [r0]
blx func_ov00_02083bac
blx _ZN10MapManager18func_ov00_02083bacEv
str r0, [sp, #0x14]
lsr r2, r7, #0x1f
lsl r1, r7, #0x1c
@@ -16796,11 +16796,11 @@ func_ov04_02108de0: ; 0x02108de0
add r7, r1, #0
ldr r0, [r0]
str r2, [sp, #4]
blx func_ov00_0208335c
blx _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #0xc]
ldr r0, _02109090 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02083368
blx _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp, #8]
ldrh r0, [r7, #8]
mov r5, #0
@@ -17211,11 +17211,11 @@ func_ov04_021090c8: ; 0x021090c8
str r1, [sp, #4]
ldr r0, [r0]
str r2, [sp, #8]
blx func_ov00_0208335c
blx _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #0x18]
ldr r0, _021092d0 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02083368
blx _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp, #0x14]
ldr r0, [sp, #4]
mov r4, #0
@@ -17275,7 +17275,7 @@ _0210914a:
ldr r0, [r0]
lsl r1, r1, #0x10
lsr r1, r1, #0x10
blx func_ov00_02084c6c
blx _ZN10MapManager18func_ov00_02084c6cEi
cmp r0, #0
bne _0210916c
add r0, sp, #0x5c
@@ -17292,7 +17292,7 @@ _0210916e:
ldr r0, _021092d0 ; =data_027e0e60
add r1, r7, #0
ldr r0, [r0]
blx func_ov00_02083c24
blx _ZN10MapManager18func_ov00_02083c24Ei
add r7, r0, #0
ldr r0, [sp, #0x10]
mov r1, #1
@@ -17304,7 +17304,7 @@ _0210916e:
ldr r0, _021092d0 ; =data_027e0e60
add r1, r6, #0
ldr r0, [r0]
blx func_ov00_02083c50
blx _ZN10MapManager18func_ov00_02083c50Ei
add r6, r0, #0
ldr r0, [sp, #0xc]
mov r1, #1
@@ -17320,7 +17320,7 @@ _0210916e:
add r1, sp, #0x7c
ldr r0, [r0]
mov r2, #0
blx func_ov00_02083ee0
blx _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, [sp, #0x5c]
ldr r1, _021092d4 ; =0x414e4353
str r0, [sp, #0x80]
@@ -17766,7 +17766,7 @@ _021094b2:
ldr r0, _021095b0 ; =data_027e0e60
add r1, r7, #0
ldr r0, [r0]
blx func_ov00_02083c50
blx _ZN10MapManager18func_ov00_02083c50Ei
str r0, [sp, #0x10]
lsr r2, r5, #0x1f
lsl r1, r5, #0x1c
@@ -17785,12 +17785,12 @@ _021094b2:
ldr r0, _021095b0 ; =data_027e0e60
ldr r1, [sp, #0xc]
ldr r0, [r0]
blx func_ov00_02083e34
blx _ZN10MapManager18func_ov00_02083e34Ecci
add r5, r0, #0
ldr r0, _021095b0 ; =data_027e0e60
ldr r1, [sp, #0xc]
ldr r0, [r0]
blx func_ov00_02083c24
blx _ZN10MapManager18func_ov00_02083c24Ei
add r7, r0, #0
lsr r2, r6, #0x1f
lsl r1, r6, #0x1c
@@ -17944,7 +17944,7 @@ _021095ec:
add r1, r6, r1
ldr r0, [r0]
asr r1, r1, #4
blx func_ov00_02083bac
blx _ZN10MapManager18func_ov00_02083bacEv
str r0, [sp, #0x10]
lsr r2, r6, #0x1f
lsl r1, r6, #0x1c
@@ -17984,7 +17984,7 @@ _021095ec:
ldr r0, [r0]
add r2, r1, r2
asr r1, r2, #4
blx func_ov00_02083b84
blx _ZN10MapManager18func_ov00_02083b84Ev
add r7, r0, #0
ldr r0, [sp, #8]
ldr r1, [sp, #8]
@@ -24828,7 +24828,7 @@ func_ov04_0210cb38: ; 0x0210cb38
ldr r0, _0210cc0c ; =data_027e0e60
add r1, sp, #0x74
ldr r0, [r0]
blx func_ov00_0208344c
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
mov r0, #0
str r0, [sp]
ldr r0, _0210cc10 ; =data_027e0fe8
@@ -24860,7 +24860,7 @@ _0210cb7a:
ldr r0, _0210cc0c ; =data_027e0e60
add r1, sp, #0x3c
ldr r0, [r0]
blx func_ov00_0208344c
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
mov r0, #0
str r0, [sp]
ldr r0, _0210cc10 ; =data_027e0fe8
@@ -24889,7 +24889,7 @@ _0210cbc2:
ldr r0, _0210cc0c ; =data_027e0e60
add r1, sp, #4
ldr r0, [r0]
blx func_ov00_0208344c
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
mov r0, #0
str r0, [sp]
ldr r0, _0210cc10 ; =data_027e0fe8
asm/ov05.inc
+23 -23
View File
@@ -335,29 +335,29 @@
.extern func_ov00_0207dea0
.extern func_ov00_02080de8
.extern func_ov00_02081f4c
.extern func_ov00_02082424
.extern func_ov00_020828e0
.extern func_ov00_02082d08
.extern func_ov00_0208344c
.extern func_ov00_02083664
.extern func_ov00_020839d4
.extern func_ov00_020839f8
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083c7c
.extern func_ov00_02083e34
.extern func_ov00_02083ee0
.extern func_ov00_02083f44
.extern func_ov00_02083fb0
.extern func_ov00_020840a0
.extern func_ov00_020840c4
.extern func_ov00_0208430c
.extern func_ov00_02084318
.extern func_ov00_02084740
.extern func_ov00_020848b8
.extern func_ov00_0208527c
.extern func_ov00_0208583c
.extern _ZN10MapManager18func_ov00_02082424Ev
.extern _ZN10MapManager16MapData_vfunc_84Ev
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083664EP5Vec3pi
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager17GetMapData_Unk_0aEv
.extern _ZN10MapManager17GetMapData_Unk_0bEv
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_020848b8Ev
.extern _ZN10MapManager18func_ov00_0208527cEv
.extern _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
.extern func_ov00_0208726c
.extern func_ov00_020872e8
.extern func_ov00_0208766c
asm/ov05.s
+59 -59
View File
@@ -606,7 +606,7 @@ _02101280:
bne _02101338
ldr r0, _02101420 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020828e0
bl _ZN10MapManager16MapData_vfunc_84Ev
ldr r3, [r8]
ldr r1, [r10, #0x18]
ldrb r7, [r3, #0x14]
@@ -1342,12 +1342,12 @@ _02101c04:
bne _02101c90
ldr r0, _021021dc ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, #2
beq _02101c44
ldr r0, _021021dc ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, #3
bne _02101c90
_02101c44:
@@ -1563,7 +1563,7 @@ _02101f18:
ldmneia sp!, {r4, r5, r6, pc}
ldr r0, _021021dc ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084740
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
ldr r2, [r6, #4]
ldr r0, _021021ec ; =data_ov00_020eec68
@@ -2399,7 +2399,7 @@ func_ov05_02102b0c: ; 0x02102b0c
mov r2, r7
mov r6, r3
str r5, [r4]
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
cmp r0, #0x30
bgt _02102b9c
cmp r0, #0x28
@@ -2588,11 +2588,11 @@ _02102d6c:
cmp r0, #0
bne _02102dd8
ldr r0, [sp, #0x44]
bl func_ov00_0208430c
bl _ZN10MapManager17GetMapData_Unk_0aEv
cmp r0, #0
bne _02102dd8
ldr r0, [sp, #0x44]
bl func_ov00_02084318
bl _ZN10MapManager17GetMapData_Unk_0bEv
cmp r0, #0
beq _02102de0
_02102dd8:
@@ -2608,7 +2608,7 @@ _02102de0:
streq r0, [sp, #0x30]
beq _02102e0c
ldr r0, [sp, #0x44]
bl func_ov00_02082424
bl _ZN10MapManager18func_ov00_02082424Ev
str r0, [sp, #0x30]
_02102e0c:
ldr r0, [sp, #0x28]
@@ -2641,7 +2641,7 @@ _02102e24:
ldr r1, [sp, #0x44]
add r0, sp, #0x74
add r2, sp, #0x78
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
add r0, sp, #0x74
bl func_ov05_02103b2c
cmp r0, #2
@@ -2659,7 +2659,7 @@ _02102e24:
ldr r0, [sp, #0x44]
add r1, sp, #0x84
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r6, #0x14]
add r0, sp, #0x84
bl func_0202bac0
@@ -2697,11 +2697,11 @@ _02102ee8:
bne _0210314c
ldr r1, [r7]
ldr r0, [sp, #0x44]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
mov r9, r0
ldr r0, [sp, #0x44]
ldr r1, [r7, #8]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
str r0, [sp, #0x34]
ldr r1, [sp, #0x34]
mov r0, r9
@@ -3331,7 +3331,7 @@ func_ov05_0210373c: ; 0x0210373c
mov r1, r6
mov r8, r2
mov r11, r3
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
ldr r1, [sp, #0x38]
str r0, [sp]
cmp r1, r0
@@ -3375,7 +3375,7 @@ func_ov05_0210373c: ; 0x0210373c
str r3, [sp, #4]
str r7, [sp, #8]
str r6, [sp, #0xc]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r8, r0
str r0, [r5, #0x14]
mov r2, #1
@@ -3394,7 +3394,7 @@ _02103838:
ldr r3, [r7, #8]
ldr r2, [sp]
str r3, [r5, #0x18]
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r5, #0x14]
mov r2, #1
_02103878:
@@ -3439,7 +3439,7 @@ func_ov05_021038c8: ; 0x021038c8
mov r1, r6
mov r8, r2
mov r5, r3
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
mov r11, r0
cmp r5, r11
beq _02103a90
@@ -3482,7 +3482,7 @@ func_ov05_021038c8: ; 0x021038c8
str r6, [sp, #0xc]
str r3, [sp, #0x10]
str r4, [sp, #0x14]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r8, r0
str r0, [r5, #0x14]
mov r2, #1
@@ -3503,7 +3503,7 @@ _021039c0:
str r6, [sp]
str r3, [sp, #4]
str r4, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
sub r0, r0, r8
str r0, [r5, #0x14]
mov r2, #1
@@ -3523,7 +3523,7 @@ _02103a10:
ldr r3, [r7, #8]
mov r1, r11
str r3, [r5, #0x18]
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r5, #0x14]
mov r2, #1
_02103a54:
@@ -6074,7 +6074,7 @@ _021059f0:
mov r1, r3
ldr r0, [r0]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, _02105c08 ; =data_ov05_021124f0
str r0, [r6, #0x3c]
ldr r1, [r2, #0x20]
@@ -7378,7 +7378,7 @@ func_ov05_02106bbc: ; 0x02106bbc
strb r2, [r1, #1]
ldr r2, [r1]
mov r1, r4
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
_02106c64:
@@ -7713,7 +7713,7 @@ _0210707c:
str r4, [sp, #0x1c]
str r6, [sp, #0x24]
str r5, [sp, #0x20]
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
mov r8, r0
mov r0, r7
bl _ZN13LinkStateBase12GetPlayerPosEv
@@ -7728,7 +7728,7 @@ _0210707c:
str r4, [sp, #0x10]
str r5, [sp, #0x14]
str r6, [sp, #0x18]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r8, r0
_02107148:
mov r0, r7
@@ -8389,7 +8389,7 @@ _02107a18:
mov r2, r0
add r0, sp, #2
mov r1, r5
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mov r2, #0
ldrb r1, [sp, #2]
ldrb r0, [sp, #3]
@@ -10030,7 +10030,7 @@ _02109018:
_02109060:
ldr r0, _02109294 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084740
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
ldr r0, _0210928c ; =data_ov00_020eec68
mov r2, #0
@@ -10970,7 +10970,7 @@ _02109d0c:
add r1, r7, #0x40
ldr r0, [r0]
mov r2, #1
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
str r0, [r7, #0x44]
mov r0, #0xd
str r0, [r7, #4]
@@ -11805,12 +11805,12 @@ _0210a830:
add r0, sp, #0x14
ldr r1, [r1]
add r2, sp, #0x2c
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0210aad8 ; =data_027e0e60
add r1, sp, #0x14
ldr r0, [r0]
mov r5, #0
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
beq _0210a904
ldrsb r0, [r0, #0x12]
@@ -11836,7 +11836,7 @@ _0210a830:
ldr r2, [r0]
add r1, sp, #0x2c
mov r0, r7
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
cmp r0, #0
blt _0210a904
mov r0, r4
@@ -11871,7 +11871,7 @@ _0210a904:
add r1, sp, #0x2c
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [sp, #0x30]
cmp r1, r0
movlt r5, #0
@@ -12408,7 +12408,7 @@ _0210ae98:
str r7, [sp, #0x10]
str r6, [sp, #0x14]
str r3, [sp, #0x18]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp, #0xc]
mov r0, r0, lsr #0x5
and r0, r0, #3
@@ -12823,10 +12823,10 @@ _0210b684:
ldr r4, [r1]
add r2, r5, #0x24
mov r1, r4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #0x12
mov r0, r4
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r4, r0
beq _0210b6d0
ldr r1, [r0]
@@ -12871,10 +12871,10 @@ _0210b73c:
add r0, sp, #0x10
mov r1, r4
add r2, r5, #0x24
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #0x10
mov r0, r4
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
beq _0210b788
ldr r1, [r0]
@@ -12917,7 +12917,7 @@ _0210b7dc:
mov r4, r0
ldrb r1, [r5, #0x20]
mov r0, r6
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [r4]
ldr r1, _0210b968 ; =data_027e0e60
mov r0, r5
@@ -12926,7 +12926,7 @@ _0210b7dc:
mov r4, r0
ldrb r1, [r5, #0x21]
mov r0, r6
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
str r0, [r4, #8]
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerVelEv
@@ -13072,7 +13072,7 @@ func_ov05_0210b9c4: ; 0x0210b9c4
add r1, sp, #0
mov r2, #3
str r3, [sp, #8]
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
mov r1, r0
mov r0, r5
bl _ZN12ActorManager13FindActorByIdEj
@@ -13144,7 +13144,7 @@ func_ov05_0210babc: ; 0x0210babc
add r1, sp, #0
mov r2, #5
str r3, [sp, #8]
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
_0210bb10:
@@ -13204,10 +13204,10 @@ func_ov05_0210bb98: ; 0x0210bb98
ldr r4, [r1]
add r2, r5, #0x24
mov r1, r4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #0
mov r0, r4
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r4, r0
beq _0210bc04
ldr r0, _0210bd5c ; =gAdventureFlags
@@ -13339,10 +13339,10 @@ func_ov05_0210bd70: ; 0x0210bd70
ldr r4, [r1]
add r2, r5, #0x24
mov r1, r4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #0
mov r0, r4
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r4, r0
beq _0210bdd8
ldr r1, [r0]
@@ -13671,7 +13671,7 @@ func_ov05_0210c20c: ; 0x0210c20c
strb r1, [r3, #1]
ldr r2, [r3]
add r1, sp, #0x6c
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
mov r0, r7
bl _ZN13LinkStateBase12GetPlayerPosEv
mov r1, r0
@@ -13756,7 +13756,7 @@ _0210c398:
add r1, r5, #0x18
ldr r0, [r0]
add r2, r7, #0x24
bl func_ov00_0208527c
bl _ZN10MapManager18func_ov00_0208527cEv
mov r6, r0
add r1, sp, #0x54
mov r0, r7
@@ -13850,7 +13850,7 @@ _0210c4d8:
add r1, sp, #0x3c
mov r2, #0xe
str r3, [sp, #0x44]
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
add sp, sp, #0x78
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -13872,7 +13872,7 @@ _0210c540:
add r1, sp, #0x30
mov r2, #4
str r3, [sp, #0x38]
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
mov r4, r0
bl func_ov05_0210c980
mov r1, r4
@@ -13962,13 +13962,13 @@ _0210c680:
add r1, sp, #0x24
mov r2, #7
str r3, [sp, #0x2c]
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
str r0, [r7, #0x10]
ldr r1, _0210c950 ; =data_027e0e60
add r0, sp, #6
ldr r1, [r1]
add r2, r7, #0x24
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r3, [sp, #6]
ldrb r2, [sp, #7]
ldr r0, _0210c968 ; =0x00020007
@@ -14058,7 +14058,7 @@ _0210c7cc:
add r1, sp, #0x18
mov r2, #0xb
str r3, [sp, #0x20]
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
_0210c818:
add sp, sp, #0x78
mov r0, #1
@@ -14079,7 +14079,7 @@ _0210c824:
ldr r0, [r1]
add r1, sp, #0xc
mov r2, #0xc
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
mov r1, r0
mov r0, r4
ldr r4, [r0]
@@ -14200,10 +14200,10 @@ _0210c9e8:
ldr r6, [r1]
add r2, r4, #0x24
mov r1, r6
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #0
mov r0, r6
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r6, r0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, r5, r6, pc}
@@ -16376,7 +16376,7 @@ _0210e6d8:
ldr r2, [r0]
ldr r0, [r1]
add r1, r2, #0xc4
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
mov r4, r0
_0210e72c:
ldr r1, _0210e884 ; =data_027e0fd4
@@ -16508,7 +16508,7 @@ func_ov05_0210e8b4: ; 0x0210e8b4
ldrh r2, [r5, #0xe]
ldr r0, [r0]
add r1, sp, #4
bl func_ov00_02083664
bl _ZN10MapManager18func_ov00_02083664EP5Vec3pi
ldr r2, [sp, #0xc]
ldr r1, [sp, #8]
ldr r0, [sp, #4]
@@ -18865,7 +18865,7 @@ func_ov05_021109c0: ; 0x021109c0
ldr r0, [r2]
add r1, r1, #0x1c
mov r4, #0x13
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
mov r5, r0
mov r0, r6
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
@@ -19406,7 +19406,7 @@ _02111100:
add r1, sp, #0xc
mov r0, r5
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r4, #4]
mov r5, #0x4000
sub r4, r1, r0
@@ -20209,7 +20209,7 @@ func_ov05_02111c00: ; 0x02111c00
ldr r0, _02111c68 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r0, [r5, #0x140]
add r1, sp, #0
ldr r2, [r0]
@@ -20448,7 +20448,7 @@ func_ov05_02111f40: ; 0x02111f40
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _02111fb0 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020848b8
bl _ZN10MapManager18func_ov00_020848b8Ev
cmp r0, #0
ldmneia sp!, {r3, r4, r5, pc}
bl func_ov15_0215b780
asm/ov09.inc
+8 -8
View File
@@ -230,14 +230,14 @@
.extern func_ov00_0207c1f8
.extern func_ov00_0207c358
.extern func_ov00_0207c444
.extern func_ov00_020820ec
.extern func_ov00_020820fc
.extern func_ov00_0208210c
.extern func_ov00_02082614
.extern func_ov00_02082908
.extern func_ov00_02082adc
.extern func_ov00_02083ee0
.extern func_ov00_020848b8
.extern _ZN10MapManager18func_ov00_020820ecEPi
.extern _ZN10MapManager18func_ov00_020820fcEiii
.extern _ZN10MapManager18func_ov00_0208210cEii
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager20GetCourseData_Unk_b0Ev
.extern _ZN10MapManager18func_ov00_02082adcEv
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_020848b8Ev
.extern func_ov00_02087d34
.extern func_ov00_020a5e9c
.extern func_ov00_020a61ac
asm/ov09.s
+8 -8
View File
@@ -3218,7 +3218,7 @@ func_ov09_02114554: ; 0x02114554
blx func_020078f4
add r0, r7, #0
add r1, sp, #0x14
blx func_ov00_020820ec
blx _ZN10MapManager18func_ov00_020820ecEPi
ldr r0, _021146b0 ; =data_027e0d38
ldr r0, [r0]
add r0, #0xc
@@ -3242,7 +3242,7 @@ func_ov09_02114554: ; 0x02114554
str r0, [sp, #8]
_021145b6:
add r0, r7, #0
blx func_ov00_02082908
blx _ZN10MapManager20GetCourseData_Unk_b0Ev
add r4, sp, #0x1c
str r0, [sp, #0xc]
mov r0, #0
@@ -3271,7 +3271,7 @@ _021145f2:
add r1, r4, #0
add r2, sp, #0x10
add r3, sp, #0x1c
blx func_ov00_020820fc
blx _ZN10MapManager18func_ov00_020820fcEiii
add r0, sp, #0x10
ldrh r1, [r0]
cmp r1, #0xcf
@@ -3323,7 +3323,7 @@ _02114634:
ldr r1, [sp, #4]
add r0, r7, #0
add r2, r4, #0
blx func_ov00_0208210c
blx _ZN10MapManager18func_ov00_0208210cEii
mov r0, #0x71
lsl r0, r0, #2
str r0, [sp]
@@ -3347,7 +3347,7 @@ _02114688:
bl func_ov09_02114520
ldr r0, _021146ac ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02082adc
blx _ZN10MapManager18func_ov00_02082adcEv
add sp, #0x1ec
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -16512,7 +16512,7 @@ func_ov09_0211c3d8: ; 0x0211c3d8
add r4, r0, #0
ldr r0, _0211c418 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_020848b8
blx _ZN10MapManager18func_ov00_020848b8Ev
strb r0, [r4, #0xa]
ldr r5, [r4, #4]
cmp r5, #0
@@ -18385,7 +18385,7 @@ func_ov09_0211d180: ; 0x0211d180
mov r2, r6
str r3, [sp, #0x94]
str r9, [sp, #0x98]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [sp, #0x94]
cmp r1, r0
movle r6, #1
@@ -18858,7 +18858,7 @@ _0211d86e:
add r0, r4, #0
add r1, r7, #0
add r2, r5, #0
blx func_ov00_02082614
blx _ZN10MapManager18func_ov00_02082614Eii
add r0, r7, #0
add r1, r6, #0
blx strcmp
asm/ov12.inc
+18 -18
View File
@@ -1,6 +1,24 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager17GetMapData_Unk_48Ev
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager17Get_MapData_Unk2aEv
.extern _ZN10MapManager18Get_MapData_Unk_d0Ev
.extern _ZN10MapManager18Get_MapData_Unk_d8Ev
.extern _ZN10MapManager18func_ov00_02083664EP5Vec3pi
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_020839b4Ei
.extern _ZN10MapManager18func_ov00_020839c4Ei
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase9AddHealthEs
@@ -357,24 +375,6 @@
.extern func_ov00_0207f588
.extern func_ov00_020807d4
.extern func_ov00_02081f4c
.extern func_ov00_0208335c
.extern func_ov00_02083368
.extern func_ov00_020833f4
.extern func_ov00_02083400
.extern func_ov00_02083664
.extern func_ov00_02083770
.extern func_ov00_020838e8
.extern func_ov00_020839b4
.extern func_ov00_020839c4
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083e34
.extern func_ov00_02083ee0
.extern func_ov00_02083ef8
.extern func_ov00_02083fb0
.extern func_ov00_020840a0
.extern func_ov00_02084114
.extern func_ov00_020872e8
.extern func_ov00_02087d84
.extern func_ov00_0208819c
asm/ov12.s
+54 -54
View File
@@ -935,7 +935,7 @@ func_ov12_02113720: ; 0x02113720
mov r4, r0
ldr r0, [r2]
mov r5, r1
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldrb r1, [r4, #1]
sub r0, r5, r0
mov r3, r0, asr #0x6
@@ -969,7 +969,7 @@ func_ov12_02113790: ; 0x02113790
mov r4, r0
ldr r0, [r2]
mov r5, r1
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldrb r1, [r4, #3]
sub r0, r5, r0
mov r2, r0, asr #0x6
@@ -1008,7 +1008,7 @@ func_ov12_021137e8: ; 0x021137e8
orrne r4, r4, #0x3fc0000
ldr r0, [r0]
orrne r4, r4, #0xfc000000
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
add r0, r4, r0
ldmia sp!, {r4, pc}
.align 2, 0
@@ -1031,7 +1031,7 @@ func_ov12_02113838: ; 0x02113838
orrne r4, r4, #0x3fc0000
ldr r0, [r0]
orrne r4, r4, #0xfc000000
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
add r0, r4, r0
ldmia sp!, {r4, pc}
.align 2, 0
@@ -6740,13 +6740,13 @@ func_ov12_02118428: ; 0x02118428
add r1, sp, #0xbc
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, _02118808 ; =data_027e0e60
str r0, [sp, #0x9c]
ldr r0, [r1]
add r1, sp, #0xbc
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0xa8]
add r0, sp, #0x8c
bl func_01ff9cec
@@ -6884,7 +6884,7 @@ _02118740:
ldr r0, [r11]
mov r1, r7
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [sp, #0x68]
str r0, [sp, #0x6c]
str r0, [sp, #0xa8]
@@ -8230,12 +8230,12 @@ func_ov12_021196d4: ; 0x021196d4
add r0, sp, #0
ldr r1, [r1]
mov r2, r4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0211977c ; =data_027e0e60
ldrb r1, [sp]
ldrb r2, [sp, #1]
ldr r0, [r0]
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
cmp r0, #0x18
bgt _0211973c
bge _02119754
@@ -8365,7 +8365,7 @@ func_ov12_0211986c: ; 0x0211986c
mov r5, r0
ldr r0, [r2]
mov r4, r1
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r2, [r4]
ldrb r1, [r5, #0x118]
sub r0, r2, r0
@@ -8397,7 +8397,7 @@ func_ov12_0211986c: ; 0x0211986c
orr r1, r2, r1, asr #3
strb r1, [r5, #0x11a]
ldr r0, [r0]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldr r2, [r4, #8]
ldrb r1, [r5, #0x11a]
sub r0, r2, r0
@@ -8442,7 +8442,7 @@ func_ov12_02119968: ; 0x02119968
orrne r6, r6, #0x3fc0000
ldr r0, [r0]
orrne r6, r6, #0xfc000000
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
add r0, r6, r0
str r0, [r4]
ldrb r1, [r5, #0x119]
@@ -8472,7 +8472,7 @@ func_ov12_02119968: ; 0x02119968
orrne r5, r5, #0x3fc0000
ldr r0, [r0]
orrne r5, r5, #0xfc000000
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
add r0, r5, r0
str r0, [r4, #8]
ldmia sp!, {r4, r5, r6, pc}
@@ -9492,7 +9492,7 @@ _0211a834:
add r1, sp, #8
ldr r0, [r0]
mov r2, r4
bl func_ov00_02083664
bl _ZN10MapManager18func_ov00_02083664EP5Vec3pi
cmp r0, #0
beq _0211a884
mov r0, #1
@@ -10865,7 +10865,7 @@ func_ov12_0211b9c4: ; 0x0211b9c4
str r2, [sp, #8]
add r1, sp, #0
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r6, r8]
add r2, r0, #0x148
cmp r1, r2
@@ -27793,11 +27793,11 @@ func_ov12_021296a4: ; 0x021296a4
bl func_ov12_0212a258
ldr r0, _0212975c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _0212975c ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldrb r1, [r5, #0x11b]
cmp r1, #0
ldmneia sp!, {r3, r4, r5, pc}
@@ -28547,7 +28547,7 @@ func_ov12_0212a104: ; 0x0212a104
bge _0212a15c
ldr r0, _0212a164 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084114
bl _ZN10MapManager17GetMapData_Unk_48Ev
ldr r1, [r5, #0x4c]
cmp r1, r0
ble _0212a15c
@@ -28573,12 +28573,12 @@ func_ov12_0212a168: ; 0x0212a168
ldr r1, [r2]
add r0, sp, #0
add r2, r5, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0212a230 ; =data_027e0e60
ldrb r1, [sp]
ldrb r2, [sp, #1]
ldr r0, [r0]
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
cmp r0, #0x18
bgt _0212a1e0
cmp r0, #0x17
@@ -28872,11 +28872,11 @@ _0212a520:
bl func_ov12_0212a234
ldr r0, _0212a618 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _0212a618 ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldrb r1, [r5, #0x24c]
ldr ip, [sp]
bic r3, r1, #0xe0
@@ -29016,7 +29016,7 @@ _0212a740:
add r1, sp, #0x14
str r2, [sp, #0x1c]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r6, #0x22c]
mvn r4, #0
bl func_ov00_02079e3c
@@ -29029,12 +29029,12 @@ _0212a740:
add r0, sp, #0
ldr r1, [r1]
add r2, r6, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0212a9ec ; =data_027e0e60
ldrb r1, [sp]
ldrb r2, [sp, #1]
ldr r0, [r0]
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
mov r1, r4
str r1, [r6, #0x238]
mov r1, #0
@@ -29082,7 +29082,7 @@ _0212a830:
add r0, sp, #4
add r2, sp, #8
str r3, [sp, #0x10]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp, #4]
mov r0, r0, lsr #0x9
and r0, r0, #3
@@ -29259,13 +29259,13 @@ func_ov12_0212aa8c: ; 0x0212aa8c
ldr r0, [r1]
mov r1, #0
str r1, [sp, #8]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
mov r1, #3
mov r7, r0
bl func_01ff9b4c
ldr r0, _0212ad00 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp]
mov r0, #0
ldr r4, _0212ad04 ; =data_027e0764
@@ -29324,7 +29324,7 @@ _0212ab90:
mov r1, r8
ldr r0, [r0]
mov r2, r9
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
mov r5, r0
ldr r0, _0212ad00 ; =data_027e0e60
ldr r2, _0212ad08 ; =func_ov00_020b1940
@@ -29337,7 +29337,7 @@ _0212ab90:
mov r0, r6
mov r1, r8
mov r2, r9
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
ldr r1, [r10, #0x18]
cmp r0, r1
bne _0212acec
@@ -29348,13 +29348,13 @@ _0212ab90:
beq _0212acec
mov r1, r8
mov r0, r6
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [sp, #0x24]
ldr r2, [r10, #0x4c]
mov r1, r9
mov r0, r6
str r2, [sp, #0x28]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
str r0, [sp, #0x2c]
mov r0, r10
add r1, sp, #0x24
@@ -29370,7 +29370,7 @@ _0212ab90:
mov r0, r6
add r1, sp, #0x18
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r0, [sp, #0x28]
ldr r1, [sp, #0x24]
str r0, [sp, #0x10]
@@ -29381,7 +29381,7 @@ _0212ab90:
str r1, [sp, #0x14]
mov r1, #0xe
add r2, sp, #0xc
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -29717,12 +29717,12 @@ _0212b0bc:
add r0, sp, #0
ldr r1, [r1]
add r2, r4, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0212b13c ; =data_027e0e60
ldrb r1, [sp]
ldrb r2, [sp, #1]
ldr r0, [r0]
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
cmp r0, #0x18
cmpne r0, #0x2c
cmpne r0, #0x2d
@@ -30531,7 +30531,7 @@ func_ov12_0212ba84: ; 0x0212ba84
ldrb r1, [r6, #1]
ldr r0, [r2]
mov r5, r3
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r4, r0
mov r0, r8
ldr r2, [r0]
@@ -30542,7 +30542,7 @@ func_ov12_0212ba84: ; 0x0212ba84
mov r9, r0
ldr r0, [r1]
ldrb r1, [r6]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [sp, #0x10]
str r9, [sp, #0x14]
str r4, [sp, #0x18]
@@ -33924,11 +33924,11 @@ func_ov12_0212e3e8: ; 0x0212e3e8
_0212e42c:
ldr r0, _0212e4cc ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _0212e4cc ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldrb r2, [r5, #0x218]
ldrb r1, [r5, #0x219]
ldrb ip, [r5, #0x21a]
@@ -34460,11 +34460,11 @@ _0212eb6c:
orr r1, r2, r1, lsr #26
strb r1, [r5, #0x218]
ldr r0, [r0]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _0212eca8 ; =data_027e0e60
mov r6, r0
ldr r0, [r1]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldr r2, [r5, #0x48]
ldrb r1, [r5, #0x218]
sub r2, r2, r6
@@ -34542,7 +34542,7 @@ func_ov12_0212ecb0: ; 0x0212ecb0
ldr r1, [r1]
add r0, sp, #0
add r2, r4, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r1, [r4, #0x48]
ldr r0, _0212ed4c ; =data_027e0e60
str r1, [sp, #8]
@@ -34553,7 +34553,7 @@ func_ov12_0212ecb0: ; 0x0212ecb0
add r0, sp, #4
add r2, sp, #8
str r3, [sp, #0x10]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldrb r1, [sp]
ldrb r0, [sp, #1]
sub r2, sp, #4
@@ -35602,7 +35602,7 @@ _0212fa9c:
ldr r0, _0212fb04 ; =data_027e0e60
add r1, r6, #0x74
ldr r0, [r0]
bl func_ov00_020839c4
bl _ZN10MapManager18func_ov00_020839c4Ei
mov r0, r6
bl func_ov12_021306ec
add r0, r6, #0xd8
@@ -35651,7 +35651,7 @@ _0212fb40:
ldr r0, _0212fba0 ; =data_027e0e60
add r1, r6, #0x74
ldr r0, [r0]
bl func_ov00_020839c4
bl _ZN10MapManager18func_ov00_020839c4Ei
mov r0, r6
bl func_ov12_021306ec
add r0, r6, #0xd8
@@ -35829,7 +35829,7 @@ _0212fc68:
str r3, [r4, #0x84]
strb r2, [r4, #0x78]
ldr r0, [r0]
bl func_ov00_020839b4
bl _ZN10MapManager18func_ov00_020839b4Ei
mov r0, r4
bl func_ov12_021306b0
ldr r0, _0212fea0 ; =0x0000026e
@@ -36741,11 +36741,11 @@ func_ov12_02130994: ; 0x02130994
ldr r1, _02130a90 ; =data_027e0e60
mov r5, r0
ldr r0, [r1]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _02130a90 ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldrb r1, [r5, #0x73a]
ldrb r2, [r5, #0x739]
mov r1, r1, lsl #0x1c
@@ -37609,7 +37609,7 @@ func_ov12_021314e8: ; 0x021314e8
str ip, [sp, #4]
ldr ip, [r4, #0x5c]
str ip, [sp, #8]
bl func_ov00_02083ef8
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
ldr r1, _021315b8 ; =data_ov12_02137680
str r0, [r4, #0x4c]
ldr r2, [r1, #0x28]
@@ -38134,11 +38134,11 @@ _02131c90:
beq _02131d64
ldr r0, _02131d78 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _02131d78 ; =data_027e0e60
mov r5, r0
ldr r0, [r1]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldr r2, [r4, #0x73c]
ldrb r1, [r4, #0x739]
sub r2, r2, r5
@@ -38700,7 +38700,7 @@ func_ov12_0213234c: ; 0x0213234c
add r2, sp, #0
str r1, [sp, #8]
ldr r1, [r3, #4]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
add sp, sp, #0xc
ldmia sp!, {pc}
_021323b8:
@@ -41102,7 +41102,7 @@ func_ov12_02134300: ; 0x02134300
ldr r0, [r1]
ldr r1, [r4, #0x5c]
add r2, sp, #0
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, pc}
asm/ov14/Actor/ActorRupee.inc
+4 -4
View File
@@ -1,4 +1,5 @@
#pragma once
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN11ItemManager10GiveRupeesEjj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -49,8 +50,11 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_027e0764
.extern data_027e0e60
.extern data_027e0fc8
@@ -60,12 +64,8 @@
.extern func_01ff9bc4
.extern func_01fffd04
.extern func_0202bc38
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern __register_global_object
.extern func_ov00_0207a13c
.extern func_ov00_0207a1c8
.extern func_ov00_02083fb0
.extern func_ov00_020bce48
.extern func_ov00_020c5a24
.extern func_ov00_020d7ad4
asm/ov14/Actor/ActorRupee.s
+1 -1
View File
@@ -440,7 +440,7 @@ _0213b3cc:
add r0, sp, #0
add r2, sp, #4
str r3, [sp, #0xc]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp]
mov r0, r0, lsr #0x5
and r0, r0, #3
asm/ov14/ov14_0211f640.inc
+38 -38
View File
@@ -1,6 +1,44 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager16MapData_vfunc_58Ev
.extern _ZN10MapManager16MapData_vfunc_60Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_6cEv
.extern _ZN10MapManager16MapData_vfunc_70Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager16MapData_vfunc_7cEv
.extern _ZN10MapManager16MapData_vfunc_b4Ev
.extern _ZN10MapManager17GetMapData_Unk_09Ev
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager17Get_MapData_Unk2aEv
.extern _ZN10MapManager18func_ov00_020823d4Ei
.extern _ZN10MapManager18func_ov00_020823e4Ei
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020826a0Eiii
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02083780Ei
.extern _ZN10MapManager18func_ov00_02083978EiP5Vec3p
.extern _ZN10MapManager18func_ov00_020839b4Ei
.extern _ZN10MapManager18func_ov00_020839c4Ei
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10MapManager18func_ov00_020840dcEv
.extern _ZN10MapManager18func_ov00_020843ecEPi
.extern _ZN10MapManager18func_ov00_02084ac4Ej
.extern _ZN10MapManager18func_ov00_02084c7cEi
.extern _ZN10MapManager18func_ov00_02084cb0Ei
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern _ZN10MapManager18func_ov00_02084ce4Ei
.extern _ZN10MapManager18func_ov00_02084cfcEi
.extern _ZN10MapManager18func_ov00_02084ebcEi
.extern _ZN10MapManager8SpawnNPCEP5Vec3pii
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager12GetItemModelEj
@@ -257,44 +295,6 @@
.extern func_ov00_02081f4c
.extern func_ov00_02081f58
.extern func_ov00_02081f6c
.extern func_ov00_020823d4
.extern func_ov00_020823e4
.extern func_ov00_020823f4
.extern func_ov00_02082680
.extern func_ov00_020826a0
.extern func_ov00_020828c0
.extern func_ov00_02082d08
.extern func_ov00_0208335c
.extern func_ov00_02083368
.extern func_ov00_02083780
.extern func_ov00_02083978
.extern func_ov00_020839b4
.extern func_ov00_020839c4
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083c7c
.extern func_ov00_02083e34
.extern func_ov00_02083e58
.extern func_ov00_02083ee0
.extern func_ov00_02083f80
.extern func_ov00_02083f98
.extern func_ov00_02083fb0
.extern func_ov00_02084088
.extern func_ov00_020840a0
.extern func_ov00_020840c4
.extern func_ov00_020840dc
.extern func_ov00_0208414c
.extern func_ov00_020843ec
.extern func_ov00_02084a5c
.extern func_ov00_02084ac4
.extern func_ov00_02084c7c
.extern func_ov00_02084cb0
.extern func_ov00_02084cc8
.extern func_ov00_02084ce4
.extern func_ov00_02084cfc
.extern func_ov00_02084d18
.extern func_ov00_02084ebc
.extern func_ov00_020875f8
.extern func_ov00_02087d34
.extern func_ov00_02088000
asm/ov14/ov14_0211f640.s
+137 -137
View File
File diff suppressed because it is too large Load Diff
asm/ov14/ov14_0213b778.inc
+36 -36
View File
@@ -315,42 +315,42 @@
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_02081f4c
.extern func_ov00_020823c4
.extern func_ov00_020823d4
.extern func_ov00_020823e4
.extern func_ov00_020823f4
.extern func_ov00_02082680
.extern func_ov00_020826a0
.extern func_ov00_02082d08
.extern func_ov00_02083344
.extern func_ov00_02083350
.extern func_ov00_0208335c
.extern func_ov00_02083368
.extern func_ov00_0208344c
.extern func_ov00_020836dc
.extern func_ov00_02083770
.extern func_ov00_02083790
.extern func_ov00_02083840
.extern func_ov00_020838e8
.extern func_ov00_020839b4
.extern func_ov00_020839c4
.extern func_ov00_02083a1c
.extern func_ov00_02083e34
.extern func_ov00_02083ee0
.extern func_ov00_02084088
.extern func_ov00_020840c4
.extern func_ov00_020840dc
.extern func_ov00_020843ec
.extern func_ov00_02084984
.extern func_ov00_02084990
.extern func_ov00_020849c0
.extern func_ov00_020849dc
.extern func_ov00_02084a5c
.extern func_ov00_02084ac4
.extern func_ov00_02084c7c
.extern func_ov00_02084c94
.extern func_ov00_02084cb0
.extern func_ov00_02084cc8
.extern _ZN10MapManager18func_ov00_020823c4EPii
.extern _ZN10MapManager18func_ov00_020823d4Ei
.extern _ZN10MapManager18func_ov00_020823e4Ei
.extern _ZN10MapManager16MapData_vfunc_b4Ev
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020826a0Eiii
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager20GetCourseData_Unk_86Ev
.extern _ZN10MapManager20GetCourseData_Unk_87Ev
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager17Get_MapData_Unk2aEv
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_02083790Ei
.extern _ZN10MapManager18func_ov00_02083840Ei
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_020839b4Ei
.extern _ZN10MapManager18func_ov00_020839c4Ei
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_020840dcEv
.extern _ZN10MapManager18func_ov00_020843ecEPi
.extern _ZN10MapManager17GetMapData_Unk_06Ev
.extern _ZN10MapManager17GetMapData_Unk_07Ev
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern _ZN10MapManager18func_ov00_020849dcEv
.extern _ZN10MapManager8SpawnNPCEP5Vec3pii
.extern _ZN10MapManager18func_ov00_02084ac4Ej
.extern _ZN10MapManager18func_ov00_02084c7cEi
.extern _ZN10MapManager18func_ov00_02084c94Ei
.extern _ZN10MapManager18func_ov00_02084cb0Ei
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern func_ov00_0208726c
.extern func_ov00_020876bc
.extern func_ov00_0208819c
asm/ov14/ov14_0213b778.s
+92 -92
View File
@@ -2767,7 +2767,7 @@ func_ov14_0213d684: ; 0x0213d684
ldr r2, _0213d6dc ; =data_027e0e60
add r1, r0, #0x2c
ldr r0, [r2]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
beq _0213d6cc
ldr r1, [r0]
@@ -2975,7 +2975,7 @@ _0213d944:
add r1, r6, #0x2c
ldr r0, [r0]
add r1, r1, r5
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r7, r0
beq _0213d990
ldr r1, [r0]
@@ -3029,7 +3029,7 @@ _0213d9fc:
ldr r0, _0213dad4 ; =data_027e0e60
mov r1, r8
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
beq _0213daa4
mov r0, r10
@@ -3634,7 +3634,7 @@ func_ov14_0213e20c: ; 0x0213e20c
add r1, r1, r6
mov r7, r2
mov r4, #0
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
beq _0213e318
ldr r1, [r0]
@@ -3739,7 +3739,7 @@ _0213e394:
ldr r0, _0213e53c ; =data_027e0e60
mov r1, r7
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
_0213e3b4:
cmp r9, #0
ldrne r0, [r9, #0x88]
@@ -5127,7 +5127,7 @@ func_ov14_0213f37c: ; 0x0213f37c
ldr r1, _0213f44c ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_02084984
bl _ZN10MapManager17GetMapData_Unk_06Ev
cmp r0, #0
ldreq r0, _0213f450 ; =data_027e077c
ldreq r0, [r0]
@@ -7035,7 +7035,7 @@ _021408e0:
cmp r1, #0
beq _02140c4c
mov r0, r11
bl func_ov00_020849dc
bl _ZN10MapManager18func_ov00_020849dcEv
cmp r0, #0
beq _021409d0
add r1, sp, #0x14
@@ -7091,7 +7091,7 @@ _02140960:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021409d0:
mov r0, r11
bl func_ov00_020849c0
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
beq _02140bdc
add r1, sp, #0x14
@@ -7261,7 +7261,7 @@ _02140c4c:
cmp r0, #0
mov r0, r11
beq _02140db0
bl func_ov00_020849dc
bl _ZN10MapManager18func_ov00_020849dcEv
cmp r0, #0
beq _02140d2c
cmp r8, #0
@@ -7316,7 +7316,7 @@ _02140cc8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02140d2c:
mov r0, r11
bl func_ov00_020849c0
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
addne sp, sp, #0x38
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
@@ -7349,7 +7349,7 @@ _02140d2c:
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02140db0:
bl func_ov00_020849c0
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
beq _02140fb0
cmp r8, #0
@@ -7542,7 +7542,7 @@ _0214107c:
addeq sp, sp, #0x38
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r11
bl func_ov00_02084990
bl _ZN10MapManager17GetMapData_Unk_07Ev
cmp r0, #0
add r3, sp, #0x10
mov r1, #0
@@ -8092,7 +8092,7 @@ func_ov14_0214178c: ; 0x0214178c
str r2, [sp, #8]
add r1, sp, #0
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r7, r8]
add r3, r0, #0xf6
add r0, r1, #0x800
@@ -8188,7 +8188,7 @@ func_ov14_021418ec: ; 0x021418ec
str r2, [sp, #8]
add r1, sp, #0
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, [r4, r6]
add r3, r0, #0xf6
add r0, r2, #0x800
@@ -8473,7 +8473,7 @@ _02141cdc:
ldrb r1, [r9, #0x14]
ldr r0, [r0]
add r2, r2, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r9, #0x1c]
mov r4, #1
b _02141d88
@@ -8485,7 +8485,7 @@ _02141d0c:
ldrb r1, [r9, #0x14]
ldr r0, [r0]
sub r2, r2, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r9, #0x1c]
b _02141d88
_02141d34:
@@ -8497,7 +8497,7 @@ _02141d34:
ldrb r2, [r9, #0x15]
ldr r0, [r0]
add r1, r1, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r9, #0x1c]
mov r4, #1
b _02141d88
@@ -8509,7 +8509,7 @@ _02141d64:
ldrb r2, [r9, #0x15]
ldr r0, [r0]
sub r1, r1, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r9, #0x1c]
_02141d88:
ldr r1, [r9, #4]
@@ -8545,13 +8545,13 @@ _02141df0:
mov r2, r5
strb r7, [sp, #0xe]
strb r8, [sp, #0xf]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r4]
mov r1, r10
strb r7, [sp, #0xc]
strb r8, [sp, #0xd]
mov r2, r11
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r1, [r9, #0x15]
ldrb r0, [r9, #0x39]
sub r8, r8, #1
@@ -8594,13 +8594,13 @@ _02141ea4:
mov r2, r5
strb r7, [sp, #0xa]
strb r8, [sp, #0xb]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r4]
mov r1, r10
strb r7, [sp, #8]
strb r8, [sp, #9]
mov r2, r11
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r1, [r9, #0x15]
ldrb r0, [r9, #0x39]
add r8, r8, #1
@@ -9135,14 +9135,14 @@ _02142634:
beq _02142664
ldr r0, _02142778 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084ac4
bl _ZN10MapManager18func_ov00_02084ac4Ej
_02142664:
ldr r0, _02142778 ; =data_027e0e60
mov r2, #0
ldr r0, [r0]
mov r3, r2
add r1, r5, #0x58
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
str r0, [r5, #0x48]
mov r0, #0
strb r0, [r5, #0x3b]
@@ -9194,14 +9194,14 @@ _02142714:
beq _02142744
ldr r0, _02142778 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084ac4
bl _ZN10MapManager18func_ov00_02084ac4Ej
_02142744:
ldr r0, _02142778 ; =data_027e0e60
mov r2, #0
ldr r0, [r0]
mov r3, r2
add r1, r5, #0x58
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
str r0, [r5, #0x48]
mov r0, #0
strb r0, [r5, #0x3b]
@@ -9257,12 +9257,12 @@ func_ov14_0214278c: ; 0x0214278c
bne _02142818
ldr r0, _02142908 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083344
bl _ZN10MapManager20GetCourseData_Unk_86Ev
cmp r0, #1
bgt _02142814
ldr r0, _02142908 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083350
bl _ZN10MapManager20GetCourseData_Unk_87Ev
cmp r0, #1
ble _02142818
_02142814:
@@ -15152,7 +15152,7 @@ _02146dd8:
ldr r0, _02146e20 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084c94
bl _ZN10MapManager18func_ov00_02084c94Ei
cmp r0, #0
ldrne r0, [r4, #4]
bicne r0, r0, #1
@@ -15248,7 +15248,7 @@ _02146f08:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _02147084
_02146f2c:
cmp r2, #0
@@ -15269,7 +15269,7 @@ _02146f54:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _02147084
_02146f78:
bl func_ov14_02147548
@@ -15315,20 +15315,20 @@ _02146ff0:
ldr r0, _02147094 ; =data_027e0e60
ldrb r5, [r4, #0x13]
ldr r0, [r0]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, r5
bne _02147040
ldr r0, _02147094 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084c7c
bl _ZN10MapManager18func_ov00_02084c7cEi
_02147040:
ldr r0, _02147094 ; =data_027e0e60
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
ldr r0, [r4, #4]
bic r0, r0, #1
str r0, [r4, #4]
@@ -15338,7 +15338,7 @@ _02147064:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
ldr r0, [r4, #4]
bic r0, r0, #1
str r0, [r4, #4]
@@ -16563,7 +16563,7 @@ func_ov14_02147ee4: ; 0x02147ee4
ldrh r1, [r4, #0x24]
ldr r0, [r0]
add r2, sp, #0
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
ldr r0, _02147fb8 ; =data_027e0d38
add r1, sp, #0
ldr r0, [r0]
@@ -16924,7 +16924,7 @@ func_ov14_02148364: ; 0x02148364
ldr r0, [r2]
mov r2, #0
mov r9, r1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r10, #0x4c]
cmp r1, r0
addlt sp, sp, #0x128
@@ -16934,11 +16934,11 @@ func_ov14_02148364: ; 0x02148364
add r0, sp, #0x14
ldr r1, [r1]
mov r2, r9
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _02148644 ; =data_027e0e60
add r1, sp, #0x14
ldr r0, [r0]
bl func_ov00_020840dc
bl _ZN10MapManager18func_ov00_020840dcEv
cmp r0, #0x5b
bgt _021483e4
bge _021483ec
@@ -17498,7 +17498,7 @@ _02148b50:
ldr r0, _021497e8 ; =data_027e0e60
add r1, sp, #0x60
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r0, [sp, #0x60]
str r0, [r4, #0x48]
ldr r0, [sp, #0x64]
@@ -17529,7 +17529,7 @@ _02148bb4:
ldr r0, _021497e8 ; =data_027e0e60
add r1, sp, #0x54
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r0, [sp, #0x54]
str r0, [r4, #0x48]
ldr r0, [sp, #0x58]
@@ -17543,7 +17543,7 @@ _02148bec:
ldr r0, _021497e8 ; =data_027e0e60
add r1, sp, #0x48
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r0, [sp, #0x48]
str r0, [r4, #0x48]
ldr r0, [sp, #0x4c]
@@ -18859,7 +18859,7 @@ _02149cec:
str r1, [r5, #0x20]
ldrsh r1, [r5, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
mov r0, r5
mov r2, #1
@@ -19117,7 +19117,7 @@ _0214a194:
str r1, [r6, #4]
ldr r0, [r0]
add r1, r6, #0x38
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _0214a3ac
_0214a1bc:
ldr r0, [r6, #0x74]
@@ -19211,7 +19211,7 @@ _0214a2e4:
streqb r0, [r6, #0x3c]
ldr r0, _0214a3b8 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
ldr r1, [r6, #0x74]
ldr r0, _0214a3cc ; =data_ov14_02153f04
add r4, r6, #0xd8
@@ -19251,7 +19251,7 @@ _0214a398:
ldrsh r1, [r6, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
_0214a3ac:
mov r0, #1
add sp, sp, #0xc0
@@ -20087,7 +20087,7 @@ func_ov14_0214adfc: ; 0x0214adfc
ldr r0, [r0]
mov r2, #0
ldrh r4, [r5, #0x24]
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0214ae7c
ldrb r0, [r5, #0x2a]
@@ -21488,7 +21488,7 @@ func_ov14_0214c018: ; 0x0214c018
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0214c09c
ldrb r0, [r4, #0x2a]
@@ -21696,7 +21696,7 @@ func_ov14_0214c274: ; 0x0214c274
mov r2, #1
strb r3, [sp]
strb ip, [sp, #1]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
@@ -21727,22 +21727,22 @@ func_ov14_0214c30c: ; 0x0214c30c
ldrh r5, [r6, #0x2a]
ldr r0, [r0]
mov r1, r4
bl func_ov00_020823d4
bl _ZN10MapManager18func_ov00_020823d4Ei
ldr r1, _0214c370 ; =data_027e0e60
str r0, [r6, #0x94]
ldr r0, [r1]
mov r1, r4
bl func_ov00_020823e4
bl _ZN10MapManager18func_ov00_020823e4Ei
ldr r1, _0214c370 ; =data_027e0e60
str r0, [r6, #0x98]
ldr r0, [r1]
mov r1, r5
bl func_ov00_020823d4
bl _ZN10MapManager18func_ov00_020823d4Ei
ldr r1, _0214c370 ; =data_027e0e60
str r0, [r6, #0x9c]
ldr r0, [r1]
mov r1, r5
bl func_ov00_020823e4
bl _ZN10MapManager18func_ov00_020823e4Ei
str r0, [r6, #0xa0]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
@@ -21772,7 +21772,7 @@ func_ov14_0214c374: ; 0x0214c374
bl func_0201933c
ldr r0, _0214c444 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020823f4
bl _ZN10MapManager16MapData_vfunc_b4Ev
mov r4, r0
mov r0, r5
mov r1, r4
@@ -22152,7 +22152,7 @@ _0214c7ec:
ldrb r1, [r10, #0x11]
ldr r0, [r4]
mov r2, r11
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
bne _0214c92c
_0214c910:
@@ -22431,7 +22431,7 @@ _0214cc34: .word gAdventureFlags
arm_func_start func_ov14_0214cc38
func_ov14_0214cc38: ; 0x0214cc38
ldr r2, _0214cc50 ; =data_027e0e60
ldr ip, _0214cc54 ; =func_ov00_020836dc
ldr ip, _0214cc54 ; =_ZN10MapManager18func_ov00_020836dcEii
ldrb r1, [r0, #0x160]
ldr r0, [r2]
mov r2, #0
@@ -22439,7 +22439,7 @@ func_ov14_0214cc38: ; 0x0214cc38
.align 2, 0
arm_func_end func_ov14_0214cc38
_0214cc50: .word data_027e0e60
_0214cc54: .word func_ov00_020836dc
_0214cc54: .word _ZN10MapManager18func_ov00_020836dcEii
.global func_ov14_0214cc58
arm_func_start func_ov14_0214cc58
@@ -22868,7 +22868,7 @@ _0214d134:
ldr r0, _0214d1b4 ; =data_027e0e60
add r1, r7, #0x74
ldr r0, [r0]
bl func_ov00_020839c4
bl _ZN10MapManager18func_ov00_020839c4Ei
add r0, r7, #0xd8
bl func_020350ac
ldr r3, _0214d1b8 ; =func_ov14_02121cd8
@@ -22917,7 +22917,7 @@ _0214d1dc:
ldr r0, _0214d254 ; =data_027e0e60
add r1, r7, #0x74
ldr r0, [r0]
bl func_ov00_020839c4
bl _ZN10MapManager18func_ov00_020839c4Ei
add r0, r7, #0xd8
bl func_020350ac
ldr r3, _0214d258 ; =func_ov14_02121cd8
@@ -23181,7 +23181,7 @@ _0214d46c:
ldr r2, [sp, #0x14]
str r2, [r4, #0x84]
ldr r0, [r0]
bl func_ov00_020839b4
bl _ZN10MapManager18func_ov00_020839b4Ei
mov r0, r4
mov r1, #1
bl func_ov14_0214e134
@@ -23999,11 +23999,11 @@ func_ov14_0214e134: ; 0x0214e134
mov r5, r0
ldr r0, [r2]
mov r4, r1
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
ldr r1, _0214e268 ; =data_027e0e60
mov r6, r0
ldr r0, [r1]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
mov r7, r0
ldrb r0, [r5, #0x15]
ldrb r9, [r5, #0x14]
@@ -24059,7 +24059,7 @@ _0214e210:
ldr r0, [r6]
mov r1, r9
mov r2, r10
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
ldr r1, [r5, #0x1c]
cmp r1, r0
bne _0214e244
@@ -24068,7 +24068,7 @@ _0214e210:
mov r2, r4
strb r7, [sp, #8]
strb r10, [sp, #9]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
_0214e244:
add r10, r10, #1
cmp r10, r8
@@ -24250,7 +24250,7 @@ func_ov14_0214e38c: ; 0x0214e38c
ldr r0, _0214e51c ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
mov r0, r4
ldr r3, [r0]
@@ -24332,7 +24332,7 @@ _0214e574:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _0214e6b0
_0214e58c:
cmp r2, #0
@@ -24397,7 +24397,7 @@ _0214e654:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
_0214e684:
ldr r1, [r4, #4]
ldr r0, _0214e6bc ; =data_027e0e60
@@ -24406,7 +24406,7 @@ _0214e684:
ldr r0, [r0]
add r1, r4, #0x38
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
ldr r0, [r4, #4]
bic r0, r0, #1
str r0, [r4, #4]
@@ -24670,7 +24670,7 @@ func_ov14_0214e8f0: ; 0x0214e8f0
ldrh r2, [r4, #0x28]
ldr r0, [r0]
add r1, r4, #0x88
bl func_ov00_020823c4
bl _ZN10MapManager18func_ov00_020823c4EPii
cmp r0, #0
addeq sp, sp, #0x50
ldmeqia sp!, {r3, r4, r5, pc}
@@ -24678,14 +24678,14 @@ func_ov14_0214e8f0: ; 0x0214e8f0
ldrh r2, [r4, #0x2a]
ldr r0, [r0]
add r1, r4, #0x80
bl func_ov00_020823c4
bl _ZN10MapManager18func_ov00_020823c4EPii
cmp r0, #0
addeq sp, sp, #0x50
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _0214ea70 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
mov r0, r4
ldr r3, [r0]
@@ -24730,7 +24730,7 @@ _0214ea9c:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
mov r0, r4
mov r1, #1
bl func_ov14_0214ec40
@@ -24785,7 +24785,7 @@ _0214eb70:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
mov r0, r4
mov r1, #0
mov r2, #1
@@ -24794,7 +24794,7 @@ _0214eb70:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
mov r0, r4
mov r1, #0
bl func_ov14_0214ec40
@@ -25425,7 +25425,7 @@ _0214f3c0:
ldr r0, [r0]
mov r3, r2
add r1, r5, #0x18
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
b _0214f4e8
_0214f41c:
ldrsh r0, [r5, #0xc]
@@ -25438,14 +25438,14 @@ _0214f41c:
add r1, r5, #0x18
ldr r0, [r0]
mov r3, #2
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
b _0214f4e8
_0214f44c:
ldr r0, _0214f500 ; =data_027e0e60
add r1, r5, #0x18
ldr r0, [r0]
mov r3, #1
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
b _0214f4e8
_0214f464:
bl func_ov14_02127188
@@ -25478,7 +25478,7 @@ _0214f4b4:
ldr r0, _0214f500 ; =data_027e0e60
ldrh r1, [r5, #0x24]
ldr r0, [r0]
bl func_ov00_02083840
bl _ZN10MapManager18func_ov00_02083840Ei
b _0214f4e8
_0214f4dc:
mov r0, r5
@@ -25511,7 +25511,7 @@ func_ov14_0214f504: ; 0x0214f504
ldrh r1, [r4, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r4, pc}
@@ -25566,7 +25566,7 @@ _0214f5e4:
ldr r0, _0214f660 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
movne r0, #1
ldmneia sp!, {r4, pc}
@@ -25584,7 +25584,7 @@ _0214f600:
ldr r0, _0214f660 ; =data_027e0e60
ldrh r1, [r4, #0x24]
ldr r0, [r0]
bl func_ov00_02083840
bl _ZN10MapManager18func_ov00_02083840Ei
mov r0, #1
ldmia sp!, {r4, pc}
_0214f640:
@@ -25631,7 +25631,7 @@ _0214f6c4:
ldr r0, _0214f76c ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -25660,14 +25660,14 @@ _0214f728:
ldrh r1, [r4, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0214f76c ; =data_027e0e60
ldrh r1, [r4, #0x24]
ldr r0, [r0]
bl func_ov00_02083790
bl _ZN10MapManager18func_ov00_02083790Ei
mov r0, #1
ldmia sp!, {r4, pc}
_0214f760:
@@ -26155,7 +26155,7 @@ _0214fd64: .word data_ov00_020eec9c
arm_func_start func_ov14_0214fd68
func_ov14_0214fd68: ; 0x0214fd68
ldr r2, _0214fd80 ; =data_027e0e60
ldr ip, _0214fd84 ; =func_ov00_020836dc
ldr ip, _0214fd84 ; =_ZN10MapManager18func_ov00_020836dcEii
ldrb r1, [r0, #0x15c]
ldr r0, [r2]
mov r2, #0
@@ -26163,7 +26163,7 @@ func_ov14_0214fd68: ; 0x0214fd68
.align 2, 0
arm_func_end func_ov14_0214fd68
_0214fd80: .word data_027e0e60
_0214fd84: .word func_ov00_020836dc
_0214fd84: .word _ZN10MapManager18func_ov00_020836dcEii
.global func_ov14_0214fd88
arm_func_start func_ov14_0214fd88
@@ -26291,7 +26291,7 @@ _0214fee0:
ldrb r1, [r4, #0x14]
ldr r0, [r0]
sub r2, r2, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r4, #0x1c]
mov r0, #0
b _0214ff34
@@ -26303,7 +26303,7 @@ _0214ff0c:
ldrb r2, [r4, #0x15]
ldr r0, [r0]
sub r1, r1, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r4, #0x1c]
mov r0, #1
_0214ff34:
@@ -26369,13 +26369,13 @@ _02150008:
mov r2, r7
strb r9, [sp, #6]
strb r10, [sp, #7]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r5]
mov r1, r6
strb r9, [sp, #4]
strb r10, [sp, #5]
mov r2, r11
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r1, [r4, #0x15]
ldrb r0, [r4, #0x39]
add r10, r10, #1
@@ -27621,7 +27621,7 @@ _02150d88:
add r1, sp, #4
strb r2, [sp, #4]
strb r3, [sp, #5]
bl func_ov00_02084088
bl _ZN10MapManager16MapData_vfunc_54Ev
cmp r0, #0x14
ldreqsh r0, [r4, #0xc]
cmpeq r0, #0
@@ -28201,7 +28201,7 @@ func_ov14_0215141c: ; 0x0215141c
ldr r2, [r4, #0x88]
str r2, [r4, #0x98]
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r0, [sp, #0xc]
str r0, [r4, #0x48]
ldr r0, [sp, #0x10]
asm/ov15.inc
+35 -35
View File
@@ -446,41 +446,41 @@
.extern func_ov00_02081f50
.extern func_ov00_02081f58
.extern func_ov00_02081f6c
.extern func_ov00_020823a4
.extern func_ov00_020823b4
.extern func_ov00_02082424
.extern func_ov00_02082454
.extern func_ov00_02082494
.extern func_ov00_020824cc
.extern func_ov00_02082504
.extern func_ov00_02082594
.extern func_ov00_020825ac
.extern func_ov00_02082650
.extern func_ov00_02082660
.extern func_ov00_02082d08
.extern func_ov00_02082d40
.extern func_ov00_02083374
.extern func_ov00_02083384
.extern func_ov00_0208340c
.extern func_ov00_0208342c
.extern func_ov00_0208346c
.extern func_ov00_020836bc
.extern func_ov00_020836dc
.extern func_ov00_02083770
.extern func_ov00_020838c8
.extern func_ov00_020838d8
.extern func_ov00_020838e8
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083ee0
.extern func_ov00_020846a4
.extern func_ov00_020848b8
.extern func_ov00_02084a5c
.extern func_ov00_02084b38
.extern func_ov00_02084cb0
.extern func_ov00_02084cc8
.extern func_ov00_02084d4c
.extern func_ov00_02085c60
.extern _ZN10MapManager18func_ov00_020823a4Ei
.extern _ZN10MapManager18func_ov00_020823b4Ev
.extern _ZN10MapManager18func_ov00_02082424Ev
.extern _ZN10MapManager18func_ov00_02082454Eii
.extern _ZN10MapManager18func_ov00_02082494Ei
.extern _ZN10MapManager18func_ov00_020824ccEi
.extern _ZN10MapManager18func_ov00_02082504Ev
.extern _ZN10MapManager18func_ov00_02082594Ev
.extern _ZN10MapManager18func_ov00_020825acEv
.extern _ZN10MapManager18func_ov00_02082650Eiii
.extern _ZN10MapManager18func_ov00_02082660Eii
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02082d40Ev
.extern _ZN10MapManager18func_ov00_02083374Ev
.extern _ZN10MapManager18func_ov00_02083384Ev
.extern _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p
.extern _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p
.extern _ZN10MapManager18func_ov00_0208346cEP4AABB
.extern _ZN10MapManager18func_ov00_020836bcEjPi
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_020838c8Ei
.extern _ZN10MapManager18func_ov00_020838d8Ei
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_020846a4Ev
.extern _ZN10MapManager18func_ov00_020848b8Ev
.extern _ZN10MapManager8SpawnNPCEP5Vec3pii
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084cb0Ei
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p
.extern _ZN10MapManager18func_ov00_02085c60Eiiii
.extern func_ov00_020872e8
.extern func_ov00_02087584
.extern func_ov00_020875f8
asm/ov15.s
+224 -224
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+33 -33
View File
@@ -229,39 +229,39 @@
.extern func_ov00_020807d4
.extern func_ov00_02081f58
.extern func_ov00_02081f6c
.extern func_ov00_020823c4
.extern func_ov00_020823d4
.extern func_ov00_020823e4
.extern func_ov00_020823f4
.extern func_ov00_02082680
.extern func_ov00_020826a0
.extern func_ov00_020828c0
.extern func_ov00_0208335c
.extern func_ov00_02083368
.extern func_ov00_02083604
.extern func_ov00_02083614
.extern func_ov00_020836dc
.extern func_ov00_02083790
.extern func_ov00_02083840
.extern func_ov00_020839d4
.extern func_ov00_020839f8
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083ee0
.extern func_ov00_02083f44
.extern func_ov00_02083fb0
.extern func_ov00_020840a0
.extern func_ov00_020840c4
.extern func_ov00_020843ec
.extern func_ov00_02084a5c
.extern func_ov00_02084ac4
.extern func_ov00_02084b20
.extern func_ov00_02084b2c
.extern func_ov00_02084cb0
.extern func_ov00_02084cc8
.extern func_ov00_02084d24
.extern func_ov00_0208583c
.extern _ZN10MapManager18func_ov00_020823c4EPii
.extern _ZN10MapManager18func_ov00_020823d4Ei
.extern _ZN10MapManager18func_ov00_020823e4Ei
.extern _ZN10MapManager16MapData_vfunc_b4Ev
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020826a0Eiii
.extern _ZN10MapManager16MapData_vfunc_7cEv
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager17Get_MapData_Unk2aEv
.extern _ZN10MapManager18func_ov00_02083604Ei
.extern _ZN10MapManager18func_ov00_02083614Ei
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083790Ei
.extern _ZN10MapManager18func_ov00_02083840Ei
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_020843ecEPi
.extern _ZN10MapManager8SpawnNPCEP5Vec3pii
.extern _ZN10MapManager18func_ov00_02084ac4Ej
.extern _ZN10MapManager21SetCourseData_Unk_25cEc
.extern _ZN10MapManager21GetCourseData_Unk_25dEv
.extern _ZN10MapManager18func_ov00_02084cb0Ei
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
.extern func_ov00_02088130
.extern func_ov00_02088144
.extern func_ov00_02088158
asm/ov17.s
+106 -106
View File
@@ -773,7 +773,7 @@ func_ov17_0215bbd4: ; 0x0215bbd4
ldrb r1, [r6, #1]
ldr r0, [r2]
mov r5, r3
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r4, r0
mov r0, r8
ldr r2, [r0]
@@ -784,7 +784,7 @@ func_ov17_0215bbd4: ; 0x0215bbd4
mov r9, r0
ldr r0, [r1]
ldrb r1, [r6]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r9, [sp, #0x14]
str r4, [sp, #0x18]
str r0, [sp, #0x10]
@@ -1144,7 +1144,7 @@ func_ov17_0215bf8c: ; 0x0215bf8c
str r1, [r4, #0x20]
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
mov r0, r4
mov r2, #1
@@ -1329,7 +1329,7 @@ _0215c2f4:
str r1, [r5, #4]
ldr r0, [r0]
add r1, r5, #0x38
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _0215c648
_0215c32c:
ldr r1, [r5, #4]
@@ -1504,7 +1504,7 @@ _0215c598:
add r1, r5, #0x38
ldr r0, [r0]
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
ldr r1, _0215c670 ; =0xffffed1f
mov r0, #0
str r1, [r5, #0x70]
@@ -1539,7 +1539,7 @@ _0215c634:
ldrsh r1, [r5, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
_0215c648:
mov r0, #1
add sp, sp, #0x108
@@ -1832,7 +1832,7 @@ func_ov17_0215c940: ; 0x0215c940
strb r2, [sp, #4]
mov r2, #1
strb r3, [sp, #5]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r2, [sp, #4]
ldr r0, _0215ca64 ; =data_027e0e60
add r1, sp, #4
@@ -1840,7 +1840,7 @@ func_ov17_0215c940: ; 0x0215c940
ldr r0, [r0]
mov r2, #1
strb r3, [sp, #4]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
_0215c9c4:
ldrh r0, [r4, #0x26]
mov r1, #0x24
@@ -1900,7 +1900,7 @@ func_ov17_0215ca70: ; 0x0215ca70
ldr r0, _0215cba0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
bne _0215cabc
mov r0, r4
@@ -1969,7 +1969,7 @@ _0215cb84:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
add sp, sp, #0x10
ldmia sp!, {r4, pc}
.align 2, 0
@@ -2221,7 +2221,7 @@ func_ov17_0215ce24: ; 0x0215ce24
ldr r1, [r0]
add r0, sp, #0
add r2, r2, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r1, [sp]
ldrb r0, [r5, #0x14]
cmp r1, r0
@@ -2498,7 +2498,7 @@ _0215d1ec:
ldr r3, [r3, #8]
str r3, [r4, #0x210]
ldr r1, [r1]
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, [r4, #0x68]
ldr r1, [r4, #0x60]
cmp r0, #0
@@ -3507,7 +3507,7 @@ func_ov17_0215dff0: ; 0x0215dff0
mov r10, r0
add r0, sp, #6
mov r2, r11
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mov r7, #0
ldr r4, _0215e1b4 ; =data_027e0e60
str r7, [r10, #0x1ec]
@@ -3526,7 +3526,7 @@ _0215e038:
mov r1, r6
strb r8, [sp, #4]
strb r2, [sp, #5]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
beq _0215e078
ldr r1, [r0]
@@ -3750,7 +3750,7 @@ func_ov17_0215e338: ; 0x0215e338
mov r10, r0
add r0, sp, #2
mov r2, r11
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mov r7, #0
ldr r4, _0215e460 ; =data_027e0e60
str r7, [r10, #0x250]
@@ -3769,7 +3769,7 @@ _0215e37c:
mov r1, r6
strb r8, [sp]
strb r2, [sp, #1]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
beq _0215e3bc
ldr r1, [r0]
@@ -4852,11 +4852,11 @@ _0215f25c:
add r0, sp, #0
ldr r1, [r1]
add r2, r4, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0215f2e0 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
beq _0215f2ac
ldr r1, [r0]
@@ -5306,11 +5306,11 @@ func_ov17_0215f874: ; 0x0215f874
add r0, sp, #0
ldr r1, [r1]
mov r2, r5
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0215f904 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r1, [r0]
@@ -5406,7 +5406,7 @@ func_ov17_0215f9a0: ; 0x0215f9a0
add r1, sp, #0
str r2, [sp, #8]
ldr r2, [r4, #8]
bl func_ov00_0208583c
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
cmp r0, #0
movlt r0, #1
movge r0, #0
@@ -5588,7 +5588,7 @@ _0215fb5e:
blx func_ov03_020f8068
add r1, r0, #0
add r0, r7, #0
blx func_ov00_02083614
blx _ZN10MapManager18func_ov00_02083614Ei
cmp r0, #0
beq _0215fb80
cmp r4, r5
@@ -5674,7 +5674,7 @@ _0215fc14:
bl func_ov03_020f8068
mov r1, r0
mov r0, r10
bl func_ov00_02083614
bl _ZN10MapManager18func_ov00_02083614Ei
cmp r0, #0
beq _0215fcb4
ldr r10, [r11]
@@ -5682,7 +5682,7 @@ _0215fc14:
bl func_ov03_020f8068
mov r1, r0
mov r0, r10
bl func_ov00_02083604
bl _ZN10MapManager18func_ov00_02083604Ei
cmp r0, #0
beq _0215fcb4
_0215fc78:
@@ -5751,7 +5751,7 @@ _0215fd3c:
bl func_ov03_020f8068
mov r1, r0
mov r0, r8
bl func_ov00_02083614
bl _ZN10MapManager18func_ov00_02083614Ei
cmp r0, #0
beq _0215fd70
cmp r5, r7
@@ -5936,7 +5936,7 @@ _0215ffcc:
bl func_ov03_020f8068
mov r1, r0
mov r0, r6
bl func_ov00_02083614
bl _ZN10MapManager18func_ov00_02083614Ei
cmp r0, #0
beq _02160088
mov r0, r7
@@ -6733,7 +6733,7 @@ _021608d4:
add r1, sp, #0
str r2, [sp, #8]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r4, #0x1bc]
ldr r0, [r4, #0x144]
cmp r0, #0
@@ -6940,7 +6940,7 @@ _02160b10:
add r0, sp, #4
add r2, sp, #0x14
str r3, [sp, #0x1c]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp, #4]
mov r0, r0, lsr #0x5
and r0, r0, #3
@@ -7012,7 +7012,7 @@ _02160c28:
add r0, sp, #0
add r2, sp, #8
str r3, [sp, #0x10]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp]
mov r0, r0, lsr #0x5
and r0, r0, #3
@@ -7611,14 +7611,14 @@ _02161404:
add r1, r5, #0x18
ldr r0, [r0]
mov r3, #2
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
b _021614dc
_02161468:
ldr r0, _021614f0 ; =data_027e0e60
add r1, r5, #0x18
ldr r0, [r0]
mov r3, #1
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
b _021614dc
_02161480:
bl func_ov14_02127188
@@ -7641,7 +7641,7 @@ _021614a8:
ldr r0, _021614f0 ; =data_027e0e60
ldrh r1, [r5, #0x24]
ldr r0, [r0]
bl func_ov00_02083840
bl _ZN10MapManager18func_ov00_02083840Ei
b _021614dc
_021614d0:
mov r0, r5
@@ -7750,7 +7750,7 @@ func_ov17_0216161c: ; 0x0216161c
ldrh r1, [r4, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _02161670
ldr r0, _0216167c ; =data_027e0fe4
@@ -7777,7 +7777,7 @@ func_ov17_02161680: ; 0x02161680
ldr r0, _021616e8 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -7795,7 +7795,7 @@ func_ov17_02161680: ; 0x02161680
ldr r0, _021616e8 ; =data_027e0e60
ldrh r1, [r4, #0x24]
ldr r0, [r0]
bl func_ov00_02083840
bl _ZN10MapManager18func_ov00_02083840Ei
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
@@ -7810,7 +7810,7 @@ func_ov17_021616ec: ; 0x021616ec
ldr r0, _0216179c ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -7839,14 +7839,14 @@ func_ov17_021616ec: ; 0x021616ec
ldrh r1, [r4, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0216179c ; =data_027e0e60
ldrh r1, [r4, #0x24]
ldr r0, [r0]
bl func_ov00_02083790
bl _ZN10MapManager18func_ov00_02083790Ei
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
@@ -10928,11 +10928,11 @@ func_ov17_02163e24: ; 0x02163e24
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02163ecc ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
ldr r1, _02163ecc ; =data_027e0e60
mov r11, r0
ldr r0, [r1]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
mov r8, r0
mov r9, #0
cmp r11, #0
@@ -10949,7 +10949,7 @@ _02163e78:
mov r1, r6
strb r7, [sp]
strb r10, [sp, #1]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
beq _02163eb0
ldr r1, [r0]
@@ -11054,7 +11054,7 @@ _02163fbc:
str r2, [r4, #0x6c]
ldr r0, [r0]
add r1, r4, #0x38
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _0216407c
_02163fe4:
mov r0, #0
@@ -11066,7 +11066,7 @@ _02163fe4:
ldr r0, [r0]
add r1, r4, #0x38
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _0216407c
_02164010:
mov r0, #1
@@ -11076,7 +11076,7 @@ _02164010:
str r2, [r4, #0x68]
ldr r0, [r0]
add r1, r4, #0x38
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
cmp r5, #0
bne _0216407c
mov r0, r4
@@ -11091,7 +11091,7 @@ _02164048:
ldr r0, [r0]
add r1, r4, #0x38
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
cmp r5, #0
bne _0216407c
mov r0, r4
@@ -11278,23 +11278,23 @@ func_ov17_02164284: ; 0x02164284
str r1, [sp, #8]
ldr r1, [sp]
add r7, r1, #0xa
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
ldr r1, [sp, #8]
cmp r1, r0
blt _021642ec
ldr r0, _02164474 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #8]
_021642ec:
ldr r0, _02164474 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
cmp r7, r0
blt _02164310
ldr r0, _02164474 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
mov r7, r0
_02164310:
ldr r8, [sp]
@@ -11310,7 +11310,7 @@ _0216432c:
mov r1, r6
strb r2, [sp, #0xe]
strb r8, [sp, #0xf]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
mov r5, r0
cmp r5, r10
beq _02164380
@@ -11359,7 +11359,7 @@ _021643e0:
ldr r0, [r0]
strb r6, [sp, #0xc]
strb r9, [sp, #0xd]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
mov r5, r0
cmp r5, r10
beq _0216442c
@@ -12427,11 +12427,11 @@ _021651b0:
_021651c0:
ldr r0, _02165280 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
ldr r1, _02165280 ; =data_027e0e60
and r11, r0, #0xff
ldr r0, [r1]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
mov r8, #0
strb r8, [sp]
strb r8, [sp, #1]
@@ -12449,7 +12449,7 @@ _02165208:
mov r1, r6
strb r8, [sp]
strb r9, [sp, #1]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r5, r0
beq _02165258
ldr r1, [r0]
@@ -13053,7 +13053,7 @@ _02165770:
_0216577e:
ldr r0, _021657b8 ; =data_027e0e60
ldr r0, [r0]
blx func_ov00_02084b2c
blx _ZN10MapManager21GetCourseData_Unk_25dEv
cmp r0, #0
beq _02165798
add r0, r4, #0
@@ -13511,7 +13511,7 @@ _02165d80:
ldr r0, _02165e44 ; =data_027e0e60
mov r1, #1
ldr r0, [r0]
bl func_ov00_02084b20
bl _ZN10MapManager21SetCourseData_Unk_25cEc
mov r0, r4
mov r1, #1
bl _ZN5Actor18CollidesWithPlayerEj
@@ -13730,12 +13730,12 @@ _02166080: ; jump table
_02166090:
ldr r0, _021661e0 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084b2c
bl _ZN10MapManager21GetCourseData_Unk_25dEv
ldmia sp!, {r4, pc}
_021660a0:
ldr r0, _021661e0 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084b2c
bl _ZN10MapManager21GetCourseData_Unk_25dEv
cmp r0, #0
movne r0, #1
ldmneia sp!, {r4, pc}
@@ -14372,15 +14372,15 @@ func_ov17_02166878: ; 0x02166878
ldr r5, [r0]
ldr r1, [r9, #0x18]
mov r0, r5
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
mov r4, r0
ldr r1, [r9, #0x20]
mov r0, r5
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
mov r2, r0
mov r0, r5
mov r1, r4
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
str r0, [r9, #0x70]
ldrb r1, [r9, #0x7a]
ldr r2, [r9, #0x18]
@@ -14465,7 +14465,7 @@ _021669f8:
mov r2, r4
strb r6, [sp, #4]
strb r8, [sp, #5]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #2
@@ -14482,7 +14482,7 @@ _02166a38:
ldrh r2, [r9, #0x2a]
ldr r0, [r0]
add r1, r9, #0x64
bl func_ov00_020823c4
bl _ZN10MapManager18func_ov00_020823c4EPii
add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
@@ -14679,7 +14679,7 @@ _02166cc4:
ldr r0, _02166df4 ; =data_027e0e60
ldr r1, [r4, #0x74]
ldr r0, [r0]
bl func_ov00_02084ac4
bl _ZN10MapManager18func_ov00_02084ac4Ej
mvn r0, #0
str r0, [r4, #0x74]
_02166cec:
@@ -14696,7 +14696,7 @@ _02166cec:
ldr r0, [r0]
add r1, r4, #0x38
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _02166de8
_02166d28:
mov r1, #1
@@ -14710,7 +14710,7 @@ _02166d28:
ldr r0, [r0]
mov r2, #1
mov r3, #0
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
str r0, [r4, #0x74]
_02166d5c:
mov r0, r4
@@ -14742,14 +14742,14 @@ _02166d8c:
ldr r0, [r0]
add r1, r4, #0x38
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
b _02166de8
_02166dd4:
ldr r0, _02166df4 ; =data_027e0e60
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
_02166de8:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
@@ -15323,12 +15323,12 @@ _021675cc:
sub r2, r2, #1
sub r2, r3, r2, lsl #11
str r2, [sp, #0x10]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _021676a8 ; =data_027e0e60
mov r5, r0
ldr r0, [r1]
ldr r1, [sp, #0x10]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
ldrb r1, [r10, #0x7a]
mov r6, r0
mov r7, #0
@@ -15348,13 +15348,13 @@ _02167650:
mov r3, r11
add r1, r5, r7
add r2, r6, r8
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
b _02167680
_02167670:
ldr r3, [r10, #0x70]
add r1, r5, r7
add r2, r6, r8
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
_02167680:
ldrb r1, [r10, #0x7a]
add r8, r8, #1
@@ -16338,13 +16338,13 @@ _021683b0:
mov r2, r5
strb r7, [sp, #6]
strb r9, [sp, #7]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldr r0, [r4]
strb r7, [sp, #4]
strb r9, [sp, #5]
mov r1, r11
mov r2, #1
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r10, #0x68]
cmp r0, #1
ldr r0, [r4]
@@ -16352,13 +16352,13 @@ _021683b0:
mov r1, r8
mov r2, r9
mov r3, #0x17
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
b _02168414
_02168404:
mov r1, r8
mov r2, r9
mov r3, #9
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
_02168414:
ldrb r0, [r10, #0x15]
add r9, r9, #1
@@ -16490,12 +16490,12 @@ func_ov17_0216857c: ; 0x0216857c
ldr r0, _021685b4 ; =data_027e0e60
ldr r0, [r0]
mov r1, r4
bl func_ov00_020823d4
bl _ZN10MapManager18func_ov00_020823d4Ei
ldr r1, _021685b4 ; =data_027e0e60
str r0, [r5, #0x6c]
ldr r0, [r1]
mov r1, r4
bl func_ov00_020823e4
bl _ZN10MapManager18func_ov00_020823e4Ei
str r0, [r5, #0x70]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
@@ -16524,7 +16524,7 @@ func_ov17_021685b8: ; 0x021685b8
bl func_0201933c
ldr r0, _02168654 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020823f4
bl _ZN10MapManager16MapData_vfunc_b4Ev
mov r4, r0
mov r0, r5
mov r1, r4
@@ -17305,7 +17305,7 @@ _02168ef8: ; jump table
_02168f08:
ldr r0, _02169180 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
sub r0, r0, #2
cmp r4, r0
addlt r0, r4, #2
@@ -17345,7 +17345,7 @@ _02168f70:
_02168f9c:
ldr r0, _02169180 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
sub r0, r0, #2
cmp r5, r0
addlt r0, r5, #2
@@ -17557,7 +17557,7 @@ _0216929c:
ldr r0, _02169340 ; =data_027e0e60
add r1, r4, #0x64
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
ldr r1, [r0]
mov r5, r0
ldr r1, [r1, #0x1c]
@@ -17578,7 +17578,7 @@ _021692e8:
ldr r0, _02169340 ; =data_027e0e60
add r1, r4, #0x64
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
ldr r1, [r0]
mov r5, r0
ldr r1, [r1, #0x1c]
@@ -17897,7 +17897,7 @@ _021696b8:
add r1, sp, #0x12
strb r3, [sp, #0x13]
mov r2, #1
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrh r0, [r4, #0x26]
cmp r0, #1
bne _02169874
@@ -17911,7 +17911,7 @@ _021696b8:
mov r2, #1
strb r3, [sp, #0x10]
strb ip, [sp, #0x11]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
b _02169874
_02169728:
ldr r1, [sp, #0x48]
@@ -17926,7 +17926,7 @@ _02169728:
add r1, sp, #0xe
strb r3, [sp, #0xf]
mov r2, #1
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrh r0, [r4, #0x26]
cmp r0, #1
bne _02169874
@@ -17940,7 +17940,7 @@ _02169728:
mov r2, #1
strb r3, [sp, #0xc]
strb ip, [sp, #0xd]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
b _02169874
_02169798:
ldr r1, [sp, #0x50]
@@ -17955,7 +17955,7 @@ _02169798:
add r1, sp, #0xa
strb r3, [sp, #0xb]
mov r2, #1
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrh r0, [r4, #0x26]
cmp r0, #1
bne _02169874
@@ -17969,7 +17969,7 @@ _02169798:
mov r2, #1
strb r3, [sp, #8]
strb ip, [sp, #9]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
b _02169874
_02169808:
ldr r1, [sp, #0x5c]
@@ -17984,7 +17984,7 @@ _02169808:
add r1, sp, #6
strb r3, [sp, #7]
mov r2, #1
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrh r0, [r4, #0x26]
cmp r0, #1
bne _02169874
@@ -17998,7 +17998,7 @@ _02169808:
mov r2, #1
strb r3, [sp, #4]
strb ip, [sp, #5]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
_02169874:
mov r1, #0
bic r1, r1, #0x6000
@@ -18072,7 +18072,7 @@ _02169960:
ldr r0, _02169a54 ; =data_027e0e60
strh r1, [r4, #0xc]
ldr r0, [r0]
bl func_ov00_0208335c
bl _ZN10MapManager17Get_MapData_Unk28Ev
ldrb r1, [sp, #4]
sub r0, r0, #2
cmp r1, r0
@@ -18084,7 +18084,7 @@ _0216998c:
ldr r0, _02169a54 ; =data_027e0e60
strh r1, [r4, #0xc]
ldr r0, [r0]
bl func_ov00_02083368
bl _ZN10MapManager17Get_MapData_Unk2aEv
ldrb r1, [sp, #5]
sub r0, r0, #2
cmp r1, r0
@@ -18131,7 +18131,7 @@ _02169a0c:
ldr r0, [r0]
add r2, sp, #4
mov r1, #0x7e
bl func_ov00_020828c0
bl _ZN10MapManager16MapData_vfunc_7cEv
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
@@ -18798,14 +18798,14 @@ _0216a250:
add r1, r5, #0x18
ldr r0, [r0]
mov r3, #2
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
b _0216a330
_0216a2b4:
ldr r0, _0216a344 ; =data_027e0e60
add r1, r5, #0x18
ldr r0, [r0]
mov r3, #1
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
b _0216a330
_0216a2cc:
bl func_ov14_02127188
@@ -18830,7 +18830,7 @@ _0216a2fc:
ldr r0, _0216a344 ; =data_027e0e60
ldrh r1, [r5, #0x24]
ldr r0, [r0]
bl func_ov00_02083840
bl _ZN10MapManager18func_ov00_02083840Ei
b _0216a330
_0216a324:
mov r0, r5
@@ -18862,7 +18862,7 @@ func_ov17_0216a348: ; 0x0216a348
ldrh r1, [r4, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r4, pc}
@@ -18917,7 +18917,7 @@ _0216a428:
ldr r0, _0216a4a4 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
movne r0, #1
ldmneia sp!, {r4, pc}
@@ -18935,7 +18935,7 @@ _0216a444:
ldr r0, _0216a4a4 ; =data_027e0e60
ldrh r1, [r4, #0x24]
ldr r0, [r0]
bl func_ov00_02083840
bl _ZN10MapManager18func_ov00_02083840Ei
mov r0, #1
ldmia sp!, {r4, pc}
_0216a484:
@@ -18982,7 +18982,7 @@ _0216a508:
ldr r0, _0216a5b0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, pc}
@@ -19011,14 +19011,14 @@ _0216a56c:
ldrh r1, [r4, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0216a5b0 ; =data_027e0e60
ldrh r1, [r4, #0x24]
ldr r0, [r0]
bl func_ov00_02083790
bl _ZN10MapManager18func_ov00_02083790Ei
mov r0, #1
ldmia sp!, {r4, pc}
_0216a5a4:
@@ -19397,7 +19397,7 @@ func_ov17_0216a9fc: ; 0x0216a9fc
str r0, [r4, #0x20]
ldr r0, [r2]
mov r2, #1
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
add r6, r4, #0x18
str r0, [r4, #0x1c]
ldmia r6, {r0, r1, r2}
@@ -19450,7 +19450,7 @@ func_ov17_0216a9fc: ; 0x0216a9fc
ldr r0, _0216abf8 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
beq _0216ab90
mov r0, r4
@@ -19711,7 +19711,7 @@ _0216aedc:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
ldr r1, [r4, #4]
mov r0, #0
bic r1, r1, #8
asm/ov18.inc
+28 -28
View File
@@ -254,34 +254,34 @@
.extern func_ov00_0207f4a4
.extern func_ov00_02080140
.extern func_ov00_020807d4
.extern func_ov00_02082680
.extern func_ov00_020828c0
.extern func_ov00_02082d08
.extern func_ov00_02082d84
.extern func_ov00_0208330c
.extern func_ov00_02083318
.extern func_ov00_02083344
.extern func_ov00_02083350
.extern func_ov00_02083374
.extern func_ov00_02083384
.extern func_ov00_0208340c
.extern func_ov00_0208342c
.extern func_ov00_0208344c
.extern func_ov00_02083560
.extern func_ov00_020838e8
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083ce8
.extern func_ov00_02083f80
.extern func_ov00_02084088
.extern func_ov00_020843ec
.extern func_ov00_020849c0
.extern func_ov00_02084be0
.extern func_ov00_02084c7c
.extern func_ov00_02084c94
.extern func_ov00_02084cb0
.extern func_ov00_02084cc8
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager16MapData_vfunc_7cEv
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02082d84Ev
.extern _ZN10MapManager21GetCourseData_Unk_25cEv
.extern _ZN10MapManager18func_ov00_02083318Ei
.extern _ZN10MapManager20GetCourseData_Unk_86Ev
.extern _ZN10MapManager20GetCourseData_Unk_87Ev
.extern _ZN10MapManager18func_ov00_02083374Ev
.extern _ZN10MapManager18func_ov00_02083384Ev
.extern _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p
.extern _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083560EiPS_j
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083ce8Ecccci
.extern _ZN10MapManager16MapData_vfunc_6cEv
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager18func_ov00_020843ecEPi
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084c7cEi
.extern _ZN10MapManager18func_ov00_02084c94Ei
.extern _ZN10MapManager18func_ov00_02084cb0Ei
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern func_ov00_0208726c
.extern func_ov00_020872e8
.extern func_ov00_02087d34
asm/ov18.s
+49 -49
View File
@@ -304,7 +304,7 @@ func_ov18_0215b86c: ; 0x0215b86c
ldr r0, _0215bd68 ; =data_027e0e60
add r1, r9, #0x1b0
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldrb r2, [r9, #0x12]
ldr r0, _0215bd6c ; =0x00001333
mov r1, #0
@@ -322,18 +322,18 @@ func_ov18_0215b86c: ; 0x0215b86c
ldr r0, _0215bd68 ; =data_027e0e60
add r1, sp, #0x64
ldr r0, [r0]
bl func_ov00_0208340c
bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p
ldr r0, _0215bd68 ; =data_027e0e60
add r1, sp, #0x58
ldr r0, [r0]
bl func_ov00_0208342c
bl _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p
ldr r0, _0215bd68 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083374
bl _ZN10MapManager18func_ov00_02083374Ev
ldr r1, _0215bd68 ; =data_027e0e60
mov r5, r0
ldr r0, [r1]
bl func_ov00_02083384
bl _ZN10MapManager18func_ov00_02083384Ev
mov r10, #0x4000
rsb r10, r10, #0
mov r6, r0
@@ -693,7 +693,7 @@ _0215be0c:
bne _0215be5c
ldr r0, _0215beb0 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020849c0
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
movne r0, #1
strneb r0, [r9, #0x1cc]
@@ -824,7 +824,7 @@ func_ov18_0215bfc8: ; 0x0215bfc8
add r0, sp, #0
add r2, sp, #4
str r3, [sp, #0xc]
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mov r0, r5
ldr r2, [r0]
add r1, sp, #0
@@ -1219,12 +1219,12 @@ func_ov18_0215c460: ; 0x0215c460
ldrb r1, [r5, #1]
ldr r0, [r2]
mov r4, r3
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
ldr r2, _0215c5bc ; =data_027e0e60
mov r8, r0
ldrb r1, [r5]
ldr r0, [r2]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
mov r1, #0x5000
str r1, [sp, #0x14]
str r0, [sp, #0x10]
@@ -3214,7 +3214,7 @@ func_ov18_0215dee4: ; 0x0215dee4
ldrb r1, [r4, #0x15c]
ldr r0, [r0]
add r2, r4, #0x1cc
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -3538,7 +3538,7 @@ _0215e324:
add r0, sp, #4
ldr r1, [r1]
add r2, r4, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r2, [sp, #4]
ldr r0, _0215e49c ; =data_027e0e60
ldrb r1, [sp, #5]
@@ -3548,7 +3548,7 @@ _0215e324:
add r1, sp, #4
strb r3, [sp, #4]
strb r2, [sp, #5]
bl func_ov00_02084088
bl _ZN10MapManager16MapData_vfunc_54Ev
cmp r0, #6
cmpne r0, #0x37
add r0, sp, #0x54
@@ -4315,7 +4315,7 @@ _0215ede4:
mov r2, r6
strb r8, [sp, #0xc]
strb r9, [sp, #0xd]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
add r9, r9, #1
cmp r9, r10
blt _0215ede4
@@ -5272,7 +5272,7 @@ _0215f9b0:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
mov r0, #7
strb r0, [r4, #0x12]
b _0215fa1c
@@ -5287,7 +5287,7 @@ _0215f9e8:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
mov r0, #1
strb r0, [r4, #0x12]
_0215fa1c:
@@ -6426,7 +6426,7 @@ _021607b8:
mov r2, r5
strb r7, [sp, #0xc]
strb r9, [sp, #0xd]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
add r9, r9, #1
cmp r9, r10
ble _021607b8
@@ -6613,7 +6613,7 @@ _021609c0:
add r2, sp, #4
ldr r0, [r0]
mov r1, #0x30
bl func_ov00_020828c0
bl _ZN10MapManager16MapData_vfunc_7cEv
add sp, sp, #0x1c
ldmia sp!, {pc}
.align 2, 0
@@ -6843,7 +6843,7 @@ _02160c80:
mov r2, r11
strb r6, [sp, #0x14]
strb r8, [sp, #0x15]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
_02160c9c:
add r8, r8, #1
cmp r8, r10
@@ -6918,7 +6918,7 @@ _02160d90:
mov r2, r11
strb r6, [sp, #0x12]
strb r8, [sp, #0x13]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
_02160dac:
add r8, r8, #1
cmp r8, r10
@@ -6993,7 +6993,7 @@ _02160ea0:
mov r2, r11
strb r6, [sp, #0x10]
strb r8, [sp, #0x11]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
_02160ebc:
add r8, r8, #1
cmp r8, r10
@@ -9042,7 +9042,7 @@ _0216285c:
ldr r0, _02162ca0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084c94
bl _ZN10MapManager18func_ov00_02084c94Ei
cmp r0, #0
bne _02162950
add r0, sp, #0x118
@@ -9105,13 +9105,13 @@ _02162950:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084c7c
bl _ZN10MapManager18func_ov00_02084c7cEi
b _02162c90
_02162968:
ldr r0, _02162ca0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084c94
bl _ZN10MapManager18func_ov00_02084c94Ei
cmp r0, #0
bne _02162a48
add r0, sp, #0xec
@@ -9171,13 +9171,13 @@ _02162a48:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084c7c
bl _ZN10MapManager18func_ov00_02084c7cEi
b _02162c90
_02162a60:
ldr r0, _02162ca0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084c94
bl _ZN10MapManager18func_ov00_02084c94Ei
cmp r0, #0
bne _02162ab4
add r0, sp, #0xb4
@@ -9200,13 +9200,13 @@ _02162ab4:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084c7c
bl _ZN10MapManager18func_ov00_02084c7cEi
b _02162c90
_02162acc:
ldr r0, _02162ca0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084c94
bl _ZN10MapManager18func_ov00_02084c94Ei
cmp r0, #0
bne _02162b20
add r0, sp, #0x88
@@ -9229,13 +9229,13 @@ _02162b20:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084c7c
bl _ZN10MapManager18func_ov00_02084c7cEi
b _02162c90
_02162b38:
ldr r0, _02162ca0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
bne _02162b94
add r0, sp, #0x5c
@@ -9260,13 +9260,13 @@ _02162b94:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
b _02162c90
_02162bac:
ldr r0, _02162ca0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
bne _02162c08
add r0, sp, #0x30
@@ -9291,13 +9291,13 @@ _02162c08:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
b _02162c90
_02162c20:
ldr r0, _02162ca0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
bne _02162c7c
add r0, sp, #4
@@ -9322,7 +9322,7 @@ _02162c7c:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
_02162c90:
mov r0, #0
str r0, [r4, #0x6c]
@@ -17123,11 +17123,11 @@ func_ov18_021693b0: ; 0x021693b0
mov r6, r0
ldr r5, [r2]
mov r0, r5
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r4, r0
mov r0, r5
mov r1, r6
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [sp, #4]
mov r0, #0
str r0, [sp, #8]
@@ -17136,7 +17136,7 @@ func_ov18_021693b0: ; 0x021693b0
add r3, sp, #0x10
mov r0, r5
str r4, [sp, #0xc]
bl func_ov00_02083f80
bl _ZN10MapManager16MapData_vfunc_6cEv
ldr r0, [sp, #0x14]
cmp r0, #0xf80
movlt r0, #1
@@ -18338,7 +18338,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8
strh r2, [r4, #0x10]
ldrb r2, [r4, #0x15]
ldr r1, [r1]
bl func_ov00_02083560
bl _ZN10MapManager18func_ov00_02083560EiPS_j
ldrb lr, [r4, #0x16]
ldrb ip, [r4, #0x17]
ldrb r1, [sp, #0x15]
@@ -18353,10 +18353,10 @@ func_ov18_0216a3c8: ; 0x0216a3c8
ldrb r3, [sp, #0x14]
add r1, sp, #0x18
strb ip, [sp, #0x13]
bl func_ov00_02083ce8
bl _ZN10MapManager18func_ov00_02083ce8Ecccci
ldr r0, _0216a5b4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208330c
bl _ZN10MapManager21GetCourseData_Unk_25cEv
cmp r0, #0
beq _0216a47c
add r0, r4, #8
@@ -18381,16 +18381,16 @@ _0216a47c:
add r3, r4, #0xc
strb ip, [sp, #0x10]
strb lr, [sp, #0x11]
bl func_ov00_02082d84
bl _ZN10MapManager18func_ov00_02082d84Ev
_0216a4a4:
ldr r0, _0216a5b4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083344
bl _ZN10MapManager20GetCourseData_Unk_86Ev
cmp r0, #2
bge _0216a4cc
ldr r0, _0216a5b4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02083350
bl _ZN10MapManager20GetCourseData_Unk_87Ev
cmp r0, #2
blt _0216a504
_0216a4cc:
@@ -18509,7 +18509,7 @@ _0216a63c:
ldr r0, _0216a6b0 ; =data_027e0e60
ldrb r1, [r4, #0x19]
ldr r0, [r0]
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
movne r0, #0
strneb r0, [r4, #0x14]
@@ -18524,7 +18524,7 @@ _0216a674:
ldr r0, _0216a6b0 ; =data_027e0e60
ldrb r1, [r4, #0x19]
ldr r0, [r0]
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
movne r0, #1
strneb r0, [r4, #0x14]
@@ -18548,7 +18548,7 @@ func_ov18_0216a6b4: ; 0x0216a6b4
ldr r0, _0216a77c ; =data_027e0e60
ldrb r5, [r4, #0x15]
ldr r0, [r0]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, r5
ldmeqia sp!, {r4, r5, r6, pc}
ldrh r0, [r6]
@@ -19096,13 +19096,13 @@ func_ov18_0216adcc: ; 0x0216adcc
ldmhiia sp!, {r3, r4, r5, pc}
ldr r0, _0216aed4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208330c
bl _ZN10MapManager21GetCourseData_Unk_25cEv
cmp r0, #0
beq _0216ae24
ldr r0, _0216aed4 ; =data_027e0e60
ldrb r1, [r5, #4]
ldr r0, [r0]
bl func_ov00_02083318
bl _ZN10MapManager18func_ov00_02083318Ei
cmp r0, #0
addeq sp, sp, #8
moveq r0, #1
@@ -19110,7 +19110,7 @@ func_ov18_0216adcc: ; 0x0216adcc
_0216ae24:
ldr r0, _0216aed4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020849c0
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
addne sp, sp, #8
movne r0, #1
asm/ov19.inc
+8 -8
View File
@@ -1,6 +1,14 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_02083780Ei
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN11ItemManager7AddItemEi
@@ -182,14 +190,6 @@
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_02081f4c
.extern func_ov00_02082680
.extern func_ov00_020836dc
.extern func_ov00_02083770
.extern func_ov00_02083780
.extern func_ov00_02083a1c
.extern func_ov00_02083ee0
.extern func_ov00_02083fb0
.extern func_ov00_02084d24
.extern func_ov00_020875f8
.extern func_ov00_02087d34
.extern func_ov00_02087df8
asm/ov19.s
+12 -12
View File
@@ -3473,7 +3473,7 @@ _021703a4:
ldr r0, [r3]
add r1, sp, #0x18
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x34]
ldr r1, [sp, #0x30]
ldr r0, _02170568 ; =data_027e0f64
@@ -5462,7 +5462,7 @@ func_ov19_02171e64: ; 0x02171e64
add r0, sp, #0
add r2, sp, #4
str r3, [sp, #0xc]
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp]
mov r0, r0, lsr #0x5
and r0, r0, #3
@@ -6438,7 +6438,7 @@ func_ov19_02172ae0: ; 0x02172ae0
ldrb r1, [r4, #0x15a]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
moveq r0, #0
streqb r0, [r4, #0x158]
@@ -7849,24 +7849,24 @@ _02173d94:
mov r2, r11
strb r6, [sp, #2]
strb r8, [sp, #3]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r4]
mov r1, r7
mov r2, r8
mov r3, #9
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
b _02173df4
_02173dcc:
add r1, sp, #0
mov r2, #0
strb r6, [sp]
strb r8, [sp, #1]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r4]
mov r1, r7
mov r2, r8
mov r3, #0x15
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
_02173df4:
ldrb r0, [r10, #0x15]
add r8, r8, #1
@@ -8418,7 +8418,7 @@ _021744b8:
ldr r2, [r4, #0x50]
add r1, sp, #0
str r2, [sp, #8]
bl func_ov00_02083780
bl _ZN10MapManager18func_ov00_02083780Ei
str r0, [r4, #0x354]
ldr r1, _02174550 ; =data_ov19_02176b88
mov r0, r4
@@ -8592,7 +8592,7 @@ _02174710:
ldrh r1, [r7, #0x20]
ldr r0, [r0]
add r2, sp, #8
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
movne r5, #1
_02174754:
@@ -9147,7 +9147,7 @@ _02174eb4:
add r2, sp, #0x14
str r1, [sp, #0x1c]
ldr r1, [r4, #0x354]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -9901,7 +9901,7 @@ func_ov19_021758c8: ; 0x021758c8
add r1, sp, #0
str r2, [sp, #8]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r5, #0x4c]
add r0, r5, #0x158
bl func_ov00_020c5e20
@@ -10078,7 +10078,7 @@ _02175af8:
mov r2, r0
add r0, sp, #2
mov r1, r5
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mov r2, #0
ldrb r1, [sp, #2]
ldrb r0, [sp, #3]
asm/ov20.inc
+8 -8
View File
@@ -167,14 +167,14 @@
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_02081f4c
.extern func_ov00_020833f4
.extern func_ov00_02083400
.extern func_ov00_020836bc
.extern func_ov00_02083770
.extern func_ov00_02083a1c
.extern func_ov00_02083c7c
.extern func_ov00_02083ee0
.extern func_ov00_02083f44
.extern _ZN10MapManager18Get_MapData_Unk_d0Ev
.extern _ZN10MapManager18Get_MapData_Unk_d8Ev
.extern _ZN10MapManager18func_ov00_020836bcEjPi
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern func_ov00_02087d34
.extern func_ov00_02087d84
.extern func_ov00_02088000
asm/ov20.s
+17 -17
View File
@@ -839,7 +839,7 @@ _0216e120:
mov r1, #2
add r2, sp, #0x20
str r3, [sp, #0x28]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -850,7 +850,7 @@ _0216e120:
add r2, sp, #0x44
ldr r0, [r0]
mov r1, #2
bl func_ov00_020836bc
bl _ZN10MapManager18func_ov00_020836bcEjPi
ldr r1, [sp, #0x44]
ldr r0, [r7, #0xa8c]
cmp r0, r1
@@ -5055,7 +5055,7 @@ _02171ac0:
str lr, [sp, #4]
str ip, [sp, #8]
str r3, [sp, #0xc]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x14]
ldr r0, [r5, #0x15c]
cmp r0, #0
@@ -5371,7 +5371,7 @@ _02171e20:
str r1, [sp, #0x18]
add r1, sp, #0x10
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x20]
ldr r0, _021720a0 ; =data_027e0ffc
ldr r1, _021720a4 ; =0x00000243
@@ -8665,7 +8665,7 @@ _02174a20:
add r1, sp, #4
mov r2, #1
str r3, [sp, #0xc]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r2, r4, r0
ldr r1, [sp, #0x50]
ldr r0, [sp, #0x58]
@@ -9881,7 +9881,7 @@ _021759e8:
ldrh r1, [r4, #0x20]
ldr r0, [r0]
add r2, sp, #0x3c
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
addeq sp, sp, #0x19c
ldmeqia sp!, {r4, r5, pc}
@@ -10024,7 +10024,7 @@ _02175c00:
str ip, [sp, #0x30]
str r3, [sp, #0x34]
str r5, [sp, #0x38]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0xa0]
mov r1, #0
str r1, [sp]
@@ -10051,7 +10051,7 @@ _02175c64:
str r5, [sp, #0x24]
str r3, [sp, #0x28]
str lr, [sp, #0x2c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x94]
mov r1, #0
str r1, [sp]
@@ -10077,7 +10077,7 @@ _02175ccc:
str lr, [sp, #0x18]
str r3, [sp, #0x1c]
str ip, [sp, #0x20]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x88]
mov r1, #0
str r1, [sp]
@@ -10103,7 +10103,7 @@ _02175d30:
str lr, [sp, #0xc]
str r3, [sp, #0x10]
str ip, [sp, #0x14]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x7c]
mov r1, #0
str r1, [sp]
@@ -11640,13 +11640,13 @@ func_ov20_02176fe8: ; 0x02176fe8
ldr r1, [r4, #0x88]
str r1, [r4, #0x98]
ldr r0, [r0]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _02177060 ; =0xffffd99a
str r0, [r4, #0x48]
ldr r0, _0217705c ; =data_027e0e60
str r1, [r4, #0x4c]
ldr r0, [r0]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
str r0, [r4, #0x50]
mov r0, #1
add sp, sp, #0xc
@@ -11908,7 +11908,7 @@ func_ov20_02177300: ; 0x02177300
mov r2, r0
mov r1, r5
add r0, sp, #0xc
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r2, [sp, #0xc]
ldrb r1, [sp, #0xd]
sub r3, sp, #4
@@ -11962,7 +11962,7 @@ func_ov20_021773f4: ; 0x021773f4
add r0, sp, #0
ldr r1, [r1]
add r2, r2, #0x20
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r2, [sp]
ldrb r1, [sp, #1]
sub r3, sp, #4
@@ -12033,7 +12033,7 @@ func_ov20_021774e8: ; 0x021774e8
add r1, sp, #0x18
strb r2, [r3, #1]
ldr r2, [r3]
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
mov r8, #0
ldr r4, _021775cc ; =data_027e0e60
mov r9, r8
@@ -12064,11 +12064,11 @@ _02177538:
mov r2, #0
mov r1, r5
bne _0217759c
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
mov r10, r0
b _021775a8
_0217759c:
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
cmp r10, r0
movge r10, r0
_021775a8:
asm/ov21.inc
+5 -5
View File
@@ -1,4 +1,9 @@
#pragma once
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager16MapData_vfunc_60Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
@@ -123,11 +128,6 @@
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1f8
.extern func_ov00_02081f4c
.extern func_ov00_020836dc
.extern func_ov00_02083a1c
.extern func_ov00_02083e58
.extern func_ov00_02083ee0
.extern func_ov00_02084088
.extern func_ov00_0208b5a4
.extern func_ov00_0208b5bc
.extern func_ov00_0208b694
asm/ov21.s
+9 -9
View File
@@ -515,7 +515,7 @@ _0216dcb0: .word data_027e0f94
arm_func_start func_ov21_0216dcb4
func_ov21_0216dcb4: ; 0x0216dcb4
ldr r2, _0216dccc ; =data_027e0e60
ldr ip, _0216dcd0 ; =func_ov00_020836dc
ldr ip, _0216dcd0 ; =_ZN10MapManager18func_ov00_020836dcEii
ldrh r1, [r0, #0x22]
ldr r0, [r2]
mov r2, #0
@@ -523,7 +523,7 @@ func_ov21_0216dcb4: ; 0x0216dcb4
.align 2, 0
arm_func_end func_ov21_0216dcb4
_0216dccc: .word data_027e0e60
_0216dcd0: .word func_ov00_020836dc
_0216dcd0: .word _ZN10MapManager18func_ov00_020836dcEii
.global func_ov21_0216dcd4
arm_func_start func_ov21_0216dcd4
@@ -926,7 +926,7 @@ func_ov21_0216e208: ; 0x0216e208
ldrh r1, [r4, #0x22]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -2896,7 +2896,7 @@ _0216fa3c:
ldr r1, [r4]
add r0, sp, #0x14
mov r2, r7
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r0, [sp, #0x14]
ldrb r1, [sp, #0x15]
ldr r2, _0216fbb4 ; =func_ov00_020b1940
@@ -3337,7 +3337,7 @@ func_ov21_02170050: ; 0x02170050
add r1, sp, #0x10
mov r2, #0
str r3, [sp, #0x18]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r6, #0xc
_021700b8:
rsb r4, r6, #0
@@ -3438,7 +3438,7 @@ func_ov21_021701b0: ; 0x021701b0
add r1, sp, #0x10
mov r2, #0
str r3, [sp, #0x18]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r6, #0xf
_02170218:
rsb r4, r6, #0
@@ -3568,11 +3568,11 @@ func_ov21_02170388: ; 0x02170388
add r0, sp, #0
ldr r1, [r1]
add r2, sp, #4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _021703fc ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02083e58
bl _ZN10MapManager16MapData_vfunc_60Ev
cmp r0, #0
addgt sp, sp, #0x10
movgt r0, #0
@@ -3580,7 +3580,7 @@ func_ov21_02170388: ; 0x02170388
ldr r0, _021703fc ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02084088
bl _ZN10MapManager16MapData_vfunc_54Ev
cmp r0, #0x14
movne r0, #0
moveq r0, #1
asm/ov22.inc
+19 -19
View File
@@ -1,6 +1,25 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager16MapData_vfunc_60Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager16MapData_vfunc_7cEv
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020826a0Eiii
.extern _ZN10MapManager18func_ov00_020836bcEjPi
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager18func_ov00_0208413cEi
.extern _ZN10MapManager18func_ov00_02084ac4Ej
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10MapManager8SpawnNPCEP5Vec3pii
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
@@ -174,25 +193,6 @@
.extern func_ov00_0207c444
.extern func_ov00_0207c518
.extern func_ov00_02081f4c
.extern func_ov00_02082680
.extern func_ov00_020826a0
.extern func_ov00_020828c0
.extern func_ov00_0208344c
.extern func_ov00_020836bc
.extern func_ov00_020836dc
.extern func_ov00_02083770
.extern func_ov00_020838e8
.extern func_ov00_02083a1c
.extern func_ov00_02083c7c
.extern func_ov00_02083e34
.extern func_ov00_02083e58
.extern func_ov00_02083ee0
.extern func_ov00_02084088
.extern func_ov00_020840c4
.extern func_ov00_0208413c
.extern func_ov00_02084a5c
.extern func_ov00_02084ac4
.extern func_ov00_02084d24
.extern func_ov00_02087df8
.extern func_ov00_02088000
.extern func_ov00_02088130
asm/ov22.s
+31 -31
View File
@@ -485,7 +485,7 @@ func_ov22_0216dc9c: ; 0x0216dc9c
ldrb r1, [r4, #0x15a]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
moveq r0, #0
streqb r0, [r4, #0x158]
@@ -1077,10 +1077,10 @@ _0216e4a8:
mov r0, r8
mov r2, r5
ldrsh r3, [r10, #0xc]
bl func_ov00_020828c0
bl _ZN10MapManager16MapData_vfunc_7cEv
ldr r0, [r4]
mov r1, r5
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
beq _0216e51c
strb r9, [r0, #0x65]
@@ -1371,7 +1371,7 @@ _0216e8bc:
ldr r0, [r0]
add r2, r10, r2
strb r2, [sp, #0xb]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r7, r0
beq _0216e938
ldr r1, [r0]
@@ -1425,14 +1425,14 @@ _0216e958:
beq _0216e9bc
ldr r0, _0216ec8c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084ac4
bl _ZN10MapManager18func_ov00_02084ac4Ej
_0216e9bc:
ldr r0, _0216ec8c ; =data_027e0e60
add r1, sp, #0x1c
ldr r0, [r0]
mov r2, #1
mov r3, #0
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
str r0, [r4, #0x74]
_0216e9d8:
mov r0, #0x3c
@@ -1536,7 +1536,7 @@ _0216eb28:
ldr r0, [r0]
add r2, r10, r2
strb r2, [sp, #9]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r7, r0
beq _0216eba4
ldr r1, [r0]
@@ -1590,14 +1590,14 @@ _0216ebc4:
beq _0216ec28
ldr r0, _0216ec8c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084ac4
bl _ZN10MapManager18func_ov00_02084ac4Ej
_0216ec28:
ldr r0, _0216ec8c ; =data_027e0e60
add r1, sp, #0x10
ldr r0, [r0]
mov r2, #1
mov r3, #0
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
str r0, [r4, #0x74]
_0216ec44:
mov r1, #0
@@ -1827,7 +1827,7 @@ _0216eed0:
ldrb r1, [r4, #0x14]
ldr r0, [r0]
sub r2, r2, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
b _0216ef14
_0216eef4:
mov r0, #0
@@ -1837,7 +1837,7 @@ _0216eef4:
ldrb r2, [r4, #0x15]
ldr r0, [r0]
sub r1, r1, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
_0216ef14:
str r0, [r4, #0x1c]
ldrh r6, [r4, #0x24]
@@ -1901,13 +1901,13 @@ _0216efe8:
mov r2, r7
strb r9, [sp, #6]
strb r10, [sp, #7]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r5]
mov r1, r6
strb r9, [sp, #4]
strb r10, [sp, #5]
mov r2, r11
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r1, [r4, #0x15]
ldrb r0, [r4, #0x39]
add r10, r10, #1
@@ -3102,7 +3102,7 @@ _0216ff6c:
strb r8, [sp, #0x37]
strb r8, [sp, #0x38]
strb r8, [sp, #0x39]
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
ldr r0, _021701e8 ; =data_027e0d38
add r1, sp, #0x24
ldr r0, [r0]
@@ -4924,7 +4924,7 @@ func_ov22_02171770: ; 0x02171770
str r1, [sp, #8]
ldrh r1, [r4, #0x22]
and r1, r1, #0xff
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
beq _021717d8
ldr r0, [r4, #0x48]
@@ -5897,7 +5897,7 @@ func_ov22_02172438: ; 0x02172438
str r1, [sp, #0xc]
ldrh r1, [r4, #0x22]
and r1, r1, #0xff
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -6099,7 +6099,7 @@ func_ov22_021726e8: ; 0x021726e8
str r1, [sp, #8]
ldrh r1, [r4, #0x22]
and r1, r1, #0xff
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -6197,7 +6197,7 @@ func_ov22_0217283c: ; 0x0217283c
str r1, [sp, #8]
ldrh r1, [r4, #0x22]
and r1, r1, #0xff
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
ldreqb r0, [r4, #0x752]
cmpeq r0, #0
@@ -8056,7 +8056,7 @@ _021740a4:
ldrh r1, [r5, #0x20]
ldr r0, [r0]
ldr r2, [r5, #8]
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _02174120
ldr r1, _02174610 ; =data_027e0764
@@ -8817,7 +8817,7 @@ func_ov22_02174a80: ; 0x02174a80
str r3, [sp, #4]
ldr r3, [r4, #0x50]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0x9a
add r0, r0, #0x900
str r0, [r4, #0x4c]
@@ -9015,7 +9015,7 @@ func_ov22_02174cb0: ; 0x02174cb0
str r3, [sp, #0x18]
str r5, [sp, #0x1c]
str r6, [sp, #0x20]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x28]
ldr r3, _02174db4 ; =0x0000059a
mov r0, #0x1f
@@ -9199,7 +9199,7 @@ _02174f9c:
ldr r0, [r7]
add r1, sp, #8
strb r4, [sp, #9]
bl func_ov00_02084088
bl _ZN10MapManager16MapData_vfunc_54Ev
cmp r0, #0x38
bne _02175028
ldr r1, [r6]
@@ -9225,7 +9225,7 @@ _02174f9c:
strb r3, [r8]
strb r2, [r8, #1]
ldr r2, [r8]
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
ldr r0, _02175064 ; =data_027e0e58
add r1, r5, #0x158
ldr r0, [r0]
@@ -9883,10 +9883,10 @@ func_ov22_021757c0: ; 0x021757c0
ldr r5, [r1]
add r2, sp, #0x1c
mov r1, r5
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #0
mov r0, r5
bl func_ov00_02083e58
bl _ZN10MapManager16MapData_vfunc_60Ev
ldr r1, [sp, #4]
mov r2, #0x19000
ldr ip, [sp, #0xc]
@@ -10228,7 +10228,7 @@ func_ov22_02175c44: ; 0x02175c44
ldr r0, _02175cfc ; =data_027e0e60
add r1, r9, #0x18
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldrb r7, [r9, #0x14]
add r0, r7, #2
cmp r7, r0
@@ -10249,7 +10249,7 @@ _02175cb4:
mov r2, r4
strb r6, [sp]
strb r8, [sp, #1]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #0x10
@@ -10596,7 +10596,7 @@ _0217612c:
mov r1, r6
mov r2, r7
mov r3, r5
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
ldrb r0, [r4, #0x15]
add r7, r7, #1
add r0, r0, #0x10
@@ -11547,7 +11547,7 @@ func_ov22_02176d6c: ; 0x02176d6c
ldrh r1, [r4, #0x20]
ldr r0, [r0]
add r2, sp, #0x30
bl func_ov00_020836bc
bl _ZN10MapManager18func_ov00_020836bcEjPi
mov ip, #0
ldr r1, _02176f7c ; =0x00000ccd
bic r0, ip, #0x6000
@@ -11589,7 +11589,7 @@ func_ov22_02176d6c: ; 0x02176d6c
strb r2, [r4, #0x125]
ldr r0, [r0]
add r1, sp, #0x18
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r1, [sp, #0x18]
ldr r0, _02176f78 ; =data_027e0e60
str r1, [r4, #0x48]
@@ -11600,7 +11600,7 @@ func_ov22_02176d6c: ; 0x02176d6c
mov r1, #0x5000
ldr r0, [r0]
rsb r1, r1, #0
bl func_ov00_0208413c
bl _ZN10MapManager18func_ov00_0208413cEi
add r0, r4, #0x170
ldr r1, [r0]
ldr r1, [r1, #8]
asm/ov23.inc
+22 -22
View File
@@ -1,6 +1,28 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi
.extern _ZN10MapManager16MapData_vfunc_60Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18Set_MapData_Unk_16Eci
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_02083790Ei
.extern _ZN10MapManager18func_ov00_02083840Ei
.extern _ZN10MapManager18func_ov00_02083918EiPi
.extern _ZN10MapManager18func_ov00_02083958Ei
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
@@ -222,28 +244,6 @@
.extern func_ov00_0207c444
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_02082680
.extern func_ov00_0208344c
.extern func_ov00_02083624
.extern func_ov00_02083790
.extern func_ov00_02083840
.extern func_ov00_02083918
.extern func_ov00_02083948
.extern func_ov00_02083958
.extern func_ov00_020839d4
.extern func_ov00_020839f8
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083c7c
.extern func_ov00_02083e58
.extern func_ov00_02083ee0
.extern func_ov00_02083fb0
.extern func_ov00_020840a0
.extern func_ov00_020840c4
.extern func_ov00_02084740
.extern func_ov00_02084b38
.extern func_ov00_02084d24
.extern func_ov00_0208726c
.extern func_ov00_0208b5a4
.extern func_ov00_0208b5bc
asm/ov23.s
+49 -49
View File
@@ -707,10 +707,10 @@ _0216df74:
ldr r5, [r1]
add r2, r4, #0x48
mov r1, r5
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #0
mov r0, r5
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r4, r0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r1, [r0]
@@ -2286,7 +2286,7 @@ func_ov23_0216f2a4: ; 0x0216f2a4
add r1, sp, #0
str r2, [sp, #8]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r4, #0x4c]
ldr r1, [r4, #0x48]
ldr r3, _0216f3f0 ; =data_ov23_0217ac20
@@ -2388,7 +2388,7 @@ func_ov23_0216f428: ; 0x0216f428
add r1, sp, #0x74
mov r2, #0
str r3, [sp, #0x7c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r4, r0
ldr r0, [sp, #0xd0]
ldr r1, [sp, #0xc8]
@@ -2400,7 +2400,7 @@ func_ov23_0216f428: ; 0x0216f428
str r1, [sp, #0x6c]
add r1, sp, #0x68
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
cmp r4, r0
addne sp, sp, #0x1fc
mov r0, #0
@@ -2538,7 +2538,7 @@ _0216f6bc:
ldr r0, _0216f878 ; =data_027e0e60
mov r1, r6
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
beq _0216f6f4
ldr r1, [r0]
@@ -2843,7 +2843,7 @@ _0216fac8:
add r1, sp, #4
str r2, [sp, #0xc]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r7, #0x3a0]
mov r1, r7
add r0, r7, #0x398
@@ -2986,7 +2986,7 @@ func_ov23_0216fc10: ; 0x0216fc10
str lr, [sp, #0x14]
str ip, [sp, #0x18]
str r3, [sp, #0x1c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcd
add r0, r0, #0x400
str r0, [sp, #0x24]
@@ -3021,7 +3021,7 @@ func_ov23_0216fc10: ; 0x0216fc10
add r1, sp, #8
mov r2, #0
str r3, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r4, #0x4c]
mov r0, r4
bl func_ov23_0216fddc
@@ -3073,7 +3073,7 @@ func_ov23_0216fddc: ; 0x0216fddc
ldr r1, [r1]
add r0, sp, #2
add r2, r2, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mvn r4, #0
_0216fe00:
ldr r6, _0216fea4 ; =data_027e0e60
@@ -3088,7 +3088,7 @@ _0216fe0c:
mov r1, r7
strb r3, [sp]
strb r2, [sp, #1]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r8, r0
beq _0216fe84
ldr r1, [r0]
@@ -3463,7 +3463,7 @@ _021702d0:
add r1, sp, #0x20
str r2, [sp, #0x28]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r5, #0x4c]
ldr r1, [r5, #0x48]
mov r0, r5
@@ -3630,7 +3630,7 @@ _02170524:
add r1, sp, #0x14
mov r2, #0
str r3, [sp, #0x1c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r5, #0x3a0]
_021705a8:
mov r0, r5
@@ -5846,16 +5846,16 @@ func_ov23_021722d0: ; 0x021722d0
add r0, sp, #0
ldr r1, [r1]
add r2, r4, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _021723c0 ; =data_027e0e60
ldrb r1, [sp]
ldr r0, [r0]
bl func_ov00_02083c24
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [r4, #0x48]
ldr r0, _021723c0 ; =data_027e0e60
ldrb r1, [sp, #1]
ldr r0, [r0]
bl func_ov00_02083c50
bl _ZN10MapManager18func_ov00_02083c50Ei
str r0, [r4, #0x50]
ldr r1, [r4, #0x48]
ldr r0, _021723c0 ; =data_027e0e60
@@ -5867,7 +5867,7 @@ func_ov23_021722d0: ; 0x021722d0
add r1, sp, #4
str r2, [sp, #0xc]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r4, #0x4c]
add r0, r4, #0x1b4
bl func_ov23_0216f0f4
@@ -6194,7 +6194,7 @@ _021727a0:
ldr r0, [r0]
mov r3, r1
mov r2, #2
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
mov r0, r4
mov r1, #1
bl _ZN5Actor18func_Ov00_020c1bfcEi
@@ -6468,7 +6468,7 @@ _02172a78:
mov r1, r5
strb r3, [sp]
strb r2, [sp, #1]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r4, r0
beq _02172ae4
ldr r1, [r0]
@@ -7126,7 +7126,7 @@ _02173388:
ldr r0, [r0]
add r1, sp, #0x10
strb r2, [sp, #0x10]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
movs r10, r0
beq _021734a8
ldr r1, [r0]
@@ -7663,13 +7663,13 @@ _02173b48:
ldr r0, _021741ac ; =data_027e0e60
mov r1, #1
ldr r0, [r0]
bl func_ov00_02083790
bl _ZN10MapManager18func_ov00_02083790Ei
ldr r0, _021741ac ; =data_027e0e60
mov r1, #1
ldr r0, [r0]
mov r2, #2
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
_02173b88:
ldr r0, [r4, #0x138]
cmp r0, #0x1e
@@ -8079,7 +8079,7 @@ _02174120:
bl _ZN5Actor18func_ov00_020c1c20Eiii
ldr r0, _021741ac ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084740
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
ldr r0, _021741a8 ; =data_ov00_020eec68
mov r2, #0
@@ -8088,13 +8088,13 @@ _02174120:
ldr r0, _021741ac ; =data_027e0e60
mov r1, #1
ldr r0, [r0]
bl func_ov00_02083840
bl _ZN10MapManager18func_ov00_02083840Ei
ldr r0, _021741ac ; =data_027e0e60
mov r1, #1
ldr r0, [r0]
mov r2, #2
mov r3, r1
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
_0217419c:
mov r0, #1
add sp, sp, #0xc4
@@ -10309,7 +10309,7 @@ func_ov23_02175d3c: ; 0x02175d3c
mov r2, #1
strb r3, [sp, #4]
strb r4, [sp, #5]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
add sp, sp, #0x6c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
@@ -11656,7 +11656,7 @@ func_ov23_02177020: ; 0x02177020
add r2, r2, #0x1800
str r2, [r9, #0x40]
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldrb r7, [r9, #0x14]
add r0, r7, #2
cmp r7, r0
@@ -11677,7 +11677,7 @@ _021770a0:
mov r2, r4
strb r6, [sp]
strb r8, [sp, #1]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #4
@@ -12266,7 +12266,7 @@ _02177890:
mov r1, r6
mov r2, r7
mov r3, r5
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
ldrb r0, [r4, #0x15]
add r7, r7, #1
add r0, r0, #4
@@ -12584,7 +12584,7 @@ func_ov23_02177ba0: ; 0x02177ba0
strb r1, [r3, #1]
ldr r2, [r3]
add r1, sp, #0x78
bl func_ov00_02083c7c
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
add r0, sp, #0x6c
add r1, sp, #0x78
bl func_ov00_020b1a4c
@@ -12688,7 +12688,7 @@ _02177d24:
add r1, sp, #0x38
strb r3, [sp, #0x46]
str r2, [sp, #0x48]
bl func_ov00_02083624
bl _ZN10MapManager14GetEntrancePosEP5Vec3pi
ldr r0, [sp, #0x40]
ldr r2, [sp, #0x38]
ldr r1, [sp, #0x3c]
@@ -12709,7 +12709,7 @@ _02177da8:
mov r2, #2
strb r4, [sp, #0x32]
str r3, [sp, #0x34]
bl func_ov00_02083624
bl _ZN10MapManager14GetEntrancePosEP5Vec3pi
ldr r2, [sp, #0x24]
ldr r1, [sp, #0x28]
ldr r0, [sp, #0x2c]
@@ -12804,16 +12804,16 @@ func_ov23_02177e90: ; 0x02177e90
ldr r1, [r1]
mov r0, r8
mov r7, #1
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _02178044 ; =data_027e0f94
mov r4, r0
ldr r1, [r1, #8]
mov r0, r8
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
mov r2, r0
mov r1, r4
mov r0, r8
bl func_ov00_020840a0
bl _ZN10MapManager18func_ov00_020840a0Ecci
sub r0, r0, #0x49
cmp r0, #3
addls pc, pc, r0, lsl #2
@@ -13056,14 +13056,14 @@ _02178218:
add r2, sp, #0xc
ldr r0, [r0]
mov r1, #0x5b
bl func_ov00_02083918
bl _ZN10MapManager18func_ov00_02083918EiPi
cmp r0, #0
beq _02178298
ldr r0, _02178318 ; =data_027e0e60
ldrb r1, [sp, #0x10]
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _0217831c ; =data_027e0f64
mov r1, #0
ldr r0, [r0]
@@ -13074,7 +13074,7 @@ _02178274:
ldr r0, _02178318 ; =data_027e0e60
mov r1, #0
ldr r0, [r0]
bl func_ov00_02083958
bl _ZN10MapManager18func_ov00_02083958Ei
ldr r0, _0217831c ; =data_027e0f64
mov r1, #0
ldr r0, [r0]
@@ -13543,7 +13543,7 @@ _021788b8:
add r1, sp, #0xc
mov r0, r6
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r5, #4]
ldr r6, [r4, #0xb0]
sub r5, r1, r0
@@ -13641,10 +13641,10 @@ func_ov23_021789fc: ; 0x021789fc
mov r2, r0
add r0, sp, #4
mov r1, r4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mov r0, r4
add r1, sp, #4
bl func_ov00_02083e58
bl _ZN10MapManager16MapData_vfunc_60Ev
str r0, [sp, #0xc]
mov r0, #1
str r0, [sp]
@@ -13680,10 +13680,10 @@ func_ov23_02178ab0: ; 0x02178ab0
ldr r4, [r1]
add r2, r2, #0x20
mov r1, r4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #8
mov r0, r4
bl func_ov00_02083e58
bl _ZN10MapManager16MapData_vfunc_60Ev
mov r7, #0
ldr r11, _02179018 ; =data_02050f54
str r0, [sp]
@@ -13747,16 +13747,16 @@ _02178b10:
ldr r9, [r0]
add r0, sp, #6
mov r1, r9
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mov r0, r9
add r1, sp, #6
bl func_ov00_02083e58
bl _ZN10MapManager16MapData_vfunc_60Ev
ldr r1, _02179014 ; =data_027e0e60
str r0, [sp, #0x30]
ldr r1, [r1]
add r0, sp, #0x10
mov r2, r4
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp, #0x10]
mov r0, r0, lsr #0x5
and r0, r0, #3
@@ -13893,16 +13893,16 @@ _02178de8:
ldr r4, [r1]
add r2, sp, #0x20
mov r1, r4
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
add r1, sp, #4
mov r0, r4
bl func_ov00_02083e58
bl _ZN10MapManager16MapData_vfunc_60Ev
ldr r1, _02179014 ; =data_027e0e60
str r0, [sp, #0x24]
ldr r1, [r1]
add r0, sp, #0xc
add r2, sp, #0x20
bl func_ov00_02083fb0
bl _ZN10MapManager18func_ov00_02083fb0EiPS_i
ldr r0, [sp, #0xc]
mov r0, r0, lsr #0x5
and r0, r0, #3
asm/ov24.inc
+12 -12
View File
@@ -163,18 +163,18 @@
.extern func_ov00_0207c1b0
.extern func_ov00_0207c2e8
.extern func_ov00_02081f4c
.extern func_ov00_02082680
.extern func_ov00_020826a0
.extern func_ov00_020833f4
.extern func_ov00_02083400
.extern func_ov00_0208344c
.extern func_ov00_02083908
.extern func_ov00_02083ee0
.extern func_ov00_0208412c
.extern func_ov00_0208413c
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern func_ov00_02084d24
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020826a0Eiii
.extern _ZN10MapManager18Get_MapData_Unk_d0Ev
.extern _ZN10MapManager18Get_MapData_Unk_d8Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083908EcPi
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_0208412cEv
.extern _ZN10MapManager18func_ov00_0208413cEi
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern func_ov00_020876bc
.extern func_ov00_02088158
.extern func_ov00_0208b180
asm/ov24.s
+22 -22
View File
@@ -180,7 +180,7 @@ _0216d8cc:
mov r2, r7
strb r4, [sp, #4]
strb r10, [sp, #5]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r1, [r5, #0x15]
ldrb r0, [r5, #0x65]
add r10, r10, #1
@@ -495,7 +495,7 @@ func_ov24_0216dcbc: ; 0x0216dcbc
ldr r1, _0216dd58 ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_0208412c
bl _ZN10MapManager18func_ov00_0208412cEv
ldr r1, _0216dd5c ; =0xfffff667
ldr r2, [r4, #0x6c]
add r0, r0, r1
@@ -519,7 +519,7 @@ _0216dd0c:
blx r2
ldr r0, _0216dd58 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208412c
bl _ZN10MapManager18func_ov00_0208412cEv
sub r1, r0, #0x800
str r0, [sp, #0x10]
str r1, [sp, #4]
@@ -712,13 +712,13 @@ _0216df44:
ldr r1, [r4, #0x88]
str r1, [r4, #0x98]
ldr r0, [r0]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
str r0, [r4, #0x228]
mov r1, #0
ldr r0, _0216dffc ; =data_027e0e60
str r1, [r4, #0x22c]
ldr r0, [r0]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
str r0, [r4, #0x230]
mov r0, #1
add sp, sp, #0xc
@@ -920,7 +920,7 @@ _0216e258:
ldr r0, _0216e4b0 ; =data_027e0e60
ldr r1, [r4, #0x16c]
ldr r0, [r0]
bl func_ov00_0208413c
bl _ZN10MapManager18func_ov00_0208413cEi
_0216e280:
ldr r1, [r4, #0x174]
ldr r0, _0216e4b4 ; =data_ov24_021791ec
@@ -998,7 +998,7 @@ _0216e378:
ldr r0, _0216e4b0 ; =data_027e0e60
ldr r1, [r4, #0x16c]
ldr r0, [r0]
bl func_ov00_0208413c
bl _ZN10MapManager18func_ov00_0208413cEi
_0216e3a0:
ldr r1, [r4, #0x174]
ldr r0, _0216e4c0 ; =data_ov24_021791f4
@@ -1106,7 +1106,7 @@ _0216e4f4:
ldr r0, _0216e6f0 ; =data_027e0e60
ldr r1, [r4, #0x16c]
ldr r0, [r0]
bl func_ov00_0208413c
bl _ZN10MapManager18func_ov00_0208413cEi
mov r2, #0
_0216e520:
add r0, r4, r2, lsl #1
@@ -1133,7 +1133,7 @@ _0216e558:
ldr r0, _0216e6f0 ; =data_027e0e60
ldr r1, [r4, #0x16c]
ldr r0, [r0]
bl func_ov00_0208413c
bl _ZN10MapManager18func_ov00_0208413cEi
mov r2, #0
mov r1, r2
_0216e588:
@@ -1336,7 +1336,7 @@ _0216e810:
ldrb r1, [r5, #0x159]
ldr r0, [r0]
add r2, sp, #0x18
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
cmp r0, #0
beq _0216e860
ldr r0, [sp, #0x20]
@@ -1705,7 +1705,7 @@ _0216ec38:
add r0, r0, #0xe00
str r0, [r4, #0x47c]
ldr r0, [r3]
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
bne _0216ecf4
mov r0, r4
@@ -1879,7 +1879,7 @@ _0216eee4:
ldr r0, [r0]
mov r2, #3
mov r3, #1
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
_0216ef1c:
mov r0, r4
ldmia sp!, {r3, r4, r5, pc}
@@ -5265,7 +5265,7 @@ _02171994:
str r6, [sp, #8]
str r3, [sp, #0xc]
str r5, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x18]
add r1, sp, #0x14
mov r0, r4
@@ -8633,7 +8633,7 @@ _02174630:
str r6, [sp, #8]
str r3, [sp, #0xc]
str r5, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x18]
add r1, sp, #0x14
mov r0, r4
@@ -9506,7 +9506,7 @@ _021752ac: ; jump table
_021752c4:
ldr r0, _02175eb8 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208412c
bl _ZN10MapManager18func_ov00_0208412cEv
ldr r1, [r4, #0x4c]
cmp r1, r0
bge _0217537c
@@ -9516,7 +9516,7 @@ _021752c4:
_021752e8:
ldr r0, _02175eb8 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_0208412c
bl _ZN10MapManager18func_ov00_0208412cEv
ldr r1, [r4, #0x4c]
cmp r1, r0
bge _0217537c
@@ -13360,12 +13360,12 @@ _02178504:
ldr r0, _0217869c ; =data_027e0e60
add r1, sp, #0x5c
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r0, _0217869c ; =data_027e0e60
add r1, sp, #0x5c
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x60]
_0217852c:
ldr r0, _02178694 ; =data_027e0f64
@@ -14079,24 +14079,24 @@ _02178e60:
mov r2, r11
strb r6, [sp, #2]
strb r8, [sp, #3]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r4]
mov r1, r7
mov r2, r8
mov r3, #9
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
b _02178ec0
_02178e98:
add r1, sp, #0
mov r2, #0
strb r6, [sp]
strb r8, [sp, #1]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r4]
mov r1, r7
mov r2, r8
mov r3, #0x35
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
_02178ec0:
ldrb r0, [r10, #0x15]
add r8, r8, #1
asm/ov25.inc
+11 -11
View File
@@ -1,5 +1,16 @@
#pragma once
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_020836bcEjPi
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10MapManager18func_ov00_02084164Ev
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
@@ -173,17 +184,6 @@
.extern func_ov00_0207c444
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_0208344c
.extern func_ov00_020836bc
.extern func_ov00_02083770
.extern func_ov00_020838e8
.extern func_ov00_02083a1c
.extern func_ov00_02083ee0
.extern func_ov00_02083f44
.extern func_ov00_020840c4
.extern func_ov00_02084164
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern func_ov00_020875f8
.extern func_ov00_02087d34
.extern func_ov00_020888e8
asm/ov25.s
+14 -14
View File
@@ -437,7 +437,7 @@ _0216db80:
str r3, [sp, #0x18]
ldr r3, [r4, #0x1c]
str r3, [sp, #0x1c]
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
str r0, [r4, #0x18]
ldr r0, _0216dcd4 ; =data_027e0fac
add r2, r4, #0x14
@@ -615,7 +615,7 @@ _0216de80:
add r2, sp, #0
ldr r0, [r0]
mov r1, #1
bl func_ov00_020836bc
bl _ZN10MapManager18func_ov00_020836bcEjPi
ldr r1, [sp]
add r0, r4, #0x3a4
str r1, [r4, #0x620]
@@ -4564,7 +4564,7 @@ func_ov25_02171508: ; 0x02171508
mov r4, r1
mov r1, #1
mov r2, #3
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
addne sp, sp, #0x38
movne r0, #0
@@ -7980,7 +7980,7 @@ _021741f4:
add r2, sp, #0xe8
mov r1, #0xd
str r3, [sp, #0xf0]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
beq _02174248
mov r0, r4
@@ -8060,7 +8060,7 @@ _02174328:
ldr r0, _0217507c ; =data_027e0e60
add r1, sp, #0x10
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
mov r0, r4
bne _02174368
@@ -8081,7 +8081,7 @@ _02174374:
ldr r0, _0217507c ; =data_027e0e60
add r1, sp, #0xe
ldr r0, [r0]
bl func_ov00_020840c4
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
beq _021743d4
ldr r5, [r4, #0x138]
@@ -8875,7 +8875,7 @@ _02174ee8:
strb r6, [sp, #0x137]
strb r6, [sp, #0x138]
strb r6, [sp, #0x139]
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
ldr r0, _021750b4 ; =data_027e0d38
mov r3, #0x17
ldr r0, [r0]
@@ -9110,7 +9110,7 @@ _02175278:
ldr r0, _0217507c ; =data_027e0e60
add r1, sp, #0xc
ldr r0, [r0]
bl func_ov00_02084164
bl _ZN10MapManager18func_ov00_02084164Ev
cmp r0, #0
addeq sp, sp, #0x340
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
@@ -9870,7 +9870,7 @@ func_ov25_02175c54: ; 0x02175c54
add r2, sp, #0
ldr r0, [r0]
mov r1, #1
bl func_ov00_020836bc
bl _ZN10MapManager18func_ov00_020836bcEjPi
add r4, r11, #0x100
ldrsh r0, [r4, #0x78]
ldr r7, [sp]
@@ -10449,7 +10449,7 @@ _021763e4:
ldr r0, [r0]
mov r3, r2
mov r1, #5
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
_0217641c:
ldr r0, [r4, #0x130]
cmp r0, #0xd
@@ -11628,7 +11628,7 @@ func_ov25_021772ec: ; 0x021772ec
add r0, sp, #4
ldr r1, [r1]
add r2, r2, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r3, [sp, #4]
ldrb r1, [r4, #8]
ldrb r2, [sp, #5]
@@ -11940,7 +11940,7 @@ _021775e8:
str r3, [sp, #4]
ldr r3, [r4, #0x50]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0x800
str r0, [r4, #0x4c]
_021776c0:
@@ -12869,7 +12869,7 @@ _0217831c:
str lr, [sp]
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x10]
ldr r0, [r5, #0x178]
cmp r0, #0
@@ -13323,7 +13323,7 @@ func_ov25_021788a4: ; 0x021788a4
ldr r2, [r4, #0x88]
str r2, [r4, #0x98]
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r2, [sp, #0x14]
ldr r1, [sp, #0x10]
ldr r0, [sp, #0xc]
asm/ov26.inc
+16 -16
View File
@@ -218,22 +218,22 @@
.extern func_ov00_0207c1f8
.extern func_ov00_0207c444
.extern func_ov00_02081f4c
.extern func_ov00_020823d4
.extern func_ov00_020823e4
.extern func_ov00_020823f4
.extern func_ov00_02082614
.extern func_ov00_02082680
.extern func_ov00_020826a0
.extern func_ov00_020836dc
.extern func_ov00_02083a1c
.extern func_ov00_02083e34
.extern func_ov00_02083ee0
.extern func_ov00_02084088
.extern func_ov00_02084164
.extern func_ov00_02084740
.extern func_ov00_02084a50
.extern func_ov00_02084cb0
.extern func_ov00_02084cc8
.extern _ZN10MapManager18func_ov00_020823d4Ei
.extern _ZN10MapManager18func_ov00_020823e4Ei
.extern _ZN10MapManager16MapData_vfunc_b4Ev
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020826a0Eiii
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager18func_ov00_02084164Ev
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_02084a50Ev
.extern _ZN10MapManager18func_ov00_02084cb0Ei
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern func_ov00_020875f8
.extern func_ov00_02087d34
.extern func_ov00_02087e8c
asm/ov26.s
+41 -41
View File
@@ -1039,7 +1039,7 @@ func_ov26_0216e11c: ; 0x0216e11c
ldr r0, _0216e320 ; =data_027e0e60
moveq r1, #5
ldr r0, [r0]
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r9, #0x1c]
ldrb r7, [r9, #0x14]
add r0, r7, #5
@@ -1060,7 +1060,7 @@ _0216e1a4:
mov r2, r4
strb r6, [sp, #4]
strb r8, [sp, #5]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #2
@@ -1939,7 +1939,7 @@ _0216ebec:
bne _0216ec8c
ldr r0, _0216ec9c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084a50
bl _ZN10MapManager18func_ov00_02084a50Ev
cmp r0, #0
ldreq r0, _0216eca0 ; =data_027e0c68
ldreqb r1, [r0, #4]
@@ -2280,7 +2280,7 @@ _0216f024:
beq _0216f0d4
ldr r0, _0216f200 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084a50
bl _ZN10MapManager18func_ov00_02084a50Ev
cmp r0, #0
bne _0216f0d4
ldr r0, [r10, #0xb8]
@@ -2493,7 +2493,7 @@ _0216f368:
ble _0216f38c
ldr r0, _0216f39c ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084a50
bl _ZN10MapManager18func_ov00_02084a50Ev
cmp r0, #0
beq _0216f394
_0216f38c:
@@ -2845,7 +2845,7 @@ func_ov26_0216f7c4: ; 0x0216f7c4
str r3, [sp, #4]
ldr r3, [r4, #0x50]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r4, #0x4c]
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
@@ -2875,7 +2875,7 @@ func_ov26_0216f828: ; 0x0216f828
add r1, sp, #0
str r2, [sp, #8]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcd
ldr r1, [r4, #0x4c]
add r0, r0, #0x400
@@ -2918,7 +2918,7 @@ func_ov26_0216f8b8: ; 0x0216f8b8
add r1, sp, #0
str r2, [sp, #8]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcd
ldr r1, [r4, #0x4c]
add r0, r0, #0x400
@@ -2958,7 +2958,7 @@ func_ov26_0216f920: ; 0x0216f920
str lr, [sp]
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcd
add r3, r0, #0x400
add r0, sp, #0x18
@@ -3062,7 +3062,7 @@ _0216fa94:
ldr r0, _0216fb18 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02084164
bl _ZN10MapManager18func_ov00_02084164Ev
cmp r0, #0
addeq sp, sp, #0x1c
ldmeqia sp!, {r3, r4, pc}
@@ -3237,7 +3237,7 @@ _0216fc2c:
ldr r0, _0216fd94 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02084164
bl _ZN10MapManager18func_ov00_02084164Ev
cmp r0, #0
addeq sp, sp, #0x34
ldmeqia sp!, {r3, r4, r5, r6, pc}
@@ -3310,7 +3310,7 @@ func_ov26_0216fdb0: ; 0x0216fdb0
ldr r0, [r0]
str ip, [sp]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0x9a
add r1, r0, #0x1100
str r1, [sp, #0x1c]
@@ -3414,7 +3414,7 @@ func_ov26_0216ff14: ; 0x0216ff14
add r1, sp, #0
mov r2, #1
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcd
add r0, r0, #0x400
str r0, [r4, #0x4cc]
@@ -3465,7 +3465,7 @@ func_ov26_0216ffb8: ; 0x0216ffb8
add r1, sp, #0
str r2, [sp, #8]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcd
ldr r1, [r4, #0x4c]
add r0, r0, #0x400
@@ -3552,7 +3552,7 @@ func_ov26_02170088: ; 0x02170088
add r1, sp, #0
str r2, [sp, #8]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcd
ldr r1, [r4, #0x4c]
add r0, r0, #0x400
@@ -3656,7 +3656,7 @@ func_ov26_02170194: ; 0x02170194
ldr r0, _02170260 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02084164
bl _ZN10MapManager18func_ov00_02084164Ev
cmp r0, #0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, pc}
@@ -3872,7 +3872,7 @@ func_ov26_02170320: ; 0x02170320
ldr r0, _0217058c ; =data_027e0e60
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_02084164
bl _ZN10MapManager18func_ov00_02084164Ev
cmp r0, #0
addeq sp, sp, #0x14
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
@@ -4030,7 +4030,7 @@ func_ov26_02170704: ; 0x02170704
str lr, [sp]
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x10]
ldr r1, _02170790 ; =data_027e0f94
add r0, r4, #0x14
@@ -5725,7 +5725,7 @@ func_ov26_02171e4c: ; 0x02171e4c
ldr r0, _02171e94 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02171e4c
@@ -6157,7 +6157,7 @@ func_ov26_021723d4: ; 0x021723d4
strb r2, [sp, #4]
mov r2, #1
strb r3, [sp, #5]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r2, [sp, #4]
ldr r0, _021725a0 ; =data_027e0e60
add r1, sp, #4
@@ -6165,7 +6165,7 @@ func_ov26_021723d4: ; 0x021723d4
ldr r0, [r0]
mov r2, #1
strb r3, [sp, #4]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
_02172454:
add ip, r4, #0x18
ldmia ip, {r0, r1, r2}
@@ -6234,7 +6234,7 @@ _02172454:
ldr r0, _021725a0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
mov r0, r4
mov r2, #1
@@ -6400,7 +6400,7 @@ _02172788:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
_0217279c:
mov r0, #1
add sp, sp, #0xb0
@@ -7922,7 +7922,7 @@ _02173b64:
ldr r0, _02173b78 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02173b3c
@@ -12278,7 +12278,7 @@ func_ov26_02176b44: ; 0x02176b44
ldr r0, _02176cb0 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
mov r0, r4
ldr r3, [r0]
@@ -12347,7 +12347,7 @@ _02176d0c:
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084cb0
bl _ZN10MapManager18func_ov00_02084cb0Ei
ldr r1, [r4, #4]
mov r0, #1
orr r1, r1, #4
@@ -12545,22 +12545,22 @@ func_ov26_02176fc8: ; 0x02176fc8
ldrh r5, [r6, #0x2a]
ldr r0, [r0]
mov r1, r4
bl func_ov00_020823d4
bl _ZN10MapManager18func_ov00_020823d4Ei
ldr r1, _0217702c ; =data_027e0e60
str r0, [r6, #0xd4]
ldr r0, [r1]
mov r1, r4
bl func_ov00_020823e4
bl _ZN10MapManager18func_ov00_020823e4Ei
ldr r1, _0217702c ; =data_027e0e60
str r0, [r6, #0xd8]
ldr r0, [r1]
mov r1, r5
bl func_ov00_020823d4
bl _ZN10MapManager18func_ov00_020823d4Ei
ldr r1, _0217702c ; =data_027e0e60
str r0, [r6, #0xdc]
ldr r0, [r1]
mov r1, r5
bl func_ov00_020823e4
bl _ZN10MapManager18func_ov00_020823e4Ei
str r0, [r6, #0xe0]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
@@ -12590,7 +12590,7 @@ func_ov26_02177030: ; 0x02177030
bl func_0201933c
ldr r0, _02177100 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020823f4
bl _ZN10MapManager16MapData_vfunc_b4Ev
mov r4, r0
mov r0, r5
mov r1, r4
@@ -13246,7 +13246,7 @@ _0217789c:
ldr r0, [r5]
mov r1, r6
and r2, r8, #0xff
bl func_ov00_02082614
bl _ZN10MapManager18func_ov00_02082614Eii
ldr r1, [r4]
mov r0, r6
add r1, r1, #4
@@ -13697,7 +13697,7 @@ func_ov26_02177e14: ; 0x02177e14
str r2, [r7, #0xb4]
ldr r1, [r1]
add r2, r7, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r4, _02177f64 ; =data_ov26_0217af64
ldr r6, _02177f60 ; =data_027e0e60
add r9, sp, #2
@@ -13715,7 +13715,7 @@ _02177e90:
mov r2, r8
strb r10, [sp, #2]
strb r3, [sp, #3]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
add r5, r5, #1
cmp r5, #0x12
blo _02177e90
@@ -13739,7 +13739,7 @@ _02177ef4:
mov r2, r9
strb ip, [sp]
strb r3, [sp, #1]
bl func_ov00_020826a0
bl _ZN10MapManager18func_ov00_020826a0Eiii
add r5, r5, #1
cmp r5, #0x18
blt _02177ef4
@@ -14008,13 +14008,13 @@ func_ov26_02178228: ; 0x02178228
mov r2, r0
ldr r0, [r1]
ldr r1, [r2, #0x15c]
ldr ip, _02178248 ; =func_ov00_020836dc
ldr ip, _02178248 ; =_ZN10MapManager18func_ov00_020836dcEii
mov r2, #0
bx ip
.align 2, 0
arm_func_end func_ov26_02178228
_02178244: .word data_027e0e60
_02178248: .word func_ov00_020836dc
_02178248: .word _ZN10MapManager18func_ov00_020836dcEii
.global func_ov26_0217824c
thumb_func_start func_ov26_0217824c
@@ -14132,7 +14132,7 @@ _02178354:
bne _02178384
ldr r0, _021783b4 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084740
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
ldr r0, _021783b0 ; =data_ov00_020eec68
mov r2, #0x3c
@@ -14311,7 +14311,7 @@ func_ov26_0217855c: ; 0x0217855c
ldrb r1, [r10, #0x14]
ldr r0, [r0]
sub r2, r2, #1
bl func_ov00_02083e34
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r10, #0x1c]
ldr r1, [r10, #0x18]
ldr r0, _021786d4 ; =data_027e0e60
@@ -14334,7 +14334,7 @@ func_ov26_0217855c: ; 0x0217855c
ldr r0, [r0]
strb r2, [sp, #6]
strb r3, [sp, #7]
bl func_ov00_02084088
bl _ZN10MapManager16MapData_vfunc_54Ev
cmp r0, #0x37
bgt _02178604
bge _0217860c
@@ -14377,7 +14377,7 @@ _02178658:
mov r2, r5
strb r7, [sp, #4]
strb r8, [sp, #5]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
add r8, r8, #1
cmp r8, r9
blt _02178658
asm/ov27.inc
+5 -5
View File
@@ -1,5 +1,10 @@
#pragma once
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_020836bcEjPi
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -175,11 +180,6 @@
.extern func_ov00_02081f50
.extern func_ov00_02081f58
.extern func_ov00_02081f6c
.extern func_ov00_0208344c
.extern func_ov00_020836bc
.extern func_ov00_020836dc
.extern func_ov00_020838e8
.extern func_ov00_02083ee0
.extern func_ov00_020872e8
.extern func_ov00_020875f8
.extern func_ov00_02087d34
asm/ov27.s
+21 -21
View File
@@ -372,7 +372,7 @@ _0216db58:
str r3, [sp, #0x18]
ldr r3, [r5, #0x50]
str r3, [sp, #0x1c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r5, #0x4c]
mov r0, r5
mov r1, #4
@@ -1417,7 +1417,7 @@ _0216eadc:
ldr r0, _0216ed44 ; =data_027e0e60
add r1, sp, #0xc
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r0, _0216ed48 ; =data_027e0f64
ldr r1, [sp, #0xc]
ldr r2, [r0]
@@ -1469,7 +1469,7 @@ _0216eb54:
add r1, sp, #0
str r3, [sp, #0x30]
str r2, [sp, #0x38]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
add r0, sp, #0
add r1, r4, #0x48
mov r2, r0
@@ -2098,7 +2098,7 @@ _0216f43c:
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0216f4b0
mov r0, r4
@@ -2197,7 +2197,7 @@ func_ov27_0216f5c0: ; 0x0216f5c0
ldrh r1, [r4, #0x22]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -2260,7 +2260,7 @@ func_ov27_0216f608: ; 0x0216f608
ldr r3, [r4, #0x50]
add r1, sp, #4
str r3, [sp, #0xc]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r4, #0x4c]
mov r0, r4
bl func_ov14_02145258
@@ -3164,7 +3164,7 @@ _021702d0:
add r1, sp, #8
mov r2, #0
str r3, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x18]
mov r1, #0
str r1, [sp]
@@ -4009,7 +4009,7 @@ func_ov27_02170e24: ; 0x02170e24
add r1, sp, #0xc
mov r2, r5
str r3, [sp, #0x14]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
cmp r0, #0x2000
addlt sp, sp, #0x18
str r0, [r4, #0x4c]
@@ -5430,7 +5430,7 @@ _02172284:
add r1, sp, #0x18
str r2, [sp, #0x20]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r6, #0x4c]
add r0, r0, #0x800
cmp r1, r0
@@ -5468,7 +5468,7 @@ _021722d0:
str r3, [sp, #0x10]
ldr r3, [r6, #0x50]
str r3, [sp, #0x14]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r5, r0, #0x800
mov r3, #0x3800
str r5, [r6, #0x4c]
@@ -5781,7 +5781,7 @@ func_ov27_02172598: ; 0x02172598
str r1, [sp, #0x20]
add r1, sp, #0x18
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr ip, _0217283c ; =0x00000a8f
str r0, [sp, #0x28]
mov r1, #0
@@ -6644,7 +6644,7 @@ func_ov27_02173330: ; 0x02173330
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -7034,7 +7034,7 @@ func_ov27_02173830: ; 0x02173830
strb lr, [sp, #0x13]
strb lr, [sp, #0x14]
strb lr, [sp, #0x15]
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
ldr r0, _021738dc ; =data_027e0d38
add r1, sp, #0
ldr r0, [r0]
@@ -7451,7 +7451,7 @@ func_ov27_02173d78: ; 0x02173d78
ldr r0, [r0]
add r1, sp, #0x18
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x28]
ldr r3, _02173e34 ; =0x0000099a
mov r0, #0
@@ -7969,7 +7969,7 @@ func_ov27_0217440c: ; 0x0217440c
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldmeqia sp!, {r4, pc}
add r0, r4, #0x470
@@ -8042,7 +8042,7 @@ func_ov27_02174454: ; 0x02174454
add r1, sp, #0
str r2, [sp, #8]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r1, r4, #0x100
ldrsh r2, [r1, #0x1e]
mov r1, #0
@@ -8209,7 +8209,7 @@ func_ov27_02174748: ; 0x02174748
add r1, sp, #0
str r2, [sp, #8]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r4, #0x4c]
ldrsb r1, [r4, #0x2c]
mov r0, r4
@@ -8237,7 +8237,7 @@ func_ov27_021747d4: ; 0x021747d4
add r1, sp, #0
mov r2, #0
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r4, r0
mov r0, r5
bl func_ov14_02145508
@@ -9153,7 +9153,7 @@ func_ov27_021752a8: ; 0x021752a8
str r1, [sp, #0x1c]
ldrh r1, [r4, #0x20]
add r2, sp, #8
bl func_ov00_020836bc
bl _ZN10MapManager18func_ov00_020836bcEjPi
add r0, r4, #0xb8
add r0, r0, #0x400
str r0, [sp]
@@ -9240,7 +9240,7 @@ _021754a4:
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _021754cc
add r0, r4, #0x470
@@ -9381,7 +9381,7 @@ func_ov27_02175660: ; 0x02175660
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldreqb r0, [r4, #0x4e7]
cmpeq r0, #1
asm/ov28.inc
+10 -10
View File
@@ -1,5 +1,15 @@
#pragma once
.extern Approach_thunk
.extern _ZN10MapManager17GetMapData_Unk_4cEv
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_02082b3cEi
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10MapManager18func_ov00_020843ecEPi
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager8SpawnNPCEP5Vec3pii
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
@@ -171,16 +181,6 @@
.extern func_ov00_0207c31c
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_02082680
.extern func_ov00_02082b3c
.extern func_ov00_020836dc
.extern func_ov00_020838e8
.extern func_ov00_02083f44
.extern func_ov00_02084120
.extern func_ov00_020843ec
.extern func_ov00_02084a5c
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern func_ov00_0208726c
.extern func_ov00_020876bc
.extern func_ov00_02087ab0
asm/ov28.s
+23 -23
View File
@@ -3517,7 +3517,7 @@ func_ov28_021704b0: ; 0x021704b0
ldr r0, [r0]
mov r2, r1
mov r3, r1
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
b _02170604
_02170524:
ldr r0, _02170624 ; =gAdventureFlags
@@ -3537,7 +3537,7 @@ _02170524:
ldr r0, [r0]
mov r3, r2
mov r1, #2
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
b _02170604
_02170570:
ldr r0, _02170624 ; =gAdventureFlags
@@ -3557,7 +3557,7 @@ _02170570:
ldr r0, [r0]
mov r3, r2
mov r1, #3
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
b _02170604
_021705bc:
ldr r0, _02170624 ; =gAdventureFlags
@@ -3577,7 +3577,7 @@ _021705bc:
ldr r0, [r0]
mov r3, r2
mov r1, #4
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
_02170604:
add r0, r4, #0x74
add r0, r0, #0x400
@@ -3950,10 +3950,10 @@ _021709a4:
mov r0, r6
add r1, sp, #0
str r3, [sp, #8]
bl func_ov00_02083f44
bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p
mov r5, r0
mov r0, r6
bl func_ov00_02084120
bl _ZN10MapManager17GetMapData_Unk_4cEv
add r0, r5, r0
str r0, [r4, #0x4c]
ldrsb r0, [r4, #0x2c]
@@ -5560,7 +5560,7 @@ _02171ee8:
mov r2, r4
strb r6, [sp, #4]
strb r8, [sp, #5]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #1
@@ -5664,7 +5664,7 @@ _02172008:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
mov r0, #0xc
strb r0, [r4, #0x12]
b _021720c4
@@ -5689,7 +5689,7 @@ _02172068:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
mov r0, #1
strb r0, [r4, #0x12]
_021720c4:
@@ -5942,7 +5942,7 @@ _021723c4:
mov r2, r4
strb r6, [sp, #4]
strb r8, [sp, #5]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #1
@@ -6065,7 +6065,7 @@ _02172528:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
ldr r0, [r4, #4]
orr r0, r0, #0x14
str r0, [r4, #4]
@@ -6088,7 +6088,7 @@ _02172580:
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
bl func_ov00_020843ec
bl _ZN10MapManager18func_ov00_020843ecEPi
ldr r0, [r4, #4]
bic r0, r0, #4
bic r0, r0, #0x10
@@ -6540,7 +6540,7 @@ func_ov28_02172af8: ; 0x02172af8
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
@@ -6615,7 +6615,7 @@ func_ov28_02172bc8: ; 0x02172bc8
ldrh r1, [r4, #0x22]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -8457,7 +8457,7 @@ func_ov28_021742b0: ; 0x021742b0
add r1, r4, #0x48
mov r2, #1
mov r3, #0
bl func_ov00_02084a5c
bl _ZN10MapManager8SpawnNPCEP5Vec3pii
add r0, sp, #0
bl func_ov00_0209a508
add sp, sp, #0xb0
@@ -8965,7 +8965,7 @@ func_ov28_0217496c: ; 0x0217496c
strb lr, [sp, #0x13]
strb lr, [sp, #0x14]
strb lr, [sp, #0x15]
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
ldr r0, _02174a10 ; =gOverlayManager
ldr r2, _02174a14 ; =0x00000004
mov r1, #2
@@ -8975,7 +8975,7 @@ func_ov28_0217496c: ; 0x0217496c
ldr r0, [r0]
add r1, sp, #0
strb r2, [sp, #0x15]
bl func_ov00_02082b3c
bl _ZN10MapManager18func_ov00_02082b3cEi
ldr r0, _02174a10 ; =gOverlayManager
ldr r2, _02174a18 ; =0x00000005
mov r1, #2
@@ -9507,7 +9507,7 @@ _0217504c:
add r1, ip, r3
and r1, r1, #0xff
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
mov r1, #0
str r1, [r4, #0x130]
ldr r0, _021750a0 ; =data_ov28_02179684
@@ -9623,7 +9623,7 @@ _02175184:
ldr r0, [r0]
and r1, r1, #0xff
mov r3, #1
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _02175260 ; =data_ov28_02179684
mov r5, #0
ldr r1, [r0, #0x18]
@@ -9731,7 +9731,7 @@ _02175308:
ldr r0, _021753dc ; =data_027e0e60
ldrb r2, [r4, #0x29]
ldr r0, [r0]
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, [r4, #0x1bc]
@@ -9749,7 +9749,7 @@ _02175364:
add r1, ip, r3
and r1, r1, #0xff
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
mov r0, r4
bl func_ov28_02175028
bl func_ov28_02174948
@@ -9796,7 +9796,7 @@ func_ov28_021753f0: ; 0x021753f0
add r1, ip, r3
and r1, r1, #0xff
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r1, _02175468 ; =data_ov28_02178348
add r0, r4, #0x1c0
ldr r1, [r1]
@@ -12084,7 +12084,7 @@ _021772b0:
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _02177408
mov r0, r4
asm/ov29.inc
+9 -9
View File
@@ -1,6 +1,15 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_6cEv
.extern _ZN10MapManager18Set_MapData_Unk_16Eci
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083908EcPi
.extern _ZN10MapManager18func_ov00_02083928EPci
.extern _ZN10MapManager18func_ov00_02083938Ei
.extern _ZN10MapManager18func_ov00_020846a4Ev
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN11ItemManager18func_ov00_020ae4dcEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
@@ -185,15 +194,6 @@
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_02081f4c
.extern func_ov00_02082680
.extern func_ov00_020836dc
.extern func_ov00_02083908
.extern func_ov00_02083928
.extern func_ov00_02083938
.extern func_ov00_02083948
.extern func_ov00_02083f80
.extern func_ov00_020846a4
.extern func_ov00_02084d24
.extern func_ov00_02087400
.extern func_ov00_0208b5a4
.extern func_ov00_0208b5bc
asm/ov29.s
+17 -17
View File
@@ -1504,7 +1504,7 @@ func_ov29_0216ea08: ; 0x0216ea08
ldmneia sp!, {r4, pc}
ldr r0, _0216ea68 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020846a4
bl _ZN10MapManager18func_ov00_020846a4Ev
cmp r0, #0xd
beq _0216ea48
cmp r0, #0xe
@@ -2286,7 +2286,7 @@ _0216f4bc:
add r1, sp, #4
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083928
bl _ZN10MapManager18func_ov00_02083928EPci
ldrb r1, [sp, #8]
ldr r0, _0216f6a4 ; =data_027e0e60
add r2, r4, #0x1f0
@@ -2297,17 +2297,17 @@ _0216f4bc:
and r1, r1, #0xff
and r5, r3, #0xff
mov r6, #1
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
ldr r0, _0216f6a4 ; =data_027e0e60
mov r1, r5
ldr r0, [r0]
add r2, r4, #0x20c
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
ldr r0, _0216f6a4 ; =data_027e0e60
mov r1, r6
ldr r0, [r0]
add r2, r4, #0x228
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
ldr r1, _0216f6a8 ; =data_02052f54
add r0, r4, #0x1c8
ldrsh r2, [r1, #2]
@@ -2649,14 +2649,14 @@ _0216f9b0:
ldrb r5, [r4, #0x22c]
ldr r0, [r0]
mov r1, #0
bl func_ov00_02083938
bl _ZN10MapManager18func_ov00_02083938Ei
cmp r0, r5
beq _0216fbe8
ldr r0, _0216fbf8 ; =data_027e0e60
ldrb r1, [r4, #0x22c]
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
b _0216fbe8
_0216f9e4:
ldr r0, _0216fbf4 ; =data_027e0f64
@@ -2683,14 +2683,14 @@ _0216fa2c:
ldrb r5, [r4, #0x1f4]
ldr r0, [r0]
mov r1, #0
bl func_ov00_02083938
bl _ZN10MapManager18func_ov00_02083938Ei
cmp r0, r5
beq _0216fbe8
ldr r0, _0216fbf8 ; =data_027e0e60
ldrb r1, [r4, #0x1f4]
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
b _0216fbe8
_0216fa60:
ldr r0, _0216fbf4 ; =data_027e0f64
@@ -2717,14 +2717,14 @@ _0216faa8:
ldrb r5, [r4, #0x210]
ldr r0, [r0]
mov r1, #0
bl func_ov00_02083938
bl _ZN10MapManager18func_ov00_02083938Ei
cmp r0, r5
beq _0216fbe8
ldr r0, _0216fbf8 ; =data_027e0e60
ldrb r1, [r4, #0x210]
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
b _0216fbe8
_0216fadc:
add r0, r4, #0x250
@@ -2891,7 +2891,7 @@ func_ov29_0216fcd4: ; 0x0216fcd4
ldrb r1, [r0, #0x1c6]
ldr r0, [r2]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0216fd6c
ldr r1, _0216fd7c ; =data_027e0f94
@@ -2906,7 +2906,7 @@ func_ov29_0216fcd4: ; 0x0216fcd4
add r2, sp, #0
add r3, sp, #4
str ip, [sp, #0x18]
bl func_ov00_02083f80
bl _ZN10MapManager16MapData_vfunc_6cEv
ldr r0, [sp, #4]
cmp r0, #0
ldreq r0, [sp, #8]
@@ -10615,24 +10615,24 @@ _02176630:
mov r2, r11
strb r6, [sp, #2]
strb r8, [sp, #3]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r4]
mov r1, r7
mov r2, r8
mov r3, #9
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
b _02176690
_02176668:
add r1, sp, #0
mov r2, #0
strb r6, [sp]
strb r8, [sp, #1]
bl func_ov00_02082680
bl _ZN10MapManager18func_ov00_02082680Eii
ldr r0, [r4]
mov r1, r7
mov r2, r8
mov r3, #0x35
bl func_ov00_02084d24
bl _ZN10MapManager18func_ov00_02084d24Ecci
_02176690:
ldrb r0, [r10, #0x15]
add r8, r8, #1
asm/ov30.inc
+8 -8
View File
@@ -140,14 +140,14 @@
.extern func_ov00_0207c1f8
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_02082d08
.extern func_ov00_02083770
.extern func_ov00_02083ee0
.extern func_ov00_02084324
.extern func_ov00_0208433c
.extern func_ov00_0208439c
.extern func_ov00_02084740
.extern func_ov00_02084924
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_a4Ev
.extern _ZN10MapManager18func_ov00_0208433cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_0208439cEv
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_02084924Ej
.extern func_ov00_02087d34
.extern func_ov00_020884b4
.extern func_ov00_02093a1c
asm/ov30.s
+35 -35
View File
@@ -1568,7 +1568,7 @@ func_ov30_0217d09c: ; 0x0217d09c
str lr, [sp, #0x28]
str ip, [sp, #0x2c]
str r3, [sp, #0x30]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
addne sp, sp, #0x58
movne r0, #0
@@ -1787,7 +1787,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8
str lr, [sp, #4]
str ip, [sp, #8]
str r3, [sp, #0xc]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
addne sp, sp, #0x20
movne r0, #0
@@ -1866,7 +1866,7 @@ func_ov30_0217d4e8: ; 0x0217d4e8
add r2, sp, #0
mov r1, #0xff
str r3, [sp, #8]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
@@ -1983,7 +1983,7 @@ func_ov30_0217d690: ; 0x0217d690
str ip, [sp, #0x24]
str r6, [sp, #0x28]
str r3, [sp, #0x2c]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
addne sp, sp, #0x48
movne r0, #0
@@ -2069,7 +2069,7 @@ func_ov30_0217d7d8: ; 0x0217d7d8
add r1, sp, #0x18
add r2, sp, #0x14
str r3, [sp, #0x20]
bl func_ov00_0208433c
bl _ZN10MapManager18func_ov00_0208433cEP5Vec3pi
mov r0, r11
ldrsh r2, [sp, #0x16]
ldrsh r1, [sp, #0x14]
@@ -2097,7 +2097,7 @@ _0217d874:
strh r0, [sp, #0xe]
ldr r0, [r5]
mov r1, r6
bl func_ov00_02084324
bl _ZN10MapManager16MapData_vfunc_a4Ev
cmp r0, #0
beq _0217d934
ldrsh r1, [sp, #0x16]
@@ -2114,7 +2114,7 @@ _0217d874:
ldr r0, [r5]
mov r1, r6
add r2, sp, #0x24
bl func_ov00_0208439c
bl _ZN10MapManager18func_ov00_0208439cEv
ldr r1, [r10, #8]
ldr r0, [sp, #0x2c]
ldr r3, [r10]
@@ -2158,7 +2158,7 @@ _0217d934:
ldr r2, [sp]
ldr r0, [r0]
add r1, sp, #0x10
bl func_ov00_0208439c
bl _ZN10MapManager18func_ov00_0208439cEv
_0217d97c:
mov r0, r11
add sp, sp, #0x30
@@ -4040,7 +4040,7 @@ _0217f250:
mov r2, #1
str r4, [sp, #0x18]
str r3, [sp, #0x1c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x60]
add r0, sp, #0x5c
bl func_ov30_0217f088
@@ -4102,7 +4102,7 @@ _0217f2f4:
str r6, [sp, #8]
str r4, [sp, #0xc]
str r3, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x54]
_0217f3b8:
ldr r0, _0217f55c ; =data_027e10b4
@@ -4306,7 +4306,7 @@ _0217f5f8:
str r5, [sp, #0x18]
str r3, [sp, #0x1c]
str r7, [sp, #0x20]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r6, r0
_0217f69c:
str r5, [r4, #0x48]
@@ -4477,7 +4477,7 @@ _0217f880:
mov r2, #1
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x10]
add r0, sp, #0xc
bl func_ov30_0217f088
@@ -4711,7 +4711,7 @@ _0217fbb4:
mov r2, #1
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x10]
add r0, sp, #0xc
bl func_ov30_0217f088
@@ -5412,7 +5412,7 @@ func_ov30_02180548: ; 0x02180548
bne _02180594
ldr r0, _021805a0 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, #7
bne _02180594
ldr r0, _021805a4 ; =gAdventureFlags
@@ -5444,7 +5444,7 @@ func_ov30_021805ac: ; 0x021805ac
bne _021805f8
ldr r0, _02180604 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02082d08
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, #7
bne _021805f8
ldr r0, _02180608 ; =gAdventureFlags
@@ -10049,7 +10049,7 @@ func_ov30_02183ca8: ; 0x02183ca8
ldr r0, [r2]
str r3, [sp, #0x38]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, [r7]
ldr r1, _02183d7c ; =data_027e0e60
str r2, [sp, #0x24]
@@ -10061,7 +10061,7 @@ func_ov30_02183ca8: ; 0x02183ca8
str r2, [sp, #0x2c]
add r1, sp, #0x24
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, _02183d78 ; =data_ov30_021894a0
add r0, r4, r0
str r0, [sp, #0x10]
@@ -10518,7 +10518,7 @@ _021841ec:
bl func_ov00_020d716c
ldr r0, _02184308 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_02084740
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
ldr r0, _02184304 ; =data_ov00_020eec68
mov r2, #0
@@ -10527,7 +10527,7 @@ _021841ec:
ldr r0, _02184308 ; =data_027e0e60
mov r1, #0
ldr r0, [r0]
bl func_ov00_02084924
bl _ZN10MapManager18func_ov00_02084924Ej
b _02184298
_0218424c:
ldr r0, [r10, #0x88]
@@ -10548,7 +10548,7 @@ _0218424c:
ldr r0, _02184308 ; =data_027e0e60
mov r1, #1
ldr r0, [r0]
bl func_ov00_02084924
bl _ZN10MapManager18func_ov00_02084924Ej
_02184298:
ldr r0, [r10, #0x94]
cmp r0, #0
@@ -11362,7 +11362,7 @@ _02184940:
ldr r3, [r7, #0x50]
add r2, sp, #0x74
str r3, [sp, #0x7c]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
movne r8, #1
_02184998:
@@ -11450,7 +11450,7 @@ _02184a84:
ldr r3, [r7, #0x50]
add r2, sp, #0x68
str r3, [sp, #0x70]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
movne r8, #1
_02184adc:
@@ -11550,7 +11550,7 @@ _02184bf8:
ldr r3, [r7, #0x50]
add r2, sp, #0x5c
str r3, [sp, #0x64]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
movne r8, #1
_02184c50:
@@ -11648,7 +11648,7 @@ _02184d64:
ldr r3, [r7, #0x50]
add r2, sp, #0x50
str r3, [sp, #0x58]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
movne r8, #1
_02184dbc:
@@ -11747,7 +11747,7 @@ _02184ed4:
ldr r3, [r0, #0x50]
ldr r0, [r5]
str r3, [sp, #0x4c]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
movne r8, #1
_02184f2c:
@@ -11842,7 +11842,7 @@ _02185034:
ldr r3, [r0, #0x50]
ldr r0, [r5]
str r3, [sp, #0x40]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
movne r8, #1
_0218508c:
@@ -11937,7 +11937,7 @@ _02185194:
ldr r3, [r0, #0x50]
ldr r0, [r5]
str r3, [sp, #0x34]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
movne r8, #1
_021851ec:
@@ -14289,7 +14289,7 @@ func_ov30_021872c4: ; 0x021872c4
ldr r0, [r3]
add r1, sp, #0
str ip, [sp, #8]
bl func_ov00_0208433c
bl _ZN10MapManager18func_ov00_0208433cEP5Vec3pi
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
@@ -14303,13 +14303,13 @@ func_ov30_02187304: ; 0x02187304
mov r3, r0
ldr r0, [r2]
mov r2, r1
ldr ip, _02187324 ; =func_ov00_0208439c
ldr ip, _02187324 ; =_ZN10MapManager18func_ov00_0208439cEv
mov r1, r3
bx ip
.align 2, 0
arm_func_end func_ov30_02187304
_02187320: .word data_027e0e60
_02187324: .word func_ov00_0208439c
_02187324: .word _ZN10MapManager18func_ov00_0208439cEv
.global func_ov30_02187328
arm_func_start func_ov30_02187328
@@ -14377,7 +14377,7 @@ func_ov30_021873bc: ; 0x021873bc
mov r5, r0
ldr r0, [r2]
mov r4, r1
bl func_ov00_02084324
bl _ZN10MapManager16MapData_vfunc_a4Ev
cmp r0, #0
addeq sp, sp, #8
moveq r0, #0
@@ -14468,13 +14468,13 @@ _02187524:
ldr r0, _02187568 ; =data_027e0e60
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_02084324
bl _ZN10MapManager16MapData_vfunc_a4Ev
cmp r0, #0
beq _0218755c
ldr r0, _02187568 ; =data_027e0e60
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_02084324
bl _ZN10MapManager16MapData_vfunc_a4Ev
cmp r0, #0
addne sp, sp, #8
movne r0, #1
@@ -14523,14 +14523,14 @@ _021875d0: .word 0x000016a1
arm_func_start func_ov30_021875d4
func_ov30_021875d4: ; 0x021875d4
ldr r2, _021875e8 ; =data_027e0e60
ldr ip, _021875ec ; =func_ov00_02084324
ldr ip, _021875ec ; =_ZN10MapManager16MapData_vfunc_a4Ev
mov r1, r0
ldr r0, [r2]
bx ip
.align 2, 0
arm_func_end func_ov30_021875d4
_021875e8: .word data_027e0e60
_021875ec: .word func_ov00_02084324
_021875ec: .word _ZN10MapManager16MapData_vfunc_a4Ev
.global func_ov30_021875f0
arm_func_start func_ov30_021875f0
asm/ov31.inc
+1 -1
View File
@@ -153,7 +153,7 @@
.extern func_ov00_0207b89c
.extern func_ov00_0207ba90
.extern func_ov00_0207bc48
.extern func_ov00_02083918
.extern _ZN10MapManager18func_ov00_02083918EiPi
.extern func_ov00_0208726c
.extern func_ov00_02087338
.extern func_ov00_02087400
asm/ov31.s
+1 -1
View File
@@ -273,7 +273,7 @@ _0217c040:
mov r1, #0x45
ldr r0, [r0]
add r2, sp, #0x50
bl func_ov00_02083918
bl _ZN10MapManager18func_ov00_02083918EiPi
cmp r0, #0
beq _0217c0f0
ldr r0, _0217c214 ; =data_027e0f64
asm/ov32.inc
+5 -5
View File
@@ -1,6 +1,11 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083780Ei
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
@@ -159,11 +164,6 @@
.extern func_ov00_02081f4c
.extern func_ov00_02081f58
.extern func_ov00_02081f6c
.extern func_ov00_020836dc
.extern func_ov00_02083780
.extern func_ov00_02083ee0
.extern func_ov00_02084be0
.extern func_ov00_02084cc8
.extern func_ov00_020875f8
.extern func_ov00_02087d34
.extern func_ov00_020888e8
asm/ov32.s
+14 -14
View File
@@ -1370,7 +1370,7 @@ func_ov32_0217cdd8: ; 0x0217cdd8
ldrh r1, [r4, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, [r4, #0x184]
@@ -1529,7 +1529,7 @@ _0217cfc4:
ldrh r1, [r5, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0217d030
mov r0, r5
@@ -1938,7 +1938,7 @@ _0217d500:
add r1, sp, #0x10
str r2, [sp, #0x18]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r5, #0x4c]
ldr r0, [r5, #0x184]
mov r1, #2
@@ -3069,7 +3069,7 @@ _0217e3e4:
ldrh r1, [r5, #0x24]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0217e448
mov r0, r5
@@ -5206,11 +5206,11 @@ func_ov32_0217feac: ; 0x0217feac
str r2, [sp, #0x18]
ldr r2, [r6, #0x50]
str r2, [sp, #0x1c]
bl func_ov00_02083780
bl _ZN10MapManager18func_ov00_02083780Ei
mov r7, r0
add r1, sp, #8
mov r0, r5
bl func_ov00_02083780
bl _ZN10MapManager18func_ov00_02083780Ei
cmp r7, r0
moveq r4, #1
_0217ff6c:
@@ -6830,7 +6830,7 @@ _021815b8:
ldr r0, _02181624 ; =data_027e0e60
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl func_ov00_02084cc8
bl _ZN10MapManager18func_ov00_02084cc8Ei
cmp r0, #0
mov r0, r4
beq _021815ec
@@ -8066,7 +8066,7 @@ func_ov32_021826c4: ; 0x021826c4
ldr r0, _021826ec ; =data_027e0e60
mov r2, #3
ldr r0, [r0]
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov32_021826c4
@@ -9021,7 +9021,7 @@ func_ov32_0218318c: ; 0x0218318c
mla r6, r5, r3, r6
mov r2, #1
add r5, r6, #0x800
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, r5
str r0, [r4, #0x234]
mov r0, #0
@@ -9122,7 +9122,7 @@ _02183414:
mov r2, #1
str r6, [lr, #4]
sub r5, r5, #0x400
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0x800
add r0, r0, r5
str r0, [r4, #0x234]
@@ -9156,7 +9156,7 @@ _02183498:
mov r2, #1
str r6, [lr, #4]
sub r5, r5, #0x400
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0x800
add r0, r0, r5
str r0, [r4, #0x234]
@@ -9394,7 +9394,7 @@ func_ov32_02183818: ; 0x02183818
str lr, [sp]
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [sp, #0x1c]
cmp r1, r0
strlt r0, [sp, #0x1c]
@@ -10648,7 +10648,7 @@ func_ov32_02184890: ; 0x02184890
str r3, [sp, #4]
ldr r3, [r4, #0x50]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0x9a
add r0, r0, #0x900
str r0, [r4, #0x4c]
@@ -10836,7 +10836,7 @@ func_ov32_02184a9c: ; 0x02184a9c
str r3, [sp, #0x18]
str r5, [sp, #0x1c]
str r6, [sp, #0x20]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x28]
ldr r3, _02184ba0 ; =0x0000059a
mov r0, #0x1f
asm/ov33.inc
+2 -2
View File
@@ -115,8 +115,8 @@
.extern func_ov00_0207a1c8
.extern func_ov00_0207c474
.extern func_ov00_02081f4c
.extern func_ov00_020836dc
.extern func_ov00_02083ee0
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern func_ov00_0208726c
.extern func_ov00_02087338
.extern func_ov00_020876bc
asm/ov33.s
+5 -5
View File
@@ -855,7 +855,7 @@ func_ov33_0217c808: ; 0x0217c808
add r1, sp, #0
mov r2, #0
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r1, r0, #0x800
mov r0, r4
str r1, [r4, #0x4c]
@@ -1130,7 +1130,7 @@ _0217cba8:
ldrh r1, [r5, #0x22]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0217cf08
mov r0, r5
@@ -1171,7 +1171,7 @@ _0217cc24:
add r1, sp, #0x1c
str r2, [sp, #0x24]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r5, #0x4c]
add r0, r0, #0x800
cmp r1, r0
@@ -1280,7 +1280,7 @@ _0217cdd0:
ldrh r1, [r5, #0x22]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0217cf08
mov r0, r5
@@ -1321,7 +1321,7 @@ _0217ce4c:
add r1, sp, #0x10
str r2, [sp, #0x18]
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r5, #0x4c]
add r0, r0, #0x800
cmp r1, r0
asm/ov34.inc
+5 -5
View File
@@ -129,11 +129,11 @@
.extern func_ov00_0207c31c
.extern func_ov00_0207c444
.extern func_ov00_02081f4c
.extern func_ov00_02083908
.extern func_ov00_02083948
.extern func_ov00_02083a1c
.extern func_ov00_02083ee0
.extern func_ov00_02084088
.extern _ZN10MapManager18func_ov00_02083908EcPi
.extern _ZN10MapManager18Set_MapData_Unk_16Eci
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern func_ov00_02087400
.extern func_ov00_02087d34
.extern func_ov00_02087d84
asm/ov34.s
+10 -10
View File
@@ -1340,14 +1340,14 @@ _0217cfa4:
add r2, sp, #0
mov r0, r4
mov r1, #1
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
cmp r0, #0
addeq sp, sp, #0x1c
ldmeqia sp!, {r3, r4, pc}
mov r0, r4
mov r1, #1
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _0217d00c ; =data_027e0f64
add r1, sp, #0
ldr r0, [r0]
@@ -1386,14 +1386,14 @@ _0217d040:
add r2, sp, #0
mov r0, r4
mov r1, #4
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
cmp r0, #0
addeq sp, sp, #0x1c
ldmeqia sp!, {r3, r4, pc}
mov r0, r4
mov r1, #4
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _0217d0a8 ; =data_027e0f64
add r1, sp, #0
ldr r0, [r0]
@@ -1432,14 +1432,14 @@ _0217d0dc:
add r2, sp, #0
mov r0, r4
mov r1, #3
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
cmp r0, #0
addeq sp, sp, #0x1c
ldmeqia sp!, {r3, r4, pc}
mov r0, r4
mov r1, #3
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _0217d144 ; =data_027e0f64
add r1, sp, #0
ldr r0, [r0]
@@ -2227,7 +2227,7 @@ _0217db48:
mov r1, #1
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _0217de98 ; =data_ov34_021861a0
mov r1, #0
ldr r2, [r0, #0x8c]
@@ -6628,7 +6628,7 @@ _02181b50:
add r1, sp, #0xc
mov r2, #0
str r3, [sp, #0x14]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
mov r1, r4, asr #0x4
mov r5, r1, lsl #0x1
add r0, r0, #0xcd
@@ -10717,11 +10717,11 @@ func_ov34_021853dc: ; 0x021853dc
ldr r1, [r1]
add r0, sp, #8
add r2, r4, #0x48
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _02185580 ; =data_027e0e60
add r1, sp, #8
ldr r0, [r0]
bl func_ov00_02084088
bl _ZN10MapManager16MapData_vfunc_54Ev
cmp r0, #5
cmpne r0, #6
cmpne r0, #0x14
asm/ov35.inc
+2 -2
View File
@@ -1,6 +1,8 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_020836bcEjPi
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager7AddItemEi
@@ -164,8 +166,6 @@
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_02081f4c
.extern func_ov00_020836bc
.extern func_ov00_02083ee0
.extern func_ov00_02087584
.extern func_ov00_020875f8
.extern func_ov00_02087d34
asm/ov35.s
+3 -3
View File
@@ -2807,7 +2807,7 @@ func_ov35_0217e320: ; 0x0217e320
ldr r0, [r0]
add r1, sp, #0x18
mov r2, #0
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x28]
mov r3, #0x800
str r3, [sp]
@@ -8086,7 +8086,7 @@ _02182d84:
add r2, sp, #0x94
ldr r0, [r0]
mov r1, #1
bl func_ov00_020836bc
bl _ZN10MapManager18func_ov00_020836bcEjPi
ldr r5, [sp, #0xac]
ldr r3, [sp, #0xb0]
ldr r2, [sp, #0xb4]
@@ -9259,7 +9259,7 @@ _02183d8c:
str ip, [sp, #0x18]
str r3, [sp, #0x1c]
str r8, [sp, #0x20]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x28]
str r5, [sp]
ldrsh r1, [r7, #0x78]
asm/ov36.inc
+11 -11
View File
@@ -157,17 +157,17 @@
.extern func_ov00_0207c5d4
.extern func_ov00_02081f58
.extern func_ov00_02081f6c
.extern func_ov00_020833f4
.extern func_ov00_02083400
.extern func_ov00_020836dc
.extern func_ov00_02083770
.extern func_ov00_02083918
.extern func_ov00_02083948
.extern func_ov00_02083958
.extern func_ov00_020839d4
.extern func_ov00_020839f8
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern _ZN10MapManager18Get_MapData_Unk_d0Ev
.extern _ZN10MapManager18Get_MapData_Unk_d8Ev
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_02083918EiPi
.extern _ZN10MapManager18Set_MapData_Unk_16Eci
.extern _ZN10MapManager18func_ov00_02083958Ei
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern func_ov00_0208726c
.extern func_ov00_02087d34
.extern func_ov00_02088000
asm/ov36.s
+21 -21
View File
@@ -1829,13 +1829,13 @@ _0217d56c:
ldr r0, [r0]
mov r2, r1
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _0217d6b0 ; =data_027e0e60
mov r1, #4
ldr r0, [r0]
mov r2, #3
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _0217d680 ; =gAdventureFlags
mov r1, #0xeb
ldr r0, [r0]
@@ -2375,7 +2375,7 @@ func_ov36_0217dd98: ; 0x0217dd98
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
beq _0217ddf0
ldr r0, [r4, #0x138]
@@ -3213,7 +3213,7 @@ _0217e978:
str r1, [sp, #0x14]
ldrh r1, [r6, #0x22]
ldr r4, _0217eb34 ; =0x00000337
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
ldrh r2, [r6, #0x78]
ldr r5, _0217eb50 ; =data_02050f54
mov r1, #0x3800
@@ -3519,7 +3519,7 @@ _0217ede8:
add r2, sp, #0
str r1, [sp, #8]
ldrh r1, [r4, #0x22]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -3528,22 +3528,22 @@ _0217ede8:
ldr r0, _0217ef0c ; =data_027e0e60
ldr r1, [r4, #0x54]
ldr r0, [r0]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _0217ef0c ; =data_027e0e60
mov r6, r0
ldr r0, [r1]
ldr r1, [r4, #0x5c]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
ldr r1, _0217ef0c ; =data_027e0e60
mov r7, r0
ldr r0, [r1]
ldr r1, [r4, #0x48]
bl func_ov00_020839d4
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _0217ef0c ; =data_027e0e60
mov r5, r0
ldr r0, [r1]
ldr r1, [r4, #0x50]
bl func_ov00_020839f8
bl _ZN10MapManager18func_ov00_020839f8Ev
cmp r6, r5
mov r2, #0
beq _0217ee8c
@@ -6918,7 +6918,7 @@ _02181dc8:
mov r1, #2
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
addeq sp, sp, #0x14
ldmeqia sp!, {r3, r4, pc}
@@ -6973,7 +6973,7 @@ _02181e34:
mov r1, #3
ldr r0, [r0]
mov r2, r1
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
addne sp, sp, #0x14
ldmneia sp!, {r3, r4, pc}
@@ -6982,13 +6982,13 @@ _02181e34:
ldr r0, [r0]
mov r2, r1
mov r3, #1
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _02181f30 ; =data_027e0e60
mov r1, #4
ldr r0, [r0]
mov r2, #3
mov r3, #1
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
.align 2, 0
@@ -7020,13 +7020,13 @@ func_ov36_02181f3c: ; 0x02181f3c
mov r2, r1
ldr r0, [r0]
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _02181fc8 ; =data_027e0e60
mov r1, #4
ldr r0, [r0]
mov r2, #3
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
mov r2, #0
ldr r1, _02181fcc ; =data_027e0f64
strb r2, [r4, #0x8aa]
@@ -7662,14 +7662,14 @@ _021828dc:
add r2, sp, #0x2c
ldr r0, [r0]
mov r1, #0x5b
bl func_ov00_02083918
bl _ZN10MapManager18func_ov00_02083918EiPi
cmp r0, #0
beq _02182934
ldr r0, _0218298c ; =data_027e0e60
ldrb r1, [sp, #0x30]
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _02182954 ; =data_027e0f64
mov r1, #0
ldr r0, [r0]
@@ -7712,7 +7712,7 @@ func_ov36_02182990: ; 0x02182990
mov r4, r0
ldr r0, [r1]
mov r1, #0
bl func_ov00_02083958
bl _ZN10MapManager18func_ov00_02083958Ei
ldr r0, _02182c68 ; =data_027e0f64
mov r1, #0
ldr r0, [r0]
@@ -10049,11 +10049,11 @@ _02184a9c:
ldr r0, [r0]
str r1, [sp, #0x20]
str r1, [sp, #0x24]
bl func_ov00_02083400
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldr r1, _02184de0 ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
bl func_ov00_020833f4
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
mov r2, #0
mov r1, r2
cmp r6, #0
@@ -10375,7 +10375,7 @@ _02184f6c:
add r2, sp, #0
str r1, [sp, #8]
ldrh r1, [r6, #0x22]
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
strb r0, [r5]
cmp r4, #0
beq _02185040
asm/ov37.inc
+3 -3
View File
@@ -1,6 +1,9 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18Set_MapData_Unk_16Eci
.extern _ZN10MapManager18func_ov00_02083908EcPi
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN11ItemManager12GetItemModelEj
@@ -145,9 +148,6 @@
.extern func_ov00_02081f4c
.extern func_ov00_02081f58
.extern func_ov00_02081f6c
.extern func_ov00_02083908
.extern func_ov00_02083948
.extern func_ov00_02083ee0
.extern func_ov00_02087400
.extern func_ov00_02087d34
.extern func_ov00_02088000
asm/ov37.s
+16 -16
View File
@@ -3062,14 +3062,14 @@ _0217e78c:
add r2, sp, #0x7c
ldr r0, [r0]
mov r1, #3
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
cmp r0, #0
beq _0217e7ec
ldr r0, _0217f0f4 ; =data_027e0e60
mov r1, #3
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _0217e334 ; =data_027e0f64
mov r2, #0
ldr r0, [r0]
@@ -3175,14 +3175,14 @@ _0217e93c:
add r2, sp, #0x54
ldr r0, [r0]
mov r1, #1
bl func_ov00_02083908
bl _ZN10MapManager18func_ov00_02083908EcPi
cmp r0, #0
beq _0217e99c
ldr r0, _0217f0f4 ; =data_027e0e60
mov r1, #1
ldr r0, [r0]
mov r2, #0
bl func_ov00_02083948
bl _ZN10MapManager18Set_MapData_Unk_16Eci
ldr r0, _0217e334 ; =data_027e0f64
mov r2, #0
ldr r0, [r0]
@@ -3939,7 +3939,7 @@ func_ov37_0217f468: ; 0x0217f468
str lr, [sp]
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x10]
add r1, sp, #0xc
mov r0, r4
@@ -3972,7 +3972,7 @@ func_ov37_0217f4d4: ; 0x0217f4d4
str lr, [sp]
str ip, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x10]
add r1, sp, #0xc
mov r0, r4
@@ -4003,7 +4003,7 @@ func_ov37_0217f540: ; 0x0217f540
str lr, [sp, #0x14]
str ip, [sp, #0x18]
str r3, [sp, #0x1c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x24]
ldr r1, [sp, #0x20]
add r0, r5, #0x2000
@@ -6751,7 +6751,7 @@ _02181b64:
str r6, [sp, #0x44]
str r4, [sp, #0x48]
str r3, [sp, #0x4c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x228]
mov r1, #0
str r1, [sp]
@@ -6805,7 +6805,7 @@ _02181c30:
str r6, [sp, #0x38]
str r4, [sp, #0x3c]
str r3, [sp, #0x40]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x21c]
mov r1, #0
str r1, [sp]
@@ -6938,7 +6938,7 @@ _02181e2c:
mov r2, #1
str r6, [sp, #0x30]
str r3, [sp, #0x34]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x1f8]
mov r0, #0
str r0, [sp]
@@ -7167,7 +7167,7 @@ _0218219c:
mov r2, #1
str r6, [sp, #0x24]
str r3, [sp, #0x28]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x1bc]
mov r0, #0
str r0, [sp]
@@ -7286,7 +7286,7 @@ _02182368:
str r6, [sp, #0x14]
str r4, [sp, #0x18]
str r3, [sp, #0x1c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x198]
mov r1, #0
str r1, [sp]
@@ -7341,7 +7341,7 @@ _02182438:
str r6, [sp, #8]
str r4, [sp, #0xc]
str r3, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x18c]
mov r1, #0
str r1, [sp]
@@ -12123,7 +12123,7 @@ func_ov37_02186458: ; 0x02186458
add r1, sp, #8
mov r2, #1
str r3, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [r4, #0x4c]
ldr r1, [r4, #0x48]
add r0, r4, #0x21c
@@ -12603,7 +12603,7 @@ func_ov37_02186b68: ; 0x02186b68
str lr, [sp, #8]
str ip, [sp, #0xc]
str r3, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add r0, r0, #0xcd
add r0, r0, #0x400
str r0, [sp, #0x18]
@@ -13264,7 +13264,7 @@ _021874d8:
str ip, [sp, #0x14]
str r4, [sp, #0x18]
str r3, [sp, #0x1c]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
str r0, [sp, #0x24]
mov r1, #0
str r1, [sp]
asm/ov38.inc
+2 -2
View File
@@ -162,8 +162,8 @@
.extern func_ov00_0207c358
.extern func_ov00_0207c444
.extern func_ov00_0207c7e8
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern func_ov00_02087d34
.extern func_ov00_02087d84
.extern func_ov00_02088000
asm/ov38.s
+9 -9
View File
@@ -10966,7 +10966,7 @@ _02185790:
mov r1, #3
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -11049,7 +11049,7 @@ _021858ac:
mov r1, #3
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, [r4, #0xff8]
@@ -11064,7 +11064,7 @@ _021858f0:
mov r1, #6
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02185a64 ; =data_027e0e60
@@ -11072,7 +11072,7 @@ _021858f0:
ldr r0, [r0]
mov r2, #1
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _02185a68 ; =data_ov29_0217a4ac
mov r1, #0
strb r1, [r0, #0x56]
@@ -11104,7 +11104,7 @@ _02185984:
mov r1, #5
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, [r4, #0xff8]
@@ -11118,7 +11118,7 @@ _02185984:
ldr r0, [r0]
mov r2, #1
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
add r0, r4, #0x1000
ldrsh r1, [r0, #0x9c]
sub r1, r1, #1
@@ -11148,7 +11148,7 @@ _021859e4:
ldr r0, [r0]
mov r3, r2
mov r1, #5
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
add r0, r4, #0x1000
ldrsh r1, [r0, #0x9c]
sub r1, r1, #1
@@ -11498,7 +11498,7 @@ _02185ef8:
ldr r0, [r0]
mov r2, r1
mov r3, r1
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _02186a10 ; =data_ov38_021891e0
mov r1, #0
ldr r2, [r0, #0x20c]
@@ -11742,7 +11742,7 @@ _021862c8:
mov r1, #2
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
beq _02186304
ldr r0, _02186a20 ; =data_027e0fc8
asm/ov39.inc
+3 -3
View File
@@ -1,6 +1,9 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
@@ -149,9 +152,6 @@
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_0207c5d4
.extern func_ov00_02083ee0
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern func_ov00_02087584
.extern func_ov00_020875f8
.extern func_ov00_02087d34
asm/ov39.s
+6 -6
View File
@@ -1779,7 +1779,7 @@ func_ov39_0217d534: ; 0x0217d534
ldr r3, [r4, #0x50]
mov r2, #0
str r3, [sp, #0x10]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, _0217d5c8 ; =data_027e0f94
mov r3, r0
str r0, [r4, #0x4c]
@@ -3458,7 +3458,7 @@ func_ov39_0217ec34: ; 0x0217ec34
ldr r0, [r0]
mov r2, #1
mov r3, r2
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov39_0217ec34
@@ -3993,7 +3993,7 @@ _0217f3c4:
mov r1, #3
ldr r0, [r0]
mov r2, #1
bl func_ov00_02084be0
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
beq _0217f40c
ldr r0, _0217f480 ; =data_ov29_0217bd28
@@ -4005,7 +4005,7 @@ _0217f3c4:
ldr r0, [r0]
mov r2, #1
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldmia sp!, {r4, pc}
_0217f40c:
ldr r0, _0217f480 ; =data_ov29_0217bd28
@@ -7587,13 +7587,13 @@ func_ov39_021825e8: ; 0x021825e8
ldr r0, [r0]
mov r2, r1
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _02182670 ; =data_027e0e60
mov r1, #2
ldr r0, [r0]
mov r2, #1
mov r3, #0
bl func_ov00_02084b38
bl _ZN10MapManager18func_ov00_02084b38Eiii
mov r0, r4
mov r1, #8
mov r2, #7
asm/ov40.inc
+6 -6
View File
@@ -260,12 +260,12 @@
.extern func_ov00_0207c074
.extern func_ov00_0207c1f8
.extern func_ov00_0207c444
.extern func_ov00_02082650
.extern func_ov00_02082660
.extern func_ov00_02082670
.extern func_ov00_0208344c
.extern func_ov00_020838e8
.extern func_ov00_020846a4
.extern _ZN10MapManager18func_ov00_02082650Eiii
.extern _ZN10MapManager18func_ov00_02082660Eii
.extern _ZN10MapManager18func_ov00_02082670Eii
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_020846a4Ev
.extern func_ov00_02089b08
.extern func_ov00_02089b50
.extern func_ov00_02089b88
asm/ov40.s
+24 -24
View File
@@ -4792,7 +4792,7 @@ func_ov40_0217fa44: ; 0x0217fa44
ldr r0, _0217fbb4 ; =data_027e0e60
add r1, sp, #0x70
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
add r0, sp, #0x44
bl func_ov00_020c1500
mvn r1, #0
@@ -4852,7 +4852,7 @@ _0217fb0c:
ldr r0, _0217fbb4 ; =data_027e0e60
add r1, sp, #0x38
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
add r0, sp, #0xc
bl func_ov00_020c1500
mvn r1, #0
@@ -8498,7 +8498,7 @@ func_ov40_02182694: ; 0x02182694
ldrb r1, [r5, #0xf]
ldr r0, [r0]
add r2, sp, #0
bl func_ov00_020838e8
bl _ZN10MapManager18func_ov00_020838e8EjPi
cmp r0, #0
beq _02182798
ldr r0, [sp, #4]
@@ -11728,7 +11728,7 @@ func_ov40_02184fb4: ; 0x02184fb4
ldr r2, [r4, #0x88]
str r2, [r4, #0x98]
ldr r0, [r0]
bl func_ov00_0208344c
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r1, [sp, #0xc]
mov r0, #1
str r1, [r4, #0x48]
@@ -12507,7 +12507,7 @@ func_ov40_02185878: ; 0x02185878
_021858c8:
ldr r0, _02185b40 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020846a4
bl _ZN10MapManager18func_ov00_020846a4Ev
sub r0, r0, #0xd
cmp r0, #3
addls pc, pc, r0, lsl #2
@@ -12522,7 +12522,7 @@ _021858f4:
mov r2, r5
ldr r0, [r0]
mov r1, #0xd
bl func_ov00_02082650
bl _ZN10MapManager18func_ov00_02082650Eiii
ldr r0, _02185b44 ; =gAdventureFlags
ldr r0, [r0]
bl _ZN14AdventureFlags18func_ov00_02097c08Ev
@@ -12546,50 +12546,50 @@ _0218594c:
mov r2, r5
ldr r0, [r0]
mov r1, #0x2b
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_02185964:
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #0x2c
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_0218597c:
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #0x1d
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_02185994:
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #0xf
bl func_ov00_02082650
bl _ZN10MapManager18func_ov00_02082650Eiii
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #4
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_021859c0:
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #6
bl func_ov00_02082650
bl _ZN10MapManager18func_ov00_02082650Eiii
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #4
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_021859ec:
ldr r0, _02185b40 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020846a4
bl _ZN10MapManager18func_ov00_020846a4Ev
sub r0, r0, #0xd
cmp r0, #3
addls pc, pc, r0, lsl #2
@@ -12604,7 +12604,7 @@ _02185a18:
mov r2, r5
ldr r0, [r0]
mov r1, #0xe
bl func_ov00_02082650
bl _ZN10MapManager18func_ov00_02082650Eiii
ldr r0, _02185b44 ; =gAdventureFlags
ldr r0, [r0]
bl _ZN14AdventureFlags18func_ov00_02097c08Ev
@@ -12628,57 +12628,57 @@ _02185a70:
mov r2, r5
ldr r0, [r0]
mov r1, #0x25
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_02185a88:
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #0x2d
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_02185aa0:
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #0x25
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_02185ab8:
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #0x10
bl func_ov00_02082650
bl _ZN10MapManager18func_ov00_02082650Eiii
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #2
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_02185ae4:
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #2
bl func_ov00_02082650
bl _ZN10MapManager18func_ov00_02082650Eiii
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #2
bl func_ov00_02082660
bl _ZN10MapManager18func_ov00_02082660Eii
b _02185b38
_02185b10:
ldr r0, _02185b40 ; =data_027e0e60
ldr r0, [r0]
bl func_ov00_020846a4
bl _ZN10MapManager18func_ov00_020846a4Ev
cmp r0, #0xe
bne _02185b38
ldr r0, _02185b40 ; =data_027e0e60
mov r2, r5
ldr r0, [r0]
mov r1, #0xe
bl func_ov00_02082670
bl _ZN10MapManager18func_ov00_02082670Eii
_02185b38:
str r4, [r6, #0x158]
ldmia sp!, {r4, r5, r6, pc}
asm/ov41.inc
+5 -5
View File
@@ -1,4 +1,9 @@
#pragma once
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_7cEv
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083770Eji
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -132,11 +137,6 @@
.extern func_ov00_0207c31c
.extern func_ov00_0207c7e8
.extern func_ov00_02081f4c
.extern func_ov00_020828c0
.extern func_ov00_020836dc
.extern func_ov00_02083770
.extern func_ov00_02083a1c
.extern func_ov00_02083ee0
.extern func_ov00_0208cd48
.extern func_ov00_02093a5c
.extern func_ov00_02094824
asm/ov41.s
+6 -6
View File
@@ -3837,7 +3837,7 @@ _0218c680:
add r0, sp, #4
ldr r1, [r1]
add r2, sp, #0x1c
bl func_ov00_02083a1c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mov r2, #0
sub r1, r2, #1
mov r0, #1
@@ -3866,7 +3866,7 @@ _0218c6cc:
add r2, sp, #4
ldr r0, [r0]
mov r1, #2
bl func_ov00_020828c0
bl _ZN10MapManager16MapData_vfunc_7cEv
add r4, r4, #1
cmp r4, #4
blt _0218c608
@@ -4015,7 +4015,7 @@ func_ov41_0218c834: ; 0x0218c834
ldr r0, [r1]
mov r1, r5
mov r2, #0
bl func_ov00_020836dc
bl _ZN10MapManager18func_ov00_020836dcEii
cmp r0, #0
bne _0218ca3c
mov r0, r6
@@ -4749,7 +4749,7 @@ func_ov41_0218d210: ; 0x0218d210
ldr r0, [r0]
ldr r1, [r6, #0x514]
add r2, sp, #0
bl func_ov00_02083770
bl _ZN10MapManager18func_ov00_02083770Eji
cmp r0, #0
moveq r5, #1
_0218d2b8:
@@ -4936,7 +4936,7 @@ _0218d438:
str r3, [sp, #4]
ldr r3, [r4, #0x50]
str r3, [sp, #8]
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
add sp, sp, #0x3c
str r0, [r4, #0x4c]
ldmia sp!, {r3, r4, pc}
@@ -5143,7 +5143,7 @@ _0218d7c0:
add r1, sp, #4
str r2, [sp, #0xc]
mov r2, #1
bl func_ov00_02083ee0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, [r4, #0x4c]
cmp r1, r0
movge r0, #1
asm/ov42.inc
+1 -1
View File
@@ -1,4 +1,5 @@
#pragma once
.extern _ZN10MapManager18func_ov00_02083918EiPi
.extern _ZN11ItemManager13ForceEquipItemEi
.extern _ZN11ItemManager20ClearForcedEquipItemEv
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -112,7 +113,6 @@
.extern func_ov00_0207a1c8
.extern func_ov00_0207bb1c
.extern func_ov00_0207c1b0
.extern func_ov00_02083918
.extern func_ov00_0208726c
.extern func_ov00_02087400
.extern func_ov00_020a61ac
asm/ov42.s
+2 -2
View File
@@ -297,7 +297,7 @@ _02189894:
add r2, sp, #0x48
ldr r0, [r0]
mov r1, #0x42
bl func_ov00_02083918
bl _ZN10MapManager18func_ov00_02083918EiPi
cmp r0, #0
beq _021898e0
ldr r0, _02189af8 ; =data_027e0f64
@@ -312,7 +312,7 @@ _021898e0:
add r2, sp, #0x64
ldr r0, [r0]
mov r1, #0x43
bl func_ov00_02083918
bl _ZN10MapManager18func_ov00_02083918EiPi
cmp r0, #0
beq _02189918
ldr r0, _02189af8 ; =data_027e0f64

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