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

Name gMapManager

Browse Source
This commit is contained in:
Aetias
2024-04-21 13:09:41 +02:00
parent 87a650dc30
commit 1b2b274633
141 changed files with 2503 additions and 2501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dtcm.s
+2 -2
View File
@@ -3548,8 +3548,8 @@ data_027e0e58:
.global data_027e0e5c
data_027e0e5c:
.space 0x4
.global data_027e0e60
data_027e0e60:
.global gMapManager
gMapManager:
.space 0x4
.global data_027e0e64
data_027e0e64:
asm/itcm.inc
+1 -1
View File
@@ -19,7 +19,7 @@
.extern data_027e080c
.extern data_027e081c
.extern data_027e08e4
.extern data_027e0e60
.extern gMapManager
.extern data_027e0e64
.extern data_027e0f6c
.extern data_027e0fdc
asm/itcm.s
+3 -3
View File
@@ -9181,7 +9181,7 @@ func_01fffd04: ; 0x01fffd04
ldr r0, [sp, #0x4c]
ldr r1, [sp, #0x44]
str r0, [sp, #0x34]
ldr r0, _01ffff04 ; =data_027e0e60
ldr r0, _01ffff04 ; =gMapManager
ldr r3, [sp, #0x48]
ldr r2, [sp, #0x54]
str r1, [sp, #0x2c]
@@ -9212,7 +9212,7 @@ _01fffdf4:
mov ip, #0
str r0, [sp, #0x24]
ldr r1, [r6, #0x50]
ldr r0, _01ffff04 ; =data_027e0e60
ldr r0, _01ffff04 ; =gMapManager
str r1, [sp, #0x28]
ldr r1, [r6, #0x54]
add r2, sp, #0x20
@@ -9277,7 +9277,7 @@ _01fffef8:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_01fffd04
_01ffff04: .word data_027e0e60
_01ffff04: .word gMapManager
.global func_01ffff08
arm_func_start func_01ffff08
asm/main/main_02000000.inc
+1 -1
View File
@@ -111,7 +111,7 @@
.extern data_027e0dbc
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f7c
.extern data_027e0f80
asm/main/main_02000000.s
+7 -7
View File
@@ -58474,7 +58474,7 @@ func_0202bf58: ; 0x0202bf58
mov r0, #0
ldmmiia sp!, {r3, pc}
ldr ip, [r2]
ldr r0, _0202bfbc ; =data_027e0e60
ldr r0, _0202bfbc ; =gMapManager
str ip, [sp, #0xc]
ldr ip, [r2, #4]
ldr r0, [r0]
@@ -58494,7 +58494,7 @@ func_0202bf58: ; 0x0202bf58
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_0202bf58
_0202bfbc: .word data_027e0e60
_0202bfbc: .word gMapManager
.global func_0202bfc0
arm_func_start func_0202bfc0
@@ -76848,7 +76848,7 @@ _020382e8:
mov r3, #0
sub r2, r3, #2
mov r5, #0x47
ldr r0, _0203859c ; =data_027e0e60
ldr r0, _0203859c ; =gMapManager
mov r1, #0xff
str r2, [sp, #0xc]
str r5, [sp]
@@ -76953,7 +76953,7 @@ _02038444:
mov r0, #2
ldmia sp!, {r3, r4, r5, pc}
_0203846c:
ldr r0, _0203859c ; =data_027e0e60
ldr r0, _0203859c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
@@ -77039,7 +77039,7 @@ _0203858c: .word data_027e0618
_02038590: .word gItemManager
_02038594: .word data_027e0db0
_02038598: .word data_027e0c68
_0203859c: .word data_027e0e60
_0203859c: .word gMapManager
_020385a0: .word data_027e0d38
_020385a4: .word data_027e0f64
_020385a8: .word data_020569e0
@@ -80336,7 +80336,7 @@ _0203ac8c:
b _0203ad24
_0203acc0:
ldrh r2, [r5, #6]
ldr r0, _0203ae9c ; =data_027e0e60
ldr r0, _0203ae9c ; =gMapManager
add r1, sp, #8
ldr r0, [r0]
and r2, r2, #0xff
@@ -80465,7 +80465,7 @@ _0203ae8c: .word 0x00020001
_0203ae90: .word 0xffff0001
_0203ae94: .word data_027e103c
_0203ae98: .word data_027e0d3c
_0203ae9c: .word data_027e0e60
_0203ae9c: .word gMapManager
_0203aea0: .word data_02057ed0
_0203aea4: .word data_027e0c68
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -25,7 +25,7 @@
.extern data_027e0c54
.extern data_027e0d0c
.extern data_027e0d3c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
asm/ov00/Actor/Actor.s
+10 -10
View File
@@ -204,7 +204,7 @@ _020c1784: .word func_ov00_02087ef0
.global _ZN5Actor18func_ov00_020c1788Ev
arm_func_start _ZN5Actor18func_ov00_020c1788Ev
_ZN5Actor18func_ov00_020c1788Ev: ; 0x020c1788
ldr r3, _020c17a0 ; =data_027e0e60
ldr r3, _020c17a0 ; =gMapManager
ldr ip, _020c17a4 ; =_ZN10MapManager18func_ov00_02083570Eii
ldrb r1, [r0, #0x10]
ldrb r2, [r0, #0x11]
@@ -212,7 +212,7 @@ _ZN5Actor18func_ov00_020c1788Ev: ; 0x020c1788
bx ip
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c1788Ev
_020c17a0: .word data_027e0e60
_020c17a0: .word gMapManager
_020c17a4: .word _ZN10MapManager18func_ov00_02083570Eii
.global _ZN5Actor8vfunc_2cEv
@@ -680,7 +680,7 @@ _ZN5Actor8vfunc_a8Ev: ; 0x020c1bf8
arm_func_start _ZN5Actor18func_Ov00_020c1bfcEi
_ZN5Actor18func_Ov00_020c1bfcEi: ; 0x020c1bfc
add r2, r0, r1
ldr r0, _020c1c18 ; =data_027e0e60
ldr r0, _020c1c18 ; =gMapManager
ldrb r1, [r2, #0x2a]
ldr ip, _020c1c1c ; =_ZN10MapManager18func_ov00_02084be0Eii
ldrb r2, [r2, #0x28]
@@ -688,7 +688,7 @@ _ZN5Actor18func_Ov00_020c1bfcEi: ; 0x020c1bfc
bx ip
.align 2, 0
arm_func_end _ZN5Actor18func_Ov00_020c1bfcEi
_020c1c18: .word data_027e0e60
_020c1c18: .word gMapManager
_020c1c1c: .word _ZN10MapManager18func_ov00_02084be0Eii
.global _ZN5Actor18func_ov00_020c1c20Eiii
@@ -696,7 +696,7 @@ _020c1c1c: .word _ZN10MapManager18func_ov00_02084be0Eii
_ZN5Actor18func_ov00_020c1c20Eiii: ; 0x020c1c20
stmdb sp!, {r3, lr}
add ip, r0, r1
ldr r0, _020c1c44 ; =data_027e0e60
ldr r0, _020c1c44 ; =gMapManager
mov r3, r2
ldrb r1, [ip, #0x2a]
ldrb r2, [ip, #0x28]
@@ -705,7 +705,7 @@ _ZN5Actor18func_ov00_020c1c20Eiii: ; 0x020c1c20
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c1c20Eiii
_020c1c44: .word data_027e0e60
_020c1c44: .word gMapManager
.global _ZN5Actor8vfunc_48Ei
arm_func_start _ZN5Actor8vfunc_48Ei
@@ -2306,7 +2306,7 @@ _ZN5Actor18func_ov00_020c3094Ev: ; 0x020c3094
sub sp, sp, #0x18
mov r5, r0
ldr r1, [r5, #0x48]
ldr r0, _020c3108 ; =data_027e0e60
ldr r0, _020c3108 ; =gMapManager
str r1, [sp, #0xc]
ldr r1, [r5, #0x4c]
mov r4, #0
@@ -2333,7 +2333,7 @@ _ZN5Actor18func_ov00_020c3094Ev: ; 0x020c3094
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c3094Ev
_020c3108: .word data_027e0e60
_020c3108: .word gMapManager
.global _ZN5Actor6GetPosEv
arm_func_start _ZN5Actor6GetPosEv
@@ -2382,14 +2382,14 @@ _ZN5Actor18func_ov00_020c3158Ev: ; 0x020c3158
ldr r1, [r0, #0x3c]
cmp r1, #0
ldmltia sp!, {r3, pc}
ldr r0, _020c317c ; =data_027e0e60
ldr r0, _020c317c ; =gMapManager
mov r2, #1
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084c5cEii
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end _ZN5Actor18func_ov00_020c3158Ev
_020c317c: .word data_027e0e60
_020c317c: .word gMapManager
.global _ZN5Actor4KillEv
arm_func_start _ZN5Actor4KillEv
asm/ov00/Actor/ActorManager.inc
+1 -1
View File
@@ -6,7 +6,7 @@
.extern _ZN5Actor18func_ov00_020c27a8Ei
.extern data_02056be4
.extern data_027e077c
.extern data_027e0e60
.extern gMapManager
.extern data_027e103c
.extern func_01ff9ec0
.extern func_ov00_0208e72c
asm/ov00/Actor/ActorManager.s
+4 -4
View File
@@ -616,7 +616,7 @@ _ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
str r0, [sp]
movne r0, #0
strne r0, [r10]
ldr r0, _020c3ce4 ; =data_027e0e60
ldr r0, _020c3ce4 ; =gMapManager
add r2, sp, #0x14
ldr r0, [r0]
mov r3, #8
@@ -695,14 +695,14 @@ _020c3cd8:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3bb0EiPi
_020c3ce4: .word data_027e0e60
_020c3ce4: .word gMapManager
.global _ZN12ActorManager18func_ov00_020c3ce8Eii
arm_func_start _ZN12ActorManager18func_ov00_020c3ce8Eii
_ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xcc
ldr r3, _020c3dcc ; =data_027e0e60
ldr r3, _020c3dcc ; =gMapManager
mov r11, r0
ldr r0, [r3]
mov r10, r2
@@ -763,7 +763,7 @@ _020c3db0:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3ce8Eii
_020c3dcc: .word data_027e0e60
_020c3dcc: .word gMapManager
.global _ZN12ActorManager14Actor_vfunc_28Ev
arm_func_start _ZN12ActorManager14Actor_vfunc_28Ev
asm/ov00/Item/ItemManager.inc
+1 -1
View File
@@ -6,7 +6,7 @@
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f78
.extern data_027e0fbc
.extern data_027e103c
asm/ov00/Item/ItemManager.s
+5 -5
View File
@@ -1113,20 +1113,20 @@ _020ae34c: .word data_027e103c
.global _ZNK11ItemManager18func_ov00_020ae350Ev
arm_func_start _ZNK11ItemManager18func_ov00_020ae350Ev
_ZNK11ItemManager18func_ov00_020ae350Ev: ; 0x020ae350
ldr r0, _020ae360 ; =data_027e0e60
ldr r0, _020ae360 ; =gMapManager
ldr ip, _020ae364 ; =_ZN10MapManager10GetNumKeysEv
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end _ZNK11ItemManager18func_ov00_020ae350Ev
_020ae360: .word data_027e0e60
_020ae360: .word gMapManager
_020ae364: .word _ZN10MapManager10GetNumKeysEv
.global _ZN11ItemManager8GiveKeysEj
thumb_func_start _ZN11ItemManager8GiveKeysEj
_ZN11ItemManager8GiveKeysEj: ; 0x020ae368
push {r4, lr}
ldr r0, _020ae38c ; =data_027e0e60
ldr r0, _020ae38c ; =gMapManager
add r4, r1, #0
ldr r0, [r0]
blx _ZN10MapManager10GetNumKeysEv
@@ -1139,13 +1139,13 @@ _020ae37c:
bgt _020ae382
mov r1, #0
_020ae382:
ldr r0, _020ae38c ; =data_027e0e60
ldr r0, _020ae38c ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager10SetNumKeysEi
pop {r4, pc}
.align 2, 0
thumb_func_end _ZN11ItemManager8GiveKeysEj
_020ae38c: .word data_027e0e60
_020ae38c: .word gMapManager
.global _ZNK11ItemManager15GetEquippedItemEv
arm_func_start _ZNK11ItemManager15GetEquippedItemEv
asm/ov00/Item/ItemManager_func_ov00_020ad790.inc
+1 -1
View File
@@ -29,7 +29,7 @@ _020ad7c0:
movne r0, #0
ldmneia sp!, {r4, r5, r6, pc}
_020ad800:
lda r0, data_027e0e60
lda r0, gMapManager
ldr r4, [r6, #8]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020849f8Ei
asm/ov00/Map/MapManager.inc
+1 -1
View File
@@ -10,7 +10,7 @@
.extern data_027e0ce0
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov00/Map/MapManager.s
+8 -8
View File
@@ -4243,7 +4243,7 @@ _02085188:
cmp r0, r7
blt _02085250
ldr r0, [sp, #0xc]
ldr r11, _02085278 ; =data_027e0e60
ldr r11, _02085278 ; =gMapManager
and r5, r0, #0xff
_020851a4:
ldr r0, [r11]
@@ -4304,7 +4304,7 @@ _02085268:
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02085108EPi
_02085274: .word data_027e0f64
_02085278: .word data_027e0e60
_02085278: .word gMapManager
.global _ZN10MapManager18func_ov00_0208527cEv
arm_func_start _ZN10MapManager18func_ov00_0208527cEv
@@ -4362,7 +4362,7 @@ _ZN10MapManager18func_ov00_0208527cEv: ; 0x0208527c
ldr r0, [sp, #8]
cmp r11, r0
bgt _020853e8
ldr r4, _020853f8 ; =data_027e0e60
ldr r4, _020853f8 ; =gMapManager
add r6, sp, #0x10
_02085358:
ldr r8, [sp, #4]
@@ -4411,7 +4411,7 @@ _020853e8:
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_0208527cEv
_020853f4: .word data_027e0f64
_020853f8: .word data_027e0e60
_020853f8: .word gMapManager
.global _ZN10MapManager18func_ov00_020853fcEv
arm_func_start _ZN10MapManager18func_ov00_020853fcEv
@@ -4482,7 +4482,7 @@ _020854e4:
ldr r0, [sp, #8]
and r6, r0, #0xff
_020854fc:
ldr r0, _02085590 ; =data_027e0e60
ldr r0, _02085590 ; =gMapManager
add r1, sp, #0x10
ldr r0, [r0]
strb r6, [sp, #0x10]
@@ -4524,7 +4524,7 @@ _02085580:
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020853fcEv
_0208558c: .word data_027e0f64
_02085590: .word data_027e0e60
_02085590: .word gMapManager
.global _ZN10MapManager18func_ov00_02085594Ev
arm_func_start _ZN10MapManager18func_ov00_02085594Ev
@@ -5362,7 +5362,7 @@ _02086164:
ldr r1, [sp, #4]
cmp r0, r1
ble _020861ec
ldr r0, _02086280 ; =data_027e0e60
ldr r0, _02086280 ; =gMapManager
add r1, sp, #0x12
ldr r0, [r0]
add r2, sp, #0x68
@@ -5432,7 +5432,7 @@ _02086274:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02086044Eiii
_02086280: .word data_027e0e60
_02086280: .word gMapManager
.global _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_
arm_func_start _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_
asm/ov00/Player/LinkStateFollow.inc
+1 -1
View File
@@ -10,7 +10,7 @@
.extern _ZN13LinkStateBase8vfunc_24Ei
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl18func_ov00_020af01cEPc
.extern data_027e0e60
.extern gMapManager
.extern data_027e0fb8
.extern func_01ff9bf8
.extern func_01ff9cec
asm/ov00/Player/LinkStateFollow.s
+6 -6
View File
@@ -30,7 +30,7 @@ _ZN15LinkStateFollow16MoveTowardTargetEv: ; 0x020a8f80
ldmneia sp!, {r4, r5, pc}
mov r0, r5
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
ldr r2, _020a9020 ; =data_027e0e60
ldr r2, _020a9020 ; =gMapManager
add r1, r0, #0xc4
ldr r0, [r2]
bl _ZN10MapManager16MapData_vfunc_78Ev
@@ -62,7 +62,7 @@ _ZN15LinkStateFollow16MoveTowardTargetEv: ; 0x020a8f80
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end _ZN15LinkStateFollow16MoveTowardTargetEv
_020a9020: .word data_027e0e60
_020a9020: .word gMapManager
_020a9024: .word 0x00000155
.global _ZN15LinkStateFollow12OnStateLeaveEi
@@ -82,7 +82,7 @@ _020a904c:
cmp r0, #6
cmpne r0, #7
ldmneia sp!, {r3, r4, r5, pc}
ldr r1, _020a90ac ; =data_027e0e60
ldr r1, _020a90ac ; =gMapManager
add r0, sp, #0
ldr r4, [r1]
add r2, r5, #0x24
@@ -104,7 +104,7 @@ _020a904c:
.align 2, 0
arm_func_end _ZN15LinkStateFollow12OnStateLeaveEi
_020a90a8: .word data_027e0fb8
_020a90ac: .word data_027e0e60
_020a90ac: .word gMapManager
.global _ZN15LinkStateFollow8vfunc_24Ei
arm_func_start _ZN15LinkStateFollow8vfunc_24Ei
@@ -204,7 +204,7 @@ _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p: ; 0x020a9180
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _020a920c ; =data_027e0e60
ldr r0, _020a920c ; =gMapManager
ldrb r2, [sp]
ldrb r1, [sp, #1]
ldr r0, [r0]
@@ -226,7 +226,7 @@ _020a91f0:
.align 2, 0
arm_func_end _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
_020a9208: .word data_027e0fb8
_020a920c: .word data_027e0e60
_020a920c: .word gMapManager
.global _ZN15LinkStateFollow18func_ov00_020a9210EP5Vec3pP5Actor
arm_func_start _ZN15LinkStateFollow18func_ov00_020a9210EP5Vec3pP5Actor
asm/ov00/Player/LinkStateInteract.inc
+1 -1
View File
@@ -43,7 +43,7 @@
.extern _ZNK11ItemManager8GetFairyEi
.extern data_02050f54
.extern data_027e0d0c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0fb8
.extern data_027e0fe4
.extern data_ov00_020eec9c
asm/ov00/Player/LinkStateInteract.s
+2 -2
View File
@@ -940,7 +940,7 @@ _020aae90:
add r2, r6, #0x8c
str r1, [sp, #0x28]
ldr r1, [r6, #0x4c]
ldr r5, _020ab3d8 ; =data_027e0e60
ldr r5, _020ab3d8 ; =gMapManager
str r1, [sp, #0x2c]
ldr r3, [r6, #0x50]
add r1, sp, #0x68
@@ -1270,7 +1270,7 @@ _020ab3c8: .word 0x000004cd
_020ab3cc: .word data_027e0fb8
_020ab3d0: .word data_027e0fe4
_020ab3d4: .word 0x0000ffff
_020ab3d8: .word data_027e0e60
_020ab3d8: .word gMapManager
_020ab3dc: .word 0x00001ccd
_020ab3e0: .word 0x00001333
_020ab3e4: .word 0x000018e4
asm/ov00/Player/PlayerBase.inc
+1 -1
View File
@@ -6,7 +6,7 @@
.extern _ZNK11ItemManager8GetFairyEi
.extern data_027e0c54
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f94
asm/ov00/Player/PlayerBase.s
+5 -5
View File
@@ -285,7 +285,7 @@ _020a7de4:
_ZN10PlayerBase8TeleportEP5Vec3psibb: ; 0x020a7df4
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0x1c
ldr r3, _020a7e6c ; =data_027e0e60
ldr r3, _020a7e6c ; =gMapManager
mov r5, r0
mov r4, r1
mov lr, #0xff
@@ -315,7 +315,7 @@ _ZN10PlayerBase8TeleportEP5Vec3psibb: ; 0x020a7df4
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end _ZN10PlayerBase8TeleportEP5Vec3psibb
_020a7e6c: .word data_027e0e60
_020a7e6c: .word gMapManager
.global _ZN10PlayerBase18TeleportToEntranceEib
arm_func_start _ZN10PlayerBase18TeleportToEntranceEib
@@ -328,7 +328,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
mov r4, r2
str r0, [r3]
ldr r1, [r5, #4]
ldr r0, _020a7f68 ; =data_027e0e60
ldr r0, _020a7f68 ; =gMapManager
str r1, [r3, #4]
ldr r2, [r5, #8]
add r1, sp, #0
@@ -366,7 +366,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
ldrb r0, [sp, #0x18]
cmp r0, #0
beq _020a7f40
ldr r0, _020a7f68 ; =data_027e0e60
ldr r0, _020a7f68 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082af4Ev
ldr r0, _020a7f80 ; =gAdventureFlags
@@ -386,7 +386,7 @@ _020a7f58:
.align 2, 0
arm_func_end _ZN10PlayerBase18TeleportToEntranceEib
_020a7f64: .word data_027e0f94
_020a7f68: .word data_027e0e60
_020a7f68: .word gMapManager
_020a7f6c: .word data_027e0fac
_020a7f70: .word data_027e0fa0
_020a7f74: .word data_027e0fb0
asm/ov00/Player/PlayerControl.inc
+1 -1
View File
@@ -26,7 +26,7 @@
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0e2c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f90
.extern data_027e0f94
asm/ov00/Player/PlayerControl.s
+15 -15
View File
@@ -643,7 +643,7 @@ _020af5c4:
mov r0, r4
bl _ZN13PlayerControl13StopFollowingEv
_020af620:
ldr r0, _020af6d8 ; =data_027e0e60
ldr r0, _020af6d8 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02085108EPi
@@ -695,7 +695,7 @@ _020af6c8: .word data_027e0c68
_020af6cc: .word data_027e0fac
_020af6d0: .word data_027e0ffc
_020af6d4: .word 0x0000010a
_020af6d8: .word data_027e0e60
_020af6d8: .word gMapManager
_020af6dc: .word data_027e103c
_020af6e0: .word data_027e05f8
@@ -721,7 +721,7 @@ _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii: ; 0x020af6e4
str r0, [r4, #0x84]
str r0, [r4, #0x88]
_020af72c:
ldr r1, _020af774 ; =data_027e0e60
ldr r1, _020af774 ; =gMapManager
add r0, sp, #0
ldr r1, [r1]
mov r2, r6
@@ -741,7 +741,7 @@ _020af72c:
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
_020af770: .word data_027e0f94
_020af774: .word data_027e0e60
_020af774: .word gMapManager
.global _ZN13PlayerControl18func_ov00_020af778Ev
arm_func_start _ZN13PlayerControl18func_ov00_020af778Ev
@@ -883,7 +883,7 @@ _020af944:
bl _ZN5Actor16XzDistanceToLinkEv
mov r4, r0
_020af97c:
ldr r0, _020afad0 ; =data_027e0e60
ldr r0, _020afad0 ; =gMapManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02085108EPi
@@ -974,7 +974,7 @@ _020afac0: .word data_027e0f90
_020afac4: .word gItemManager
_020afac8: .word data_027e0fc8
_020afacc: .word data_027e0fe4
_020afad0: .word data_027e0e60
_020afad0: .word gMapManager
_020afad4: .word data_027e0f94
.global _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
@@ -999,7 +999,7 @@ _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p: ; 0x020afad8
blx r1
cmp r0, #3
bne _020afb48
ldr r0, _020afb68 ; =data_027e0e60
ldr r0, _020afb68 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02085594Ev
@@ -1020,7 +1020,7 @@ _020afb54:
arm_func_end _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
_020afb60: .word data_027e0f94
_020afb64: .word data_027e0f90
_020afb68: .word data_027e0e60
_020afb68: .word gMapManager
.global _ZN13PlayerControl18func_ov00_020afb6cEv
arm_func_start _ZN13PlayerControl18func_ov00_020afb6cEv
@@ -1136,7 +1136,7 @@ _020afcf4:
ldrb r0, [r9, #0x81]
cmp r0, #0
beq _020afe24
ldr r0, _020afe84 ; =data_027e0e60
ldr r0, _020afe84 ; =gMapManager
add r1, r9, #0x9c
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_78Ev
@@ -1173,7 +1173,7 @@ _020afd5c:
b _020afdc4
_020afd88:
ldr r1, _020afe78 ; =data_027e0f94
ldr r0, _020afe84 ; =data_027e0e60
ldr r0, _020afe84 ; =gMapManager
ldr r1, [r1, #4]
ldr r0, [r0]
str r1, [sp, #8]
@@ -1242,7 +1242,7 @@ _020afe74: .word gItemManager
_020afe78: .word data_027e0f94
_020afe7c: .word data_027e0fc8
_020afe80: .word data_027e0ffc
_020afe84: .word data_027e0e60
_020afe84: .word gMapManager
.global _ZN13PlayerControl18func_ov00_020afe88Eib
arm_func_start _ZN13PlayerControl18func_ov00_020afe88Eib
@@ -1864,17 +1864,17 @@ _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p: ; 0x020b05e8
str r3, [sp, #4]
str r1, [sp, #0xc]
_020b06e0:
ldr r1, _020b0774 ; =data_027e0e60
ldr r1, _020b0774 ; =gMapManager
add r0, sp, #0
ldr r1, [r1]
add r2, sp, #4
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _020b0774 ; =data_027e0e60
ldr r0, _020b0774 ; =gMapManager
ldrb r1, [sp]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c24Ei
ldr r1, [sp, #4]
ldr r2, _020b0774 ; =data_027e0e60
ldr r2, _020b0774 ; =gMapManager
sub r0, r0, r1
add r0, r0, r0, lsr #31
add r3, r1, r0, asr #1
@@ -1904,7 +1904,7 @@ _020b0764: .word 0x00000333
_020b0768: .word data_027e0f94
_020b076c: .word data_027e0fac
_020b0770: .word data_02050f54
_020b0774: .word data_027e0e60
_020b0774: .word gMapManager
.global _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
arm_func_start _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
asm/ov00/Save/AdventureFlags.inc
+1 -1
View File
@@ -3,7 +3,7 @@
.extern data_027e0c68
.extern data_027e0db0
.extern data_027e0dbc
.extern data_027e0e60
.extern gMapManager
.extern func_0204f754
.extern func_ov00_0207b2f0
.extern func_ov00_0207b334
asm/ov00/Save/AdventureFlags.s
+2 -2
View File
@@ -325,7 +325,7 @@ _ZN14AdventureFlags18func_ov00_02097968Ei: ; 0x02097968
strb ip, [sp, #0x14]
strb ip, [sp, #0x15]
bl _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
ldr r0, _02097a40 ; =data_027e0e60
ldr r0, _02097a40 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020838f8EPi
@@ -342,7 +342,7 @@ _ZN14AdventureFlags18func_ov00_02097968Ei: ; 0x02097968
.align 2, 0
arm_func_end _ZN14AdventureFlags18func_ov00_02097968Ei
_02097a3c: .word data_027e0db0
_02097a40: .word data_027e0e60
_02097a40: .word gMapManager
.global _ZN14AdventureFlags18func_ov00_02097a44Eii
arm_func_start _ZN14AdventureFlags18func_ov00_02097a44Eii
asm/ov00/ov00_020773c0.inc
+1 -1
View File
@@ -26,7 +26,7 @@
.extern data_027e0d48
.extern data_027e0d54
.extern data_027e0e28
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f7c
asm/ov00/ov00_020773c0.s
+14 -14
View File
@@ -3875,7 +3875,7 @@ _02078f7c: .word data_027e1054
arm_func_start func_ov00_02078f80
func_ov00_02078f80: ; 0x02078f80
stmdb sp!, {r4, lr}
ldr r1, _02078fa8 ; =data_027e0e60
ldr r1, _02078fa8 ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager18func_ov00_02083588Ev
@@ -3886,7 +3886,7 @@ func_ov00_02078f80: ; 0x02078f80
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_02078f80
_02078fa8: .word data_027e0e60
_02078fa8: .word gMapManager
.global func_ov00_02078fac
arm_func_start func_ov00_02078fac
@@ -4038,7 +4038,7 @@ _02079148: .word data_027e0c38
func_ov00_0207914c: ; 0x0207914c
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _020791d8 ; =data_027e0e60
ldr r4, _020791d8 ; =gMapManager
mov r11, r0
ldr r7, [r4]
mov r10, r1
@@ -4073,7 +4073,7 @@ func_ov00_0207914c: ; 0x0207914c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207914c
_020791d8: .word data_027e0e60
_020791d8: .word gMapManager
.global func_ov00_020791dc
arm_func_start func_ov00_020791dc
@@ -4097,7 +4097,7 @@ func_ov00_020791dc: ; 0x020791dc
func_ov00_0207920c: ; 0x0207920c
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _0207929c ; =data_027e0e60
ldr r4, _0207929c ; =gMapManager
mov r11, r0
ldr r7, [r4]
mov r10, r1
@@ -4133,7 +4133,7 @@ func_ov00_0207920c: ; 0x0207920c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207920c
_0207929c: .word data_027e0e60
_0207929c: .word gMapManager
.global func_ov00_020792a0
arm_func_start func_ov00_020792a0
@@ -4161,7 +4161,7 @@ _020792d4:
ldr r0, [r0, #0x14]
add r9, r9, r0
_020792f4:
ldr r0, _020793b4 ; =data_027e0e60
ldr r0, _020793b4 ; =gMapManager
ldr r6, [r0]
mov r0, r6
bl _ZN10MapManager13GetCourseMinXEv
@@ -4212,7 +4212,7 @@ _02079368:
.align 2, 0
arm_func_end func_ov00_020792a0
_020793b0: .word data_027e0c38
_020793b4: .word data_027e0e60
_020793b4: .word gMapManager
.global func_ov00_020793b8
arm_func_start func_ov00_020793b8
@@ -4340,7 +4340,7 @@ _0207955c:
mov r0, #0
b _02079614
_02079564:
ldr r0, _0207967c ; =data_027e0e60
ldr r0, _0207967c ; =gMapManager
mov r1, r5
ldr r0, [r0]
mov r2, r4
@@ -4348,7 +4348,7 @@ _02079564:
cmp r0, #0
movne r0, #0
bne _02079614
ldr r0, _0207967c ; =data_027e0e60
ldr r0, _0207967c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
@@ -4357,7 +4357,7 @@ _02079564:
cmp r0, #0
moveq r0, #0
beq _02079614
ldr r0, _0207967c ; =data_027e0e60
ldr r0, _0207967c ; =gMapManager
mov r1, r5
ldr r0, [r0]
mov r2, r4
@@ -4415,7 +4415,7 @@ _0207966c: .word data_027e0e28
_02079670: .word data_027e0d38
_02079674: .word gOverlayManager
_02079678: .word 0x00000003
_0207967c: .word data_027e0e60
_0207967c: .word gMapManager
.global func_ov00_02079680
arm_func_start func_ov00_02079680
@@ -4510,7 +4510,7 @@ func_ov00_0207977c: ; 0x0207977c
bl func_ov00_02078b88
cmp r0, #0
bne _0207984c
ldr r0, _0207986c ; =data_027e0e60
ldr r0, _0207986c ; =gMapManager
mov r1, r5
ldr r0, [r0]
mov r2, r4
@@ -4555,7 +4555,7 @@ _0207984c:
arm_func_end func_ov00_0207977c
_02079864: .word data_027e0e28
_02079868: .word data_027e0d38
_0207986c: .word data_027e0e60
_0207986c: .word gMapManager
_02079870: .word data_027e0c38
_02079874: .word data_027e080c
asm/ov00/ov00_0207af9c.inc
+1 -1
View File
@@ -41,7 +41,7 @@
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov00/ov00_0207af9c.s
+16 -16
View File
@@ -807,7 +807,7 @@ _0207b62c:
ldr r0, [r5]
blx func_ov00_020a5e9c
str r0, [r5, #0x44]
ldr r0, _0207b808 ; =data_027e0e60
ldr r0, _0207b808 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02082d08Ev
add r1, r5, #0
@@ -954,12 +954,12 @@ _0207b740:
ldr r0, [r0, #8]
cmp r0, #1
beq _0207b7f0
ldr r0, _0207b808 ; =data_027e0e60
ldr r0, _0207b808 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083328Ev
cmp r0, #0
beq _0207b7f0
ldr r0, _0207b808 ; =data_027e0e60
ldr r0, _0207b808 ; =gMapManager
ldrb r1, [r4, #0x12]
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083318Ei
@@ -1027,7 +1027,7 @@ _0207b7f0:
thumb_func_end func_ov00_0207b5bc
_0207b800: .word data_027e0fe4
_0207b804: .word 0x414e4353
_0207b808: .word data_027e0e60
_0207b808: .word gMapManager
_0207b80c: .word data_027e0f94
_0207b810: .word data_027e0fac
_0207b814: .word data_027e0f7c
@@ -5073,7 +5073,7 @@ func_ov00_0207e4b0: ; 0x0207e4b0
func_ov00_0207e4b8: ; 0x0207e4b8
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x7c
ldr r3, _0207e92c ; =data_027e0e60
ldr r3, _0207e92c ; =gMapManager
mov r9, r1
ldr r1, [r3]
mov r8, r0
@@ -5376,7 +5376,7 @@ _0207e8f4:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207e4b8
_0207e92c: .word data_027e0e60
_0207e92c: .word gMapManager
_0207e930: .word data_027e0f6c
_0207e934: .word data_ov00_020ec824
_0207e938: .word func_ov00_0207e968
@@ -5415,7 +5415,7 @@ func_ov00_0207e96c: ; 0x0207e96c
func_ov00_0207e970: ; 0x0207e970
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc4
ldr r4, _0207ee00 ; =data_027e0e60
ldr r4, _0207ee00 ; =gMapManager
mov r9, r1
ldr r1, [r4]
mov r8, r0
@@ -5723,7 +5723,7 @@ _0207edd0:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207e970
_0207ee00: .word data_027e0e60
_0207ee00: .word gMapManager
_0207ee04: .word data_027e0f6c
_0207ee08: .word data_ov00_020ec864
_0207ee0c: .word func_ov00_0207e968
@@ -5734,7 +5734,7 @@ _0207ee10: .word func_ov00_0207e96c
func_ov00_0207ee14: ; 0x0207ee14
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x74
ldr r0, _0207efdc ; =data_027e0e60
ldr r0, _0207efdc ; =gMapManager
mov r9, r1
ldr r1, [r0]
add r0, sp, #8
@@ -5851,7 +5851,7 @@ _0207efbc:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207ee14
_0207efdc: .word data_027e0e60
_0207efdc: .word gMapManager
_0207efe0: .word data_027e0f6c
_0207efe4: .word data_ov00_020ec8a4
_0207efe8: .word func_ov00_0207e968
@@ -5863,7 +5863,7 @@ _0207eff0: .word 0x0000ffff
func_ov00_0207eff4: ; 0x0207eff4
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
ldr r0, _0207f0f4 ; =data_027e0e60
ldr r0, _0207f0f4 ; =gMapManager
mov r8, r1
ldr r1, [r0]
add r0, sp, #8
@@ -5930,7 +5930,7 @@ _0207f0e8:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov00_0207eff4
_0207f0f4: .word data_027e0e60
_0207f0f4: .word gMapManager
_0207f0f8: .word data_027e0f6c
_0207f0fc: .word data_ov00_020ec8e4
@@ -5944,7 +5944,7 @@ func_ov00_0207f100: ; 0x0207f100
arm_func_start func_ov00_0207f104
func_ov00_0207f104: ; 0x0207f104
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r3, _0207f1f0 ; =data_027e0e60
ldr r3, _0207f1f0 ; =gMapManager
mov r5, r1
ldr r1, [r3]
mov r6, r0
@@ -6005,14 +6005,14 @@ _0207f1cc:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov00_0207f104
_0207f1f0: .word data_027e0e60
_0207f1f0: .word gMapManager
.global func_ov00_0207f1f4
arm_func_start func_ov00_0207f1f4
func_ov00_0207f1f4: ; 0x0207f1f4
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x3c
ldr r0, _0207f318 ; =data_027e0e60
ldr r0, _0207f318 ; =gMapManager
mov r9, r1
ldr r1, [r0]
mov r8, r2
@@ -6088,7 +6088,7 @@ _0207f30c:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov00_0207f1f4
_0207f318: .word data_027e0e60
_0207f318: .word gMapManager
_0207f31c: .word data_027e0f6c
_0207f320: .word data_ov00_020ec924
asm/ov00/ov00_02086cd0.inc
+1 -1
View File
@@ -103,7 +103,7 @@
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov00/ov00_02086cd0.s
+91 -91
View File
@@ -253,7 +253,7 @@ _02086fd0:
str r0, [sp, #0xc]
mov r1, #1
str r1, [sp, #0x10]
ldr r0, _02087088 ; =data_027e0e60
ldr r0, _02087088 ; =gMapManager
add r1, sp, #0x30
ldr r0, [r0]
add r2, sp, #0x24
@@ -279,7 +279,7 @@ _02087068:
_0208707c: .word data_ov00_020e2fb4
_02087080: .word data_027e0d38
_02087084: .word data_027e071c
_02087088: .word data_027e0e60
_02087088: .word gMapManager
.global func_ov00_0208708c
arm_func_start func_ov00_0208708c
@@ -445,7 +445,7 @@ _0208729c:
strh r1, [r0, #0x18]
cmp ip, #2
blo _0208729c
ldr r0, _020872e4 ; =data_027e0e60
ldr r0, _020872e4 ; =gMapManager
ldrb r2, [r5, #0x1b8]
ldr r0, [r0]
add r1, sp, #0
@@ -460,7 +460,7 @@ _0208729c:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_0208726c
_020872e4: .word data_027e0e60
_020872e4: .word gMapManager
.global func_ov00_020872e8
arm_func_start func_ov00_020872e8
@@ -782,7 +782,7 @@ _02087724:
strh r1, [r0, #0x18]
cmp r3, #2
blo _02087724
ldr r0, _0208784c ; =data_027e0e60
ldr r0, _0208784c ; =gMapManager
ldrb r2, [r7, #0x1b8]
ldr r0, [r0]
add r1, sp, #0x6c
@@ -855,7 +855,7 @@ _02087830:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov00_020876bc
_0208784c: .word data_027e0e60
_0208784c: .word gMapManager
.global func_ov00_02087850
arm_func_start func_ov00_02087850
@@ -892,7 +892,7 @@ _020878b8:
strh r1, [r0, #0x18]
cmp r3, #2
blo _020878b8
ldr r0, _020879e0 ; =data_027e0e60
ldr r0, _020879e0 ; =gMapManager
ldrb r2, [r7, #0x1b8]
ldr r0, [r0]
add r1, sp, #0x6c
@@ -965,7 +965,7 @@ _020879c4:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov00_02087850
_020879e0: .word data_027e0e60
_020879e0: .word gMapManager
.global func_ov00_020879e4
arm_func_start func_ov00_020879e4
@@ -1329,7 +1329,7 @@ func_ov00_02087e14: ; 0x02087e14
arm_func_start func_ov00_02087e8c
func_ov00_02087e8c: ; 0x02087e8c
stmdb sp!, {r3, lr}
ldr r0, _02087eec ; =data_027e0e60
ldr r0, _02087eec ; =gMapManager
mov r1, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083938Ei
@@ -1357,7 +1357,7 @@ _02087ee4:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_02087e8c
_02087eec: .word data_027e0e60
_02087eec: .word gMapManager
.global func_ov00_02087ef0
arm_func_start func_ov00_02087ef0
@@ -1475,7 +1475,7 @@ _0208800c: .word func_ov00_020a1888
func_ov00_02088010: ; 0x02088010
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr r2, _02088070 ; =data_027e0e60
ldr r2, _02088070 ; =gMapManager
mov r5, r0
ldr r0, [r2]
mov r4, r1
@@ -1499,7 +1499,7 @@ func_ov00_02088010: ; 0x02088010
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_02088010
_02088070: .word data_027e0e60
_02088070: .word gMapManager
.global func_ov00_02088074
arm_func_start func_ov00_02088074
@@ -2664,7 +2664,7 @@ func_ov00_0208901c: ; 0x0208901c
func_ov00_02089068: ; 0x02089068
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0x4c
ldr r3, _02089164 ; =data_027e0e60
ldr r3, _02089164 ; =gMapManager
mov r5, r0
ldr r0, [r3]
mov r4, r2
@@ -2697,7 +2697,7 @@ _020890b8:
str r0, [sp, #0x20]
b _0208912c
_020890ec:
ldr r0, _02089164 ; =data_027e0e60
ldr r0, _02089164 ; =gMapManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -2731,7 +2731,7 @@ _0208912c:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_02089068
_02089164: .word data_027e0e60
_02089164: .word gMapManager
.global func_ov00_02089168
arm_func_start func_ov00_02089168
@@ -3290,7 +3290,7 @@ _02089910:
strh r1, [r0, #0x18]
cmp r3, #2
blo _02089910
ldr r0, _02089a28 ; =data_027e0e60
ldr r0, _02089a28 ; =gMapManager
ldrb r2, [r9, #0x1b8]
ldr r0, [r0]
add r1, sp, #0x20
@@ -3360,7 +3360,7 @@ _020899b4:
.align 2, 0
arm_func_end func_ov00_0208967c
_02089a24: .word gAdventureFlags
_02089a28: .word data_027e0e60
_02089a28: .word gMapManager
.global func_ov00_02089a2c
arm_func_start func_ov00_02089a2c
@@ -4133,7 +4133,7 @@ func_ov00_0208a464: ; 0x0208a464
bl func_ov00_0208edd8
b _0208a77c
_0208a4d0:
ldr r1, _0208a844 ; =data_027e0e60
ldr r1, _0208a844 ; =gMapManager
add r0, sp, #0x18
ldr r1, [r1]
bl _ZN10MapManager18func_ov00_02084100EiPS_
@@ -4305,25 +4305,25 @@ _0208a4d0:
add r1, sp, #0x20
bl func_ov00_0208ed74
_0208a77c:
ldr r0, _0208a844 ; =data_027e0e60
ldr r0, _0208a844 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager17Get_MapData_Unk28Ev
ldr r1, _0208a844 ; =data_027e0e60
ldr r1, _0208a844 ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager17Get_MapData_Unk2aEv
ldr r1, _0208a844 ; =data_027e0e60
ldr r1, _0208a844 ; =gMapManager
mov r5, r0
ldr r0, [r1]
ldr r1, [r6, #0x308]
bl _ZN10MapManager18func_ov00_020839d4Ev
strb r0, [r6, #0x320]
ldr r0, _0208a844 ; =data_027e0e60
ldr r0, _0208a844 ; =gMapManager
ldr r1, [r6, #0x310]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020839f8Ev
strb r0, [r6, #0x321]
ldr r0, _0208a844 ; =data_027e0e60
ldr r0, _0208a844 ; =gMapManager
ldr r1, [r6, #0x314]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020839d4Ev
@@ -4338,7 +4338,7 @@ _0208a77c:
cmp r0, r4
subge r0, r4, #1
strgeb r0, [r6, #0x322]
ldr r0, _0208a844 ; =data_027e0e60
ldr r0, _0208a844 ; =gMapManager
ldr r1, [r6, #0x31c]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020839f8Ev
@@ -4357,7 +4357,7 @@ _0208a77c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_0208a464
_0208a844: .word data_027e0e60
_0208a844: .word gMapManager
_0208a848: .word data_027e0f94
.global func_ov00_0208a84c
@@ -4907,7 +4907,7 @@ _0208af04:
strh r2, [r0, #0x18]
cmp r5, #2
blo _0208af04
ldr r0, _0208b114 ; =data_027e0e60
ldr r0, _0208b114 ; =gMapManager
add r1, sp, #0x18
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083928EPci
@@ -5037,7 +5037,7 @@ _0208b0dc:
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_0208aed8
_0208b114: .word data_027e0e60
_0208b114: .word gMapManager
_0208b118: .word data_027e0f64
.global func_ov00_0208b11c
@@ -5851,7 +5851,7 @@ _0208b9e0: .word func_ov00_0208ba58
arm_func_start func_ov00_0208b9e4
func_ov00_0208b9e4: ; 0x0208b9e4
add r2, r0, r1
ldr r0, _0208ba00 ; =data_027e0e60
ldr r0, _0208ba00 ; =gMapManager
ldrb r1, [r2, #0x2e]
ldr ip, _0208ba04 ; =_ZN10MapManager18func_ov00_02084be0Eii
ldrb r2, [r2, #0x2c]
@@ -5859,7 +5859,7 @@ func_ov00_0208b9e4: ; 0x0208b9e4
bx ip
.align 2, 0
arm_func_end func_ov00_0208b9e4
_0208ba00: .word data_027e0e60
_0208ba00: .word gMapManager
_0208ba04: .word _ZN10MapManager18func_ov00_02084be0Eii
.global func_ov00_0208ba08
@@ -5867,7 +5867,7 @@ _0208ba04: .word _ZN10MapManager18func_ov00_02084be0Eii
func_ov00_0208ba08: ; 0x0208ba08
stmdb sp!, {r3, lr}
add ip, r0, r1
ldr r0, _0208ba2c ; =data_027e0e60
ldr r0, _0208ba2c ; =gMapManager
mov r3, r2
ldrb r1, [ip, #0x2e]
ldrb r2, [ip, #0x2c]
@@ -5876,7 +5876,7 @@ func_ov00_0208ba08: ; 0x0208ba08
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_0208ba08
_0208ba2c: .word data_027e0e60
_0208ba2c: .word gMapManager
.global func_ov00_0208ba30
arm_func_start func_ov00_0208ba30
@@ -7394,7 +7394,7 @@ _0208cd78:
mov r2, #0x18
str r4, [sp]
bl func_0204f614
ldr r0, _0208ce80 ; =data_027e0e60
ldr r0, _0208ce80 ; =gMapManager
add r2, sp, #0x24
ldr r0, [r0]
mov r1, r5
@@ -7459,7 +7459,7 @@ _0208ce54:
arm_func_end func_ov00_0208cd48
_0208ce78: .word func_ov00_0207f100
_0208ce7c: .word func_ov00_0208d018
_0208ce80: .word data_027e0e60
_0208ce80: .word gMapManager
.global func_ov00_0208ce84
arm_func_start func_ov00_0208ce84
@@ -7619,7 +7619,7 @@ _0208d064:
mov r2, #0x18
str r4, [sp]
bl func_0204f614
ldr r0, _0208d1f4 ; =data_027e0e60
ldr r0, _0208d1f4 ; =gMapManager
add r2, sp, #0x44
ldr r0, [r0]
mov r1, r5
@@ -7719,7 +7719,7 @@ _0208d1c8:
arm_func_end func_ov00_0208d01c
_0208d1ec: .word func_ov00_0207f100
_0208d1f0: .word func_ov00_0208d018
_0208d1f4: .word data_027e0e60
_0208d1f4: .word gMapManager
.global func_ov00_0208d1f8
arm_func_start func_ov00_0208d1f8
@@ -10562,7 +10562,7 @@ func_ov00_0208f794: ; 0x0208f794
bl func_020078f4
ldr r6, _0208f9dc ; =data_ov00_020db010
ldr r11, _0208f9e0 ; =data_ov00_020db030
ldr r4, _0208f9e4 ; =data_027e0e60
ldr r4, _0208f9e4 ; =gMapManager
mov r9, #0
add r5, sp, #4
_0208f7d4:
@@ -10710,7 +10710,7 @@ _0208f9ac:
arm_func_end func_ov00_0208f794
_0208f9dc: .word data_ov00_020db010
_0208f9e0: .word data_ov00_020db030
_0208f9e4: .word data_027e0e60
_0208f9e4: .word gMapManager
_0208f9e8: .word data_027e0f68
.global func_ov00_0208f9ec
@@ -10980,7 +10980,7 @@ _0208fcd4:
cmp r1, r0
cmplt r6, r1
bge _0208fd30
ldr r4, _0208fef4 ; =data_027e0e60
ldr r4, _0208fef4 ; =gMapManager
_0208fcf8:
ldr r0, [r4]
ldr r2, [r5, #0x16c]
@@ -10998,7 +10998,7 @@ _0208fd20:
cmp r6, r1
blt _0208fcf8
_0208fd30:
ldr r0, _0208fef4 ; =data_027e0e60
ldr r0, _0208fef4 ; =gMapManager
ldr r2, [r5, #0x16c]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084be0Eii
@@ -11009,7 +11009,7 @@ _0208fd30:
add r6, r0, #1
cmp r6, r1
bge _0208fd98
ldr r4, _0208fef4 ; =data_027e0e60
ldr r4, _0208fef4 ; =gMapManager
_0208fd60:
ldr r0, [r4]
ldr r2, [r5, #0x16c]
@@ -11039,7 +11039,7 @@ _0208fda8:
movne r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_0208fdc0:
ldr r0, _0208fef4 ; =data_027e0e60
ldr r0, _0208fef4 ; =gMapManager
ldr r1, [r5, #0x160]
ldr r0, [r0]
ldr r2, [r5, #0x16c]
@@ -11052,7 +11052,7 @@ _0208fdc0:
cmp r4, r0
mov r8, #0
bge _0208fe2c
ldr r6, _0208fef4 ; =data_027e0e60
ldr r6, _0208fef4 ; =gMapManager
mov r7, #1
_0208fdfc:
ldr r0, [r6]
@@ -11078,7 +11078,7 @@ _0208fe3c:
mov r6, #1
cmp r7, r0
bge _0208fe80
ldr r4, _0208fef4 ; =data_027e0e60
ldr r4, _0208fef4 ; =gMapManager
_0208fe54:
ldr r0, [r4]
ldr r2, [r5, #0x16c]
@@ -11108,7 +11108,7 @@ _0208fea8:
mov r6, #0
cmp r0, #0
ble _0208feec
ldr r4, _0208fef4 ; =data_027e0e60
ldr r4, _0208fef4 ; =gMapManager
_0208febc:
ldr r1, [r5, #0x164]
ldr r0, [r4]
@@ -11127,7 +11127,7 @@ _0208feec:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_0208fcb4
_0208fef4: .word data_027e0e60
_0208fef4: .word gMapManager
.global func_ov00_0208fef8
arm_func_start func_ov00_0208fef8
@@ -11268,7 +11268,7 @@ _02090004:
bl func_01ff9bc4
cmp r5, #0xa
bge _020902d4
ldr r1, _02090320 ; =data_027e0e60
ldr r1, _02090320 ; =gMapManager
add r0, sp, #0x18
ldr r1, [r1]
add r2, sp, #0x5c
@@ -11278,7 +11278,7 @@ _02090004:
bl func_01ff9ec0
cmp r0, #0x2000
blt _02090144
ldr r0, _02090320 ; =data_027e0e60
ldr r0, _02090320 ; =gMapManager
add r1, sp, #0x18
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083e70Ev
@@ -11289,13 +11289,13 @@ _02090144:
add r5, r5, #1
b _020902f8
_02090150:
ldr r0, _02090320 ; =data_027e0e60
ldr r0, _02090320 ; =gMapManager
add r1, sp, #0x18
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_78Ev
cmp r0, #0
bne _020902f8
ldr r0, _02090320 ; =data_027e0e60
ldr r0, _02090320 ; =gMapManager
add r1, sp, #0x18
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084164Ev
@@ -11303,7 +11303,7 @@ _02090150:
subeq r6, r6, #1
addeq r5, r5, #1
beq _020902f8
ldr r0, _02090320 ; =data_027e0e60
ldr r0, _02090320 ; =gMapManager
add r1, sp, #0x18
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_54Ev
@@ -11418,7 +11418,7 @@ _02090310: .word data_027e0f94
_02090314: .word data_027e0fe4
_02090318: .word 0x534e414b
_0209031c: .word data_027e0764
_02090320: .word data_027e0e60
_02090320: .word gMapManager
_02090324: .word 0x5053424c
_02090328: .word data_027e0fe8
@@ -11431,7 +11431,7 @@ func_ov00_0209032c: ; 0x0209032c
ldr r0, [r7, #0x168]
cmp r6, r0
ldmgeia sp!, {r3, r4, r5, r6, r7, pc}
ldr r4, _02090374 ; =data_027e0e60
ldr r4, _02090374 ; =gMapManager
mov r5, #0
_0209034c:
ldr r0, [r4]
@@ -11446,7 +11446,7 @@ _0209034c:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov00_0209032c
_02090374: .word data_027e0e60
_02090374: .word gMapManager
.global func_ov00_02090378
arm_func_start func_ov00_02090378
@@ -13284,7 +13284,7 @@ func_ov00_020915e8: ; 0x020915e8
_0209167c:
cmp r1, #0
bne _0209173c
ldr r0, _020917ac ; =data_027e0e60
ldr r0, _020917ac ; =gMapManager
ldr r6, _020917b0 ; =0x000004cd
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020848b8Ev
@@ -13314,7 +13314,7 @@ _0209167c:
str r0, [sp, #8]
str r1, [sp, #0xc]
str r1, [sp, #0x10]
ldr r0, _020917ac ; =data_027e0e60
ldr r0, _020917ac ; =gMapManager
add r1, sp, #0x34
ldr r0, [r0]
mov r3, r2
@@ -13361,7 +13361,7 @@ _0209173c:
arm_func_end func_ov00_020915e8
_020917a4: .word data_027e0d38
_020917a8: .word data_027e10a4
_020917ac: .word data_027e0e60
_020917ac: .word gMapManager
_020917b0: .word 0x000004cd
_020917b4: .word 0x0000ffff
@@ -13671,7 +13671,7 @@ _02091bd4:
ldrb r0, [r5, #0x18]
cmp r0, #0
beq _02091ce0
ldr r0, _02091d4c ; =data_027e0e60
ldr r0, _02091d4c ; =gMapManager
ldr r4, _02091d50 ; =0x000004cd
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020848b8Ev
@@ -13701,7 +13701,7 @@ _02091bd4:
str r0, [sp, #8]
str r1, [sp, #0xc]
str r1, [sp, #0x10]
ldr r0, _02091d4c ; =data_027e0e60
ldr r0, _02091d4c ; =gMapManager
add r1, sp, #0x5c
ldr r0, [r0]
mov r3, r2
@@ -13751,7 +13751,7 @@ _02091d3c: .word data_027e0f94
_02091d40: .word data_027e0fac
_02091d44: .word data_027e10a4
_02091d48: .word data_027e0d38
_02091d4c: .word data_027e0e60
_02091d4c: .word gMapManager
_02091d50: .word 0x000004cd
_02091d54: .word 0x0000ffff
@@ -15098,7 +15098,7 @@ _0209309c:
strle r0, [sp, #0x104]
b _020930d4
_020930b4:
ldr r0, _02093208 ; =data_027e0e60
ldr r0, _02093208 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082538Ev
add r3, sp, #0x28
@@ -15188,7 +15188,7 @@ _020931f8: .word data_027e0f94
_020931fc: .word 0x00001ccd
_02093200: .word 0xffffe333
_02093204: .word 0x000004cd
_02093208: .word data_027e0e60
_02093208: .word gMapManager
.global func_ov00_0209320c
arm_func_start func_ov00_0209320c
@@ -15391,7 +15391,7 @@ _0209349c:
strgt r0, [r4, #8]
ldmia sp!, {r3, r4, pc}
_020934c8:
ldr r0, _02093504 ; =data_027e0e60
ldr r0, _02093504 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082538Ev
add r3, sp, #0
@@ -15408,7 +15408,7 @@ _020934c8:
.align 2, 0
arm_func_end func_ov00_020933d4
_02093500: .word data_027e0f94
_02093504: .word data_027e0e60
_02093504: .word gMapManager
.global func_ov00_02093508
arm_func_start func_ov00_02093508
@@ -16155,7 +16155,7 @@ func_ov00_02093e00: ; 0x02093e00
sub sp, sp, #0x70
mov r10, r0
ldr r1, [r10, #4]
ldr r0, _020940cc ; =data_027e0e60
ldr r0, _020940cc ; =gMapManager
orr r1, r1, #0x800
str r1, [r10, #4]
ldr r2, [r10, #0x18]
@@ -16240,7 +16240,7 @@ _02093e70:
strb r5, [sp, #0x54]
strb r5, [sp, #0x55]
bl _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
ldr r0, _020940cc ; =data_027e0e60
ldr r0, _020940cc ; =gMapManager
add r1, sp, #0x40
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020838f8EPi
@@ -16272,7 +16272,7 @@ _02093f80:
add r0, r8, #2
cmp r8, r0
bge _0209406c
ldr r4, _020940cc ; =data_027e0e60
ldr r4, _020940cc ; =gMapManager
add r6, sp, #6
mov r5, #1
add r11, sp, #4
@@ -16340,7 +16340,7 @@ _020940ac:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_02093e00
_020940cc: .word data_027e0e60
_020940cc: .word gMapManager
_020940d0: .word 0x00000e66
_020940d4: .word gAdventureFlags
@@ -17651,7 +17651,7 @@ func_ov00_02094e6c: ; 0x02094e6c
strb r0, [r10]
mov r5, r2
strh r6, [r10, #2]
ldr r0, _02094f84 ; =data_027e0e60
ldr r0, _02094f84 ; =gMapManager
strh r5, [r10, #4]
ldr r0, [r0]
mov r9, r3
@@ -17659,7 +17659,7 @@ func_ov00_02094e6c: ; 0x02094e6c
ldrh r1, [r10, #2]
bl func_02002c14
mov r1, r0, lsl #0xc
ldr r0, _02094f84 ; =data_027e0e60
ldr r0, _02094f84 ; =gMapManager
str r1, [r10, #0xc]
ldr r0, [r0]
bl _ZN10MapManager17Get_MapData_Unk2aEv
@@ -17718,7 +17718,7 @@ _02094f40:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_02094e6c
_02094f84: .word data_027e0e60
_02094f84: .word gMapManager
_02094f88: .word data_027e0ce0
_02094f8c: .word func_ov00_02094fa8
_02094f90: .word func_ov00_02094f94
@@ -17762,13 +17762,13 @@ func_ov00_02094fbc: ; 0x02094fbc
cmpne r0, #0
addeq sp, sp, #8
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldr r0, _02095124 ; =data_027e0e60
ldr r0, _02095124 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager17Get_MapData_Unk28Ev
ldrh r1, [r4, #2]
bl func_02002c14
mov r1, r0, lsl #0xc
ldr r0, _02095124 ; =data_027e0e60
ldr r0, _02095124 ; =gMapManager
str r1, [r4, #0xc]
ldr r0, [r0]
bl _ZN10MapManager17Get_MapData_Unk2aEv
@@ -17842,7 +17842,7 @@ _0209510c:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_02094fbc
_02095124: .word data_027e0e60
_02095124: .word gMapManager
_02095128: .word data_027e0ce0
_0209512c: .word func_ov00_02094fa8
_02095130: .word func_ov00_02094f94
@@ -17958,7 +17958,7 @@ func_ov00_02095258: ; 0x02095258
func_ov00_02095278: ; 0x02095278
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x18
ldr r3, _0209530c ; =data_027e0e60
ldr r3, _0209530c ; =gMapManager
add ip, sp, #0xc
mov r4, r0
mov r6, r1
@@ -17995,7 +17995,7 @@ func_ov00_02095278: ; 0x02095278
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_02095278
_0209530c: .word data_027e0e60
_0209530c: .word gMapManager
.global func_ov00_02095310
arm_func_start func_ov00_02095310
@@ -18171,26 +18171,26 @@ func_ov00_020954a0: ; 0x020954a0
mov r5, r1
bl func_ov00_020953fc
ldr r1, _0209554c ; =data_ov00_020e3040
ldr r0, _02095550 ; =data_027e0e60
ldr r0, _02095550 ; =gMapManager
str r1, [r6]
ldrb r1, [r5, #1]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083bacEv
ldr r2, _02095550 ; =data_027e0e60
ldr r2, _02095550 ; =gMapManager
mov r4, r0
ldrb r1, [r5, #2]
ldr r0, [r2]
bl _ZN10MapManager18func_ov00_02083b84Ev
mov r3, #0x5000
rsb r3, r3, #0
ldr r2, _02095550 ; =data_027e0e60
ldr r2, _02095550 ; =gMapManager
str r0, [sp, #0xc]
ldrb r1, [r5, #3]
ldr r0, [r2]
str r3, [sp, #0x10]
str r4, [sp, #0x14]
bl _ZN10MapManager18func_ov00_02083bfcEv
ldr r2, _02095550 ; =data_027e0e60
ldr r2, _02095550 ; =gMapManager
mov r4, r0
ldrb r1, [r5, #4]
ldr r0, [r2]
@@ -18211,7 +18211,7 @@ func_ov00_020954a0: ; 0x020954a0
.align 2, 0
arm_func_end func_ov00_020954a0
_0209554c: .word data_ov00_020e3040
_02095550: .word data_027e0e60
_02095550: .word gMapManager
.global func_ov00_02095554
arm_func_start func_ov00_02095554
@@ -18222,26 +18222,26 @@ func_ov00_02095554: ; 0x02095554
mov r5, r1
bl func_ov00_020953fc
ldr r1, _02095600 ; =data_ov00_020e3040
ldr r0, _02095604 ; =data_027e0e60
ldr r0, _02095604 ; =gMapManager
str r1, [r6]
ldrb r1, [r5, #1]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083bacEv
ldr r2, _02095604 ; =data_027e0e60
ldr r2, _02095604 ; =gMapManager
mov r4, r0
ldrb r1, [r5, #2]
ldr r0, [r2]
bl _ZN10MapManager18func_ov00_02083b84Ev
mov r3, #0x5000
rsb r3, r3, #0
ldr r2, _02095604 ; =data_027e0e60
ldr r2, _02095604 ; =gMapManager
str r0, [sp, #0xc]
ldrb r1, [r5, #3]
ldr r0, [r2]
str r3, [sp, #0x10]
str r4, [sp, #0x14]
bl _ZN10MapManager18func_ov00_02083bfcEv
ldr r2, _02095604 ; =data_027e0e60
ldr r2, _02095604 ; =gMapManager
mov r4, r0
ldrb r1, [r5, #4]
ldr r0, [r2]
@@ -18262,7 +18262,7 @@ func_ov00_02095554: ; 0x02095554
.align 2, 0
arm_func_end func_ov00_02095554
_02095600: .word data_ov00_020e3040
_02095604: .word data_027e0e60
_02095604: .word gMapManager
.global func_ov00_02095608
arm_func_start func_ov00_02095608
@@ -18311,11 +18311,11 @@ func_ov00_0209564c: ; 0x0209564c
str r0, [r6, #0x14]
str r0, [r6, #0x18]
str r0, [r6, #0x1c]
ldr r0, _0209571c ; =data_027e0e60
ldr r0, _0209571c ; =gMapManager
ldrb r1, [r5, #1]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083bacEv
ldr r2, _0209571c ; =data_027e0e60
ldr r2, _0209571c ; =gMapManager
mov r4, r0
ldrb r1, [r5, #2]
ldr r0, [r2]
@@ -18353,7 +18353,7 @@ func_ov00_0209564c: ; 0x0209564c
.align 2, 0
arm_func_end func_ov00_0209564c
_02095718: .word data_ov00_020e301c
_0209571c: .word data_027e0e60
_0209571c: .word gMapManager
.global func_ov00_02095720
arm_func_start func_ov00_02095720
@@ -19067,7 +19067,7 @@ func_ov00_02095fe0: ; 0x02095fe0
addeq sp, sp, #0x34
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0209614c ; =data_027e0d3c
ldr r1, _02096150 ; =data_027e0e60
ldr r1, _02096150 ; =gMapManager
ldr r2, [r0]
ldr r0, [r1]
ldr r1, [r2, #0x44]
@@ -19084,7 +19084,7 @@ func_ov00_02095fe0: ; 0x02095fe0
cmp r8, r0
addeq sp, sp, #0x34
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r4, _02096150 ; =data_027e0e60
ldr r4, _02096150 ; =gMapManager
add r6, sp, #0x1c
add r5, sp, #0x28
add r11, sp, #0x10
@@ -19154,7 +19154,7 @@ _02096128:
.align 2, 0
arm_func_end func_ov00_02095fe0
_0209614c: .word data_027e0d3c
_02096150: .word data_027e0e60
_02096150: .word gMapManager
_02096154: .word 0x43525953
_02096158: .word 0x464f5243
_0209615c: .word data_ov00_020db050
asm/ov00/ov00_020980f4.inc
+1 -1
View File
@@ -95,7 +95,7 @@
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0de4
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f78
asm/ov00/ov00_020980f4.s
+56 -56
View File
@@ -301,7 +301,7 @@ _0209848c:
sub r2, r3, #2
mov ip, #0x47
mov r1, #0xff
ldr r0, _020985b8 ; =data_027e0e60
ldr r0, _020985b8 ; =gMapManager
str r2, [sp, #0x18]
str ip, [sp, #0xc]
str r3, [sp, #0x10]
@@ -354,7 +354,7 @@ _020985a8: .word data_027e0f64
_020985ac: .word data_027e0f90
_020985b0: .word data_027e0c54
_020985b4: .word data_027e0db0
_020985b8: .word data_027e0e60
_020985b8: .word gMapManager
_020985bc: .word data_027e0d38
.global func_ov00_020985c0
@@ -1469,7 +1469,7 @@ _020993b4:
sub r2, r3, #2
mov r4, #0x47
mov r1, #0xff
ldr r0, _020994cc ; =data_027e0e60
ldr r0, _020994cc ; =gMapManager
str r2, [sp, #0x14]
str r4, [sp, #8]
str r3, [sp, #0xc]
@@ -1535,7 +1535,7 @@ _020994bc: .word data_027e0f68
_020994c0: .word data_027e0f64
_020994c4: .word data_027e0c68
_020994c8: .word data_027e0db0
_020994cc: .word data_027e0e60
_020994cc: .word gMapManager
_020994d0: .word data_027e0d38
_020994d4: .word 0x414e4353
@@ -5632,7 +5632,7 @@ func_ov00_0209c8f4: ; 0x0209c8f4
str r1, [r4, #0xfc]
ldmia sp!, {r4, pc}
_0209c93c:
ldr r0, _0209c954 ; =data_027e0e60
ldr r0, _0209c954 ; =gMapManager
add r1, r4, #0xf8
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -5640,7 +5640,7 @@ _0209c93c:
.align 2, 0
arm_func_end func_ov00_0209c8f4
_0209c950: .word data_027e0f94
_0209c954: .word data_027e0e60
_0209c954: .word gMapManager
.global func_ov00_0209c958
arm_func_start func_ov00_0209c958
@@ -5743,11 +5743,11 @@ func_ov00_0209ca80: ; 0x0209ca80
bl func_01ffa8d4
ldr r1, _0209cbbc ; =0x04000444
mov r2, #0
ldr r0, _0209cbc0 ; =data_027e0e60
ldr r0, _0209cbc0 ; =gMapManager
str r2, [r1]
ldr r0, [r0]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldr r1, _0209cbc0 ; =data_027e0e60
ldr r1, _0209cbc0 ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
@@ -5820,7 +5820,7 @@ func_ov00_0209ca80: ; 0x0209ca80
.align 2, 0
arm_func_end func_ov00_0209ca80
_0209cbbc: .word 0x04000444
_0209cbc0: .word data_027e0e60
_0209cbc0: .word gMapManager
_0209cbc4: .word 0x04000470
_0209cbc8: .word 0x4210ffff
_0209cbcc: .word 0x001f0080
@@ -5830,7 +5830,7 @@ _0209cbd0: .word 0x04000504
arm_func_start func_ov00_0209cbd4
func_ov00_0209cbd4: ; 0x0209cbd4
stmdb sp!, {r3, r4, r5, lr}
ldr r3, _0209cc2c ; =data_027e0e60
ldr r3, _0209cc2c ; =gMapManager
mov r5, r0
ldr r0, [r3]
mov r4, r2
@@ -5853,7 +5853,7 @@ func_ov00_0209cbd4: ; 0x0209cbd4
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_0209cbd4
_0209cc2c: .word data_027e0e60
_0209cc2c: .word gMapManager
.global func_ov00_0209cc30
arm_func_start func_ov00_0209cc30
@@ -5888,7 +5888,7 @@ func_ov00_0209cc48: ; 0x0209cc48
ldrh r1, [r4, #0x1a]
ldr r0, [r0]
bl func_ov00_020c4648
ldr r0, _0209cce0 ; =data_027e0e60
ldr r0, _0209cce0 ; =gMapManager
ldrh r1, [r4, #0x1c]
ldrh r2, [r4, #0x1e]
ldr r0, [r0]
@@ -5915,7 +5915,7 @@ func_ov00_0209cc48: ; 0x0209cc48
arm_func_end func_ov00_0209cc48
_0209ccd8: .word gItemManager
_0209ccdc: .word data_027e0fec
_0209cce0: .word data_027e0e60
_0209cce0: .word gMapManager
_0209cce4: .word data_027e0f68
.global func_ov00_0209cce8
@@ -6642,7 +6642,7 @@ func_ov00_0209d564: ; 0x0209d564
mov r2, #2
str r0, [sp, #0x28]
ldr r1, [lr, #0x288]
ldr r0, _0209d6cc ; =data_027e0e60
ldr r0, _0209d6cc ; =gMapManager
str r1, [sp, #0x2c]
ldr lr, [lr, #0x28c]
add r1, sp, #0x40
@@ -6698,7 +6698,7 @@ _0209d694:
arm_func_end func_ov00_0209d564
_0209d6c4: .word 0x0000ffff
_0209d6c8: .word 0x00000333
_0209d6cc: .word data_027e0e60
_0209d6cc: .word gMapManager
.global func_ov00_0209d6d0
arm_func_start func_ov00_0209d6d0
@@ -8276,7 +8276,7 @@ _0209e9c0:
strh r2, [r0, #0x18]
cmp ip, #2
blo _0209e9c0
ldr r0, _0209eafc ; =data_027e0e60
ldr r0, _0209eafc ; =gMapManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083928EPci
@@ -8290,7 +8290,7 @@ _0209e9c0:
moveq r0, #1
movne r0, #0
strb r0, [r4, #0x165]
ldr r0, _0209eafc ; =data_027e0e60
ldr r0, _0209eafc ; =gMapManager
ldrb r1, [r4, #0x163]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083908EcPi
@@ -8357,7 +8357,7 @@ _0209eae4:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_0209e994
_0209eafc: .word data_027e0e60
_0209eafc: .word gMapManager
.global func_ov00_0209eb00
arm_func_start func_ov00_0209eb00
@@ -8448,7 +8448,7 @@ _0209ec14:
cmp r2, #0
movne r0, #1
ldmneia sp!, {r4, pc}
ldr r0, _0209ecd0 ; =data_027e0e60
ldr r0, _0209ecd0 ; =gMapManager
ldrb r1, [r4, #0x162]
ldr r0, [r0]
mov r2, r3
@@ -8479,7 +8479,7 @@ _0209ec80:
mov r3, #0
bl func_ov00_02087400
_0209ec9c:
ldr r0, _0209ecd0 ; =data_027e0e60
ldr r0, _0209ecd0 ; =gMapManager
ldrb r1, [r4, #0x16c]
ldr r0, [r0]
mov r2, #0
@@ -8496,7 +8496,7 @@ _0209ecc8:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_0209ebec
_0209ecd0: .word data_027e0e60
_0209ecd0: .word gMapManager
_0209ecd4: .word data_027e0f64
.global func_ov00_0209ecd8
@@ -8509,7 +8509,7 @@ func_ov00_0209ecd8: ; 0x0209ecd8
cmp r1, #1
b _0209ed08
_0209ecf0:
ldr r2, _0209ed14 ; =data_027e0e60
ldr r2, _0209ed14 ; =gMapManager
ldrb r1, [r0, #0x164]
ldr r0, [r2]
mov r2, #0
@@ -8521,7 +8521,7 @@ _0209ed08:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_0209ecd8
_0209ed14: .word data_027e0e60
_0209ed14: .word gMapManager
.global func_ov00_0209ed18
arm_func_start func_ov00_0209ed18
@@ -12501,7 +12501,7 @@ func_ov00_020a1dc8: ; 0x020a1dc8
_020a1de8:
cmp r2, #0
bne _020a1e4c
ldr r0, _020a1e54 ; =data_027e0e60
ldr r0, _020a1e54 ; =gMapManager
ldrb r1, [r4, #0x15c]
ldrb r2, [r4, #0x29]
ldr r0, [r0]
@@ -12510,7 +12510,7 @@ _020a1de8:
b _020a1e4c
_020a1e0c:
bl func_ov00_020a1e58
ldr r0, _020a1e54 ; =data_027e0e60
ldr r0, _020a1e54 ; =gMapManager
ldrb r1, [r4, #0x15c]
ldrb r2, [r4, #0x29]
ldr r0, [r0]
@@ -12530,7 +12530,7 @@ _020a1e4c:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020a1dc8
_020a1e54: .word data_027e0e60
_020a1e54: .word gMapManager
.global func_ov00_020a1e58
arm_func_start func_ov00_020a1e58
@@ -12611,11 +12611,11 @@ func_ov00_020a1f24: ; 0x020a1f24
ldr r0, [r0, #0x15c]
cmp r0, #0x24
bne _020a1f90
ldr r0, _020a1fc8 ; =data_027e0e60
ldr r0, _020a1fc8 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082538Ev
ldr r2, [r0]
ldr r1, _020a1fc8 ; =data_027e0e60
ldr r1, _020a1fc8 ; =gMapManager
str r2, [r4, #0x18]
ldr r2, [r0, #4]
str r2, [r4, #0x1c]
@@ -12647,7 +12647,7 @@ _020a1f90:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020a1f24
_020a1fc8: .word data_027e0e60
_020a1fc8: .word gMapManager
_020a1fcc: .word data_027e0f94
.global func_ov00_020a1fd0
@@ -12736,14 +12736,14 @@ func_ov00_020a1fd0: ; 0x020a1fd0
add r5, r0, r2
b _020a21d0
_020a2118:
ldr r0, _020a2224 ; =data_027e0e60
ldr r0, _020a2224 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082424Ev
rsb r0, r0, #0
sub r0, r0, #0x4000
cmp r4, r0
blt _020a21d0
ldr r0, _020a2224 ; =data_027e0e60
ldr r0, _020a2224 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082424Ev
add r0, r4, r0
@@ -12806,7 +12806,7 @@ _020a21d0:
.align 2, 0
arm_func_end func_ov00_020a1fd0
_020a2220: .word data_027e0fac
_020a2224: .word data_027e0e60
_020a2224: .word gMapManager
.global func_ov00_020a2228
arm_func_start func_ov00_020a2228
@@ -12833,7 +12833,7 @@ func_ov00_020a222c: ; 0x020a222c
ldr r0, [r4, #0x28]
sub r1, r1, #0x1000
cmp r0, r1
ldr r0, _020a22b4 ; =data_027e0e60
ldr r0, _020a22b4 ; =gMapManager
strgt r1, [r4, #0x28]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082424Ev
@@ -12843,7 +12843,7 @@ func_ov00_020a222c: ; 0x020a222c
add r0, r1, r0
cmp r2, r0
ldmgeia sp!, {r4, pc}
ldr r0, _020a22b4 ; =data_027e0e60
ldr r0, _020a22b4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082424Ev
ldr r1, [r4, #0x1c]
@@ -12853,7 +12853,7 @@ func_ov00_020a222c: ; 0x020a222c
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020a222c
_020a22b4: .word data_027e0e60
_020a22b4: .word gMapManager
.global func_ov00_020a22b8
arm_func_start func_ov00_020a22b8
@@ -13107,12 +13107,12 @@ _020a2614:
mov r0, r0, lsl #0x10
mov r4, r0, asr #0x10
beq _020a2680
ldr r0, _020a26e0 ; =data_027e0e60
ldr r0, _020a26e0 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_06Ev
cmp r0, #0
bne _020a2680
ldr r0, _020a26e0 ; =data_027e0e60
ldr r0, _020a26e0 ; =gMapManager
mov r1, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083938Ei
@@ -13157,7 +13157,7 @@ _020a2680:
.align 2, 0
arm_func_end func_ov00_020a23a4
_020a26dc: .word data_027e0d38
_020a26e0: .word data_027e0e60
_020a26e0: .word gMapManager
.global func_ov00_020a26e4
arm_func_start func_ov00_020a26e4
@@ -13180,7 +13180,7 @@ func_ov00_020a26e4: ; 0x020a26e4
stmia sp, {r0, r3}
mov r1, #0
str r1, [sp, #8]
ldr r0, _020a2758 ; =data_027e0e60
ldr r0, _020a2758 ; =gMapManager
add r1, sp, #0xc
ldr r0, [r0]
add r2, sp, #0x18
@@ -13193,7 +13193,7 @@ func_ov00_020a26e4: ; 0x020a26e4
ldmia sp!, {pc}
.align 2, 0
arm_func_end func_ov00_020a26e4
_020a2758: .word data_027e0e60
_020a2758: .word gMapManager
.global func_ov00_020a275c
arm_func_start func_ov00_020a275c
@@ -13216,7 +13216,7 @@ func_ov00_020a275c: ; 0x020a275c
stmia sp, {r0, r3}
mov r1, #0
str r1, [sp, #8]
ldr r0, _020a27d0 ; =data_027e0e60
ldr r0, _020a27d0 ; =gMapManager
add r1, sp, #0xc
ldr r0, [r0]
add r2, sp, #0x18
@@ -13229,7 +13229,7 @@ func_ov00_020a275c: ; 0x020a275c
ldmia sp!, {pc}
.align 2, 0
arm_func_end func_ov00_020a275c
_020a27d0: .word data_027e0e60
_020a27d0: .word gMapManager
.global func_ov00_020a27d4
arm_func_start func_ov00_020a27d4
@@ -13252,7 +13252,7 @@ func_ov00_020a27d4: ; 0x020a27d4
stmia sp, {r0, r3}
mov r1, #0
str r1, [sp, #8]
ldr r0, _020a2848 ; =data_027e0e60
ldr r0, _020a2848 ; =gMapManager
add r1, sp, #0xc
ldr r0, [r0]
add r2, sp, #0x18
@@ -13265,7 +13265,7 @@ func_ov00_020a27d4: ; 0x020a27d4
ldmia sp!, {pc}
.align 2, 0
arm_func_end func_ov00_020a27d4
_020a2848: .word data_027e0e60
_020a2848: .word gMapManager
.global func_ov00_020a284c
arm_func_start func_ov00_020a284c
@@ -13472,7 +13472,7 @@ _020a2b28:
add r3, sp, #4
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _020a2c04 ; =data_027e0e60
ldr r0, _020a2c04 ; =gMapManager
mov r1, r3
ldr r0, [r0]
mov r2, #1
@@ -13522,7 +13522,7 @@ _020a2ba8:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020a2adc
_020a2c04: .word data_027e0e60
_020a2c04: .word gMapManager
.global func_ov00_020a2c08
arm_func_start func_ov00_020a2c08
@@ -13770,7 +13770,7 @@ _020a2f18:
cmp r5, #2
blo _020a2f18
ldr r1, [r4, #4]
ldr r0, _020a2ff0 ; =data_027e0e60
ldr r0, _020a2ff0 ; =gMapManager
ldrb r2, [r1, #0x1b8]
ldr r0, [r0]
add r1, sp, #0x10
@@ -13822,7 +13822,7 @@ _020a2fac:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020a2e8c
_020a2ff0: .word data_027e0e60
_020a2ff0: .word gMapManager
.global func_ov00_020a2ff4
arm_func_start func_ov00_020a2ff4
@@ -13867,7 +13867,7 @@ _020a3074:
cmp r5, #2
blo _020a3074
ldr r1, [r4, #4]
ldr r0, _020a3140 ; =data_027e0e60
ldr r0, _020a3140 ; =gMapManager
ldrb r2, [r1, #0x1b8]
ldr r0, [r0]
add r1, sp, #0x10
@@ -13916,7 +13916,7 @@ _020a3108:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020a2ff4
_020a3140: .word data_027e0e60
_020a3140: .word gMapManager
.global func_ov00_020a3144
arm_func_start func_ov00_020a3144
@@ -15289,7 +15289,7 @@ func_ov00_020a41e4: ; 0x020a41e4
mov r5, r2
mov r4, r3
bl func_ov00_020a5e9c
ldr r1, _020a42c8 ; =data_027e0e60
ldr r1, _020a42c8 ; =gMapManager
str r0, [r6]
ldr r0, [r1]
bl _ZN10MapManager18func_ov00_02082d08Ev
@@ -15335,7 +15335,7 @@ func_ov00_020a41e4: ; 0x020a41e4
.align 2, 0
arm_func_end func_ov00_020a41e4
_020a42c4: .word data_027e0d38
_020a42c8: .word data_027e0e60
_020a42c8: .word gMapManager
.global func_ov00_020a42cc
arm_func_start func_ov00_020a42cc
@@ -15351,7 +15351,7 @@ func_ov00_020a42cc: ; 0x020a42cc
mov r5, r2
mov r4, r3
bl func_ov00_020a5e9c
ldr r1, _020a4344 ; =data_027e0e60
ldr r1, _020a4344 ; =gMapManager
str r0, [r6]
ldr r0, [r1]
bl _ZN10MapManager18func_ov00_02082d08Ev
@@ -15372,7 +15372,7 @@ func_ov00_020a42cc: ; 0x020a42cc
.align 2, 0
arm_func_end func_ov00_020a42cc
_020a4340: .word data_027e0d38
_020a4344: .word data_027e0e60
_020a4344: .word gMapManager
.global func_ov00_020a4348
arm_func_start func_ov00_020a4348
@@ -16228,14 +16228,14 @@ func_ov00_020a4dd0: ; 0x020a4dd0
strb r3, [r4, #0x37]
str r3, [r4, #0x38]
bl func_ov00_020a5508
ldr r0, _020a4e08 ; =data_027e0e60
ldr r0, _020a4e08 ; =gMapManager
add r1, r4, #0x28
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020a4dd0
_020a4e08: .word data_027e0e60
_020a4e08: .word gMapManager
.global func_ov00_020a4e0c
arm_func_start func_ov00_020a4e0c
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -183,7 +183,7 @@
.extern data_027e0d84
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f78
asm/ov00/ov00_020b1498.s
+95 -95
View File
@@ -280,7 +280,7 @@ _020b1788: .word data_027e0f6c
func_ov00_020b178c: ; 0x020b178c
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r4, lr}
ldr r3, _020b17e8 ; =data_027e0e60
ldr r3, _020b17e8 ; =gMapManager
ldrb r1, [sp, #0xc]
mov r4, r0
ldrb r2, [sp, #0xd]
@@ -288,7 +288,7 @@ func_ov00_020b178c: ; 0x020b178c
bl _ZN10MapManager18func_ov00_02083e34Ecci
cmp r0, r4
bgt _020b17d8
ldr r0, _020b17e8 ; =data_027e0e60
ldr r0, _020b17e8 ; =gMapManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_78Ev
@@ -304,7 +304,7 @@ _020b17d8:
bx lr
.align 2, 0
arm_func_end func_ov00_020b178c
_020b17e8: .word data_027e0e60
_020b17e8: .word gMapManager
.global func_ov00_020b17ec
arm_func_start func_ov00_020b17ec
@@ -444,14 +444,14 @@ func_ov00_020b199c: ; 0x020b199c
mov r5, r1
mov r4, r2
bmi _020b19e4
ldr r0, _020b1a48 ; =data_027e0e60
ldr r0, _020b1a48 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager17Get_MapData_Unk28Ev
cmp r0, r6
ble _020b19e4
cmp r5, #0
blt _020b19e4
ldr r0, _020b1a48 ; =data_027e0e60
ldr r0, _020b1a48 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager17Get_MapData_Unk2aEv
cmp r0, r5
@@ -461,7 +461,7 @@ _020b19e4:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, pc}
_020b19f0:
ldr r0, _020b1a48 ; =data_027e0e60
ldr r0, _020b1a48 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
strb r6, [sp]
@@ -478,7 +478,7 @@ _020b19f0:
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, pc}
_020b1a30:
ldr r0, _020b1a48 ; =data_027e0e60
ldr r0, _020b1a48 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084164Ev
@@ -486,20 +486,20 @@ _020b1a30:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020b199c
_020b1a48: .word data_027e0e60
_020b1a48: .word gMapManager
.global func_ov00_020b1a4c
arm_func_start func_ov00_020b1a4c
func_ov00_020b1a4c: ; 0x020b1a4c
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0xc0
ldr r2, _020b1b48 ; =data_027e0e60
ldr r2, _020b1b48 ; =gMapManager
mov r8, r1
mov r9, r0
ldr r0, [r2]
ldr r1, [r8]
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _020b1b48 ; =data_027e0e60
ldr r1, _020b1b48 ; =gMapManager
mov r5, r0
ldr r0, [r1]
ldr r1, [r8, #8]
@@ -559,7 +559,7 @@ _020b1b34:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov00_020b1a4c
_020b1b48: .word data_027e0e60
_020b1b48: .word gMapManager
_020b1b4c: .word func_ov00_020b1940
_020b1b50: .word data_ov00_020dc704
@@ -568,7 +568,7 @@ _020b1b50: .word data_ov00_020dc704
func_ov00_020b1b54: ; 0x020b1b54
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r3, lr}
ldr r0, _020b1ba0 ; =data_027e0e60
ldr r0, _020b1ba0 ; =gMapManager
ldrb r1, [sp, #8]
ldrb r2, [sp, #9]
ldr r0, [r0]
@@ -588,7 +588,7 @@ _020b1b90:
bx lr
.align 2, 0
arm_func_end func_ov00_020b1b54
_020b1ba0: .word data_027e0e60
_020b1ba0: .word gMapManager
.global func_ov00_020b1ba4
arm_func_start func_ov00_020b1ba4
@@ -596,7 +596,7 @@ func_ov00_020b1ba4: ; 0x020b1ba4
stmdb sp!, {r3, lr}
sub sp, sp, #0x10
ldr r2, [r0]
ldr r1, _020b1bf8 ; =data_027e0e60
ldr r1, _020b1bf8 ; =gMapManager
str r2, [sp, #4]
ldr r2, [r0, #4]
ldr r1, [r1]
@@ -616,7 +616,7 @@ func_ov00_020b1ba4: ; 0x020b1ba4
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020b1ba4
_020b1bf8: .word data_027e0e60
_020b1bf8: .word gMapManager
.global func_ov00_020b1bfc
arm_func_start func_ov00_020b1bfc
@@ -625,7 +625,7 @@ func_ov00_020b1bfc: ; 0x020b1bfc
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldrb r5, [sp, #0x1d]
ldrb r6, [sp, #0x1c]
ldr r1, _020b1d38 ; =data_027e0e60
ldr r1, _020b1d38 ; =gMapManager
mov r7, r0
ldr r0, [r1]
mov r1, r6
@@ -702,7 +702,7 @@ func_ov00_020b1bfc: ; 0x020b1bfc
bx lr
.align 2, 0
arm_func_end func_ov00_020b1bfc
_020b1d38: .word data_027e0e60
_020b1d38: .word gMapManager
.global func_ov00_020b1d3c
arm_func_start func_ov00_020b1d3c
@@ -1435,7 +1435,7 @@ func_ov00_020b2598: ; 0x020b2598
mov r3, #0
sub r2, r3, #2
mov r5, #0x47
ldr r0, _020b2b90 ; =data_027e0e60
ldr r0, _020b2b90 ; =gMapManager
mov r1, #0xff
str r2, [sp, #0xc]
str r5, [sp]
@@ -1830,7 +1830,7 @@ _020b2b88:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020b2598
_020b2b90: .word data_027e0e60
_020b2b90: .word gMapManager
_020b2b94: .word data_027e0d38
_020b2b98: .word data_02052f54
_020b2b9c: .word data_02051f54
@@ -2300,7 +2300,7 @@ func_ov00_020b30e4: ; 0x020b30e4
ldr r0, [r0, #4]
cmp r2, r0
bne _020b325c
ldr r0, _020b3270 ; =data_027e0e60
ldr r0, _020b3270 ; =gMapManager
add r2, sp, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020838e8EjPi
@@ -2375,7 +2375,7 @@ _020b325c:
arm_func_end func_ov00_020b30e4
_020b3268: .word data_027e0d38
_020b326c: .word data_027e077c
_020b3270: .word data_027e0e60
_020b3270: .word gMapManager
_020b3274: .word gAdventureFlags
.global func_ov00_020b3278
@@ -3112,7 +3112,7 @@ _020b3ce4:
mov r0, r4
str r1, [sp, #8]
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r1, _020b3d68 ; =data_027e0e60
ldr r1, _020b3d68 ; =gMapManager
ldr r5, [r0, #4]
ldr r0, [r1]
add r1, sp, #0
@@ -3137,7 +3137,7 @@ _020b3d58: .word data_027e0618
_020b3d5c: .word data_ov00_020eec9c
_020b3d60: .word 0xffffe4cd
_020b3d64: .word data_ov00_020e6194
_020b3d68: .word data_027e0e60
_020b3d68: .word gMapManager
.global func_ov00_020b3d6c
arm_func_start func_ov00_020b3d6c
@@ -4606,7 +4606,7 @@ _020b4cfc: .word 0xffffb000
func_ov00_020b4d00: ; 0x020b4d00
push {r3, r4, lr}
sub sp, #4
ldr r1, _020b4d24 ; =data_027e0e60
ldr r1, _020b4d24 ; =gMapManager
add r4, r0, #0
add r2, r4, #0
ldr r1, [r1]
@@ -4622,7 +4622,7 @@ func_ov00_020b4d00: ; 0x020b4d00
pop {r3, r4, pc}
nop
thumb_func_end func_ov00_020b4d00
_020b4d24: .word data_027e0e60
_020b4d24: .word gMapManager
.global func_ov00_020b4d28
arm_func_start func_ov00_020b4d28
@@ -4645,7 +4645,7 @@ func_ov00_020b4d28: ; 0x020b4d28
rsblt r1, r4, #0
cmp r1, r0
ble _020b4ec8
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r2, [r7, #0x20]
ldr r1, [r7, #0x2c]
ldr r0, [r0]
@@ -4654,7 +4654,7 @@ func_ov00_020b4d28: ; 0x020b4d28
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r3, [r7, #0x20]
ldr r2, [r7, #0x2c]
ldr r1, _020b502c ; =data_027e0e60
ldr r1, _020b502c ; =gMapManager
mov r8, r0
sub r2, r3, r2
ldr r0, [r1]
@@ -4664,14 +4664,14 @@ func_ov00_020b4d28: ; 0x020b4d28
mov r1, r0
cmp r2, #0
ble _020b4dd0
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c24Ei
mov r8, r0
b _020b4e60
_020b4dd0:
bge _020b4dec
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
mov r1, r8
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c24Ei
@@ -4697,24 +4697,24 @@ _020b4dec:
str ip, [r3, #4]
adds r0, r2, r0, ror #31
bne _020b4e4c
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c24Ei
mov r8, r0
b _020b4e60
_020b4e4c:
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
mov r1, r8
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c24Ei
mov r8, r0
_020b4e60:
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020833c4Ev
cmp r8, r0
ble _020b4e88
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020833dcEv
cmp r8, r0
@@ -4738,7 +4738,7 @@ _020b4e90:
str r0, [r6]
b _020b501c
_020b4ec8:
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r2, [r7, #0x28]
ldr r1, [r7, #0x2c]
ldr r0, [r0]
@@ -4747,7 +4747,7 @@ _020b4ec8:
bl _ZN10MapManager18func_ov00_020839f8Ev
ldr r3, [r7, #0x28]
ldr r2, [r7, #0x2c]
ldr r1, _020b502c ; =data_027e0e60
ldr r1, _020b502c ; =gMapManager
mov r8, r0
sub r2, r3, r2
ldr r0, [r1]
@@ -4757,14 +4757,14 @@ _020b4ec8:
mov r1, r0
cmp r2, #0
ble _020b4f28
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r8, r0
b _020b4fb8
_020b4f28:
bge _020b4f44
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
mov r1, r8
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c50Ei
@@ -4790,24 +4790,24 @@ _020b4f44:
str ip, [r3, #4]
adds r0, r2, r0, ror #31
bne _020b4fa4
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r8, r0
b _020b4fb8
_020b4fa4:
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
mov r1, r8
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c50Ei
mov r8, r0
_020b4fb8:
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020833d0Ev
cmp r8, r0
ble _020b4fe0
ldr r0, _020b502c ; =data_027e0e60
ldr r0, _020b502c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020833e8Ev
cmp r8, r0
@@ -4836,7 +4836,7 @@ _020b501c:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov00_020b4d28
_020b502c: .word data_027e0e60
_020b502c: .word gMapManager
_020b5030: .word data_027e0764
.global func_ov00_020b5034
@@ -4849,7 +4849,7 @@ func_ov00_020b5034: ; 0x020b5034
ldr r4, [r5, #4]
cmp r0, #0
blt _020b50cc
ldr r0, _020b50d4 ; =data_027e0e60
ldr r0, _020b50d4 ; =gMapManager
ldrb r3, [r6, #0x1c]
ldrb r2, [r6, #0x1d]
ldr r0, [r0]
@@ -4885,7 +4885,7 @@ _020b50cc:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov00_020b5034
_020b50d4: .word data_027e0e60
_020b50d4: .word gMapManager
_020b50d8: .word 0xfffff333
_020b50dc: .word func_ov00_020b1940
@@ -5024,7 +5024,7 @@ func_ov00_020b5268: ; 0x020b5268
mov r5, r1
str r2, [sp, #0x28]
ldr r2, [r4, #4]
ldr r1, _020b5340 ; =data_027e0e60
ldr r1, _020b5340 ; =gMapManager
str r2, [sp, #0x2c]
ldr r2, [r4, #8]
mov r6, r0
@@ -5055,7 +5055,7 @@ _020b52d0:
add r1, sp, #0x14
str r0, [sp, #0x20]
ldr r2, [r4, #8]
ldr r0, _020b5340 ; =data_027e0e60
ldr r0, _020b5340 ; =gMapManager
str r2, [sp, #0x24]
ldr r4, [r6, #0x2c]
add r2, sp, #0x1c
@@ -5075,7 +5075,7 @@ _020b52d0:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020b5268
_020b5340: .word data_027e0e60
_020b5340: .word gMapManager
_020b5344: .word 0xfffff667
_020b5348: .word data_ov00_020e64a8
@@ -5520,7 +5520,7 @@ _020b5884:
add r2, r1, r0, lsl #1
ldrb r4, [r1, r0, lsl #1]
ldrb r3, [r2, #1]
ldr r0, _020b5c98 ; =data_027e0e60
ldr r0, _020b5c98 ; =gMapManager
sub r2, sp, #4
ldr r0, [r0]
add r1, sp, #0x28
@@ -5742,7 +5742,7 @@ _020b5c88: .word data_02050f54
_020b5c8c: .word gAdventureFlags
_020b5c90: .word 0x00000ccd
_020b5c94: .word data_027e0fc8
_020b5c98: .word data_027e0e60
_020b5c98: .word gMapManager
_020b5c9c: .word data_027e0f78
_020b5ca0: .word gItemManager
_020b5ca4: .word 0x0000019a
@@ -5882,7 +5882,7 @@ _020b5e88:
str r1, [sp]
str r0, [sp, #4]
ldrh r2, [r7, #0xa4]
ldr r0, _020b6ac8 ; =data_027e0e60
ldr r0, _020b6ac8 ; =gMapManager
add r1, sp, #0x1e4
str r2, [sp, #8]
str r7, [sp, #0xc]
@@ -5964,7 +5964,7 @@ _020b5f34:
str ip, [sp, #0xec]
ldrh r11, [r7, #0xa4]
add r0, sp, #0x28
ldr lr, _020b6ac8 ; =data_027e0e60
ldr lr, _020b6ac8 ; =gMapManager
bic r11, r11, #2
mov r11, r11, lsl #0x10
str r9, [sp, #0xf4]
@@ -6102,7 +6102,7 @@ _020b61d4:
strh r0, [r7, #0x60]
_020b61e0:
ldr r0, [r7, #0x20]
ldr r1, _020b6ac8 ; =data_027e0e60
ldr r1, _020b6ac8 ; =gMapManager
stmia r10, {r0, r8}
ldr r2, [r7, #0x28]
add r0, sp, #0x14
@@ -6111,7 +6111,7 @@ _020b61e0:
add r2, r7, #0x20
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r2, [sp, #0x14]
ldr r0, _020b6ac8 ; =data_027e0e60
ldr r0, _020b6ac8 ; =gMapManager
add r1, r7, #0x1c
strb r2, [r7, #0x1c]
ldrb r2, [sp, #0x15]
@@ -6214,7 +6214,7 @@ _020b632c:
ldmia r8, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r1, [sp, #0xb4]
ldr r0, _020b6ac8 ; =data_027e0e60
ldr r0, _020b6ac8 ; =gMapManager
sub r1, r1, #0x1000
str r1, [sp, #0xb4]
ldr r2, [r10]
@@ -6265,7 +6265,7 @@ _020b632c:
stmib sp, {r0, r1}
str r0, [sp, #0xc]
str r0, [sp, #0x10]
ldr r0, _020b6ac8 ; =data_027e0e60
ldr r0, _020b6ac8 ; =gMapManager
add r1, sp, #0x124
ldr r0, [r0]
add r2, sp, #0x68
@@ -6284,7 +6284,7 @@ _020b6494:
str r1, [r6, #8]
strb r0, [r7, #0x55]
_020b64a4:
ldr r0, _020b6ac8 ; =data_027e0e60
ldr r0, _020b6ac8 ; =gMapManager
ldr r1, [r10]
ldr r8, [r0]
mov r0, r8
@@ -6330,7 +6330,7 @@ _020b6538:
subne r0, r8, #1
cmpne r1, r0
beq _020b65c0
ldr r0, _020b6ac8 ; =data_027e0e60
ldr r0, _020b6ac8 ; =gMapManager
add r1, r7, #0xc4
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_78Ev
@@ -6536,7 +6536,7 @@ _020b6830:
cmp r1, r0
blt _020b68c0
ldr r1, [r10]
ldr r0, _020b6ac8 ; =data_027e0e60
ldr r0, _020b6ac8 ; =gMapManager
str r1, [sp, #0x50]
ldr r2, [r10, #4]
ldr r1, [r0]
@@ -6705,7 +6705,7 @@ _020b6aa0:
arm_func_end func_ov00_020b5cb4
_020b6ac0: .word data_027e0ff8
_020b6ac4: .word 0x0000ffff
_020b6ac8: .word data_027e0e60
_020b6ac8: .word gMapManager
_020b6acc: .word data_027e0d0c
_020b6ad0: .word data_ov00_020e64a8
_020b6ad4: .word data_027e0d38
@@ -6721,7 +6721,7 @@ _020b6aec: .word data_ov00_020e647c
func_ov00_020b6af0: ; 0x020b6af0
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0x14
ldr r0, _020b6b94 ; =data_027e0e60
ldr r0, _020b6b94 ; =gMapManager
mov r5, r1
ldr r0, [r0]
ldrb r1, [r0, #9]
@@ -6743,7 +6743,7 @@ func_ov00_020b6af0: ; 0x020b6af0
beq _020b6b84
ldrh r1, [r0, #0x20]
ldr r2, [r5]
ldr r0, _020b6b94 ; =data_027e0e60
ldr r0, _020b6b94 ; =gMapManager
str r2, [sp, #8]
ldr r2, [r5, #4]
ldr r0, [r0]
@@ -6763,7 +6763,7 @@ _020b6b84:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020b6af0
_020b6b94: .word data_027e0e60
_020b6b94: .word gMapManager
_020b6b98: .word data_027e0fe4
_020b6b9c: .word 0x574c4354
_020b6ba0: .word 0xfffff666
@@ -6881,7 +6881,7 @@ _020b6c3c:
strb r0, [sp, #0xb9]
str r1, [sp, #0x1c]
ldr r1, [r6, #0x2c]
ldr r4, _020b6e6c ; =data_027e0e60
ldr r4, _020b6e6c ; =gMapManager
str r1, [sp]
str r0, [sp, #4]
ldrh r3, [r6, #0xa4]
@@ -6956,7 +6956,7 @@ _020b6e28:
.align 2, 0
arm_func_end func_ov00_020b6ba4
_020b6e68: .word 0x0000ffff
_020b6e6c: .word data_027e0e60
_020b6e6c: .word gMapManager
.global func_ov00_020b6e70
arm_func_start func_ov00_020b6e70
@@ -7106,7 +7106,7 @@ _020b7000:
str ip, [sp, #0x20]
str lr, [sp, #0x28]
bl func_01ff9e64
ldr r0, _020b7334 ; =data_027e0e60
ldr r0, _020b7334 ; =gMapManager
ldr r6, [sp, #0x14]
ldr r3, [sp, #0x18]
ldr r2, [sp, #0x1c]
@@ -7286,7 +7286,7 @@ _020b7324: .word data_027e0f6c
_020b7328: .word func_ov00_0207e968
_020b732c: .word func_ov00_0207e96c
_020b7330: .word data_02050f54
_020b7334: .word data_027e0e60
_020b7334: .word gMapManager
_020b7338: .word 0x00000e66
.global func_ov00_020b733c
@@ -7495,7 +7495,7 @@ _020b75b0:
str r1, [sp, #4]
tst r0, #0x3f
bne _020b7714
ldr r0, _020b7750 ; =data_027e0e60
ldr r0, _020b7750 ; =gMapManager
ldrb r4, [r5, #0x14]
ldrb r3, [r5, #0x15]
ldr r0, [r0]
@@ -7511,7 +7511,7 @@ _020b75b0:
add r1, r6, #0x20
mov r2, r0
bl func_01ff9bf8
ldr r0, _020b7750 ; =data_027e0e60
ldr r0, _020b7750 ; =gMapManager
ldrb r2, [r6, #0xc4]
ldrb r1, [r6, #0xc5]
ldr r0, [r0]
@@ -7581,7 +7581,7 @@ _020b7714:
.align 2, 0
arm_func_end func_ov00_020b73b0
_020b774c: .word data_027e0fa0
_020b7750: .word data_027e0e60
_020b7750: .word gMapManager
.global func_ov00_020b7754
arm_func_start func_ov00_020b7754
@@ -9927,7 +9927,7 @@ _020b9260:
_020b9278:
mvn r1, #0
str r1, [r9, #0x280]
ldr r0, _020b92d4 ; =data_027e0e60
ldr r0, _020b92d4 ; =gMapManager
str r1, [r9, #0x284]
ldr r1, [r0]
add r0, sp, #4
@@ -9952,7 +9952,7 @@ _020b92b8:
arm_func_end func_ov00_020b917c
_020b92cc: .word data_ov00_020dc81c
_020b92d0: .word data_027e0e58
_020b92d4: .word data_027e0e60
_020b92d4: .word gMapManager
.global func_ov00_020b92d8
arm_func_start func_ov00_020b92d8
@@ -10135,7 +10135,7 @@ _020b94e8:
add r0, r1, r0
str r0, [r7, #0x15c]
_020b956c:
ldr r0, _020b9758 ; =data_027e0e60
ldr r0, _020b9758 ; =gMapManager
ldr r3, [sp]
ldr r0, [r0]
add r1, sp, #8
@@ -10268,7 +10268,7 @@ _020b9748: .word data_027e0fc8
_020b974c: .word data_027e0f94
_020b9750: .word data_027e0fe4
_020b9754: .word data_ov00_020e67d8
_020b9758: .word data_027e0e60
_020b9758: .word gMapManager
.global func_ov00_020b975c
arm_func_start func_ov00_020b975c
@@ -11105,7 +11105,7 @@ func_ov00_020ba204: ; 0x020ba204
add r0, sp, #0x2c
str r0, [sp, #0xc]
str r3, [sp, #0x10]
ldr r0, _020ba34c ; =data_027e0e60
ldr r0, _020ba34c ; =gMapManager
add r1, sp, #0x4c
ldr r0, [r0]
add r2, sp, #0x20
@@ -11133,7 +11133,7 @@ _020ba32c:
_020ba340: .word data_ov00_020e67b8
_020ba344: .word 0x0000ffff
_020ba348: .word 0x00000333
_020ba34c: .word data_027e0e60
_020ba34c: .word gMapManager
.global func_ov00_020ba350
arm_func_start func_ov00_020ba350
@@ -11624,7 +11624,7 @@ _020ba958:
cmp r0, #0x31
bne _020baab8
ldr r1, _020bac68 ; =data_027e0f64
ldr r0, _020bac6c ; =data_027e0e60
ldr r0, _020bac6c ; =gMapManager
ldr r1, [r1]
ldr r2, _020bac70 ; =data_02050f54
ldr r1, [r1, #4]
@@ -11727,7 +11727,7 @@ _020baab8:
ldr r7, [sp, #0x18]
orr r4, r4, ip, lsl #20
add r7, r7, r4
ldr r1, _020bac6c ; =data_027e0e60
ldr r1, _020bac6c ; =gMapManager
orr r2, r2, r0, lsl #20
ldr r4, [sp, #0x20]
ldr r0, [r1]
@@ -11810,7 +11810,7 @@ _020bac5c: .word data_ov00_020eec9c
_020bac60: .word data_027e0f94
_020bac64: .word data_027e0d38
_020bac68: .word data_027e0f64
_020bac6c: .word data_027e0e60
_020bac6c: .word gMapManager
_020bac70: .word data_02050f54
.global func_ov00_020bac74
@@ -11940,7 +11940,7 @@ _020badf0:
mov r0, #0x24
smlabb r3, r1, r0, r2
ldr r1, [r3, #4]
ldr r0, _020baf60 ; =data_027e0e60
ldr r0, _020baf60 ; =gMapManager
str r1, [r6, #0x158]
ldr r2, [r3, #8]
add r1, sp, #0xc
@@ -12008,7 +12008,7 @@ _020baef0:
mov r0, #0x24
smlabb r3, r1, r0, r2
ldr r1, [r3, #4]
ldr r0, _020baf60 ; =data_027e0e60
ldr r0, _020baf60 ; =gMapManager
str r1, [r6, #0x158]
ldr r2, [r3, #8]
add r1, sp, #0
@@ -12033,7 +12033,7 @@ _020baf50:
.align 2, 0
arm_func_end func_ov00_020bad44
_020baf5c: .word data_ov00_020e8b08
_020baf60: .word data_027e0e60
_020baf60: .word gMapManager
_020baf64: .word 0x00000333
.global func_ov00_020baf68
@@ -12093,7 +12093,7 @@ _020baff8:
_020bb020:
str r0, [r5, #0x160]
ldr r1, [r5, #0x158]
ldr r0, _020bb0a8 ; =data_027e0e60
ldr r0, _020bb0a8 ; =gMapManager
str r1, [sp]
ldr r1, [r5, #0x15c]
ldr r0, [r0]
@@ -12127,7 +12127,7 @@ _020bb020:
.align 2, 0
arm_func_end func_ov00_020baf68
_020bb0a4: .word data_ov00_020e8b08
_020bb0a8: .word data_027e0e60
_020bb0a8: .word gMapManager
.global func_ov00_020bb0ac
arm_func_start func_ov00_020bb0ac
@@ -13909,7 +13909,7 @@ _020bc3e0:
ldr r0, [r2, #0xc]
str r0, [sp, #0x14]
_020bc40c:
ldr r0, _020bc464 ; =data_027e0e60
ldr r0, _020bc464 ; =gMapManager
ldr lr, [sp, #0xc]
ldr ip, [sp, #0x10]
ldr r3, [sp, #0x14]
@@ -13933,7 +13933,7 @@ _020bc40c:
.align 2, 0
arm_func_end func_ov00_020bc398
_020bc460: .word data_027e0f94
_020bc464: .word data_027e0e60
_020bc464: .word gMapManager
_020bc468: .word data_027e0fac
.global func_ov00_020bc46c
@@ -14298,7 +14298,7 @@ _020bc8b4: .word data_027e0fd0
func_ov00_020bc8b8: ; 0x020bc8b8
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #4
ldr r3, _020bc908 ; =data_027e0e60
ldr r3, _020bc908 ; =gMapManager
mov r5, r1
ldr r1, [r3]
mov r6, r0
@@ -14318,7 +14318,7 @@ func_ov00_020bc8b8: ; 0x020bc8b8
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020bc8b8
_020bc908: .word data_027e0e60
_020bc908: .word gMapManager
.global func_ov00_020bc90c
arm_func_start func_ov00_020bc90c
@@ -14326,7 +14326,7 @@ func_ov00_020bc90c: ; 0x020bc90c
stmdb sp!, {r4, r5, r6, lr}
mov r6, r0
mov r5, r2
ldr r0, _020bc95c ; =data_027e0e60
ldr r0, _020bc95c ; =gMapManager
add r2, r6, r5, lsl #1
mov r4, r1
ldrb r1, [r2, #0x2c]
@@ -14337,7 +14337,7 @@ func_ov00_020bc90c: ; 0x020bc90c
ldr r0, [r0, #0x30]
add r1, r6, r5, lsl #1
str r0, [r4, #4]
ldr r0, _020bc95c ; =data_027e0e60
ldr r0, _020bc95c ; =gMapManager
ldrb r1, [r1, #0x2d]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c50Ei
@@ -14345,7 +14345,7 @@ func_ov00_020bc90c: ; 0x020bc90c
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020bc90c
_020bc95c: .word data_027e0e60
_020bc95c: .word gMapManager
.global func_ov00_020bc960
arm_func_start func_ov00_020bc960
@@ -16474,7 +16474,7 @@ _020be334:
_020be338:
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _020be404 ; =data_027e0e60
ldr r0, _020be404 ; =gMapManager
ldrh r1, [r5, #0x22]
ldr r0, [r0]
mov r2, #0
@@ -16528,7 +16528,7 @@ _020be3e4:
.align 2, 0
arm_func_end func_ov00_020be294
_020be400: .word data_027e0fc8
_020be404: .word data_027e0e60
_020be404: .word gMapManager
_020be408: .word gAdventureFlags
.global func_ov00_020be40c
@@ -18103,7 +18103,7 @@ _020bf70c:
str r0, [sp, #0xc]
mov r1, #0
str r1, [sp, #0x10]
ldr r0, _020bff3c ; =data_027e0e60
ldr r0, _020bff3c ; =gMapManager
add r1, sp, #0x154
ldr r0, [r0]
add r2, sp, #0xe4
@@ -18238,7 +18238,7 @@ _020bf794:
add r0, sp, #0x14
str r0, [sp, #0xc]
str r3, [sp, #0x10]
ldr r0, _020bff3c ; =data_027e0e60
ldr r0, _020bff3c ; =gMapManager
add r1, sp, #0xf4
ldr r0, [r0]
add r2, sp, #0x30
@@ -18637,7 +18637,7 @@ _020bff2c: .word data_ov00_020e6f90
_020bff30: .word data_ov00_020dd294
_020bff34: .word data_ov00_020eec9c
_020bff38: .word gItemManager
_020bff3c: .word data_027e0e60
_020bff3c: .word gMapManager
_020bff40: .word 0x0000099a
_020bff44: .word data_ov00_020dd268
_020bff48: .word data_027e0fe4
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -139,7 +139,7 @@
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f70
asm/ov00/ov00_020c3e54.s
+61 -61
View File
@@ -296,7 +296,7 @@ _020c40b4:
strlt r2, [r0, #0x3c]
ldr r2, [r6]
ldr r1, [r9, #0x1c]
ldr r0, _020c42d4 ; =data_027e0e60
ldr r0, _020c42d4 ; =gMapManager
str r1, [r2, #0x34]
ldr r1, [r9, #0x20]
str r1, [r2, #0x38]
@@ -322,7 +322,7 @@ _020c40b4:
ldr r0, [r0]
bl _ZN10MapManager20GetCourseData_Unk_1cEv
ldr r2, [r6]
ldr r1, _020c42d4 ; =data_027e0e60
ldr r1, _020c42d4 ; =gMapManager
strb r0, [r2, #0x10]
ldr r0, [r1]
bl _ZN10MapManager20GetCourseData_Unk_1dEv
@@ -378,7 +378,7 @@ _020c42c4:
arm_func_end func_ov00_020c4048
_020c42cc: .word data_027e0fe4
_020c42d0: .word 0x0000ffff
_020c42d4: .word data_027e0e60
_020c42d4: .word gMapManager
.global func_ov00_020c42d8
arm_func_start func_ov00_020c42d8
@@ -923,7 +923,7 @@ _020c498c:
ldrb r0, [r6, #6]
cmp r0, #0
beq _020c49fc
ldr r0, _020c4ae0 ; =data_027e0e60
ldr r0, _020c4ae0 ; =gMapManager
ldr lr, [sp, #0x20]
ldr ip, [sp, #0x24]
ldr r3, [sp, #0x28]
@@ -1003,7 +1003,7 @@ _020c4ad4:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020c4924
_020c4ae0: .word data_027e0e60
_020c4ae0: .word gMapManager
_020c4ae4: .word data_027e0ff0
.global func_ov00_020c4ae8
@@ -1605,7 +1605,7 @@ func_ov00_020c51d0: ; 0x020c51d0
arm_func_start func_ov00_020c522c
func_ov00_020c522c: ; 0x020c522c
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _020c5284 ; =data_027e0e60
ldr r2, _020c5284 ; =gMapManager
mov r6, r0
ldr r4, [r2]
mov r5, r1
@@ -1628,14 +1628,14 @@ func_ov00_020c522c: ; 0x020c522c
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020c522c
_020c5284: .word data_027e0e60
_020c5284: .word gMapManager
.global func_ov00_020c5288
arm_func_start func_ov00_020c5288
func_ov00_020c5288: ; 0x020c5288
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0x14
ldr r1, _020c532c ; =data_027e0e60
ldr r1, _020c532c ; =gMapManager
mov r2, #0
mov r5, r0
ldr r4, [r1]
@@ -1676,19 +1676,19 @@ func_ov00_020c5288: ; 0x020c5288
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020c5288
_020c532c: .word data_027e0e60
_020c532c: .word gMapManager
.global func_ov00_020c5330
arm_func_start func_ov00_020c5330
func_ov00_020c5330: ; 0x020c5330
stmdb sp!, {r4, r5, r6, lr}
mov r6, r0
ldr r0, _020c5370 ; =data_027e0e60
ldr r0, _020c5370 ; =gMapManager
mov r5, r1
ldrb r1, [r6, #1]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c50Ei
ldr r2, _020c5370 ; =data_027e0e60
ldr r2, _020c5370 ; =gMapManager
mov r4, r0
ldrb r1, [r6]
ldr r0, [r2]
@@ -1699,14 +1699,14 @@ func_ov00_020c5330: ; 0x020c5330
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020c5330
_020c5370: .word data_027e0e60
_020c5370: .word gMapManager
.global func_ov00_020c5374
arm_func_start func_ov00_020c5374
func_ov00_020c5374: ; 0x020c5374
stmdb sp!, {r3, r4, lr}
sub sp, sp, #4
ldr r3, _020c53ac ; =data_027e0e60
ldr r3, _020c53ac ; =gMapManager
mov r4, r1
ldr r1, [r3]
mov r2, r0
@@ -1720,7 +1720,7 @@ func_ov00_020c5374: ; 0x020c5374
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov00_020c5374
_020c53ac: .word data_027e0e60
_020c53ac: .word gMapManager
.global func_ov00_020c53b0
arm_func_start func_ov00_020c53b0
@@ -1902,7 +1902,7 @@ func_ov00_020c558c: ; 0x020c558c
str r0, [sp, #4]
add r1, sp, #0xc
str r1, [sp, #8]
ldr r0, _020c5654 ; =data_027e0e60
ldr r0, _020c5654 ; =gMapManager
add r1, sp, #0x1c
ldr r0, [r0]
add r2, sp, #0x10
@@ -1923,7 +1923,7 @@ _020c5640:
.align 2, 0
arm_func_end func_ov00_020c558c
_020c5650: .word data_ov00_020e892c
_020c5654: .word data_027e0e60
_020c5654: .word gMapManager
.global func_ov00_020c5658
arm_func_start func_ov00_020c5658
@@ -4549,7 +4549,7 @@ func_ov00_020c7764: ; 0x020c7764
rsb r0, r0, #0
cmp r1, r0
strlt r0, [sp, #0x18]
ldr r0, _020c7e9c ; =data_027e0e60
ldr r0, _020c7e9c ; =gMapManager
ldr ip, [sp, #0x14]
ldr r4, [r0]
ldr r8, [sp, #0x18]
@@ -4723,7 +4723,7 @@ _020c79b0:
add sp, sp, #0x20
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020c7a38:
ldr r0, _020c7e9c ; =data_027e0e60
ldr r0, _020c7e9c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084838Ev
cmp r0, #0
@@ -5018,7 +5018,7 @@ _020c7e94:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_020c7764
_020c7e9c: .word data_027e0e60
_020c7e9c: .word gMapManager
_020c7ea0: .word data_027e0d38
_020c7ea4: .word data_027e0e58
_020c7ea8: .word 0x000001ee
@@ -5100,7 +5100,7 @@ func_ov00_020c7f98: ; 0x020c7f98
movs r5, r3
stmia r4, {r0, r1, r2}
beq _020c7ffc
ldr r0, _020c8048 ; =data_027e0e60
ldr r0, _020c8048 ; =gMapManager
ldr ip, [sp, #0x10]
ldr r4, [r0]
ldr r7, [sp, #0x14]
@@ -5142,7 +5142,7 @@ _020c8040:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov00_020c7f98
_020c8048: .word data_027e0e60
_020c8048: .word gMapManager
_020c804c: .word 0x00000ccd
.global func_ov00_020c8050
@@ -7684,7 +7684,7 @@ func_ov00_020ca094: ; 0x020ca094
cmp r0, #0
beq _020ca108
ldr r1, [r5, #0x48]
ldr r0, _020ca144 ; =data_027e0e60
ldr r0, _020ca144 ; =gMapManager
str r1, [sp]
ldr r1, [r5, #0x4c]
ldr r7, [r0]
@@ -7719,7 +7719,7 @@ _020ca12c:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov00_020ca094
_020ca144: .word data_027e0e60
_020ca144: .word gMapManager
.global func_ov00_020ca148
arm_func_start func_ov00_020ca148
@@ -8582,7 +8582,7 @@ _020cab14:
strb r2, [sp, #4]
strb r2, [sp, #5]
bl func_ov00_020c5374
ldr r0, _020cace8 ; =data_027e0e60
ldr r0, _020cace8 ; =gMapManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084164Ev
@@ -8692,7 +8692,7 @@ _020cacd8:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020caa90
_020cace8: .word data_027e0e60
_020cace8: .word gMapManager
_020cacec: .word data_027e0ffc
_020cacf0: .word data_027e0f64
@@ -10366,7 +10366,7 @@ func_ov00_020cc180: ; 0x020cc180
sub sp, sp, #0xc
mov r4, r0
ldr r1, [r4, #0x48]
ldr r0, _020cc1f4 ; =data_027e0e60
ldr r0, _020cc1f4 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -10394,7 +10394,7 @@ _020cc1d8:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov00_020cc180
_020cc1f4: .word data_027e0e60
_020cc1f4: .word gMapManager
.global func_ov00_020cc1f8
arm_func_start func_ov00_020cc1f8
@@ -10456,7 +10456,7 @@ func_ov00_020cc27c: ; 0x020cc27c
stmdb sp!, {r3, lr}
sub sp, sp, #0x10
ldr r2, [r0, #0x48]
ldr r1, _020cc2d0 ; =data_027e0e60
ldr r1, _020cc2d0 ; =gMapManager
str r2, [sp, #4]
ldr r2, [r0, #0x4c]
ldr r1, [r1]
@@ -10476,7 +10476,7 @@ func_ov00_020cc27c: ; 0x020cc27c
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020cc27c
_020cc2d0: .word data_027e0e60
_020cc2d0: .word gMapManager
.global func_ov00_020cc2d4
arm_func_start func_ov00_020cc2d4
@@ -10535,7 +10535,7 @@ func_ov00_020cc308: ; 0x020cc308
add lr, sp, #0x14
str r1, [sp, #0x30]
ldr r1, [r4, #0x54]
ldr ip, _020cc3e4 ; =data_027e0e60
ldr ip, _020cc3e4 ; =gMapManager
str r1, [sp, #0x1c]
ldr r2, [r4, #0x58]
add r1, sp, #0x34
@@ -10557,7 +10557,7 @@ func_ov00_020cc308: ; 0x020cc308
.align 2, 0
arm_func_end func_ov00_020cc308
_020cc3e0: .word 0x0000ffff
_020cc3e4: .word data_027e0e60
_020cc3e4: .word gMapManager
.global func_ov00_020cc3e8
arm_func_start func_ov00_020cc3e8
@@ -11129,7 +11129,7 @@ func_ov00_020cca68: ; 0x020cca68
str ip, [sp, #0x1c]
ldrh r0, [r4, #0x9c]
ldr r1, [sp, #0x20]
ldr r2, _020ccb00 ; =data_027e0e60
ldr r2, _020ccb00 ; =gMapManager
bic r0, r0, #2
mov r0, r0, lsl #0x10
str r3, [sp, #0xc]
@@ -11150,7 +11150,7 @@ func_ov00_020cca68: ; 0x020cca68
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020cca68
_020ccb00: .word data_027e0e60
_020ccb00: .word gMapManager
.global func_ov00_020ccb04
arm_func_start func_ov00_020ccb04
@@ -12720,7 +12720,7 @@ _020cdec8:
str r0, [sp]
mov r2, r3
ldrh r3, [r4, #0x9c]
ldr r0, _020cdfc8 ; =data_027e0e60
ldr r0, _020cdfc8 ; =gMapManager
add r1, sp, #0x18
str r3, [sp, #4]
ldr r3, [r4, #0xa0]
@@ -12742,7 +12742,7 @@ _020cdec8:
.align 2, 0
arm_func_end func_ov00_020cde0c
_020cdfc4: .word data_02050f54
_020cdfc8: .word data_027e0e60
_020cdfc8: .word gMapManager
.global func_ov00_020cdfcc
arm_func_start func_ov00_020cdfcc
@@ -13787,7 +13787,7 @@ _020cecd4: .word 0x000002fd
func_ov00_020cecd8: ; 0x020cecd8
stmdb sp!, {r4, r5, r6, r7, r8, lr}
sub sp, sp, #8
ldr r4, _020ced5c ; =data_027e0e60
ldr r4, _020ced5c ; =gMapManager
mov r6, r0
ldr r0, [r4]
mov r5, r1
@@ -13820,7 +13820,7 @@ func_ov00_020cecd8: ; 0x020cecd8
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_020cecd8
_020ced5c: .word data_027e0e60
_020ced5c: .word gMapManager
_020ced60: .word data_ov00_020eec9c
.global func_ov00_020ced64
@@ -13839,7 +13839,7 @@ _020ced78: .word data_ov00_020eec9c
arm_func_start func_ov00_020ced7c
func_ov00_020ced7c: ; 0x020ced7c
stmdb sp!, {r4, r5, r6, lr}
ldr r0, _020cedb4 ; =data_027e0e60
ldr r0, _020cedb4 ; =gMapManager
mov r5, r2
ldr r0, [r0]
mov r4, r3
@@ -13854,7 +13854,7 @@ func_ov00_020ced7c: ; 0x020ced7c
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020ced7c
_020cedb4: .word data_027e0e60
_020cedb4: .word gMapManager
_020cedb8: .word data_ov00_020eec9c
.global func_ov00_020cedbc
@@ -14210,7 +14210,7 @@ func_ov00_020cf13c: ; 0x020cf13c
blx func_ov00_02078e00
b _020cf184
_020cf168:
ldr r0, _020cf1b0 ; =data_027e0e60
ldr r0, _020cf1b0 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083588Ev
mov r2, r0
@@ -14231,7 +14231,7 @@ _020cf184:
.align 2, 0
arm_func_end func_ov00_020cf13c
_020cf1ac: .word data_027e0d3c
_020cf1b0: .word data_027e0e60
_020cf1b0: .word gMapManager
_020cf1b4: .word data_027e0c54
.global func_ov00_020cf1b8
@@ -15359,7 +15359,7 @@ _020cfd50:
ldreqb r0, [r0, #4]
cmpeq r0, #0
bne _020cfdb8
ldr r0, _020cfde0 ; =data_027e0e60
ldr r0, _020cfde0 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
@@ -15378,7 +15378,7 @@ _020cfdd0: .word data_027e0c68
_020cfdd4: .word data_027e0e28
_020cfdd8: .word data_ov09_0211f5b4
_020cfddc: .word data_027e0d04
_020cfde0: .word data_027e0e60
_020cfde0: .word gMapManager
.global func_ov00_020cfde4
arm_func_start func_ov00_020cfde4
@@ -19103,7 +19103,7 @@ _020d2d34: .word data_ov00_020e8b64
arm_func_start func_ov00_020d2d38
func_ov00_020d2d38: ; 0x020d2d38
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _020d2da8 ; =data_027e0e60
ldr r2, _020d2da8 ; =gMapManager
mov r5, r0
ldr r0, [r2]
mov r4, r1
@@ -19133,7 +19133,7 @@ _020d2d84:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020d2d38
_020d2da8: .word data_027e0e60
_020d2da8: .word gMapManager
_020d2dac: .word data_027e0f64
_020d2db0: .word data_027e0c68
@@ -19161,7 +19161,7 @@ _020d2de0:
func_ov00_020d2de8: ; 0x020d2de8
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x18
ldr r2, _020d2f00 ; =data_027e0e60
ldr r2, _020d2f00 ; =gMapManager
mov r6, r0
ldr r0, [r2]
mov r5, r1
@@ -19234,7 +19234,7 @@ _020d2e8c:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020d2de8
_020d2f00: .word data_027e0e60
_020d2f00: .word gMapManager
_020d2f04: .word data_027e0c68
.global func_ov00_020d2f08
@@ -20208,7 +20208,7 @@ _020d3a00: .word data_027e0d0c
func_ov00_020d3a04: ; 0x020d3a04
stmdb sp!, {r3, r4, r5, lr}
mov r4, r0
ldr r0, _020d3b04 ; =data_027e0e60
ldr r0, _020d3b04 ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -20276,7 +20276,7 @@ _020d3afc:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020d3a04
_020d3b04: .word data_027e0e60
_020d3b04: .word gMapManager
_020d3b08: .word gAdventureFlags
_020d3b0c: .word data_027e0f90
_020d3b10: .word data_027e077c
@@ -21200,7 +21200,7 @@ func_ov00_020d454c: ; 0x020d454c
mov r1, r0
bl func_ov00_020b1a4c
ldr r1, [r6, #0x158]
ldr r0, _020d4604 ; =data_027e0e60
ldr r0, _020d4604 ; =gMapManager
str r1, [sp]
ldr r1, [r6, #0x15c]
ldr r0, [r0]
@@ -21232,7 +21232,7 @@ func_ov00_020d454c: ; 0x020d454c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020d454c
_020d4604: .word data_027e0e60
_020d4604: .word gMapManager
.global func_ov00_020d4608
arm_func_start func_ov00_020d4608
@@ -21268,7 +21268,7 @@ _020d4648:
str r0, [sp, #0x6c]
_020d4660:
ldr r1, [sp, #0x68]
ldr r0, _020d484c ; =data_027e0e60
ldr r0, _020d484c ; =gMapManager
add r3, r1, #0x40
ldr r6, [sp, #0x64]
ldr r4, [sp, #0x6c]
@@ -21279,7 +21279,7 @@ _020d4660:
str r4, [sp, #0x60]
str r3, [sp, #0x5c]
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _020d484c ; =data_027e0e60
ldr r0, _020d484c ; =gMapManager
ldr r6, [sp, #0x58]
ldr r4, [sp, #0x5c]
ldr r3, [sp, #0x60]
@@ -21294,7 +21294,7 @@ _020d4660:
ldr r4, [sp, #0x5c]
ldr r3, [sp, #0x60]
str r2, [sp, #0x20]
ldr r1, _020d484c ; =data_027e0e60
ldr r1, _020d484c ; =gMapManager
mov r8, r0
ldr r0, [r1]
add r1, sp, #0x20
@@ -21359,7 +21359,7 @@ _020d4790:
add r0, r1, r4, lsl #12
str r0, [sp]
ldr r2, [sp]
ldr r0, _020d484c ; =data_027e0e60
ldr r0, _020d484c ; =gMapManager
str r2, [sp, #0x1c]
ldrb r2, [sp, #0x11]
ldr r0, [r0]
@@ -21397,7 +21397,7 @@ _020d4834:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020d4624
_020d484c: .word data_027e0e60
_020d484c: .word gMapManager
_020d4850: .word func_ov00_020d4608
_020d4854: .word data_ov00_020df2f8
_020d4858: .word func_ov00_020b1940
@@ -21752,7 +21752,7 @@ _020d4d08:
cmp r1, r0
blt _020d4da8
ldr r1, [r10, #0x48]
ldr r0, _020d4de0 ; =data_027e0e60
ldr r0, _020d4de0 ; =gMapManager
str r1, [sp, #0x10]
ldr r1, [r10, #0x4c]
ldr r0, [r0]
@@ -21771,7 +21771,7 @@ _020d4d08:
bl func_ov00_020b18d8
b _020d4db8
_020d4d68:
ldr r0, _020d4de0 ; =data_027e0e60
ldr r0, _020d4de0 ; =gMapManager
ldr r5, [r10, #0x4c]
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_48Ev
@@ -21805,7 +21805,7 @@ _020d4db8:
.align 2, 0
arm_func_end func_ov00_020d4b54
_020d4ddc: .word data_ov00_020ee670
_020d4de0: .word data_027e0e60
_020d4de0: .word gMapManager
_020d4de4: .word 0x00000333
.global func_ov00_020d4de8
@@ -22568,7 +22568,7 @@ func_ov00_020d573c: ; 0x020d573c
cmp r0, #0
beq _020d57b0
ldr r1, [r10, #0x48]
ldr r0, _020d58a8 ; =data_027e0e60
ldr r0, _020d58a8 ; =gMapManager
str r1, [sp, #4]
ldr r1, [r10, #0x4c]
ldr r5, [r0]
@@ -22654,7 +22654,7 @@ _020d5888:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020d573c
_020d58a8: .word data_027e0e60
_020d58a8: .word gMapManager
.global func_ov00_020d58ac
arm_func_start func_ov00_020d58ac
asm/ov02.inc
+1 -1
View File
@@ -31,7 +31,7 @@
.extern data_027e0d0c
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f88
.extern data_027e0f8c
.extern data_027e0fbc
asm/ov02.s
+2 -2
View File
@@ -6629,7 +6629,7 @@ _020f430c:
ldr r0, _020f4ce4 ; =data_027e0f88
ldr r0, [r0]
bl func_ov00_020a1abc
ldr r0, _020f4ce8 ; =data_027e0e60
ldr r0, _020f4ce8 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020847e0Ev
str r0, [r7, #0x2c]
@@ -7282,7 +7282,7 @@ _020f4cd8: .word data_ov09_0211ee20
_020f4cdc: .word data_ov09_0211ee24
_020f4ce0: .word data_ov09_0211ee28
_020f4ce4: .word data_027e0f88
_020f4ce8: .word data_027e0e60
_020f4ce8: .word gMapManager
_020f4cec: .word data_027e0f8c
_020f4cf0: .word data_ov00_020ecdf6
_020f4cf4: .word data_ov00_020ee0a0
asm/ov03.inc
+1 -1
View File
@@ -93,7 +93,7 @@
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f7c
.extern data_027e0f84
asm/ov03.s
+40 -40
View File
@@ -3622,7 +3622,7 @@ _020f0884:
bl func_0202ed14
add r7, r7, r0, lsl #12
_020f08a4:
ldr r0, _020f0aa4 ; =data_027e0e60
ldr r0, _020f0aa4 ; =gMapManager
ldr r5, [r0]
mov r0, r5
bl _ZN10MapManager13GetCourseMinXEv
@@ -3755,7 +3755,7 @@ _020f0a30:
arm_func_end func_ov03_020f0844
_020f0a9c: .word data_027e0c38
_020f0aa0: .word data_027e080c
_020f0aa4: .word data_027e0e60
_020f0aa4: .word gMapManager
.global func_ov03_020f0aa8
arm_func_start func_ov03_020f0aa8
@@ -3780,7 +3780,7 @@ func_ov03_020f0aa8: ; 0x020f0aa8
ldrb r0, [r1, #0x95]
cmp r0, #0
beq _020f0b18
ldr r0, _020f0b84 ; =data_027e0e60
ldr r0, _020f0b84 ; =gMapManager
mov r1, r5
ldr r0, [r0]
mov r2, r4
@@ -3789,10 +3789,10 @@ func_ov03_020f0aa8: ; 0x020f0aa8
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
_020f0b18:
ldr r0, _020f0b84 ; =data_027e0e60
ldr r0, _020f0b84 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082d40Ev
ldr r1, _020f0b84 ; =data_027e0e60
ldr r1, _020f0b84 ; =gMapManager
mov r2, r0
ldr r0, [r1]
add r1, sp, #0
@@ -3804,7 +3804,7 @@ _020f0b18:
bl strcmp
cmp r0, #0
bne _020f0b74
ldr r0, _020f0b84 ; =data_027e0e60
ldr r0, _020f0b84 ; =gMapManager
mov r1, r5
ldr r0, [r0]
mov r2, r4
@@ -3819,7 +3819,7 @@ _020f0b74:
.align 2, 0
arm_func_end func_ov03_020f0aa8
_020f0b80: .word data_027e1054
_020f0b84: .word data_027e0e60
_020f0b84: .word gMapManager
_020f0b88: .word data_027e0d3c
.global func_ov03_020f0b8c
@@ -3896,7 +3896,7 @@ _020f0c7c:
mov r4, r0
cmp r1, #0
blt _020f0ca4
ldr r0, _020f0e3c ; =data_027e0e60
ldr r0, _020f0e3c ; =gMapManager
add r2, sp, #0x24
ldr r0, [r0]
mov r3, #8
@@ -4011,7 +4011,7 @@ _020f0e2c: .word data_027e0c54
_020f0e30: .word data_027e0d3c
_020f0e34: .word data_027e0f94
_020f0e38: .word 0x00001ccd
_020f0e3c: .word data_027e0e60
_020f0e3c: .word gMapManager
_020f0e40: .word 0x00002ccd
_020f0e44: .word data_ov03_020fc45c
_020f0e48: .word data_ov03_020fc460
@@ -9792,7 +9792,7 @@ func_ov03_020f4778: ; 0x020f4778
sub sp, #0x44
add r6, r0, #0
add r5, r1, #0
ldr r0, _020f47d8 ; =data_027e0e60
ldr r0, _020f47d8 ; =gMapManager
lsl r2, r5, #0x18
ldr r0, [r0]
add r1, sp, #4
@@ -9818,7 +9818,7 @@ func_ov03_020f4778: ; 0x020f4778
_020f47b4:
mov r4, #7
_020f47b6:
ldr r0, _020f47d8 ; =data_027e0e60
ldr r0, _020f47d8 ; =gMapManager
lsl r1, r5, #0x18
ldr r0, [r0]
lsr r1, r1, #0x18
@@ -9835,7 +9835,7 @@ _020f47b6:
pop {r3, r4, r5, r6, pc}
.align 2, 0
thumb_func_end func_ov03_020f4778
_020f47d8: .word data_027e0e60
_020f47d8: .word gMapManager
_020f47dc: .word data_027e0d38
_020f47e0: .word data_027e103c
@@ -10419,13 +10419,13 @@ _020f4ce4:
mov r0, #7
str r0, [r5, #0xc]
_020f4ce8:
ldr r0, _020f4d18 ; =data_027e0e60
ldr r0, _020f4d18 ; =gMapManager
add r1, r5, #0
ldr r0, [r0]
add r1, #0x50
add r2, r4, #0
blx _ZN10MapManager18func_ov00_02082614Eii
ldr r0, _020f4d18 ; =data_027e0e60
ldr r0, _020f4d18 ; =gMapManager
add r1, r4, #0
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02082d74Ei
@@ -10439,7 +10439,7 @@ _020f4ce8:
thumb_func_end func_ov03_020f4c94
_020f4d10: .word data_027e0d38
_020f4d14: .word data_027e103c
_020f4d18: .word data_027e0e60
_020f4d18: .word gMapManager
_020f4d1c: .word data_027e077c
.global func_ov03_020f4d20
@@ -10552,7 +10552,7 @@ func_ov03_020f4de0: ; 0x020f4de0
add r4, r0, #0
ldr r0, _020f4e48 ; =data_027e0d3c
ldr r5, [r0]
ldr r0, _020f4e4c ; =data_027e0e60
ldr r0, _020f4e4c ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083588Ev
ldr r1, _020f4e50 ; =data_ov00_020d878c
@@ -10601,7 +10601,7 @@ _020f4e40:
.align 2, 0
thumb_func_end func_ov03_020f4de0
_020f4e48: .word data_027e0d3c
_020f4e4c: .word data_027e0e60
_020f4e4c: .word gMapManager
_020f4e50: .word data_ov00_020d878c
_020f4e54: .word data_027e0d38
_020f4e58: .word data_027e103c
@@ -10613,7 +10613,7 @@ func_ov03_020f4e5c: ; 0x020f4e5c
add r4, r0, #0
ldr r0, _020f4f30 ; =data_027e0d3c
ldr r5, [r0]
ldr r0, _020f4f34 ; =data_027e0e60
ldr r0, _020f4f34 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083588Ev
add r1, r4, #0
@@ -10621,7 +10621,7 @@ func_ov03_020f4e5c: ; 0x020f4e5c
add r0, r5, #0
add r1, #0x10
bl func_ov00_02078e00
ldr r0, _020f4f34 ; =data_027e0e60
ldr r0, _020f4f34 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02082accEv
add r0, r4, #0
@@ -10715,7 +10715,7 @@ _020f4f20:
nop
thumb_func_end func_ov03_020f4e5c
_020f4f30: .word data_027e0d3c
_020f4f34: .word data_027e0e60
_020f4f34: .word gMapManager
_020f4f38: .word data_027e103c
_020f4f3c: .word data_027e0cbc
_020f4f40: .word 0x0400100c
@@ -10729,7 +10729,7 @@ func_ov03_020f4f4c: ; 0x020f4f4c
add r5, r0, #0
ldr r0, _020f4fa8 ; =data_027e0d3c
ldr r4, [r0]
ldr r0, _020f4fac ; =data_027e0e60
ldr r0, _020f4fac ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083588Ev
add r1, r5, #0
@@ -10770,7 +10770,7 @@ _020f4f9e:
nop
thumb_func_end func_ov03_020f4f4c
_020f4fa8: .word data_027e0d3c
_020f4fac: .word data_027e0e60
_020f4fac: .word gMapManager
_020f4fb0: .word data_027e103c
_020f4fb4: .word data_027e0cbc
@@ -10780,7 +10780,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8
push {r3, r4, r5, lr}
sub sp, #0x40
add r5, r0, #0
ldr r0, _020f4ffc ; =data_027e0e60
ldr r0, _020f4ffc ; =gMapManager
mov r1, #0x93
ldrsb r1, [r5, r1]
ldr r0, [r0]
@@ -10795,7 +10795,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8
ldr r0, _020f5004 ; =data_027e103c
mov r1, #0x93
ldr r4, [r0]
ldr r0, _020f4ffc ; =data_027e0e60
ldr r0, _020f4ffc ; =gMapManager
ldrsb r1, [r5, r1]
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_020835f4Ei
@@ -10809,7 +10809,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8
pop {r3, r4, r5, pc}
.align 2, 0
thumb_func_end func_ov03_020f4fb8
_020f4ffc: .word data_027e0e60
_020f4ffc: .word gMapManager
_020f5000: .word data_027e0d3c
_020f5004: .word data_027e103c
@@ -12830,7 +12830,7 @@ _020f6578:
ldrb r0, [r0, #0x98]
cmp r0, #0
bne _020f6600
ldr r0, _020f670c ; =data_027e0e60
ldr r0, _020f670c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083588Ev
cmp r0, #0
@@ -12913,7 +12913,7 @@ _020f66fc: .word 0x000004cc
_020f6700: .word data_027e077c
_020f6704: .word data_02056be4
_020f6708: .word data_027e1054
_020f670c: .word data_027e0e60
_020f670c: .word gMapManager
_020f6710: .word 0x0000ffff
.global func_ov03_020f6714
@@ -14232,7 +14232,7 @@ _020f7760:
bl func_ov03_020f4b7c
cmp r0, #0
bne _020f7794
ldr r0, _020f7bb4 ; =data_027e0e60
ldr r0, _020f7bb4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
@@ -14523,7 +14523,7 @@ _020f7ba4:
arm_func_end func_ov03_020f7730
_020f7bac: .word data_027e1054
_020f7bb0: .word data_027e0d3c
_020f7bb4: .word data_027e0e60
_020f7bb4: .word gMapManager
_020f7bb8: .word data_027e0f7c
_020f7bbc: .word gAdventureFlags
_020f7bc0: .word data_027e0618
@@ -14862,12 +14862,12 @@ func_ov03_020f7f6c: ; 0x020f7f6c
bl func_ov03_020f74b8
cmp r0, #0
beq _020f7fbc
ldr r0, _020f7fe4 ; =data_027e0e60
ldr r0, _020f7fe4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083588Ev
cmp r0, #0
beq _020f7fbc
ldr r0, _020f7fe4 ; =data_027e0e60
ldr r0, _020f7fe4 ; =gMapManager
ldr r7, [r0]
mov r0, r7
bl _ZN10MapManager18func_ov00_020835a4Ev
@@ -14890,7 +14890,7 @@ _020f7fdc:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov03_020f7f6c
_020f7fe4: .word data_027e0e60
_020f7fe4: .word gMapManager
_020f7fe8: .word data_027e1054
.global func_ov03_020f7fec
@@ -14909,40 +14909,40 @@ func_ov03_020f7fec: ; 0x020f7fec
arm_func_start func_ov03_020f8008
func_ov03_020f8008: ; 0x020f8008
stmdb sp!, {r3, lr}
ldr r0, _020f8020 ; =data_027e0e60
ldr r0, _020f8020 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083588Ev
bl func_ov03_020f805c
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov03_020f8008
_020f8020: .word data_027e0e60
_020f8020: .word gMapManager
.global func_ov03_020f8024
arm_func_start func_ov03_020f8024
func_ov03_020f8024: ; 0x020f8024
stmdb sp!, {r3, lr}
ldr r0, _020f803c ; =data_027e0e60
ldr r0, _020f803c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020835a4Ev
bl func_ov03_020f805c
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov03_020f8024
_020f803c: .word data_027e0e60
_020f803c: .word gMapManager
.global func_ov03_020f8040
arm_func_start func_ov03_020f8040
func_ov03_020f8040: ; 0x020f8040
stmdb sp!, {r3, lr}
ldr r0, _020f8058 ; =data_027e0e60
ldr r0, _020f8058 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020835b4Ev
bl func_ov03_020f805c
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov03_020f8040
_020f8058: .word data_027e0e60
_020f8058: .word gMapManager
.global func_ov03_020f805c
arm_func_start func_ov03_020f805c
@@ -18001,7 +18001,7 @@ func_ov03_020fa528: ; 0x020fa528
bl func_ov00_020a5e9c
movs r1, r0
bne _020fa568
ldr r0, _020fa5c8 ; =data_027e0e60
ldr r0, _020fa5c8 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082d08Ev
add r0, r0, #0xab
@@ -18037,7 +18037,7 @@ _020fa590:
.align 2, 0
arm_func_end func_ov03_020fa528
_020fa5c4: .word data_027e0d38
_020fa5c8: .word data_027e0e60
_020fa5c8: .word gMapManager
_020fa5cc: .word data_027e0f7c
_020fa5d0: .word data_ov03_020ff648
_020fa5d4: .word data_027e0c68
asm/ov04.inc
+1 -1
View File
@@ -107,7 +107,7 @@
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov04.s
+49 -49
View File
@@ -921,7 +921,7 @@ _0210122a:
str r0, [sp]
mov r0, #1
str r0, [sp, #4]
ldr r0, _02101388 ; =data_027e0e60
ldr r0, _02101388 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083588Ev
str r0, [sp, #8]
@@ -971,7 +971,7 @@ _02101292:
ldr r0, _02101398 ; =data_027e0e58
ldr r0, [r0]
bl func_ov04_02107e34
ldr r0, _02101388 ; =data_027e0e60
ldr r0, _02101388 ; =gMapManager
add r1, r5, #4
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02082b3cEi
@@ -982,7 +982,7 @@ _02101292:
cmp r7, #3
bne _021012d0
_021012b0:
ldr r0, _02101388 ; =data_027e0e60
ldr r0, _02101388 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083588Ev
add r1, r0, #0
@@ -1088,7 +1088,7 @@ _02101378: .word data_027e0d38
_0210137c: .word data_027e0fac
_02101380: .word data_027e0f94
_02101384: .word data_027e0618
_02101388: .word data_027e0e60
_02101388: .word gMapManager
_0210138c: .word data_027e077c
_02101390: .word 0x04000304
_02101394: .word 0xffff7fff
@@ -2204,7 +2204,7 @@ _02101bce:
add r5, #0xc
add r7, sp, #4
_02101bda:
ldr r0, _02101c0c ; =data_027e0e60
ldr r0, _02101c0c ; =gMapManager
add r1, r7, #0
ldr r0, [r0]
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -2229,7 +2229,7 @@ _02101bf6:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end func_ov04_02101bbc
_02101c0c: .word data_027e0e60
_02101c0c: .word gMapManager
_02101c10: .word data_027e0f6c
.global func_ov04_02101c14
@@ -2765,7 +2765,7 @@ _02101fb6:
thumb_func_start func_ov04_02101fbc
func_ov04_02101fbc: ; 0x02101fbc
push {r3, lr}
ldr r0, _02101fe0 ; =data_027e0e60
ldr r0, _02101fe0 ; =gMapManager
ldr r0, [r0]
cmp r0, #0
bne _02101fde
@@ -2778,20 +2778,20 @@ func_ov04_02101fbc: ; 0x02101fbc
beq _02101fda
bl func_ov04_02101f54
_02101fda:
ldr r1, _02101fe0 ; =data_027e0e60
ldr r1, _02101fe0 ; =gMapManager
str r0, [r1]
_02101fde:
pop {r3, pc}
.align 2, 0
thumb_func_end func_ov04_02101fbc
_02101fe0: .word data_027e0e60
_02101fe0: .word gMapManager
_02101fe4: .word data_027e0ce0
.global func_ov04_02101fe8
thumb_func_start func_ov04_02101fe8
func_ov04_02101fe8: ; 0x02101fe8
push {r4, lr}
ldr r0, _02102008 ; =data_027e0e60
ldr r0, _02102008 ; =gMapManager
ldr r4, [r0]
cmp r4, #0
beq _02102006
@@ -2801,14 +2801,14 @@ func_ov04_02101fe8: ; 0x02101fe8
add r0, r4, #0
blx _ZN9SysObjectdlEPv
_02102000:
ldr r0, _02102008 ; =data_027e0e60
ldr r0, _02102008 ; =gMapManager
mov r1, #0
str r1, [r0]
_02102006:
pop {r4, pc}
.align 2, 0
thumb_func_end func_ov04_02101fe8
_02102008: .word data_027e0e60
_02102008: .word gMapManager
.global func_ov04_0210200c
thumb_func_start func_ov04_0210200c
@@ -7455,7 +7455,7 @@ _021045bc:
mov r1, #0
strb r1, [r0, #0xa]
strb r1, [r0, #0xb]
ldr r0, _021046bc ; =data_027e0e60
ldr r0, _021046bc ; =gMapManager
add r1, sp, #0x30
ldr r0, [r0]
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -7525,7 +7525,7 @@ _021045bc:
ldrb r0, [r0, #0x15]
strb r0, [r1, #0x15]
_02104682:
ldr r0, _021046bc ; =data_027e0e60
ldr r0, _021046bc ; =gMapManager
add r1, sp, #0x18
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_020838f8EPi
@@ -7554,7 +7554,7 @@ _021046b6:
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end func_ov04_0210455c
_021046bc: .word data_027e0e60
_021046bc: .word gMapManager
_021046c0: .word data_ov00_020eab04
_021046c4: .word gAdventureFlags
@@ -7868,7 +7868,7 @@ _02104920:
ldr r0, _021049fc ; =data_027e0f78
ldr r0, [r0]
bl func_ov04_02102e3c
ldr r0, _02104a00 ; =data_027e0e60
ldr r0, _02104a00 ; =gMapManager
ldr r0, [r0]
bl func_ov04_02102260
ldr r0, _02104a04 ; =data_027e0f68
@@ -7894,7 +7894,7 @@ _02104920:
ldrb r2, [r2]
ldr r1, [sp]
bl func_ov04_02109b78
ldr r0, _02104a00 ; =data_027e0e60
ldr r0, _02104a00 ; =gMapManager
ldr r1, [sp]
ldr r0, [r0]
ldr r2, [sp, #4]
@@ -7938,7 +7938,7 @@ _021049f0: .word data_027e0f64
_021049f4: .word data_ov09_0211f5b4
_021049f8: .word data_027e1048
_021049fc: .word data_027e0f78
_02104a00: .word data_027e0e60
_02104a00: .word gMapManager
_02104a04: .word data_027e0f68
_02104a08: .word data_027e0f90
_02104a0c: .word data_027e0fc0
@@ -7971,7 +7971,7 @@ _02104a3c:
ldr r0, _02104adc ; =data_027e0f68
ldr r0, [r0]
bl func_ov04_02102ad8
ldr r0, _02104ae0 ; =data_027e0e60
ldr r0, _02104ae0 ; =gMapManager
ldr r0, [r0]
bl func_ov04_021025d8
ldr r0, _02104ae4 ; =data_027e0f64
@@ -8021,7 +8021,7 @@ _02104ad0: .word data_ov09_0211f5b4
_02104ad4: .word data_027e0e28
_02104ad8: .word data_ov00_020ee734
_02104adc: .word data_027e0f68
_02104ae0: .word data_027e0e60
_02104ae0: .word gMapManager
_02104ae4: .word data_027e0f64
_02104ae8: .word gAdventureFlags
_02104aec: .word data_027e0fe4
@@ -9864,7 +9864,7 @@ func_ov04_021058cc: ; 0x021058cc
blx func_ov00_02078b40
cmp r0, #2
beq _021058f6
ldr r0, _02105948 ; =data_027e0e60
ldr r0, _02105948 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02084838Ev
cmp r0, #0
@@ -9914,7 +9914,7 @@ _02105940:
nop
thumb_func_end func_ov04_021058cc
_02105944: .word data_027e0d38
_02105948: .word data_027e0e60
_02105948: .word gMapManager
_0210594c: .word 0x00000126
.global func_ov04_02105950
@@ -16578,7 +16578,7 @@ _02108c18:
strh r1, [r4, #0x1c]
ldrh r0, [r0, #0x16]
strh r0, [r4, #0x1e]
ldr r0, _02108d20 ; =data_027e0e60
ldr r0, _02108d20 ; =gMapManager
ldrh r1, [r4, #0x14]
ldr r0, [r0]
lsr r1, r1, #4
@@ -16602,7 +16602,7 @@ _02108c18:
ldrh r7, [r4, #0x16]
lsl r0, r0, #0xc
str r0, [sp, #0x3c]
ldr r0, _02108d20 ; =data_027e0e60
ldr r0, _02108d20 ; =gMapManager
lsr r1, r7, #4
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083bacEv
@@ -16689,7 +16689,7 @@ _02108d0e:
.align 2, 0
thumb_func_end func_ov04_02108bd4
_02108d1c: .word data_027e0ff0
_02108d20: .word data_027e0e60
_02108d20: .word gMapManager
_02108d24: .word 0x0b60b60b
_02108d28: .word 0x00000800
@@ -16792,13 +16792,13 @@ func_ov04_02108de0: ; 0x02108de0
push {r4, r5, r6, r7, lr}
sub sp, #0x44
add r4, r0, #0
ldr r0, _02109090 ; =data_027e0e60
ldr r0, _02109090 ; =gMapManager
add r7, r1, #0
ldr r0, [r0]
str r2, [sp, #4]
blx _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #0xc]
ldr r0, _02109090 ; =data_027e0e60
ldr r0, _02109090 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp, #8]
@@ -17172,7 +17172,7 @@ _0210906c:
b _0210909c
nop
thumb_func_end func_ov04_02108de0
_02109090: .word data_027e0e60
_02109090: .word gMapManager
_02109094: .word 0x0b60b60b
_02109098: .word 0x00000800
_0210909c:
@@ -17207,13 +17207,13 @@ func_ov04_021090c8: ; 0x021090c8
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x88
add r5, r0, #0
ldr r0, _021092d0 ; =data_027e0e60
ldr r0, _021092d0 ; =gMapManager
str r1, [sp, #4]
ldr r0, [r0]
str r2, [sp, #8]
blx _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #0x18]
ldr r0, _021092d0 ; =data_027e0e60
ldr r0, _021092d0 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp, #0x14]
@@ -17270,7 +17270,7 @@ _021090f2:
_02109148:
b _021092ba
_0210914a:
ldr r0, _021092d0 ; =data_027e0e60
ldr r0, _021092d0 ; =gMapManager
ldr r1, [r5, #0x10]
ldr r0, [r0]
lsl r1, r1, #0x10
@@ -17289,7 +17289,7 @@ _0210914a:
_0210916c:
b _021092b4
_0210916e:
ldr r0, _021092d0 ; =data_027e0e60
ldr r0, _021092d0 ; =gMapManager
add r1, r7, #0
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083c24Ei
@@ -17301,7 +17301,7 @@ _0210916e:
blx func_0200388c
add r0, r7, r0
str r0, [sp, #0x7c]
ldr r0, _021092d0 ; =data_027e0e60
ldr r0, _021092d0 ; =gMapManager
add r1, r6, #0
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083c50Ei
@@ -17316,7 +17316,7 @@ _0210916e:
mov r0, #5
lsl r0, r0, #0xc
str r0, [sp, #0x80]
ldr r0, _021092d0 ; =data_027e0e60
ldr r0, _021092d0 ; =gMapManager
add r1, sp, #0x7c
ldr r0, [r0]
mov r2, #0
@@ -17466,7 +17466,7 @@ _021092ca:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end func_ov04_021090c8
_021092d0: .word data_027e0e60
_021092d0: .word gMapManager
_021092d4: .word 0x414e4353
_021092d8: .word 0x0b60b60b
_021092dc: .word 0x00000800
@@ -17553,13 +17553,13 @@ _02109360:
beq _02109382
b _0210938a
_02109378:
ldr r0, _02109480 ; =data_027e0e60
ldr r0, _02109480 ; =gMapManager
ldr r1, [r0]
mov r0, #1
strb r0, [r1, #8]
b _0210938a
_02109382:
ldr r0, _02109480 ; =data_027e0e60
ldr r0, _02109480 ; =gMapManager
ldr r1, [r0]
mov r0, #0
strb r0, [r1, #8]
@@ -17704,7 +17704,7 @@ _0210946c:
nop
thumb_func_end func_ov04_021092e8
_0210947c: .word 0x00001333
_02109480: .word data_027e0e60
_02109480: .word gMapManager
_02109484: .word data_027e0618
_02109488: .word data_027e0d38
_0210948c: .word gOverlayManager
@@ -17763,7 +17763,7 @@ _021094b2:
lsr r0, r0, #0x1c
add r0, r5, r0
asr r7, r0, #4
ldr r0, _021095b0 ; =data_027e0e60
ldr r0, _021095b0 ; =gMapManager
add r1, r7, #0
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083c50Ei
@@ -17782,12 +17782,12 @@ _021094b2:
add r2, r7, #0
add r0, r1, r0
str r0, [sp, #8]
ldr r0, _021095b0 ; =data_027e0e60
ldr r0, _021095b0 ; =gMapManager
ldr r1, [sp, #0xc]
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083e34Ecci
add r5, r0, #0
ldr r0, _021095b0 ; =data_027e0e60
ldr r0, _021095b0 ; =gMapManager
ldr r1, [sp, #0xc]
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02083c24Ei
@@ -17848,7 +17848,7 @@ _021095a8:
pop {r4, r5, r6, r7, pc}
nop
thumb_func_end func_ov04_021094a0
_021095b0: .word data_027e0e60
_021095b0: .word gMapManager
_021095b4: .word 0x0b60b60b
_021095b8: .word 0x00000800
@@ -17938,7 +17938,7 @@ _021095ec:
lsl r0, r0, #0xa
add r0, r1, r0
asr r6, r0, #0xc
ldr r0, _0210974c ; =data_027e0e60
ldr r0, _0210974c ; =gMapManager
asr r1, r6, #3
lsr r1, r1, #0x1c
add r1, r6, r1
@@ -17977,7 +17977,7 @@ _021095ec:
mul r1, r2
add r6, r1, r0
ldr r1, [sp, #8]
ldr r0, _0210974c ; =data_027e0e60
ldr r0, _0210974c ; =gMapManager
asr r1, r1, #3
lsr r2, r1, #0x1c
ldr r1, [sp, #8]
@@ -18052,7 +18052,7 @@ _02109746:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end func_ov04_021095bc
_0210974c: .word data_027e0e60
_0210974c: .word gMapManager
_02109750: .word 0x00001333
_02109754: .word 0x00000133
_02109758: .word 0x0b60b60b
@@ -24825,7 +24825,7 @@ func_ov04_0210cb38: ; 0x0210cb38
str r0, [sp, #0xa0]
add r0, sp, #0x80
blx func_ov00_020c3348
ldr r0, _0210cc0c ; =data_027e0e60
ldr r0, _0210cc0c ; =gMapManager
add r1, sp, #0x74
ldr r0, [r0]
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -24857,7 +24857,7 @@ _0210cb7a:
str r0, [sp, #0x68]
add r0, sp, #0x48
blx func_ov00_020c3348
ldr r0, _0210cc0c ; =data_027e0e60
ldr r0, _0210cc0c ; =gMapManager
add r1, sp, #0x3c
ldr r0, [r0]
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -24886,7 +24886,7 @@ _0210cbc2:
str r0, [sp, #0x30]
add r0, sp, #0x10
blx func_ov00_020c3348
ldr r0, _0210cc0c ; =data_027e0e60
ldr r0, _0210cc0c ; =gMapManager
add r1, sp, #4
ldr r0, [r0]
blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -24904,7 +24904,7 @@ _0210cc04:
.align 2, 0
thumb_func_end func_ov04_0210cb38
_0210cc08: .word data_027e0d38
_0210cc0c: .word data_027e0e60
_0210cc0c: .word gMapManager
_0210cc10: .word data_027e0fe8
_0210cc14: .word 0x49434645
_0210cc18: .word 0x534e4546
asm/ov05.inc
+1 -1
View File
@@ -159,7 +159,7 @@
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov05.s
+79 -79
View File
@@ -604,7 +604,7 @@ _02101280:
ldr r0, [r1, #4]
tst r0, #1
bne _02101338
ldr r0, _02101420 ; =data_027e0e60
ldr r0, _02101420 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_84Ev
ldr r3, [r8]
@@ -709,7 +709,7 @@ _021013f4:
.align 2, 0
arm_func_end func_ov05_02101230
_0210141c: .word data_027e077c
_02101420: .word data_027e0e60
_02101420: .word gMapManager
.global func_ov05_02101424
arm_func_start func_ov05_02101424
@@ -1340,12 +1340,12 @@ _02101c04:
bl func_ov00_020a5e9c
cmp r0, #0x12
bne _02101c90
ldr r0, _021021dc ; =data_027e0e60
ldr r0, _021021dc ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, #2
beq _02101c44
ldr r0, _021021dc ; =data_027e0e60
ldr r0, _021021dc ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, #3
@@ -1561,7 +1561,7 @@ _02101f18:
cmp r0, #0
addne sp, sp, #0x58
ldmneia sp!, {r4, r5, r6, pc}
ldr r0, _021021dc ; =data_027e0e60
ldr r0, _021021dc ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
@@ -1730,7 +1730,7 @@ _02102140:
arm_func_end func_ov05_02101b14
_021021d4: .word data_027e0f64
_021021d8: .word data_027e0d38
_021021dc: .word data_027e0e60
_021021dc: .word gMapManager
_021021e0: .word data_027e0f94
_021021e4: .word data_027e0ffc
_021021e8: .word data_ov00_020eec9c
@@ -2009,7 +2009,7 @@ _0210259c:
mov r1, r8
ldr r0, [r0]
bl func_ov05_021017e8
ldr r0, _021026e0 ; =data_027e0e60
ldr r0, _021026e0 ; =gMapManager
mov r1, r8
ldr r0, [r0]
bl func_ov05_0210112c
@@ -2081,7 +2081,7 @@ _021026d0: .word data_027e0d04
_021026d4: .word data_027e0f90
_021026d8: .word data_027e0f64
_021026dc: .word data_027e0f78
_021026e0: .word data_027e0e60
_021026e0: .word gMapManager
_021026e4: .word data_027e0fe4
_021026e8: .word data_027e0f6c
_021026ec: .word data_ov12_0213deb0
@@ -2100,7 +2100,7 @@ func_ov05_021026f8: ; 0x021026f8
bl func_ov05_02103df0
cmp r5, #1
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _02102744 ; =data_027e0e60
ldr r0, _02102744 ; =gMapManager
mov r1, r4
ldr r0, [r0]
bl func_ov05_021011b4
@@ -2112,7 +2112,7 @@ func_ov05_021026f8: ; 0x021026f8
.align 2, 0
arm_func_end func_ov05_021026f8
_02102740: .word data_027e103c
_02102744: .word data_027e0e60
_02102744: .word gMapManager
_02102748: .word data_027e0fc0
.global func_ov05_0210274c
@@ -2164,7 +2164,7 @@ _021027d8:
mov r1, r4
ldr r0, [r0]
bl func_ov05_02105304
ldr r0, _02102824 ; =data_027e0e60
ldr r0, _02102824 ; =gMapManager
mov r1, r4
ldr r0, [r0]
bl func_ov05_021011cc
@@ -2176,7 +2176,7 @@ _02102814: .word data_027e103c
_02102818: .word data_027e0c54
_0210281c: .word data_027e0f90
_02102820: .word data_027e0fe4
_02102824: .word data_027e0e60
_02102824: .word gMapManager
.global func_ov05_02102828
arm_func_start func_ov05_02102828
@@ -2266,7 +2266,7 @@ _0210294c:
bl func_ov05_02101804
cmp r7, #0
bne _02102978
ldr r0, _02102a5c ; =data_027e0e60
ldr r0, _02102a5c ; =gMapManager
mov r1, r8
ldr r0, [r0]
bl func_ov05_021011fc
@@ -2333,7 +2333,7 @@ _02102a4c: .word data_027e0de4
_02102a50: .word data_027e0de8
_02102a54: .word data_027e0f88
_02102a58: .word data_027e0f64
_02102a5c: .word data_027e0e60
_02102a5c: .word gMapManager
_02102a60: .word data_027e0f90
_02102a64: .word data_027e0fe4
_02102a68: .word data_027e0618
@@ -2389,7 +2389,7 @@ _02102b08: .word data_027e0cbc
arm_func_start func_ov05_02102b0c
func_ov05_02102b0c: ; 0x02102b0c
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldr ip, _02102c28 ; =data_027e0e60
ldr ip, _02102c28 ; =gMapManager
mov r8, r0
mov r7, r1
mov r4, r2
@@ -2471,7 +2471,7 @@ _02102c20:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov05_02102b0c
_02102c28: .word data_027e0e60
_02102c28: .word gMapManager
.global func_ov05_02102c2c
arm_func_start func_ov05_02102c2c
@@ -3320,7 +3320,7 @@ func_ov05_0210373c: ; 0x0210373c
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
ldr r7, [sp, #0x44]
ldr r4, _021038c0 ; =data_027e0e60
ldr r4, _021038c0 ; =gMapManager
ldr r6, [r7, #8]
ldr r5, [sp, #0x3c]
ldr r4, [r4]
@@ -3419,7 +3419,7 @@ _021038b4:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov05_0210373c
_021038c0: .word data_027e0e60
_021038c0: .word gMapManager
_021038c4: .word data_ov05_021122a8
.global func_ov05_021038c8
@@ -3428,7 +3428,7 @@ func_ov05_021038c8: ; 0x021038c8
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
ldr r7, [sp, #0x4c]
ldr r4, _02103a9c ; =data_027e0e60
ldr r4, _02103a9c ; =gMapManager
ldr r6, [r7]
ldr r5, [sp, #0x44]
ldr r4, [r4]
@@ -3548,7 +3548,7 @@ _02103a90:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov05_021038c8
_02103a9c: .word data_027e0e60
_02103a9c: .word gMapManager
_02103aa0: .word data_ov05_021122a8
.global func_ov05_02103aa4
@@ -3684,12 +3684,12 @@ func_ov05_02103b88: ; 0x02103b88
.global func_ov05_02103ba0
arm_func_start func_ov05_02103ba0
func_ov05_02103ba0: ; 0x02103ba0
ldr r0, _02103bac ; =data_027e0e60
ldr r0, _02103bac ; =gMapManager
ldr r0, [r0]
bx lr
.align 2, 0
arm_func_end func_ov05_02103ba0
_02103bac: .word data_027e0e60
_02103bac: .word gMapManager
.global func_ov05_02103bb0
arm_func_start func_ov05_02103bb0
@@ -6070,7 +6070,7 @@ _021059f0:
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02105c0c ; =data_027e0e60
ldr r0, _02105c0c ; =gMapManager
mov r1, r3
ldr r0, [r0]
mov r2, #1
@@ -6210,7 +6210,7 @@ _02105bfc: .word 0x00000112
_02105c00: .word 0x00000113
_02105c04: .word 0x00000666
_02105c08: .word data_ov05_021124f0
_02105c0c: .word data_027e0e60
_02105c0c: .word gMapManager
_02105c10: .word data_02050f54
_02105c14: .word 0x00000266
_02105c18: .word 0x00000115
@@ -7366,7 +7366,7 @@ func_ov05_02106bbc: ; 0x02106bbc
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r0, [r0, #4]
ldr r1, _02106c70 ; =data_027e0e60
ldr r1, _02106c70 ; =gMapManager
add r0, r0, #0x33
add r0, r0, #0x1300
str r0, [r4, #4]
@@ -7387,7 +7387,7 @@ _02106c64:
.align 2, 0
arm_func_end func_ov05_02106bbc
_02106c6c: .word data_027e0fb8
_02106c70: .word data_027e0e60
_02106c70: .word gMapManager
.global func_ov05_02106c74
arm_func_start func_ov05_02106c74
@@ -7700,7 +7700,7 @@ _0210707c:
add r3, sp, #0x28
ldmia r4, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _021071e8 ; =data_027e0e60
ldr r0, _021071e8 ; =gMapManager
ldr r4, [sp, #0x28]
ldr r5, [sp, #0x2c]
ldr r2, [sp, #0x30]
@@ -7721,7 +7721,7 @@ _0210707c:
add r0, r0, #0x800
cmp r0, r8
bge _02107148
ldr r0, _021071e8 ; =data_027e0e60
ldr r0, _021071e8 ; =gMapManager
add r1, sp, #0x10
ldr r0, [r0]
mov r2, #1
@@ -7775,7 +7775,7 @@ _021071d8: .word data_ov05_021126ac
_021071dc: .word data_027e0fb8
_021071e0: .word 0x00000ccd
_021071e4: .word data_027e0e58
_021071e8: .word data_027e0e60
_021071e8: .word gMapManager
_021071ec: .word 0xfffffb33
_021071f0: .word func_ov05_02106c74
_021071f4: .word data_027e103c
@@ -8382,7 +8382,7 @@ _02107a18:
ldrsh r0, [r4, #0x10]
cmp r0, #0
bgt _02107b1c
ldr r1, _02107b68 ; =data_027e0e60
ldr r1, _02107b68 ; =gMapManager
mov r0, r4
ldr r5, [r1]
bl _ZN13LinkStateBase12GetPlayerPosEv
@@ -8452,7 +8452,7 @@ _02107b1c:
_02107b5c: .word data_ov05_021126ac
_02107b60: .word data_ov05_021126b4
_02107b64: .word data_027e0fb8
_02107b68: .word data_027e0e60
_02107b68: .word gMapManager
_02107b6c: .word data_ov05_021122e0
_02107b70: .word data_027e0d0c
@@ -10028,7 +10028,7 @@ _02109018:
bl func_ov00_020d70a4
b _02109080
_02109060:
ldr r0, _02109294 ; =data_027e0e60
ldr r0, _02109294 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
@@ -10180,7 +10180,7 @@ _02109278:
arm_func_end func_ov05_02108f98
_0210928c: .word data_ov00_020eec68
_02109290: .word data_027e071c
_02109294: .word data_027e0e60
_02109294: .word gMapManager
_02109298: .word data_027e0d38
_0210929c: .word data_027e0618
_021092a0: .word data_027e0c54
@@ -10966,7 +10966,7 @@ _02109d0c:
str r1, [r7, #0x40]
str r3, [r7, #0x44]
str r2, [r7, #0x48]
ldr r0, _02109e80 ; =data_027e0e60
ldr r0, _02109e80 ; =gMapManager
add r1, r7, #0x40
ldr r0, [r0]
mov r2, #1
@@ -11058,7 +11058,7 @@ _02109e74:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov05_02109cd0
_02109e80: .word data_027e0e60
_02109e80: .word gMapManager
.global func_ov05_02109e84
arm_func_start func_ov05_02109e84
@@ -11801,12 +11801,12 @@ func_ov05_0210a7d4: ; 0x0210a7d4
str r1, [r0, #4]
b _0210aa98
_0210a830:
ldr r1, _0210aad8 ; =data_027e0e60
ldr r1, _0210aad8 ; =gMapManager
add r0, sp, #0x14
ldr r1, [r1]
add r2, sp, #0x2c
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0210aad8 ; =data_027e0e60
ldr r0, _0210aad8 ; =gMapManager
add r1, sp, #0x14
ldr r0, [r0]
mov r5, #0
@@ -11829,7 +11829,7 @@ _0210a830:
movls r5, #0
cmp r1, r0
bne _0210a904
ldr r1, _0210aad8 ; =data_027e0e60
ldr r1, _0210aad8 ; =gMapManager
mov r0, r6
ldr r7, [r1]
bl _ZN13LinkStateBase15GetGrabActorRefEv
@@ -11867,7 +11867,7 @@ _0210a904:
mov r5, #1
cmp r1, r0
beq _0210aa20
ldr r0, _0210aad8 ; =data_027e0e60
ldr r0, _0210aad8 ; =gMapManager
add r1, sp, #0x2c
ldr r0, [r0]
mov r2, #0
@@ -11906,7 +11906,7 @@ _0210a904:
mov ip, #0
str r1, [sp, #0x24]
ldr r1, [r0, #8]
ldr r0, _0210aad8 ; =data_027e0e60
ldr r0, _0210aad8 ; =gMapManager
str r1, [sp, #0x28]
ldr r2, [r4, #0x98]
add r1, sp, #0x38
@@ -11979,7 +11979,7 @@ _0210aac0:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov05_0210a7d4
_0210aad8: .word data_027e0e60
_0210aad8: .word gMapManager
_0210aadc: .word 0x424f4d42
_0210aae0: .word gItemManager
_0210aae4: .word 0x43525953
@@ -12399,7 +12399,7 @@ _0210ae98:
movne r1, #1
moveq r1, #0
strb r1, [r5, #0xb1]
ldr r0, _0210b290 ; =data_027e0e60
ldr r0, _0210b290 ; =gMapManager
ldr r7, [sp, #0x28]
ldr r6, [sp, #0x2c]
ldr r3, [sp, #0x30]
@@ -12514,7 +12514,7 @@ _0210b280: .word data_027e0fe4
_0210b284: .word gAdventureFlags
_0210b288: .word data_02050f54
_0210b28c: .word 0x0000ffff
_0210b290: .word data_027e0e60
_0210b290: .word gMapManager
_0210b294: .word data_027e0fb8
_0210b298: .word data_ov05_021128a4
_0210b29c: .word data_ov05_021128b4
@@ -12818,7 +12818,7 @@ _0210b684:
ldr r0, _0210b95c ; =data_027e0fb8
ldr r0, [r0]
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r1, _0210b968 ; =data_027e0e60
ldr r1, _0210b968 ; =gMapManager
add r0, sp, #0x12
ldr r4, [r1]
add r2, r5, #0x24
@@ -12865,7 +12865,7 @@ _0210b6dc:
ldmia sp!, {r3, r4, r5, r6, pc}
_0210b73c:
mov r1, #2
ldr r0, _0210b968 ; =data_027e0e60
ldr r0, _0210b968 ; =gMapManager
str r1, [r5, #0xc]
ldr r4, [r0]
add r0, sp, #0x10
@@ -12910,7 +12910,7 @@ _0210b7b0:
_0210b7dc:
mov r0, r5
bl _ZN13LinkStateBase18EquipItem_vfunc_28Ev
ldr r1, _0210b968 ; =data_027e0e60
ldr r1, _0210b968 ; =gMapManager
mov r0, r5
ldr r6, [r1]
bl _ZN13LinkStateBase12GetPlayerPosEv
@@ -12919,7 +12919,7 @@ _0210b7dc:
mov r0, r6
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [r4]
ldr r1, _0210b968 ; =data_027e0e60
ldr r1, _0210b968 ; =gMapManager
mov r0, r5
ldr r6, [r1]
bl _ZN13LinkStateBase12GetPlayerPosEv
@@ -13012,7 +13012,7 @@ _0210b954:
_0210b95c: .word data_027e0fb8
_0210b960: .word data_ov05_02112984
_0210b964: .word data_ov05_021129f4
_0210b968: .word data_027e0e60
_0210b968: .word gMapManager
.global func_ov05_0210b96c
arm_func_start func_ov05_0210b96c
@@ -13064,7 +13064,7 @@ func_ov05_0210b9c4: ; 0x0210b9c4
ldr r1, _0210ba8c ; =data_027e0fe4
str r0, [sp]
ldr r2, [r4, #0x28]
ldr r0, _0210ba90 ; =data_027e0e60
ldr r0, _0210ba90 ; =gMapManager
str r2, [sp, #4]
ldr r3, [r4, #0x2c]
ldr r5, [r1]
@@ -13106,7 +13106,7 @@ _0210ba7c:
.align 2, 0
arm_func_end func_ov05_0210b9c4
_0210ba8c: .word data_027e0fe4
_0210ba90: .word data_027e0e60
_0210ba90: .word gMapManager
_0210ba94: .word data_ov00_020eec9c
.global func_ov05_0210ba98
@@ -13135,7 +13135,7 @@ func_ov05_0210babc: ; 0x0210babc
cmp r0, #0
beq _0210bb10
ldr r1, [r4, #0x24]
ldr r0, _0210bb48 ; =data_027e0e60
ldr r0, _0210bb48 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x28]
ldr r0, [r0]
@@ -13164,7 +13164,7 @@ _0210bb10:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov05_0210babc
_0210bb48: .word data_027e0e60
_0210bb48: .word gMapManager
_0210bb4c: .word data_027e0fb8
.global func_ov05_0210bb50
@@ -13199,7 +13199,7 @@ func_ov05_0210bb98: ; 0x0210bb98
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r1, #0
strb r1, [r0, #0xbc]
ldr r1, _0210bd58 ; =data_027e0e60
ldr r1, _0210bd58 ; =gMapManager
add r0, sp, #0
ldr r4, [r1]
add r2, r5, #0x24
@@ -13314,7 +13314,7 @@ _0210bd48:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov05_0210bb98
_0210bd58: .word data_027e0e60
_0210bd58: .word gMapManager
_0210bd5c: .word gAdventureFlags
_0210bd60: .word data_027e0fb8
_0210bd64: .word data_ov05_021129d4
@@ -13334,7 +13334,7 @@ func_ov05_0210bd70: ; 0x0210bd70
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r1, #0
strb r1, [r0, #0xbc]
ldr r1, _0210bf40 ; =data_027e0e60
ldr r1, _0210bf40 ; =gMapManager
add r0, sp, #0
ldr r4, [r1]
add r2, r5, #0x24
@@ -13451,7 +13451,7 @@ _0210beb8:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov05_0210bd70
_0210bf40: .word data_027e0e60
_0210bf40: .word gMapManager
_0210bf44: .word data_027e0fb8
_0210bf48: .word gAdventureFlags
_0210bf4c: .word 0x00000155
@@ -13662,7 +13662,7 @@ func_ov05_0210c20c: ; 0x0210c20c
bl _ZN13PlayerControl18func_ov00_020af01cEPc
cmp r0, #0
beq _0210c2a8
ldr r0, _0210c950 ; =data_027e0e60
ldr r0, _0210c950 ; =gMapManager
ldrb r2, [sp, #8]
ldrb r1, [sp, #9]
ldr r0, [r0]
@@ -13752,7 +13752,7 @@ _0210c398:
ldr r5, [r0, #0xa0]
cmp r5, #0
beq _0210c3ec
ldr r0, _0210c950 ; =data_027e0e60
ldr r0, _0210c950 ; =gMapManager
add r1, r5, #0x18
ldr r0, [r0]
add r2, r7, #0x24
@@ -13841,7 +13841,7 @@ _0210c4d8:
ldr r0, [r0]
bl _ZN13PlayerControl13StopFollowingEv
ldr r1, [r7, #0x24]
ldr r0, _0210c950 ; =data_027e0e60
ldr r0, _0210c950 ; =gMapManager
str r1, [sp, #0x3c]
ldr r1, [r7, #0x28]
ldr r0, [r0]
@@ -13863,7 +13863,7 @@ _0210c528:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0210c540:
ldr r1, [r7, #0x24]
ldr r0, _0210c950 ; =data_027e0e60
ldr r0, _0210c950 ; =gMapManager
str r1, [sp, #0x30]
ldr r1, [r7, #0x28]
ldr r0, [r0]
@@ -13953,7 +13953,7 @@ _0210c650:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0210c680:
ldr r1, [r7, #0x24]
ldr r0, _0210c950 ; =data_027e0e60
ldr r0, _0210c950 ; =gMapManager
str r1, [sp, #0x24]
ldr r1, [r7, #0x28]
ldr r0, [r0]
@@ -13964,7 +13964,7 @@ _0210c680:
str r3, [sp, #0x2c]
bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
str r0, [r7, #0x10]
ldr r1, _0210c950 ; =data_027e0e60
ldr r1, _0210c950 ; =gMapManager
add r0, sp, #6
ldr r1, [r1]
add r2, r7, #0x24
@@ -14049,7 +14049,7 @@ _0210c7cc:
cmpne r1, r0
bne _0210c818
ldr r1, [r7, #0x24]
ldr r0, _0210c950 ; =data_027e0e60
ldr r0, _0210c950 ; =gMapManager
str r1, [sp, #0x18]
ldr r1, [r7, #0x28]
ldr r0, [r0]
@@ -14074,7 +14074,7 @@ _0210c824:
mov r1, #0
str r2, [sp, #0x14]
bl _ZNK11ItemManager8GetFairyEi
ldr r1, _0210c950 ; =data_027e0e60
ldr r1, _0210c950 ; =gMapManager
mov r4, r0
ldr r0, [r1]
add r1, sp, #0xc
@@ -14143,7 +14143,7 @@ _0210c93c:
arm_func_end func_ov05_0210c20c
_0210c948: .word data_027e0618
_0210c94c: .word data_027e0fb8
_0210c950: .word data_027e0e60
_0210c950: .word gMapManager
_0210c954: .word data_ov00_020eec9c
_0210c958: .word data_ov05_02112324
_0210c95c: .word data_ov05_02112360
@@ -14195,7 +14195,7 @@ _0210c9d0:
_0210c9e4:
mov r5, #2
_0210c9e8:
ldr r1, _0210ca7c ; =data_027e0e60
ldr r1, _0210ca7c ; =gMapManager
add r0, sp, #0
ldr r6, [r1]
add r2, r4, #0x24
@@ -14234,7 +14234,7 @@ _0210c9e8:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov05_0210c990
_0210ca7c: .word data_027e0e60
_0210ca7c: .word gMapManager
.global func_ov05_0210ca80
arm_func_start func_ov05_0210ca80
@@ -16372,7 +16372,7 @@ _0210e6d8:
cmp r0, #0
beq _0210e72c
ldr r0, _0210e884 ; =data_027e0fd4
ldr r1, _0210e894 ; =data_027e0e60
ldr r1, _0210e894 ; =gMapManager
ldr r2, [r0]
ldr r0, [r1]
add r1, r2, #0xc4
@@ -16474,7 +16474,7 @@ _0210e884: .word data_027e0fd4
_0210e888: .word data_027e0fa0
_0210e88c: .word data_027e0fd0
_0210e890: .word data_027e0f94
_0210e894: .word data_027e0e60
_0210e894: .word gMapManager
_0210e898: .word gAdventureFlags
_0210e89c: .word 0x66666667
_0210e8a0: .word data_027e0fac
@@ -16504,7 +16504,7 @@ func_ov05_0210e8b4: ; 0x0210e8b4
ldr r1, [r1, #0x14]
cmp r1, #1
bne _0210e918
ldr r0, _0210ea8c ; =data_027e0e60
ldr r0, _0210ea8c ; =gMapManager
ldrh r2, [r5, #0xe]
ldr r0, [r0]
add r1, sp, #4
@@ -16619,7 +16619,7 @@ _0210ea38:
.align 2, 0
arm_func_end func_ov05_0210e8b4
_0210ea88: .word data_027e0d38
_0210ea8c: .word data_027e0e60
_0210ea8c: .word gMapManager
_0210ea90: .word data_027e0fac
_0210ea94: .word data_027e0f94
_0210ea98: .word data_027e0fcc
@@ -18859,7 +18859,7 @@ func_ov05_021109c0: ; 0x021109c0
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #4
ldr r1, _02110b38 ; =data_027e0fd4
ldr r2, _02110b3c ; =data_027e0e60
ldr r2, _02110b3c ; =gMapManager
ldr r1, [r1]
mov r6, r0
ldr r0, [r2]
@@ -18972,7 +18972,7 @@ _02110b2c:
.align 2, 0
arm_func_end func_ov05_021109c0
_02110b38: .word data_027e0fd4
_02110b3c: .word data_027e0e60
_02110b3c: .word gMapManager
.global func_ov05_02110b40
arm_func_start func_ov05_02110b40
@@ -19393,7 +19393,7 @@ _021110cc:
_02111100:
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r2, [r0]
ldr r1, _021112e8 ; =data_027e0e60
ldr r1, _021112e8 ; =gMapManager
str r2, [sp, #0xc]
ldr r2, [r0, #4]
ldr r5, [r1]
@@ -19522,7 +19522,7 @@ _021112d8: .word data_ov05_02112b34
_021112dc: .word data_027e0e58
_021112e0: .word 0x0000102e
_021112e4: .word 0x000001a7
_021112e8: .word data_027e0e60
_021112e8: .word gMapManager
.global func_ov05_021112ec
arm_func_start func_ov05_021112ec
@@ -20206,7 +20206,7 @@ func_ov05_02111c00: ; 0x02111c00
mov r0, r5
mov r1, r4
bl func_ov00_02080de8
ldr r0, _02111c68 ; =data_027e0e60
ldr r0, _02111c68 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -20219,7 +20219,7 @@ func_ov05_02111c00: ; 0x02111c00
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov05_02111c00
_02111c68: .word data_027e0e60
_02111c68: .word gMapManager
.global func_ov05_02111c6c
arm_func_start func_ov05_02111c6c
@@ -20446,7 +20446,7 @@ func_ov05_02111f40: ; 0x02111f40
ldr r0, [r5, #0xf0]
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _02111fb0 ; =data_027e0e60
ldr r0, _02111fb0 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020848b8Ev
cmp r0, #0
@@ -20466,7 +20466,7 @@ func_ov05_02111f40: ; 0x02111f40
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov05_02111f40
_02111fb0: .word data_027e0e60
_02111fb0: .word gMapManager
_02111fb4: .word data_027e0d3c
.global func_ov05_02111fb8
asm/ov09.inc
+1 -1
View File
@@ -49,7 +49,7 @@
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f90
.extern data_027e0fbc
asm/ov09.s
+9 -9
View File
@@ -3206,7 +3206,7 @@ func_ov09_02114554: ; 0x02114554
blx _ZN12ActorManager14Actor_vfunc_28Ev
mov r0, #0
str r0, [sp, #8]
ldr r0, _021146ac ; =data_027e0e60
ldr r0, _021146ac ; =gMapManager
add r1, sp, #0x14
ldr r7, [r0]
ldr r0, [sp, #8]
@@ -3345,7 +3345,7 @@ _02114688:
ldr r1, [sp, #8]
add r0, r5, #0
bl func_ov09_02114520
ldr r0, _021146ac ; =data_027e0e60
ldr r0, _021146ac ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_02082adcEv
add sp, #0x1ec
@@ -3353,7 +3353,7 @@ _02114688:
.align 2, 0
thumb_func_end func_ov09_02114554
_021146a8: .word data_027e0fe4
_021146ac: .word data_027e0e60
_021146ac: .word gMapManager
_021146b0: .word data_027e0d38
_021146b4: .word data_ov00_020e9f10
_021146b8: .word data_ov00_020ea110
@@ -16510,7 +16510,7 @@ _0211c3d4: .word data_027e0ce0
func_ov09_0211c3d8: ; 0x0211c3d8
push {r3, r4, r5, lr}
add r4, r0, #0
ldr r0, _0211c418 ; =data_027e0e60
ldr r0, _0211c418 ; =gMapManager
ldr r0, [r0]
blx _ZN10MapManager18func_ov00_020848b8Ev
strb r0, [r4, #0xa]
@@ -16541,7 +16541,7 @@ _0211c416:
pop {r3, r4, r5, pc}
.align 2, 0
thumb_func_end func_ov09_0211c3d8
_0211c418: .word data_027e0e60
_0211c418: .word gMapManager
.global func_ov09_0211c41c
thumb_func_start func_ov09_0211c41c
@@ -18378,7 +18378,7 @@ func_ov09_0211d180: ; 0x0211d180
str r2, [sp, #0x94]
add r3, r2, r1
ldr r9, [r4, #8]
ldr r1, _0211d658 ; =data_027e0e60
ldr r1, _0211d658 ; =gMapManager
mov r5, r0
ldr r0, [r1]
add r1, sp, #0x90
@@ -18690,7 +18690,7 @@ _0211d628:
.align 2, 0
arm_func_end func_ov09_0211d180
_0211d654: .word 0xfffffccd
_0211d658: .word data_027e0e60
_0211d658: .word gMapManager
_0211d65c: .word 0x00000385
_0211d660: .word 0xfffff4a4
_0211d664: .word 0x0000099a
@@ -18850,7 +18850,7 @@ func_ov09_0211d860: ; 0x0211d860
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x40
add r6, r0, #0
ldr r0, _0211d89c ; =data_027e0e60
ldr r0, _0211d89c ; =gMapManager
mov r5, #0
ldr r4, [r0]
add r7, sp, #0
@@ -18879,7 +18879,7 @@ _0211d88a:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end func_ov09_0211d860
_0211d89c: .word data_027e0e60
_0211d89c: .word gMapManager
.global func_ov09_0211d8a0
thumb_func_start func_ov09_0211d8a0
asm/ov12.inc
+1 -1
View File
@@ -128,7 +128,7 @@
.extern data_027e0dcc
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f84
asm/ov12.s
+84 -84
View File
@@ -931,7 +931,7 @@ _0211371c: .word data_027e0fe0
arm_func_start func_ov12_02113720
func_ov12_02113720: ; 0x02113720
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _0211378c ; =data_027e0e60
ldr r2, _0211378c ; =gMapManager
mov r4, r0
ldr r0, [r2]
mov r5, r1
@@ -959,13 +959,13 @@ func_ov12_02113720: ; 0x02113720
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_02113720
_0211378c: .word data_027e0e60
_0211378c: .word gMapManager
.global func_ov12_02113790
arm_func_start func_ov12_02113790
func_ov12_02113790: ; 0x02113790
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _021137e4 ; =data_027e0e60
ldr r2, _021137e4 ; =gMapManager
mov r4, r0
ldr r0, [r2]
mov r5, r1
@@ -987,7 +987,7 @@ func_ov12_02113790: ; 0x02113790
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_02113790
_021137e4: .word data_027e0e60
_021137e4: .word gMapManager
.global func_ov12_021137e8
arm_func_start func_ov12_021137e8
@@ -1003,7 +1003,7 @@ func_ov12_021137e8: ; 0x021137e8
add r0, r2, r0, lsr #22
add r0, r0, r1, lsr #20
mov r4, r0, lsl #0x6
ldr r0, _02113834 ; =data_027e0e60
ldr r0, _02113834 ; =gMapManager
tst r4, #0x20000
orrne r4, r4, #0x3fc0000
ldr r0, [r0]
@@ -1013,7 +1013,7 @@ func_ov12_021137e8: ; 0x021137e8
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov12_021137e8
_02113834: .word data_027e0e60
_02113834: .word gMapManager
.global func_ov12_02113838
arm_func_start func_ov12_02113838
@@ -1026,7 +1026,7 @@ func_ov12_02113838: ; 0x02113838
mov r0, r0, lsl #0x1a
add r0, r1, r0, lsr #20
mov r4, r0, lsl #0x6
ldr r0, _02113878 ; =data_027e0e60
ldr r0, _02113878 ; =gMapManager
tst r4, #0x20000
orrne r4, r4, #0x3fc0000
ldr r0, [r0]
@@ -1036,7 +1036,7 @@ func_ov12_02113838: ; 0x02113838
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov12_02113838
_02113878: .word data_027e0e60
_02113878: .word gMapManager
.global func_ov12_0211387c
arm_func_start func_ov12_0211387c
@@ -6736,12 +6736,12 @@ func_ov12_02118428: ; 0x02118428
addeq sp, sp, #0x128
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02118808 ; =data_027e0e60
ldr r0, _02118808 ; =gMapManager
add r1, sp, #0xbc
ldr r0, [r0]
mov r2, #0
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r1, _02118808 ; =data_027e0e60
ldr r1, _02118808 ; =gMapManager
str r0, [sp, #0x9c]
ldr r0, [r1]
add r1, sp, #0xbc
@@ -6785,7 +6785,7 @@ _0211857c:
cmp r10, #0
stmia r7, {r0, r1, r2}
ble _0211877c
ldr r11, _02118808 ; =data_027e0e60
ldr r11, _02118808 ; =gMapManager
add r5, r8, #0x8c
add r4, sp, #0x44
mov r6, #0
@@ -6934,7 +6934,7 @@ _0211877c:
_021187fc: .word data_027e0c38
_02118800: .word data_027e0d3c
_02118804: .word data_ov12_02137d20
_02118808: .word data_027e0e60
_02118808: .word gMapManager
_0211880c: .word 0x0000ffff
_02118810: .word 0xfffff0f7
@@ -8226,12 +8226,12 @@ func_ov12_021196d4: ; 0x021196d4
bl func_ov00_020bbb64
cmp r0, #0
bne _02119774
ldr r1, _0211977c ; =data_027e0e60
ldr r1, _0211977c ; =gMapManager
add r0, sp, #0
ldr r1, [r1]
mov r2, r4
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0211977c ; =data_027e0e60
ldr r0, _0211977c ; =gMapManager
ldrb r1, [sp]
ldrb r2, [sp, #1]
ldr r0, [r0]
@@ -8264,7 +8264,7 @@ _02119774:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_021196d4
_0211977c: .word data_027e0e60
_0211977c: .word gMapManager
.global func_ov12_02119780
arm_func_start func_ov12_02119780
@@ -8361,7 +8361,7 @@ func_ov12_02119840: ; 0x02119840
arm_func_start func_ov12_0211986c
func_ov12_0211986c: ; 0x0211986c
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _02119964 ; =data_027e0e60
ldr r2, _02119964 ; =gMapManager
mov r5, r0
ldr r0, [r2]
mov r4, r1
@@ -8377,7 +8377,7 @@ func_ov12_0211986c: ; 0x0211986c
strb r0, [r5, #0x118]
ldrb r2, [r5, #0x119]
and r1, r3, #0x1f00
ldr r0, _02119964 ; =data_027e0e60
ldr r0, _02119964 ; =gMapManager
bic r3, r2, #0x1f
and r2, r3, #0xff
orr r1, r2, r1, asr #8
@@ -8424,7 +8424,7 @@ func_ov12_0211986c: ; 0x0211986c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_0211986c
_02119964: .word data_027e0e60
_02119964: .word gMapManager
.global func_ov12_02119968
arm_func_start func_ov12_02119968
@@ -8437,7 +8437,7 @@ func_ov12_02119968: ; 0x02119968
mov r0, r0, lsl #0x1b
add r0, r2, r0, lsr #19
mov r6, r0, lsl #0x5
ldr r0, _02119a24 ; =data_027e0e60
ldr r0, _02119a24 ; =gMapManager
tst r6, #0x20000
orrne r6, r6, #0x3fc0000
ldr r0, [r0]
@@ -8467,7 +8467,7 @@ func_ov12_02119968: ; 0x02119968
add r0, r1, r0, lsr #22
add r0, r0, r2, lsr #19
mov r5, r0, lsl #0x5
ldr r0, _02119a24 ; =data_027e0e60
ldr r0, _02119a24 ; =gMapManager
tst r5, #0x20000
orrne r5, r5, #0x3fc0000
ldr r0, [r0]
@@ -8478,7 +8478,7 @@ func_ov12_02119968: ; 0x02119968
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov12_02119968
_02119a24: .word data_027e0e60
_02119a24: .word gMapManager
.global func_ov12_02119a28
arm_func_start func_ov12_02119a28
@@ -9488,7 +9488,7 @@ func_ov12_0211a7d0: ; 0x0211a7d0
_0211a830:
mov r4, r2
_0211a834:
ldr r0, _0211a948 ; =data_027e0e60
ldr r0, _0211a948 ; =gMapManager
add r1, sp, #8
ldr r0, [r0]
mov r2, r4
@@ -9560,7 +9560,7 @@ _0211a884:
.align 2, 0
arm_func_end func_ov12_0211a7d0
_0211a944: .word data_ov12_02137c64
_0211a948: .word data_027e0e60
_0211a948: .word gMapManager
_0211a94c: .word data_027e0f94
_0211a950: .word data_027e0fcc
_0211a954: .word data_027e0fd4
@@ -10858,7 +10858,7 @@ func_ov12_0211b9c4: ; 0x0211b9c4
add r4, r0, #0xd8
str r1, [sp]
ldr r1, [r7, r8]
ldr r0, _0211ba90 ; =data_027e0e60
ldr r0, _0211ba90 ; =gMapManager
str r1, [sp, #4]
ldr r2, [r4, r8]
ldr r0, [r0]
@@ -10889,7 +10889,7 @@ _0211ba84:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov12_0211b9c4
_0211ba90: .word data_027e0e60
_0211ba90: .word gMapManager
.global func_ov12_0211ba94
arm_func_start func_ov12_0211ba94
@@ -27791,10 +27791,10 @@ func_ov12_021296a4: ; 0x021296a4
mov r1, r1, asr #0x5
and r1, r1, #7
bl func_ov12_0212a258
ldr r0, _0212975c ; =data_027e0e60
ldr r0, _0212975c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _0212975c ; =data_027e0e60
ldr r1, _0212975c ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
@@ -27833,7 +27833,7 @@ func_ov12_021296a4: ; 0x021296a4
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_021296a4
_0212975c: .word data_027e0e60
_0212975c: .word gMapManager
.global func_ov12_02129760
arm_func_start func_ov12_02129760
@@ -28545,7 +28545,7 @@ func_ov12_0212a104: ; 0x0212a104
add r0, r0, #0x1300
cmp r1, r0
bge _0212a15c
ldr r0, _0212a164 ; =data_027e0e60
ldr r0, _0212a164 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_48Ev
ldr r1, [r5, #0x4c]
@@ -28561,20 +28561,20 @@ _0212a15c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_0212a104
_0212a164: .word data_027e0e60
_0212a164: .word gMapManager
.global func_ov12_0212a168
arm_func_start func_ov12_0212a168
func_ov12_0212a168: ; 0x0212a168
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _0212a230 ; =data_027e0e60
ldr r2, _0212a230 ; =gMapManager
mov r5, r0
mov r4, r1
ldr r1, [r2]
add r0, sp, #0
add r2, r5, #0x48
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0212a230 ; =data_027e0e60
ldr r0, _0212a230 ; =gMapManager
ldrb r1, [sp]
ldrb r2, [sp, #1]
ldr r0, [r0]
@@ -28624,7 +28624,7 @@ _0212a220:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_0212a168
_0212a230: .word data_027e0e60
_0212a230: .word gMapManager
.global func_ov12_0212a234
arm_func_start func_ov12_0212a234
@@ -28870,10 +28870,10 @@ _0212a520:
add r1, sp, #0
mov r0, r5
bl func_ov12_0212a234
ldr r0, _0212a618 ; =data_027e0e60
ldr r0, _0212a618 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _0212a618 ; =data_027e0e60
ldr r1, _0212a618 ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
@@ -28925,7 +28925,7 @@ _0212a60c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_0212a4d4
_0212a618: .word data_027e0e60
_0212a618: .word gMapManager
.global func_ov12_0212a61c
arm_func_start func_ov12_0212a61c
@@ -29007,7 +29007,7 @@ _0212a6cc:
bl func_01ff9bc4
_0212a740:
ldr r1, [r6, #0x48]
ldr r0, _0212a9ec ; =data_027e0e60
ldr r0, _0212a9ec ; =gMapManager
str r1, [sp, #0x14]
ldr r1, [r6, #0x4c]
ldr r0, [r0]
@@ -29025,12 +29025,12 @@ _0212a740:
ldrb r0, [r6, #0x256]
cmp r0, #0
beq _0212a8e4
ldr r1, _0212a9ec ; =data_027e0e60
ldr r1, _0212a9ec ; =gMapManager
add r0, sp, #0
ldr r1, [r1]
add r2, r6, #0x48
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0212a9ec ; =data_027e0e60
ldr r0, _0212a9ec ; =gMapManager
ldrb r1, [sp]
ldrb r2, [sp, #1]
ldr r0, [r0]
@@ -29073,7 +29073,7 @@ _0212a81c:
b _0212a8c0
_0212a830:
ldr r1, [r6, #0x48]
ldr r0, _0212a9ec ; =data_027e0e60
ldr r0, _0212a9ec ; =gMapManager
str r1, [sp, #8]
ldr r2, [r6, #0x4c]
ldr r1, [r0]
@@ -29193,7 +29193,7 @@ _0212a9d4:
arm_func_end func_ov12_0212a61c
_0212a9e4: .word 0x00000555
_0212a9e8: .word 0xc00c00c1
_0212a9ec: .word data_027e0e60
_0212a9ec: .word gMapManager
_0212a9f0: .word data_ov12_0213dd0c
_0212a9f4: .word data_ov12_02137c64
_0212a9f8: .word data_ov00_020eec9c
@@ -29254,7 +29254,7 @@ _0212aa88: .word data_ov12_0213dc88
func_ov12_0212aa8c: ; 0x0212aa8c
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x30
ldr r1, _0212ad00 ; =data_027e0e60
ldr r1, _0212ad00 ; =gMapManager
mov r10, r0
ldr r0, [r1]
mov r1, #0
@@ -29263,7 +29263,7 @@ func_ov12_0212aa8c: ; 0x0212aa8c
mov r1, #3
mov r7, r0
bl func_01ff9b4c
ldr r0, _0212ad00 ; =data_027e0e60
ldr r0, _0212ad00 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager17Get_MapData_Unk2aEv
str r0, [sp]
@@ -29320,13 +29320,13 @@ _0212ab2c:
mla r2, r1, r0, r2
mov r9, r2
_0212ab90:
ldr r0, _0212ad00 ; =data_027e0e60
ldr r0, _0212ad00 ; =gMapManager
mov r1, r8
ldr r0, [r0]
mov r2, r9
bl _ZN10MapManager18func_ov00_020840a0Ecci
mov r5, r0
ldr r0, _0212ad00 ; =data_027e0e60
ldr r0, _0212ad00 ; =gMapManager
ldr r2, _0212ad08 ; =func_ov00_020b1940
ldr r6, [r0]
mov r0, r8
@@ -29374,7 +29374,7 @@ _0212ab90:
ldr r0, [sp, #0x28]
ldr r1, [sp, #0x24]
str r0, [sp, #0x10]
ldr r0, _0212ad00 ; =data_027e0e60
ldr r0, _0212ad00 ; =gMapManager
str r1, [sp, #0xc]
ldr r1, [sp, #0x2c]
ldr r0, [r0]
@@ -29415,7 +29415,7 @@ _0212acec:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov12_0212aa8c
_0212ad00: .word data_027e0e60
_0212ad00: .word gMapManager
_0212ad04: .word data_027e0764
_0212ad08: .word func_ov00_020b1940
@@ -29713,12 +29713,12 @@ _0212b0bc:
ldrb r0, [r4, #0x255]
cmp r0, #0
beq _0212b11c
ldr r1, _0212b13c ; =data_027e0e60
ldr r1, _0212b13c ; =gMapManager
add r0, sp, #0
ldr r1, [r1]
add r2, r4, #0x48
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _0212b13c ; =data_027e0e60
ldr r0, _0212b13c ; =gMapManager
ldrb r1, [sp]
ldrb r2, [sp, #1]
ldr r0, [r0]
@@ -29748,7 +29748,7 @@ _0212b130:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov12_0212b078
_0212b13c: .word data_027e0e60
_0212b13c: .word gMapManager
_0212b140: .word data_ov12_0213dd0c
.global func_ov12_0212b144
@@ -30526,7 +30526,7 @@ func_ov12_0212ba84: ; 0x0212ba84
sub sp, sp, #0x1c
mov r6, r2
mov r7, r1
ldr r2, _0212bb9c ; =data_027e0e60
ldr r2, _0212bb9c ; =gMapManager
mov r8, r0
ldrb r1, [r6, #1]
ldr r0, [r2]
@@ -30538,7 +30538,7 @@ func_ov12_0212ba84: ; 0x0212ba84
mov r1, r6
ldr r2, [r2, #0x60]
blx r2
ldr r1, _0212bb9c ; =data_027e0e60
ldr r1, _0212bb9c ; =gMapManager
mov r9, r0
ldr r0, [r1]
ldrb r1, [r6]
@@ -30597,7 +30597,7 @@ _0212bb90:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov12_0212ba84
_0212bb9c: .word data_027e0e60
_0212bb9c: .word gMapManager
_0212bba0: .word data_027e0f68
.global func_ov12_0212bba4
@@ -33922,10 +33922,10 @@ func_ov12_0212e3e8: ; 0x0212e3e8
mov r0, r5
bl func_ov12_0212e990
_0212e42c:
ldr r0, _0212e4cc ; =data_027e0e60
ldr r0, _0212e4cc ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _0212e4cc ; =data_027e0e60
ldr r1, _0212e4cc ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
@@ -33964,7 +33964,7 @@ _0212e42c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_0212e3e8
_0212e4cc: .word data_027e0e60
_0212e4cc: .word gMapManager
.global func_ov12_0212e4d0
arm_func_start func_ov12_0212e4d0
@@ -34453,7 +34453,7 @@ _0212eb6c:
beq _0212ec88
ldrb r1, [r5, #0x218]
ldr r6, [r5, #0x130]
ldr r0, _0212eca8 ; =data_027e0e60
ldr r0, _0212eca8 ; =gMapManager
bic r3, r1, #0x20
and r2, r3, #0xff
mov r1, r6, lsl #0x1f
@@ -34461,7 +34461,7 @@ _0212eb6c:
strb r1, [r5, #0x218]
ldr r0, [r0]
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _0212eca8 ; =data_027e0e60
ldr r1, _0212eca8 ; =gMapManager
mov r6, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
@@ -34529,7 +34529,7 @@ _0212ec94:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov12_0212eb14
_0212eca8: .word data_027e0e60
_0212eca8: .word gMapManager
_0212ecac: .word 0x00001fe0
.global func_ov12_0212ecb0
@@ -34537,14 +34537,14 @@ _0212ecac: .word 0x00001fe0
func_ov12_0212ecb0: ; 0x0212ecb0
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x14
ldr r1, _0212ed4c ; =data_027e0e60
ldr r1, _0212ed4c ; =gMapManager
mov r4, r0
ldr r1, [r1]
add r0, sp, #0
add r2, r4, #0x48
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r1, [r4, #0x48]
ldr r0, _0212ed4c ; =data_027e0e60
ldr r0, _0212ed4c ; =gMapManager
str r1, [sp, #8]
ldr r2, [r4, #0x4c]
ldr r1, [r0]
@@ -34578,7 +34578,7 @@ _0212ed40:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov12_0212ecb0
_0212ed4c: .word data_027e0e60
_0212ed4c: .word gMapManager
.global func_ov12_0212ed50
arm_func_start func_ov12_0212ed50
@@ -35599,7 +35599,7 @@ _0212fa88:
cmp r5, r4
bne _0212fa88
_0212fa9c:
ldr r0, _0212fb04 ; =data_027e0e60
ldr r0, _0212fb04 ; =gMapManager
add r1, r6, #0x74
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020839c4Ei
@@ -35627,7 +35627,7 @@ _0212fa9c:
.align 2, 0
arm_func_end func_ov12_0212fa68
_0212fb00: .word data_ov12_021375ac
_0212fb04: .word data_027e0e60
_0212fb04: .word gMapManager
_0212fb08: .word func_ov12_021194c0
.global func_ov12_0212fb0c
@@ -35648,7 +35648,7 @@ _0212fb2c:
cmp r5, r4
bne _0212fb2c
_0212fb40:
ldr r0, _0212fba0 ; =data_027e0e60
ldr r0, _0212fba0 ; =gMapManager
add r1, r6, #0x74
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020839c4Ei
@@ -35674,7 +35674,7 @@ _0212fb40:
.align 2, 0
arm_func_end func_ov12_0212fb0c
_0212fb9c: .word data_ov12_021375ac
_0212fba0: .word data_027e0e60
_0212fba0: .word gMapManager
_0212fba4: .word func_ov12_021194c0
.global func_ov12_0212fba8
@@ -35822,7 +35822,7 @@ _0212fc68:
mov r2, #0
str r0, [r4, #0x7c]
ldr r1, [sp, #0x10]
ldr r0, _0212fe9c ; =data_027e0e60
ldr r0, _0212fe9c ; =gMapManager
str r1, [r4, #0x80]
ldr r3, [sp, #0x14]
add r1, r4, #0x74
@@ -35878,7 +35878,7 @@ _0212fe78:
_0212fe90: .word 0xfffff666
_0212fe94: .word data_02050f54
_0212fe98: .word 0x000004cd
_0212fe9c: .word data_027e0e60
_0212fe9c: .word gMapManager
_0212fea0: .word 0x0000026e
.global func_ov12_0212fea4
@@ -36220,7 +36220,7 @@ func_ov12_0213024c: ; 0x0213024c
mov r0, #0
str r0, [sp, #0xc]
str r0, [sp, #0x10]
ldr r0, _021306a0 ; =data_027e0e60
ldr r0, _021306a0 ; =gMapManager
add r1, sp, #0xa4
ldr r0, [r0]
add r2, sp, #0x80
@@ -36458,7 +36458,7 @@ _02130598:
.align 2, 0
arm_func_end func_ov12_0213024c
_0213069c: .word 0x0000ffff
_021306a0: .word data_027e0e60
_021306a0: .word gMapManager
_021306a4: .word 0x00000d9a
_021306a8: .word data_ov12_0213758c
_021306ac: .word data_ov12_02137574
@@ -36738,11 +36738,11 @@ _02130990: .word func_ov12_02130994
arm_func_start func_ov12_02130994
func_ov12_02130994: ; 0x02130994
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _02130a90 ; =data_027e0e60
ldr r1, _02130a90 ; =gMapManager
mov r5, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _02130a90 ; =data_027e0e60
ldr r1, _02130a90 ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
@@ -36809,7 +36809,7 @@ _02130a84:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov12_02130994
_02130a90: .word data_027e0e60
_02130a90: .word gMapManager
.global func_ov12_02130a94
arm_func_start func_ov12_02130a94
@@ -37593,7 +37593,7 @@ func_ov12_021314e8: ; 0x021314e8
add r0, r4, #0x48
bl func_ov00_020c70ac
ldr r1, [r4, #0x48]
ldr r0, _021315b4 ; =data_027e0e60
ldr r0, _021315b4 ; =gMapManager
str r1, [sp, #0xc]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -37621,7 +37621,7 @@ func_ov12_021314e8: ; 0x021314e8
.align 2, 0
arm_func_end func_ov12_021314e8
_021315b0: .word data_ov12_02137d1c
_021315b4: .word data_027e0e60
_021315b4: .word gMapManager
_021315b8: .word data_ov12_02137680
.global func_ov12_021315bc
@@ -37905,7 +37905,7 @@ _021318d0:
ldr r0, [r10, #8]
stmib sp, {r0, r11}
str r5, [sp, #0xc]
ldr r0, _02131a28 ; =data_027e0e60
ldr r0, _02131a28 ; =gMapManager
str r5, [sp, #0x10]
ldr r0, [r0]
bl func_01ffbe78
@@ -37937,7 +37937,7 @@ _02131a00:
_02131a1c: .word data_027e0764
_02131a20: .word data_02050f54
_02131a24: .word 0x0000ffff
_02131a28: .word data_027e0e60
_02131a28: .word gMapManager
_02131a2c: .word data_ov12_02137680
.global func_ov12_02131a30
@@ -38132,10 +38132,10 @@ _02131c90:
ldrb r0, [r4, #0x754]
cmp r0, #0
beq _02131d64
ldr r0, _02131d78 ; =data_027e0e60
ldr r0, _02131d78 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _02131d78 ; =data_027e0e60
ldr r1, _02131d78 ; =gMapManager
mov r5, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
@@ -38190,7 +38190,7 @@ _02131d64:
arm_func_end func_ov12_02131bdc
_02131d70: .word data_ov12_02137c64
_02131d74: .word data_027e0f90
_02131d78: .word data_027e0e60
_02131d78: .word gMapManager
.global func_ov12_02131d7c
arm_func_start func_ov12_02131d7c
@@ -38691,7 +38691,7 @@ func_ov12_0213234c: ; 0x0213234c
moveq r0, #0
ldmeqia sp!, {pc}
ldr r2, [r1, #0x48]
ldr r0, _021323c8 ; =data_027e0e60
ldr r0, _021323c8 ; =gMapManager
str r2, [sp]
ldr r2, [r1, #0x4c]
ldr r0, [r0]
@@ -38710,7 +38710,7 @@ _021323b8:
.align 2, 0
arm_func_end func_ov12_0213234c
_021323c4: .word 0x42545246
_021323c8: .word data_027e0e60
_021323c8: .word gMapManager
.global func_ov12_021323cc
arm_func_start func_ov12_021323cc
@@ -41089,7 +41089,7 @@ func_ov12_02134300: ; 0x02134300
mov lr, #0x47
mov r2, #0xff
strb r2, [sp, #0x12]
ldr r1, _02134374 ; =data_027e0e60
ldr r1, _02134374 ; =gMapManager
mov r4, r0
str lr, [sp]
str ip, [sp, #4]
@@ -41113,7 +41113,7 @@ func_ov12_02134300: ; 0x02134300
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov12_02134300
_02134374: .word data_027e0e60
_02134374: .word gMapManager
.global func_ov12_02134378
arm_func_start func_ov12_02134378
asm/ov14/Actor/ActorRupee.inc
+1 -1
View File
@@ -56,7 +56,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_027e0764
.extern data_027e0e60
.extern gMapManager
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_ov00_020e9370
asm/ov14/Actor/ActorRupee.s
+2 -2
View File
@@ -431,7 +431,7 @@ _0213b3cc:
cmp r0, #0
beq _0213b4fc
ldr r1, [r5, #0x48]
ldr r0, _0213b518 ; =data_027e0e60
ldr r0, _0213b518 ; =gMapManager
str r1, [sp, #4]
ldr r2, [r5, #0x4c]
ldr r1, [r0]
@@ -517,7 +517,7 @@ _0213b4fc:
_0213b50c: .word data_027e0fc8
_0213b510: .word gItemManager
_0213b514: .word data_ov00_020eec9c
_0213b518: .word data_027e0e60
_0213b518: .word gMapManager
.global _ZN10ActorRupee8vfunc_14Ej
arm_func_start _ZN10ActorRupee8vfunc_14Ej
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -159,7 +159,7 @@
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov14/ov14_0211f640.s
+187 -187
View File
File diff suppressed because it is too large Load Diff
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -124,7 +124,7 @@
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov14/ov14_0213b778.s
+128 -128
View File
File diff suppressed because it is too large Load Diff
asm/ov15.inc
+1 -1
View File
@@ -149,7 +149,7 @@
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov15.s
+397 -397
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+1 -1
View File
@@ -90,7 +90,7 @@
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov17.s
+162 -162
View File
File diff suppressed because it is too large Load Diff
asm/ov18.inc
+1 -1
View File
@@ -90,7 +90,7 @@
.extern data_027e0dbc
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov18.s
+64 -64
View File
@@ -301,7 +301,7 @@ func_ov18_0215b86c: ; 0x0215b86c
mov r8, r3
str r4, [sp, #4]
blx func_ov04_0210c1f8
ldr r0, _0215bd68 ; =data_027e0e60
ldr r0, _0215bd68 ; =gMapManager
add r1, r9, #0x1b0
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -319,18 +319,18 @@ func_ov18_0215b86c: ; 0x0215b86c
mov r1, r4, lsr #0xc
orr r1, r1, r0, lsl #20
str r1, [r9, #0x1b4]
ldr r0, _0215bd68 ; =data_027e0e60
ldr r0, _0215bd68 ; =gMapManager
add r1, sp, #0x64
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p
ldr r0, _0215bd68 ; =data_027e0e60
ldr r0, _0215bd68 ; =gMapManager
add r1, sp, #0x58
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p
ldr r0, _0215bd68 ; =data_027e0e60
ldr r0, _0215bd68 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083374Ev
ldr r1, _0215bd68 ; =data_027e0e60
ldr r1, _0215bd68 ; =gMapManager
mov r5, r0
ldr r0, [r1]
bl _ZN10MapManager18func_ov00_02083384Ev
@@ -630,7 +630,7 @@ _0215bd54:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov18_0215b86c
_0215bd68: .word data_027e0e60
_0215bd68: .word gMapManager
_0215bd6c: .word 0x00001333
_0215bd70: .word 0xffffd99a
_0215bd74: .word data_027e0ce0
@@ -691,7 +691,7 @@ _0215be0c:
movne r0, #1
strneb r0, [r9, #0x1cc]
bne _0215be5c
ldr r0, _0215beb0 ; =data_027e0e60
ldr r0, _0215beb0 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
@@ -726,7 +726,7 @@ _0215bea8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov18_0215bd84
_0215beb0: .word data_027e0e60
_0215beb0: .word gMapManager
_0215beb4: .word func_ov18_0215ca24
.global func_ov18_0215beb8
@@ -813,7 +813,7 @@ func_ov18_0215bfc8: ; 0x0215bfc8
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x10
ldr r2, _0215c12c ; =data_027e0f94
ldr r1, _0215c130 ; =data_027e0e60
ldr r1, _0215c130 ; =gMapManager
ldr r4, [r2]
ldr r3, [r2, #4]
str r4, [sp, #4]
@@ -909,7 +909,7 @@ _0215c108:
.align 2, 0
arm_func_end func_ov18_0215bfc8
_0215c12c: .word data_027e0f94
_0215c130: .word data_027e0e60
_0215c130: .word gMapManager
_0215c134: .word 0x0000019a
_0215c138: .word data_ov18_0216b43c
_0215c13c: .word data_ov18_0216b44c
@@ -1214,13 +1214,13 @@ func_ov18_0215c460: ; 0x0215c460
sub sp, sp, #0x1c
mov r5, r2
mov r6, r1
ldr r2, _0215c5bc ; =data_027e0e60
ldr r2, _0215c5bc ; =gMapManager
mov r7, r0
ldrb r1, [r5, #1]
ldr r0, [r2]
mov r4, r3
bl _ZN10MapManager18func_ov00_02083c50Ei
ldr r2, _0215c5bc ; =data_027e0e60
ldr r2, _0215c5bc ; =gMapManager
mov r8, r0
ldrb r1, [r5]
ldr r0, [r2]
@@ -1306,7 +1306,7 @@ _0215c5b0:
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov18_0215c460
_0215c5bc: .word data_027e0e60
_0215c5bc: .word gMapManager
_0215c5c0: .word data_027e0f68
.global func_ov18_0215c5c4
@@ -3210,7 +3210,7 @@ func_ov18_0215dec0: ; 0x0215dec0
func_ov18_0215dee4: ; 0x0215dee4
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _0215df18 ; =data_027e0e60
ldr r0, _0215df18 ; =gMapManager
ldrb r1, [r4, #0x15c]
ldr r0, [r0]
add r2, r4, #0x1cc
@@ -3223,7 +3223,7 @@ func_ov18_0215dee4: ; 0x0215dee4
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov18_0215dee4
_0215df18: .word data_027e0e60
_0215df18: .word gMapManager
.global func_ov18_0215df1c
arm_func_start func_ov18_0215df1c
@@ -3534,13 +3534,13 @@ _0215e300:
bl func_ov00_0208edd8
b _0215e3d8
_0215e324:
ldr r1, _0215e49c ; =data_027e0e60
ldr r1, _0215e49c ; =gMapManager
add r0, sp, #4
ldr r1, [r1]
add r2, r4, #0x48
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r2, [sp, #4]
ldr r0, _0215e49c ; =data_027e0e60
ldr r0, _0215e49c ; =gMapManager
ldrb r1, [sp, #5]
add r3, r2, #2
ldr r0, [r0]
@@ -3637,7 +3637,7 @@ _0215e480:
.align 2, 0
arm_func_end func_ov18_0215e274
_0215e498: .word data_027e0d38
_0215e49c: .word data_027e0e60
_0215e49c: .word gMapManager
_0215e4a0: .word 0x000013ae
_0215e4a4: .word data_027e0f6c
@@ -4300,7 +4300,7 @@ _0215ed70:
ldr r0, [sp, #4]
add r10, r0, r1
bge _0215ee18
ldr r5, _0215ee8c ; =data_027e0e60
ldr r5, _0215ee8c ; =gMapManager
add r7, sp, #0xc
mov r6, #1
_0215edd0:
@@ -4357,7 +4357,7 @@ _0215ee7c: .word data_ov18_0216c3a8
_0215ee80: .word data_ov18_0216c3ce
_0215ee84: .word data_ov18_0216c3a9
_0215ee88: .word data_ov18_0216c3cf
_0215ee8c: .word data_027e0e60
_0215ee8c: .word gMapManager
.global func_ov18_0215ee90
arm_func_start func_ov18_0215ee90
@@ -5268,7 +5268,7 @@ _0215f9b0:
mov r1, #3
str r2, [r4, #4]
bl func_ov00_02094884
ldr r0, _0215fa24 ; =data_027e0e60
ldr r0, _0215fa24 ; =gMapManager
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
@@ -5283,7 +5283,7 @@ _0215f9e8:
mov r1, #1
str r2, [r4, #4]
bl func_ov00_02094884
ldr r0, _0215fa24 ; =data_027e0e60
ldr r0, _0215fa24 ; =gMapManager
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
@@ -5295,7 +5295,7 @@ _0215fa1c:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov18_0215f990
_0215fa24: .word data_027e0e60
_0215fa24: .word gMapManager
.global func_ov18_0215fa28
arm_func_start func_ov18_0215fa28
@@ -6411,7 +6411,7 @@ _02160774:
ldr r0, [sp, #4]
add r10, r0, #3
bgt _021607ec
ldr r4, _0216081c ; =data_027e0e60
ldr r4, _0216081c ; =gMapManager
add r6, sp, #0xc
mov r5, #1
_021607a4:
@@ -6450,7 +6450,7 @@ _0216080c: .word data_027e0fe8
_02160810: .word 0x48534b42
_02160814: .word data_027e0fe4
_02160818: .word 0x0000099a
_0216081c: .word data_027e0e60
_0216081c: .word gMapManager
.global func_ov18_02160820
arm_func_start func_ov18_02160820
@@ -6609,7 +6609,7 @@ _021609c0:
strh r2, [sp, #8]
strh r0, [sp, #0xa]
str r1, [sp]
ldr r0, _02160a0c ; =data_027e0e60
ldr r0, _02160a0c ; =gMapManager
add r2, sp, #4
ldr r0, [r0]
mov r1, #0x30
@@ -6618,7 +6618,7 @@ _021609c0:
ldmia sp!, {pc}
.align 2, 0
arm_func_end func_ov18_02160968
_02160a0c: .word data_027e0e60
_02160a0c: .word gMapManager
.global func_ov18_02160a10
arm_func_start func_ov18_02160a10
@@ -6837,7 +6837,7 @@ _02160c5c:
cmp r8, r0
bge _02160c9c
_02160c80:
ldr r0, _02160ffc ; =data_027e0e60
ldr r0, _02160ffc ; =gMapManager
mov r1, r5
ldr r0, [r0]
mov r2, r11
@@ -6912,7 +6912,7 @@ _02160d6c:
cmp r8, r0
bge _02160dac
_02160d90:
ldr r0, _02160ffc ; =data_027e0e60
ldr r0, _02160ffc ; =gMapManager
mov r1, r5
ldr r0, [r0]
mov r2, r11
@@ -6987,7 +6987,7 @@ _02160e7c:
cmp r8, r0
bge _02160ebc
_02160ea0:
ldr r0, _02160ffc ; =data_027e0e60
ldr r0, _02160ffc ; =gMapManager
mov r1, r5
ldr r0, [r0]
mov r2, r11
@@ -7082,7 +7082,7 @@ _02160fb0:
.align 2, 0
arm_func_end func_ov18_02160b6c
_02160ff8: .word data_027e0f68
_02160ffc: .word data_027e0e60
_02160ffc: .word gMapManager
.global func_ov18_02161000
arm_func_start func_ov18_02161000
@@ -9039,7 +9039,7 @@ _0216283c: ; jump table
b _02162c20 ; case 6
b _02162bac ; case 7
_0216285c:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084c94Ei
@@ -9101,14 +9101,14 @@ _0216285c:
add r3, sp, #0x118
bl func_ov00_020c4048
_02162950:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl _ZN10MapManager18func_ov00_02084c7cEi
b _02162c90
_02162968:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084c94Ei
@@ -9167,14 +9167,14 @@ _02162a00:
add r3, sp, #0xec
bl func_ov00_020c4048
_02162a48:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl _ZN10MapManager18func_ov00_02084c7cEi
b _02162c90
_02162a60:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084c94Ei
@@ -9196,14 +9196,14 @@ _02162a60:
add r3, sp, #0xb4
bl func_ov00_020c4048
_02162ab4:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl _ZN10MapManager18func_ov00_02084c7cEi
b _02162c90
_02162acc:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084c94Ei
@@ -9225,14 +9225,14 @@ _02162acc:
add r3, sp, #0x88
bl func_ov00_020c4048
_02162b20:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl _ZN10MapManager18func_ov00_02084c7cEi
b _02162c90
_02162b38:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084cc8Ei
@@ -9256,14 +9256,14 @@ _02162b38:
add r3, sp, #0x5c
bl func_ov00_020c4048
_02162b94:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl _ZN10MapManager18func_ov00_02084cb0Ei
b _02162c90
_02162bac:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084cc8Ei
@@ -9287,14 +9287,14 @@ _02162bac:
add r3, sp, #0x30
bl func_ov00_020c4048
_02162c08:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
bl _ZN10MapManager18func_ov00_02084cb0Ei
b _02162c90
_02162c20:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084cc8Ei
@@ -9318,7 +9318,7 @@ _02162c20:
add r3, sp, #4
bl func_ov00_020c4048
_02162c7c:
ldr r0, _02162ca0 ; =data_027e0e60
ldr r0, _02162ca0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
@@ -9330,7 +9330,7 @@ _02162c90:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov18_021627dc
_02162ca0: .word data_027e0e60
_02162ca0: .word gMapManager
_02162ca4: .word data_027e0fe8
_02162ca8: .word 0x48415254
_02162cac: .word 0x42454548
@@ -17119,7 +17119,7 @@ func_ov18_02169378: ; 0x02169378
func_ov18_021693b0: ; 0x021693b0
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0x1c
ldr r2, _02169418 ; =data_027e0e60
ldr r2, _02169418 ; =gMapManager
mov r6, r0
ldr r5, [r2]
mov r0, r5
@@ -17145,7 +17145,7 @@ func_ov18_021693b0: ; 0x021693b0
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov18_021693b0
_02169418: .word data_027e0e60
_02169418: .word gMapManager
.global func_ov18_0216941c
arm_func_start func_ov18_0216941c
@@ -18333,7 +18333,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8
ldr r0, _0216a5b0 ; =data_ov18_0216b6f4
mov r1, r1, lsl #0x1
ldrh r2, [r0, r1]
ldr r1, _0216a5b4 ; =data_027e0e60
ldr r1, _0216a5b4 ; =gMapManager
add r0, sp, #0x14
strh r2, [r4, #0x10]
ldrb r2, [r4, #0x15]
@@ -18342,7 +18342,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8
ldrb lr, [r4, #0x16]
ldrb ip, [r4, #0x17]
ldrb r1, [sp, #0x15]
ldr r0, _0216a5b4 ; =data_027e0e60
ldr r0, _0216a5b4 ; =gMapManager
strb lr, [sp, #0x12]
str r1, [sp]
ldr r0, [r0]
@@ -18354,7 +18354,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8
add r1, sp, #0x18
strb ip, [sp, #0x13]
bl _ZN10MapManager18func_ov00_02083ce8Ecccci
ldr r0, _0216a5b4 ; =data_027e0e60
ldr r0, _0216a5b4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager21GetCourseData_Unk_25cEv
cmp r0, #0
@@ -18372,7 +18372,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8
bl func_ov00_02079470
b _0216a4a4
_0216a47c:
ldr r0, _0216a5b4 ; =data_027e0e60
ldr r0, _0216a5b4 ; =gMapManager
ldrb lr, [r4, #0x17]
ldrb ip, [r4, #0x16]
ldr r0, [r0]
@@ -18383,12 +18383,12 @@ _0216a47c:
strb lr, [sp, #0x11]
bl _ZN10MapManager18func_ov00_02082d84Ev
_0216a4a4:
ldr r0, _0216a5b4 ; =data_027e0e60
ldr r0, _0216a5b4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager20GetCourseData_Unk_86Ev
cmp r0, #2
bge _0216a4cc
ldr r0, _0216a5b4 ; =data_027e0e60
ldr r0, _0216a5b4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager20GetCourseData_Unk_87Ev
cmp r0, #2
@@ -18461,7 +18461,7 @@ _0216a5a8:
.align 2, 0
arm_func_end func_ov18_0216a3c8
_0216a5b0: .word data_ov18_0216b6f4
_0216a5b4: .word data_027e0e60
_0216a5b4: .word gMapManager
_0216a5b8: .word data_027e0d3c
_0216a5bc: .word data_ov18_0216b710
_0216a5c0: .word data_ov18_0216b748
@@ -18506,7 +18506,7 @@ _0216a63c:
cmp r2, #2
cmpne r2, #3
ldmneia sp!, {r4, pc}
ldr r0, _0216a6b0 ; =data_027e0e60
ldr r0, _0216a6b0 ; =gMapManager
ldrb r1, [r4, #0x19]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084be0Eii
@@ -18521,7 +18521,7 @@ _0216a674:
cmp r2, #2
cmpne r2, #3
ldmneia sp!, {r4, pc}
ldr r0, _0216a6b0 ; =data_027e0e60
ldr r0, _0216a6b0 ; =gMapManager
ldrb r1, [r4, #0x19]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084be0Eii
@@ -18534,7 +18534,7 @@ _0216a674:
.align 2, 0
arm_func_end func_ov18_0216a5c4
_0216a6ac: .word gAdventureFlags
_0216a6b0: .word data_027e0e60
_0216a6b0: .word gMapManager
.global func_ov18_0216a6b4
arm_func_start func_ov18_0216a6b4
@@ -18545,7 +18545,7 @@ func_ov18_0216a6b4: ; 0x0216a6b4
mov r6, r1
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
ldr r0, _0216a77c ; =data_027e0e60
ldr r0, _0216a77c ; =gMapManager
ldrb r5, [r4, #0x15]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082d08Ev
@@ -18598,7 +18598,7 @@ _0216a770:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov18_0216a6b4
_0216a77c: .word data_027e0e60
_0216a77c: .word gMapManager
.global func_ov18_0216a780
arm_func_start func_ov18_0216a780
@@ -19094,12 +19094,12 @@ func_ov18_0216adcc: ; 0x0216adcc
addhi sp, sp, #8
movhi r0, #0
ldmhiia sp!, {r3, r4, r5, pc}
ldr r0, _0216aed4 ; =data_027e0e60
ldr r0, _0216aed4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager21GetCourseData_Unk_25cEv
cmp r0, #0
beq _0216ae24
ldr r0, _0216aed4 ; =data_027e0e60
ldr r0, _0216aed4 ; =gMapManager
ldrb r1, [r5, #4]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083318Ei
@@ -19108,7 +19108,7 @@ func_ov18_0216adcc: ; 0x0216adcc
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, pc}
_0216ae24:
ldr r0, _0216aed4 ; =data_027e0e60
ldr r0, _0216aed4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020849c0Ev
cmp r0, #0
@@ -19157,7 +19157,7 @@ _0216aec8:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov18_0216adcc
_0216aed4: .word data_027e0e60
_0216aed4: .word gMapManager
_0216aed8: .word data_027e0ce0
.global func_ov18_0216aedc
asm/ov19.inc
+1 -1
View File
@@ -112,7 +112,7 @@
.extern data_027e0d44
.extern data_027e0db0
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov19.s
+18 -18
View File
@@ -3464,7 +3464,7 @@ _021703a4:
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
ldr r2, [sp, #0x30]
ldr r3, _02170564 ; =data_027e0e60
ldr r3, _02170564 ; =gMapManager
ldr r1, [sp, #0x34]
str r2, [sp, #0x18]
ldr r2, [sp, #0x38]
@@ -3557,7 +3557,7 @@ _02170554: .word data_027e0c54
_02170558: .word func_ov05_02102a80
_0217055c: .word data_027e0db0
_02170560: .word data_027e0f90
_02170564: .word data_027e0e60
_02170564: .word gMapManager
_02170568: .word data_027e0f64
_0217056c: .word 0x00001555
_02170570: .word data_027e0ffc
@@ -5453,7 +5453,7 @@ func_ov19_02171e64: ; 0x02171e64
stmdb sp!, {r3, lr}
sub sp, sp, #0x10
ldr r2, [r0, #0x48]
ldr r1, _02171eb8 ; =data_027e0e60
ldr r1, _02171eb8 ; =gMapManager
str r2, [sp, #4]
ldr r2, [r0, #0x4c]
ldr r1, [r1]
@@ -5473,7 +5473,7 @@ func_ov19_02171e64: ; 0x02171e64
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov19_02171e64
_02171eb8: .word data_027e0e60
_02171eb8: .word gMapManager
.global func_ov19_02171ebc
arm_func_start func_ov19_02171ebc
@@ -6434,7 +6434,7 @@ _02172adc: .word data_027e0f78
func_ov19_02172ae0: ; 0x02172ae0
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _02172b1c ; =data_027e0e60
ldr r0, _02172b1c ; =gMapManager
ldrb r1, [r4, #0x15a]
ldr r0, [r0]
mov r2, #0
@@ -6449,7 +6449,7 @@ func_ov19_02172ae0: ; 0x02172ae0
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov19_02172ae0
_02172b1c: .word data_027e0e60
_02172b1c: .word gMapManager
.global func_ov19_02172b20
arm_func_start func_ov19_02172b20
@@ -7832,7 +7832,7 @@ func_ov19_02173d54: ; 0x02173d54
add r0, r7, #2
cmp r7, r0
bge _02173e1c
ldr r4, _02173ee8 ; =data_027e0e60
ldr r4, _02173ee8 ; =gMapManager
add r5, sp, #2
mov r11, #1
_02173d80:
@@ -7934,7 +7934,7 @@ _02173ea0:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov19_02173d54
_02173ee8: .word data_027e0e60
_02173ee8: .word gMapManager
_02173eec: .word data_027e0f6c
.global func_ov19_02173ef0
@@ -8410,7 +8410,7 @@ _0217448c:
ldmneia sp!, {r3, r4, pc}
_021744b8:
ldr r1, [r4, #0x48]
ldr r0, _0217454c ; =data_027e0e60
ldr r0, _0217454c ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -8448,7 +8448,7 @@ _021744b8:
.align 2, 0
arm_func_end func_ov19_02174454
_02174548: .word gAdventureFlags
_0217454c: .word data_027e0e60
_0217454c: .word gMapManager
_02174550: .word data_ov19_02176b88
.global func_ov19_02174554
@@ -8585,7 +8585,7 @@ _02174710:
ldr r3, [r4]
ldr r2, [r4, #4]
ldr r1, [r4, #8]
ldr r0, _02174798 ; =data_027e0e60
ldr r0, _02174798 ; =gMapManager
str r2, [sp, #0xc]
str r3, [sp, #8]
str r1, [sp, #0x10]
@@ -8616,7 +8616,7 @@ _02174788: .word 0x424f4d42
_0217478c: .word data_027e0f94
_02174790: .word data_027e0fa0
_02174794: .word 0x0000019a
_02174798: .word data_027e0e60
_02174798: .word gMapManager
.global func_ov19_0217479c
arm_func_start func_ov19_0217479c
@@ -9138,7 +9138,7 @@ _02174e5c:
b _021754d0
_02174eb4:
ldr r1, [r4, #0x48]
ldr r0, _02175588 ; =data_027e0e60
ldr r0, _02175588 ; =gMapManager
str r1, [sp, #0x14]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -9603,7 +9603,7 @@ _02175574:
arm_func_end func_ov19_02174d7c
_02175580: .word data_027e0ffc
_02175584: .word 0x0000024a
_02175588: .word data_027e0e60
_02175588: .word gMapManager
_0217558c: .word data_027e0f90
_02175590: .word 0x00000333
_02175594: .word data_027e0fc8
@@ -9892,7 +9892,7 @@ func_ov19_021758c8: ; 0x021758c8
mov r0, r5
bl _ZN5Actor20IncreaseActiveFramesEv
ldr r1, [r5, #0x48]
ldr r0, _02175958 ; =data_027e0e60
ldr r0, _02175958 ; =gMapManager
str r1, [sp]
ldr r1, [r5, #0x4c]
ldr r0, [r0]
@@ -9921,7 +9921,7 @@ _02175940:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov19_021758c8
_02175958: .word data_027e0e60
_02175958: .word gMapManager
.global func_ov19_0217595c
arm_func_start func_ov19_0217595c
@@ -10071,7 +10071,7 @@ _02175af8:
ldrsh r0, [r4, #0x10]
cmp r0, #0
bgt _02175be8
ldr r1, _02175c34 ; =data_027e0e60
ldr r1, _02175c34 ; =gMapManager
mov r0, r4
ldr r5, [r1]
bl _ZN13LinkStateBase12GetPlayerPosEv
@@ -10139,7 +10139,7 @@ _02175be8:
_02175c28: .word data_027e0fb8
_02175c2c: .word 0xb60b60b7
_02175c30: .word data_ov00_020eec9c
_02175c34: .word data_027e0e60
_02175c34: .word gMapManager
_02175c38: .word data_ov19_02175ee0
_02175c3c: .word data_027e0d0c
asm/ov20.inc
+1 -1
View File
@@ -89,7 +89,7 @@
.extern data_027e0d78
.extern data_027e0de4
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f84
asm/ov20.s
+27 -27
View File
@@ -830,7 +830,7 @@ _0216e120:
add r0, r4, #0x3000
bl func_01ff9e64
ldr r1, [r7, #0xa8c]
ldr r0, _0216e550 ; =data_027e0e60
ldr r0, _0216e550 ; =gMapManager
str r1, [sp, #0x20]
ldr r2, [r7, #0xa90]
ldr r0, [r0]
@@ -846,7 +846,7 @@ _0216e120:
cmp r0, #0
addeq sp, sp, #0x124
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0216e550 ; =data_027e0e60
ldr r0, _0216e550 ; =gMapManager
add r2, sp, #0x44
ldr r0, [r0]
mov r1, #2
@@ -1030,7 +1030,7 @@ _0216e540: .word data_027e0ffc
_0216e544: .word data_027e0f94
_0216e548: .word data_027e0764
_0216e54c: .word 0x00008001
_0216e550: .word data_027e0e60
_0216e550: .word gMapManager
_0216e554: .word data_027e0f90
_0216e558: .word data_027e0f64
_0216e55c: .word 0x00001555
@@ -5045,7 +5045,7 @@ _02171ac0:
add r3, sp, #0x10
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02171bf8 ; =data_027e0e60
ldr r0, _02171bf8 ; =gMapManager
ldr lr, [sp, #0x10]
ldr ip, [sp, #0x14]
ldr r3, [sp, #0x18]
@@ -5126,7 +5126,7 @@ _02171bd8:
arm_func_end func_ov20_021719dc
_02171bf0: .word data_027e0ffc
_02171bf4: .word 0x00000272
_02171bf8: .word data_027e0e60
_02171bf8: .word gMapManager
.global func_ov20_02171bfc
arm_func_start func_ov20_02171bfc
@@ -5364,7 +5364,7 @@ _02171e20:
ldr r0, [sp, #0x20]
ldr r1, [sp, #0x1c]
str r0, [sp, #0x14]
ldr r0, _0217209c ; =data_027e0e60
ldr r0, _0217209c ; =gMapManager
str r1, [sp, #0x10]
ldr r1, [sp, #0x24]
ldr r0, [r0]
@@ -5470,7 +5470,7 @@ _0217208c: .word data_027e0764
_02172090: .word data_02050f54
_02172094: .word data_027e0e58
_02172098: .word 0x00000263
_0217209c: .word data_027e0e60
_0217209c: .word gMapManager
_021720a0: .word data_027e0ffc
_021720a4: .word 0x00000243
_021720a8: .word data_027e0f64
@@ -7621,7 +7621,7 @@ func_ov20_02173ce4: ; 0x02173ce4
mov ip, #5
str r0, [sp, #0x38]
ldr r1, [r6, #0x48]
ldr r0, _02173e30 ; =data_027e0e60
ldr r0, _02173e30 ; =gMapManager
str r1, [sp, #0x24]
ldr r2, [r6, #0x4c]
add r1, sp, #0x48
@@ -7683,7 +7683,7 @@ _02173e20:
.align 2, 0
arm_func_end func_ov20_02173ce4
_02173e2c: .word 0x0000ffff
_02173e30: .word data_027e0e60
_02173e30: .word gMapManager
_02173e34: .word data_027e0f94
.global func_ov20_02173e38
@@ -8656,7 +8656,7 @@ _02174a20:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r1, [r6, #0x48]
ldr r0, _02174ba0 ; =data_027e0e60
ldr r0, _02174ba0 ; =gMapManager
str r1, [sp, #4]
ldr r1, [r6, #0x4c]
ldr r0, [r0]
@@ -8752,7 +8752,7 @@ _02174b88:
_02174b94: .word gItemManager
_02174b98: .word 0x000008a4
_02174b9c: .word 0x00000733
_02174ba0: .word data_027e0e60
_02174ba0: .word gMapManager
_02174ba4: .word data_027e0f94
.global func_ov20_02174ba8
@@ -9874,7 +9874,7 @@ _021759e8:
ldr r3, [sp, #0xe0]
ldr r2, [sp, #0xe4]
ldr r1, [sp, #0xe8]
ldr r0, _02175f14 ; =data_027e0e60
ldr r0, _02175f14 ; =gMapManager
str r2, [sp, #0x40]
str r3, [sp, #0x3c]
str r1, [sp, #0x44]
@@ -10010,7 +10010,7 @@ _02175bf4:
beq _02175eb8
b _02175ec8
_02175c00:
ldr r0, _02175f14 ; =data_027e0e60
ldr r0, _02175f14 ; =gMapManager
ldr ip, _02175f30 ; =0xfffffe66
ldr r0, [r0]
add ip, r2, ip
@@ -10037,7 +10037,7 @@ _02175c00:
b _02175ec8
_02175c64:
ldr r0, _02175f3c ; =0xfffff333
ldr ip, _02175f14 ; =data_027e0e60
ldr ip, _02175f14 ; =gMapManager
add r5, r2, r0
add r1, r1, #0x33
add lr, r1, #0x300
@@ -10063,7 +10063,7 @@ _02175c64:
bl func_ov00_020c4048
b _02175ec8
_02175ccc:
ldr r0, _02175f14 ; =data_027e0e60
ldr r0, _02175f14 ; =gMapManager
ldr ip, _02175f30 ; =0xfffffe66
ldr r0, [r0]
add lr, r2, ip
@@ -10089,7 +10089,7 @@ _02175ccc:
bl func_ov00_020c4048
b _02175ec8
_02175d30:
ldr r0, _02175f14 ; =data_027e0e60
ldr r0, _02175f14 ; =gMapManager
ldr ip, _02175f3c ; =0xfffff333
ldr r0, [r0]
add lr, r2, ip
@@ -10218,7 +10218,7 @@ _02175ec8:
.align 2, 0
arm_func_end func_ov20_02175978
_02175f10: .word data_027e0f94
_02175f14: .word data_027e0e60
_02175f14: .word gMapManager
_02175f18: .word data_027e077c
_02175f1c: .word gAdventureFlags
_02175f20: .word data_027e0ffc
@@ -11631,7 +11631,7 @@ func_ov20_02176fe8: ; 0x02176fe8
str r0, [r4, #0x84]
str r0, [r4, #0x88]
ldr r1, [r4, #0x7c]
ldr r0, _0217705c ; =data_027e0e60
ldr r0, _0217705c ; =gMapManager
str r1, [r4, #0x8c]
ldr r1, [r4, #0x80]
str r1, [r4, #0x90]
@@ -11643,7 +11643,7 @@ func_ov20_02176fe8: ; 0x02176fe8
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
ldr r1, _02177060 ; =0xffffd99a
str r0, [r4, #0x48]
ldr r0, _0217705c ; =data_027e0e60
ldr r0, _0217705c ; =gMapManager
str r1, [r4, #0x4c]
ldr r0, [r0]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
@@ -11653,7 +11653,7 @@ func_ov20_02176fe8: ; 0x02176fe8
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov20_02176fe8
_0217705c: .word data_027e0e60
_0217705c: .word gMapManager
_02177060: .word 0xffffd99a
.global func_ov20_02177064
@@ -11898,7 +11898,7 @@ func_ov20_02177300: ; 0x02177300
str r1, [r0, #8]
mov r0, r4
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r1, _021773e0 ; =data_027e0e60
ldr r1, _021773e0 ; =gMapManager
add r3, sp, #0x10
ldr r5, [r1]
ldmia r0, {r0, r1, r2}
@@ -11944,7 +11944,7 @@ func_ov20_02177300: ; 0x02177300
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov20_02177300
_021773e0: .word data_027e0e60
_021773e0: .word gMapManager
_021773e4: .word 0x0000012a
_021773e8: .word data_027e0e58
_021773ec: .word data_027e0ffc
@@ -11958,7 +11958,7 @@ func_ov20_021773f4: ; 0x021773f4
mov r4, r0
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r2, r0
ldr r1, _021774dc ; =data_027e0e60
ldr r1, _021774dc ; =gMapManager
add r0, sp, #0
ldr r1, [r1]
add r2, r2, #0x20
@@ -12014,7 +12014,7 @@ _021774c4:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov20_021773f4
_021774dc: .word data_027e0e60
_021774dc: .word gMapManager
_021774e0: .word 0xfffff99a
_021774e4: .word data_ov20_021793bc
@@ -12024,7 +12024,7 @@ func_ov20_021774e8: ; 0x021774e8
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
ldr r0, _021775cc ; =data_027e0e60
ldr r0, _021775cc ; =gMapManager
ldrb r1, [sp, #0x4c]
ldr r0, [r0]
sub r3, sp, #4
@@ -12035,7 +12035,7 @@ func_ov20_021774e8: ; 0x021774e8
ldr r2, [r3]
bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
mov r8, #0
ldr r4, _021775cc ; =data_027e0e60
ldr r4, _021775cc ; =gMapManager
mov r9, r8
add r5, sp, #0xc
mov r7, r8
@@ -12083,7 +12083,7 @@ _021775a8:
bx lr
.align 2, 0
arm_func_end func_ov20_021774e8
_021775cc: .word data_027e0e60
_021775cc: .word gMapManager
.global func_ov20_021775d0
arm_func_start func_ov20_021775d0
asm/ov21.inc
+1 -1
View File
@@ -73,7 +73,7 @@
.extern data_027e077c
.extern data_027e0d3c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
asm/ov21.s
+17 -17
View File
@@ -514,7 +514,7 @@ _0216dcb0: .word data_027e0f94
.global func_ov21_0216dcb4
arm_func_start func_ov21_0216dcb4
func_ov21_0216dcb4: ; 0x0216dcb4
ldr r2, _0216dccc ; =data_027e0e60
ldr r2, _0216dccc ; =gMapManager
ldr ip, _0216dcd0 ; =_ZN10MapManager18func_ov00_020836dcEii
ldrh r1, [r0, #0x22]
ldr r0, [r2]
@@ -522,7 +522,7 @@ func_ov21_0216dcb4: ; 0x0216dcb4
bx ip
.align 2, 0
arm_func_end func_ov21_0216dcb4
_0216dccc: .word data_027e0e60
_0216dccc: .word gMapManager
_0216dcd0: .word _ZN10MapManager18func_ov00_020836dcEii
.global func_ov21_0216dcd4
@@ -922,7 +922,7 @@ _0216e204: .word data_ov21_021710a0
func_ov21_0216e208: ; 0x0216e208
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _0216e238 ; =data_027e0e60
ldr r0, _0216e238 ; =gMapManager
ldrh r1, [r4, #0x22]
ldr r0, [r0]
mov r2, #0
@@ -934,7 +934,7 @@ func_ov21_0216e208: ; 0x0216e208
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov21_0216e208
_0216e238: .word data_027e0e60
_0216e238: .word gMapManager
.global func_ov21_0216e23c
arm_func_start func_ov21_0216e23c
@@ -2772,7 +2772,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
ldmia r0, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldr r1, [r10, #0x98]
ldr r0, _0216fb84 ; =data_027e0e60
ldr r0, _0216fb84 ; =gMapManager
str r1, [sp, #0x54]
ldr r2, [r10, #0x48]
add r1, sp, #0xb8
@@ -2874,7 +2874,7 @@ _0216f9c0:
add r0, r0, #0x9a
add r0, r0, #0x900
ldr r9, _0216fb90 ; =data_ov21_02171750
ldr r4, _0216fb84 ; =data_027e0e60
ldr r4, _0216fb84 ; =gMapManager
str r1, [sp, #0x3c]
str r0, [sp, #0x40]
str r2, [sp, #0x44]
@@ -2971,7 +2971,7 @@ _0216fb74:
.align 2, 0
arm_func_end func_ov21_0216f7c8
_0216fb80: .word 0x0000ffff
_0216fb84: .word data_027e0e60
_0216fb84: .word gMapManager
_0216fb88: .word data_ov21_02171bb4
_0216fb8c: .word data_ov21_02171750
_0216fb90: .word data_ov21_02171750
@@ -3328,7 +3328,7 @@ func_ov21_02170050: ; 0x02170050
str r3, [sp, #0xc]
bl func_ov00_020793b8
ldr r1, [r11, #0x48]
ldr r0, _021701a8 ; =data_027e0e60
ldr r0, _021701a8 ; =gMapManager
str r1, [sp, #0x10]
ldr r1, [r11, #0x4c]
ldr r0, [r0]
@@ -3408,7 +3408,7 @@ _0217018c:
.align 2, 0
arm_func_end func_ov21_02170050
_021701a4: .word data_027e0d3c
_021701a8: .word data_027e0e60
_021701a8: .word gMapManager
_021701ac: .word data_027e103c
.global func_ov21_021701b0
@@ -3429,7 +3429,7 @@ func_ov21_021701b0: ; 0x021701b0
str r3, [sp]
bl func_ov00_020793b8
ldr r1, [r10, #0x48]
ldr r0, _0217032c ; =data_027e0e60
ldr r0, _0217032c ; =gMapManager
str r1, [sp, #0x10]
ldr r1, [r10, #0x4c]
ldr r0, [r0]
@@ -3518,13 +3518,13 @@ _02170310:
.align 2, 0
arm_func_end func_ov21_021701b0
_02170328: .word data_027e0d3c
_0217032c: .word data_027e0e60
_0217032c: .word gMapManager
_02170330: .word data_027e103c
.global func_ov21_02170334
arm_func_start func_ov21_02170334
func_ov21_02170334: ; 0x02170334
ldr r1, _02170380 ; =data_027e0e60
ldr r1, _02170380 ; =gMapManager
ldrh r2, [r0, #0x20]
ldr r1, [r1]
ldrh r0, [r0, #0x22]
@@ -3547,7 +3547,7 @@ _02170378:
bx lr
.align 2, 0
arm_func_end func_ov21_02170334
_02170380: .word data_027e0e60
_02170380: .word gMapManager
.global func_ov21_02170384
arm_func_start func_ov21_02170384
@@ -3564,12 +3564,12 @@ func_ov21_02170388: ; 0x02170388
add r2, sp, #4
ldr r0, [r0]
bl func_ov00_020793b8
ldr r1, _021703fc ; =data_027e0e60
ldr r1, _021703fc ; =gMapManager
add r0, sp, #0
ldr r1, [r1]
add r2, sp, #4
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _021703fc ; =data_027e0e60
ldr r0, _021703fc ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_60Ev
@@ -3577,7 +3577,7 @@ func_ov21_02170388: ; 0x02170388
addgt sp, sp, #0x10
movgt r0, #0
ldmgtia sp!, {r3, pc}
ldr r0, _021703fc ; =data_027e0e60
ldr r0, _021703fc ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_54Ev
@@ -3589,7 +3589,7 @@ func_ov21_02170388: ; 0x02170388
.align 2, 0
arm_func_end func_ov21_02170388
_021703f8: .word data_027e0d3c
_021703fc: .word data_027e0e60
_021703fc: .word gMapManager
.global func_ov21_02170400
arm_func_start func_ov21_02170400
asm/ov22.inc
+1 -1
View File
@@ -107,7 +107,7 @@
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov22.s
+46 -46
View File
@@ -481,7 +481,7 @@ _0216dc98: .word data_027e0f78
func_ov22_0216dc9c: ; 0x0216dc9c
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _0216dcd8 ; =data_027e0e60
ldr r0, _0216dcd8 ; =gMapManager
ldrb r1, [r4, #0x15a]
ldr r0, [r0]
mov r2, #0
@@ -496,7 +496,7 @@ func_ov22_0216dc9c: ; 0x0216dc9c
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov22_0216dc9c
_0216dcd8: .word data_027e0e60
_0216dcd8: .word gMapManager
.global func_ov22_0216dcdc
arm_func_start func_ov22_0216dcdc
@@ -1056,7 +1056,7 @@ _0216e494:
mov r7, #0
cmp r0, #0
ble _0216e52c
ldr r4, _0216e584 ; =data_027e0e60
ldr r4, _0216e584 ; =gMapManager
_0216e4a8:
cmp r6, #0
cmpeq r7, #0
@@ -1119,7 +1119,7 @@ _0216e56c:
.align 2, 0
arm_func_end func_ov22_0216e2a8
_0216e580: .word 0x00001334
_0216e584: .word data_027e0e60
_0216e584: .word gMapManager
.global func_ov22_0216e588
arm_func_start func_ov22_0216e588
@@ -1363,7 +1363,7 @@ _0216e8bc:
cmpeq r10, #0
beq _0216e938
ldrb r2, [r4, #0x14]
ldr r0, _0216ec8c ; =data_027e0e60
ldr r0, _0216ec8c ; =gMapManager
mov r1, r8
add r2, r9, r2
strb r2, [sp, #0xa]
@@ -1423,11 +1423,11 @@ _0216e958:
mvn r0, #0
cmp r1, r0
beq _0216e9bc
ldr r0, _0216ec8c ; =data_027e0e60
ldr r0, _0216ec8c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084ac4Ej
_0216e9bc:
ldr r0, _0216ec8c ; =data_027e0e60
ldr r0, _0216ec8c ; =gMapManager
add r1, sp, #0x1c
ldr r0, [r0]
mov r2, #1
@@ -1528,7 +1528,7 @@ _0216eb28:
cmpeq r10, #0
beq _0216eba4
ldrb r2, [r4, #0x14]
ldr r0, _0216ec8c ; =data_027e0e60
ldr r0, _0216ec8c ; =gMapManager
mov r1, r8
add r2, r9, r2
strb r2, [sp, #8]
@@ -1588,11 +1588,11 @@ _0216ebc4:
mvn r0, #0
cmp r1, r0
beq _0216ec28
ldr r0, _0216ec8c ; =data_027e0e60
ldr r0, _0216ec8c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084ac4Ej
_0216ec28:
ldr r0, _0216ec8c ; =data_027e0e60
ldr r0, _0216ec8c ; =gMapManager
add r1, sp, #0x10
ldr r0, [r0]
mov r2, #1
@@ -1621,7 +1621,7 @@ _0216ec74:
.align 2, 0
arm_func_end func_ov22_0216e778
_0216ec88: .word gAdventureFlags
_0216ec8c: .word data_027e0e60
_0216ec8c: .word gMapManager
_0216ec90: .word data_027e0ffc
_0216ec94: .word 0x00000335
_0216ec98: .word data_027e0e58
@@ -1823,7 +1823,7 @@ _0216eed0:
mov r0, #0x4000
strh r0, [r4, #0xc]
ldrb r2, [r4, #0x15]
ldr r0, _0216f0b0 ; =data_027e0e60
ldr r0, _0216f0b0 ; =gMapManager
ldrb r1, [r4, #0x14]
ldr r0, [r0]
sub r2, r2, #1
@@ -1833,7 +1833,7 @@ _0216eef4:
mov r0, #0
strh r0, [r4, #0xc]
ldrb r1, [r4, #0x14]
ldr r0, _0216f0b0 ; =data_027e0e60
ldr r0, _0216f0b0 ; =gMapManager
ldrb r2, [r4, #0x15]
ldr r0, [r0]
sub r1, r1, #1
@@ -1883,7 +1883,7 @@ _0216efa0:
cmp r0, r1
bge _0216f050
mov r7, #1
ldr r5, _0216f0b0 ; =data_027e0e60
ldr r5, _0216f0b0 ; =gMapManager
add r8, sp, #6
add r6, sp, #4
mov r11, r7
@@ -1950,7 +1950,7 @@ _0216f050:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216ee88
_0216f0b0: .word data_027e0e60
_0216f0b0: .word gMapManager
_0216f0b4: .word 0x0000099a
.global func_ov22_0216f0b8
@@ -3085,7 +3085,7 @@ _0216ff6c:
str r0, [r6, #0x698]
cmp r0, #0x2d
bne _0216ffdc
ldr r0, _021701e4 ; =data_027e0e60
ldr r0, _021701e4 ; =gMapManager
mov r8, #0
ldr r0, [r0]
sub r7, r8, #2
@@ -3255,7 +3255,7 @@ _021701d4: .word data_027e0e58
_021701d8: .word data_027e0ffc
_021701dc: .word 0x00000297
_021701e0: .word 0x00000295
_021701e4: .word data_027e0e60
_021701e4: .word gMapManager
_021701e8: .word data_027e0d38
_021701ec: .word 0xfffffccd
_021701f0: .word data_ov22_021785b8
@@ -4914,7 +4914,7 @@ func_ov22_02171770: ; 0x02171770
tst r0, #0xff
beq _021717d8
ldr r1, [r4, #0x48]
ldr r0, _02171930 ; =data_027e0e60
ldr r0, _02171930 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -5026,7 +5026,7 @@ _0217190c:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov22_02171770
_02171930: .word data_027e0e60
_02171930: .word gMapManager
_02171934: .word data_027e0f94
_02171938: .word 0x0000071c
_0217193c: .word data_02050f54
@@ -5446,7 +5446,7 @@ func_ov22_02171dfc: ; 0x02171dfc
mov ip, #4
str r1, [sp, #0x28]
ldr r1, [r4, #0x54]
ldr r3, _02171fec ; =data_027e0e60
ldr r3, _02171fec ; =gMapManager
str r1, [sp, #0x14]
ldr r2, [r4, #0x58]
add r1, sp, #0x2c
@@ -5535,7 +5535,7 @@ _02171fd8:
arm_func_end func_ov22_02171dfc
_02171fe4: .word 0x00000b33
_02171fe8: .word 0x0000ffff
_02171fec: .word data_027e0e60
_02171fec: .word gMapManager
.global func_ov22_02171ff0
arm_func_start func_ov22_02171ff0
@@ -5887,7 +5887,7 @@ func_ov22_02172438: ; 0x02172438
tst r0, #0xff
beq _021724a4
ldr r1, [r4, #0x48]
ldr r0, _0217250c ; =data_027e0e60
ldr r0, _0217250c ; =gMapManager
str r1, [sp, #4]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -5936,7 +5936,7 @@ _021724a4:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov22_02172438
_0217250c: .word data_027e0e60
_0217250c: .word gMapManager
_02172510: .word data_ov22_02179430
.global func_ov22_02172514
@@ -6089,7 +6089,7 @@ func_ov22_021726e8: ; 0x021726e8
tst r0, #0xff
beq _02172754
ldr r1, [r4, #0x48]
ldr r0, _021727ec ; =data_027e0e60
ldr r0, _021727ec ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -6150,7 +6150,7 @@ _02172754:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov22_021726e8
_021727ec: .word data_027e0e60
_021727ec: .word gMapManager
_021727f0: .word data_027e0764
_021727f4: .word data_ov22_02179430
@@ -6187,7 +6187,7 @@ func_ov22_0217283c: ; 0x0217283c
tst r0, #0xff
beq _021728b0
ldr r1, [r4, #0x48]
ldr r0, _02172954 ; =data_027e0e60
ldr r0, _02172954 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -6254,7 +6254,7 @@ _0217290c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov22_0217283c
_02172954: .word data_027e0e60
_02172954: .word gMapManager
_02172958: .word data_027e0764
_0217295c: .word data_ov22_02179430
@@ -8052,7 +8052,7 @@ _021740a4:
bl func_0202b154
cmp r0, #0
beq _02174134
ldr r0, _0217460c ; =data_027e0e60
ldr r0, _0217460c ; =gMapManager
ldrh r1, [r5, #0x20]
ldr r0, [r0]
ldr r2, [r5, #8]
@@ -8421,7 +8421,7 @@ _02174604:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov22_0217406c
_0217460c: .word data_027e0e60
_0217460c: .word gMapManager
_02174610: .word data_027e0764
_02174614: .word data_02050f54
_02174618: .word data_027e0f94
@@ -8802,7 +8802,7 @@ func_ov22_02174a80: ; 0x02174a80
cmp r3, #0
beq _02174ae8
ldr r1, [r3, #0x48]
ldr r0, _02174b38 ; =data_027e0e60
ldr r0, _02174b38 ; =gMapManager
str r1, [r4, #0x48]
ldr r2, [r3, #0x4c]
add r1, sp, #0
@@ -8847,7 +8847,7 @@ _02174b2c:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov22_02174a80
_02174b38: .word data_027e0e60
_02174b38: .word gMapManager
.global func_ov22_02174b3c
arm_func_start func_ov22_02174b3c
@@ -8989,7 +8989,7 @@ func_ov22_02174cb0: ; 0x02174cb0
mov r1, r1, lsl #0x2
ldrsh r1, [r0, r1]
ldr r2, [sp, #0x24]
ldr lr, _02174db0 ; =data_027e0e60
ldr lr, _02174db0 ; =gMapManager
smulbb r1, r1, ip
add r1, r1, #0x800
add r3, r2, r1, asr #12
@@ -9038,7 +9038,7 @@ func_ov22_02174cb0: ; 0x02174cb0
arm_func_end func_ov22_02174cb0
_02174da8: .word data_02050f54
_02174dac: .word 0x00000266
_02174db0: .word data_027e0e60
_02174db0: .word gMapManager
_02174db4: .word 0x0000059a
_02174db8: .word data_ov00_020e9370
@@ -9191,7 +9191,7 @@ _02174f74:
strb r0, [sp, #8]
cmp r4, r1
bge _02175038
ldr r7, _0217505c ; =data_027e0e60
ldr r7, _0217505c ; =gMapManager
ldr r6, _02175060 ; =data_027e0764
sub r8, sp, #4
mov r11, #5
@@ -9248,7 +9248,7 @@ _02175038:
.align 2, 0
arm_func_end func_ov22_02174f00
_02175058: .word data_027e0f64
_0217505c: .word data_027e0e60
_0217505c: .word gMapManager
_02175060: .word data_027e0764
_02175064: .word data_027e0e58
@@ -9878,7 +9878,7 @@ func_ov22_021757c0: ; 0x021757c0
ldr r3, [r5, #0x298]
str r3, [sp, #0x18]
bl func_01ff9bf8
ldr r1, _0217590c ; =data_027e0e60
ldr r1, _0217590c ; =gMapManager
add r0, sp, #0
ldr r5, [r1]
add r2, sp, #0x1c
@@ -9940,7 +9940,7 @@ func_ov22_021757c0: ; 0x021757c0
.align 2, 0
arm_func_end func_ov22_021757c0
_02175908: .word data_027e0f64
_0217590c: .word data_027e0e60
_0217590c: .word gMapManager
.global func_ov22_02175910
arm_func_start func_ov22_02175910
@@ -10225,7 +10225,7 @@ func_ov22_02175c44: ; 0x02175c44
str r1, [r9, #0x44]
add r1, r2, #0x7800
str r1, [r9, #0x48]
ldr r0, _02175cfc ; =data_027e0e60
ldr r0, _02175cfc ; =gMapManager
add r1, r9, #0x18
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -10234,7 +10234,7 @@ func_ov22_02175c44: ; 0x02175c44
cmp r7, r0
addge sp, sp, #4
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
ldr r10, _02175cfc ; =data_027e0e60
ldr r10, _02175cfc ; =gMapManager
add r5, sp, #0
mov r4, #1
_02175ca0:
@@ -10265,7 +10265,7 @@ _02175ce0:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov22_02175c44
_02175cfc: .word data_027e0e60
_02175cfc: .word gMapManager
.global func_ov22_02175d00
arm_func_start func_ov22_02175d00
@@ -10584,7 +10584,7 @@ _021760b8:
cmp r6, r0
addge sp, sp, #0xc
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, pc}
ldr r8, _02176174 ; =data_027e0e60
ldr r8, _02176174 ; =gMapManager
mov r5, #0x45
_0217611c:
ldrb r7, [r4, #0x15]
@@ -10613,7 +10613,7 @@ _02176154:
.align 2, 0
arm_func_end func_ov22_02176000
_02176170: .word data_027e0f6c
_02176174: .word data_027e0e60
_02176174: .word gMapManager
.global func_ov22_02176178
arm_func_start func_ov22_02176178
@@ -11543,7 +11543,7 @@ func_ov22_02176d6c: ; 0x02176d6c
stmdb sp!, {r4, lr}
sub sp, sp, #0x48
mov r4, r0
ldr r0, _02176f78 ; =data_027e0e60
ldr r0, _02176f78 ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
add r2, sp, #0x30
@@ -11585,13 +11585,13 @@ func_ov22_02176d6c: ; 0x02176d6c
mov r0, #4
str r1, [r4, #0x2bc]
strb r0, [r4, #0x124]
ldr r0, _02176f78 ; =data_027e0e60
ldr r0, _02176f78 ; =gMapManager
strb r2, [r4, #0x125]
ldr r0, [r0]
add r1, sp, #0x18
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r1, [sp, #0x18]
ldr r0, _02176f78 ; =data_027e0e60
ldr r0, _02176f78 ; =gMapManager
str r1, [r4, #0x48]
ldr r1, [sp, #0x1c]
str r1, [r4, #0x4c]
@@ -11673,7 +11673,7 @@ func_ov22_02176d6c: ; 0x02176d6c
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov22_02176d6c
_02176f78: .word data_027e0e60
_02176f78: .word gMapManager
_02176f7c: .word 0x00000ccd
_02176f80: .word data_027e0f6c
_02176f84: .word data_ov22_021788f4
asm/ov23.inc
+1 -1
View File
@@ -142,7 +142,7 @@
.extern data_027e0db0
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov23.s
+64 -64
View File
@@ -702,7 +702,7 @@ _0216df74:
ldreq r0, [r4, #0x480]
cmpeq r0, #1
ldmneia sp!, {r3, r4, r5, pc}
ldr r1, _0216e00c ; =data_027e0e60
ldr r1, _0216e00c ; =gMapManager
add r0, sp, #0
ldr r5, [r1]
add r2, r4, #0x48
@@ -727,7 +727,7 @@ _0216df74:
arm_func_end func_ov23_0216df28
_0216e004: .word data_ov00_020e8b08
_0216e008: .word 0x47524e43
_0216e00c: .word data_027e0e60
_0216e00c: .word gMapManager
.global func_ov23_0216e010
arm_func_start func_ov23_0216e010
@@ -2277,7 +2277,7 @@ func_ov23_0216f2a4: ; 0x0216f2a4
add r1, r4, #0x48
bl func_ov00_020c5330
ldr r1, [r4, #0x48]
ldr r0, _0216f3ec ; =data_027e0e60
ldr r0, _0216f3ec ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -2337,7 +2337,7 @@ _0216f39c:
arm_func_end func_ov23_0216f2a4
_0216f3e4: .word data_ov23_0217a030
_0216f3e8: .word 0x0000059a
_0216f3ec: .word data_027e0e60
_0216f3ec: .word gMapManager
_0216f3f0: .word data_ov23_0217ac20
_0216f3f4: .word data_ov23_0217a0b8
_0216f3f8: .word data_ov23_0217ac5c
@@ -2378,7 +2378,7 @@ func_ov23_0216f428: ; 0x0216f428
add r1, sp, #0xbc
add r0, r5, #0x3a8
bl func_ov00_020c5330
ldr r0, _0216f878 ; =data_027e0e60
ldr r0, _0216f878 ; =gMapManager
ldr r1, [sp, #0xbc]
ldr r2, [sp, #0xc0]
ldr r3, [sp, #0xc4]
@@ -2393,7 +2393,7 @@ func_ov23_0216f428: ; 0x0216f428
ldr r0, [sp, #0xd0]
ldr r1, [sp, #0xc8]
str r0, [sp, #0x70]
ldr r0, _0216f878 ; =data_027e0e60
ldr r0, _0216f878 ; =gMapManager
str r1, [sp, #0x68]
ldr r1, [sp, #0xcc]
ldr r0, [r0]
@@ -2442,7 +2442,7 @@ func_ov23_0216f428: ; 0x0216f428
str r3, [sp, #0x58]
str r2, [sp]
ldr r1, [r5, #8]
ldr r4, _0216f878 ; =data_027e0e60
ldr r4, _0216f878 ; =gMapManager
str r1, [sp, #4]
ldrh r3, [r5, #0x9c]
add r1, sp, #0x19c
@@ -2535,7 +2535,7 @@ _0216f630:
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0216f6bc:
ldr r0, _0216f878 ; =data_027e0e60
ldr r0, _0216f878 ; =gMapManager
mov r1, r6
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_78Ev
@@ -2654,7 +2654,7 @@ _0216f86c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov23_0216f428
_0216f878: .word data_027e0e60
_0216f878: .word gMapManager
_0216f87c: .word 0x0000ffff
_0216f880: .word 0x00000733
_0216f884: .word data_027e0fe4
@@ -2834,7 +2834,7 @@ _0216fac8:
add r1, r7, #0x39c
bl func_ov00_020c5330
ldr r1, [r7, #0x39c]
ldr r0, _0216fb1c ; =data_027e0e60
ldr r0, _0216fb1c ; =gMapManager
str r1, [sp, #4]
ldr r1, [r7, #0x3a0]
ldr r0, [r0]
@@ -2852,7 +2852,7 @@ _0216fac8:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov23_0216f898
_0216fb1c: .word data_027e0e60
_0216fb1c: .word gMapManager
.global func_ov23_0216fb20
arm_func_start func_ov23_0216fb20
@@ -2976,7 +2976,7 @@ func_ov23_0216fc10: ; 0x0216fc10
add r3, sp, #0x20
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0216fd84 ; =data_027e0e60
ldr r0, _0216fd84 ; =gMapManager
ldr lr, [sp, #0x20]
ldr ip, [sp, #0x24]
ldr r3, [sp, #0x28]
@@ -3012,7 +3012,7 @@ func_ov23_0216fc10: ; 0x0216fc10
strb r2, [r4, #0x3a9]
bl func_ov00_020c5330
ldr r1, [r4, #0x48]
ldr r0, _0216fd84 ; =data_027e0e60
ldr r0, _0216fd84 ; =gMapManager
str r1, [sp, #8]
ldr r2, [r4, #0x4c]
ldr r0, [r0]
@@ -3030,7 +3030,7 @@ func_ov23_0216fc10: ; 0x0216fc10
.align 2, 0
arm_func_end func_ov23_0216fc10
_0216fd80: .word 0x66666667
_0216fd84: .word data_027e0e60
_0216fd84: .word gMapManager
_0216fd88: .word data_027e0e58
_0216fd8c: .word 0x000001a9
_0216fd90: .word data_027e0ffc
@@ -3068,7 +3068,7 @@ func_ov23_0216fda0: ; 0x0216fda0
func_ov23_0216fddc: ; 0x0216fddc
stmdb sp!, {r3, r4, r5, r6, r7, r8, lr}
sub sp, sp, #4
ldr r1, _0216fea4 ; =data_027e0e60
ldr r1, _0216fea4 ; =gMapManager
mov r2, r0
ldr r1, [r1]
add r0, sp, #2
@@ -3076,7 +3076,7 @@ func_ov23_0216fddc: ; 0x0216fddc
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
mvn r4, #0
_0216fe00:
ldr r6, _0216fea4 ; =data_027e0e60
ldr r6, _0216fea4 ; =gMapManager
mvn r5, #0
add r7, sp, #0
_0216fe0c:
@@ -3123,7 +3123,7 @@ _0216fe84:
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov23_0216fddc
_0216fea4: .word data_027e0e60
_0216fea4: .word gMapManager
.global func_ov23_0216fea8
arm_func_start func_ov23_0216fea8
@@ -3454,7 +3454,7 @@ _021702d0:
add r1, r5, #0x48
bl func_ov00_020c5330
ldr r1, [r5, #0x48]
ldr r0, _02170670 ; =data_027e0e60
ldr r0, _02170670 ; =gMapManager
str r1, [sp, #0x20]
ldr r1, [r5, #0x4c]
ldr r0, [r0]
@@ -3621,7 +3621,7 @@ _02170524:
strb r2, [r5, #0x3ab]
bl func_ov00_020c5330
ldr r1, [r5, #0x39c]
ldr r0, _02170670 ; =data_027e0e60
ldr r0, _02170670 ; =gMapManager
str r1, [sp, #0x14]
ldr r1, [r5, #0x3a0]
ldr r0, [r0]
@@ -3690,7 +3690,7 @@ _02170658:
_02170664: .word data_027e0f94
_02170668: .word data_027e0fe4
_0217066c: .word 0x50534241
_02170670: .word data_027e0e60
_02170670: .word gMapManager
_02170674: .word data_027e0ffc
_02170678: .word 0x00000332
_0217067c: .word 0x00000333
@@ -5842,23 +5842,23 @@ func_ov23_021722d0: ; 0x021722d0
addeq sp, sp, #0x10
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r1, _021723c0 ; =data_027e0e60
ldr r1, _021723c0 ; =gMapManager
add r0, sp, #0
ldr r1, [r1]
add r2, r4, #0x48
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _021723c0 ; =data_027e0e60
ldr r0, _021723c0 ; =gMapManager
ldrb r1, [sp]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c24Ei
str r0, [r4, #0x48]
ldr r0, _021723c0 ; =data_027e0e60
ldr r0, _021723c0 ; =gMapManager
ldrb r1, [sp, #1]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083c50Ei
str r0, [r4, #0x50]
ldr r1, [r4, #0x48]
ldr r0, _021723c0 ; =data_027e0e60
ldr r0, _021723c0 ; =gMapManager
str r1, [sp, #4]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -5896,7 +5896,7 @@ func_ov23_021722d0: ; 0x021722d0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov23_021722d0
_021723c0: .word data_027e0e60
_021723c0: .word gMapManager
.global func_ov23_021723c4
arm_func_start func_ov23_021723c4
@@ -6189,7 +6189,7 @@ _02172794:
bl func_ov23_02172cac
b _021727e0
_021727a0:
ldr r0, _021727f0 ; =data_027e0e60
ldr r0, _021727f0 ; =gMapManager
mov r1, #1
ldr r0, [r0]
mov r3, r1
@@ -6213,7 +6213,7 @@ _021727e0:
arm_func_end func_ov23_02172700
_021727e8: .word data_ov23_0217a3e0
_021727ec: .word 0x00000333
_021727f0: .word data_027e0e60
_021727f0: .word gMapManager
.global func_ov23_021727f4
arm_func_start func_ov23_021727f4
@@ -6453,7 +6453,7 @@ _02172a44:
strb r2, [sp, #3]
bl func_ov00_020c5374
mvn r7, #0
ldr r9, _02172b14 ; =data_027e0e60
ldr r9, _02172b14 ; =gMapManager
mov r6, r7
add r10, sp, #0x1c
add r5, sp, #0
@@ -6502,7 +6502,7 @@ _02172ae4:
_02172b08: .word data_027e0fe4
_02172b0c: .word 0x00000666
_02172b10: .word 0x424f4d42
_02172b14: .word data_027e0e60
_02172b14: .word gMapManager
.global func_ov23_02172b18
arm_func_start func_ov23_02172b18
@@ -7119,7 +7119,7 @@ _02173364:
_02173388:
ldrb r1, [sp, #0x13]
ldrb r2, [sp, #0x12]
ldr r0, _021734e0 ; =data_027e0e60
ldr r0, _021734e0 ; =gMapManager
add r1, r1, r5
add r2, r2, r4
strb r1, [sp, #0x11]
@@ -7206,7 +7206,7 @@ _021734d0: .word _ZTV11FilterActor
_021734d4: .word 0x424f4d42
_021734d8: .word data_027e0fe4
_021734dc: .word 0x00000733
_021734e0: .word data_027e0e60
_021734e0: .word gMapManager
.global func_ov23_021734e4
arm_func_start func_ov23_021734e4
@@ -7660,11 +7660,11 @@ _02173b48:
ldr r0, _021741a8 ; =data_ov00_020eec68
mov r1, #0xf
bl func_ov00_020d716c
ldr r0, _021741ac ; =data_027e0e60
ldr r0, _021741ac ; =gMapManager
mov r1, #1
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083790Ei
ldr r0, _021741ac ; =data_027e0e60
ldr r0, _021741ac ; =gMapManager
mov r1, #1
ldr r0, [r0]
mov r2, #2
@@ -8077,7 +8077,7 @@ _02174120:
mov r0, r4
mov r2, r1
bl _ZN5Actor18func_ov00_020c1c20Eiii
ldr r0, _021741ac ; =data_027e0e60
ldr r0, _021741ac ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
@@ -8085,11 +8085,11 @@ _02174120:
mov r2, #0
mov r3, #0x7f
bl func_ov00_020d70a4
ldr r0, _021741ac ; =data_027e0e60
ldr r0, _021741ac ; =gMapManager
mov r1, #1
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083840Ei
ldr r0, _021741ac ; =data_027e0e60
ldr r0, _021741ac ; =gMapManager
mov r1, #1
ldr r0, [r0]
mov r2, #2
@@ -8102,7 +8102,7 @@ _0217419c:
.align 2, 0
arm_func_end func_ov23_021738c0
_021741a8: .word data_ov00_020eec68
_021741ac: .word data_027e0e60
_021741ac: .word gMapManager
_021741b0: .word data_027e0e58
_021741b4: .word data_027e0ffc
_021741b8: .word data_027e103c
@@ -10301,7 +10301,7 @@ func_ov23_02175d3c: ; 0x02175d3c
str r3, [sp, #8]
blx ip
ldrb r1, [r4, #0x14]
ldr r0, _02175f08 ; =data_027e0e60
ldr r0, _02175f08 ; =gMapManager
ldrb r4, [r4, #0x15]
add r3, r1, #1
ldr r0, [r0]
@@ -10318,7 +10318,7 @@ _02175ef8: .word 0x000007fc
_02175efc: .word data_ov23_0217966c
_02175f00: .word data_027e0f68
_02175f04: .word 0x000002cd
_02175f08: .word data_027e0e60
_02175f08: .word gMapManager
.global func_ov23_02175f0c
arm_func_start func_ov23_02175f0c
@@ -11642,7 +11642,7 @@ func_ov23_02177020: ; 0x02177020
sub sp, sp, #4
mov r9, r0
ldr r1, [r9, #0x18]
ldr r0, _021770e8 ; =data_027e0e60
ldr r0, _021770e8 ; =gMapManager
str r1, [r9, #0x38]
ldr r2, [r9, #0x1c]
add r1, r9, #0x18
@@ -11662,7 +11662,7 @@ func_ov23_02177020: ; 0x02177020
cmp r7, r0
addge sp, sp, #4
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
ldr r10, _021770e8 ; =data_027e0e60
ldr r10, _021770e8 ; =gMapManager
add r5, sp, #0
mov r4, #1
_0217708c:
@@ -11693,7 +11693,7 @@ _021770cc:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov23_02177020
_021770e8: .word data_027e0e60
_021770e8: .word gMapManager
.global func_ov23_021770ec
arm_func_start func_ov23_021770ec
@@ -12254,7 +12254,7 @@ _0217781c:
cmp r6, r0
addge sp, sp, #0xc
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, pc}
ldr r8, _021778d8 ; =data_027e0e60
ldr r8, _021778d8 ; =gMapManager
mov r5, #0x15
_02177880:
ldrb r7, [r4, #0x15]
@@ -12283,7 +12283,7 @@ _021778b8:
.align 2, 0
arm_func_end func_ov23_02177754
_021778d4: .word data_027e0f6c
_021778d8: .word data_027e0e60
_021778d8: .word gMapManager
.global func_ov23_021778dc
arm_func_start func_ov23_021778dc
@@ -12575,7 +12575,7 @@ func_ov23_02177ba0: ; 0x02177ba0
add r2, r6, #0x2c
mov r1, r0, lsl #0x1
add r3, r2, r0, lsl #1
ldr r0, _02177e10 ; =data_027e0e60
ldr r0, _02177e10 ; =gMapManager
ldrb r2, [r2, r1]
ldrb r1, [r3, #1]
ldr r0, [r0]
@@ -12681,7 +12681,7 @@ _02177d24:
ldr r0, [sp, #0x74]
cmp r0, #0x5000
bge _02177df0
ldr r0, _02177e10 ; =data_027e0e60
ldr r0, _02177e10 ; =gMapManager
mov r3, #0xff
ldr r0, [r0]
mov r2, #0
@@ -12701,7 +12701,7 @@ _02177da8:
ldr r0, [sp, #0x74]
cmp r0, #0x5000
blt _02177df0
ldr r0, _02177e10 ; =data_027e0e60
ldr r0, _02177e10 ; =gMapManager
mov r4, #0xff
ldr r0, [r0]
mov r3, #0
@@ -12727,7 +12727,7 @@ _02177df0:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov23_02177ba0
_02177e10: .word data_027e0e60
_02177e10: .word gMapManager
_02177e14: .word data_027e0fe4
_02177e18: .word 0x504c444d
_02177e1c: .word 0x50574253
@@ -12797,7 +12797,7 @@ func_ov23_02177e90: ; 0x02177e90
bl func_ov23_02177e7c
mov r6, r0
bl func_ov23_02177e84
ldr r2, _02178040 ; =data_027e0e60
ldr r2, _02178040 ; =gMapManager
ldr r1, _02178044 ; =data_027e0f94
ldr r8, [r2]
mov r5, r0
@@ -12906,7 +12906,7 @@ _02178030:
.align 2, 0
arm_func_end func_ov23_02177e90
_0217803c: .word data_027e0d38
_02178040: .word data_027e0e60
_02178040: .word gMapManager
_02178044: .word data_027e0f94
_02178048: .word data_027e0fa0
_0217804c: .word data_027e0ffc
@@ -13052,14 +13052,14 @@ _02178218:
strh r1, [r0, #0x18]
cmp r3, #2
blo _02178218
ldr r0, _02178318 ; =data_027e0e60
ldr r0, _02178318 ; =gMapManager
add r2, sp, #0xc
ldr r0, [r0]
mov r1, #0x5b
bl _ZN10MapManager18func_ov00_02083918EiPi
cmp r0, #0
beq _02178298
ldr r0, _02178318 ; =data_027e0e60
ldr r0, _02178318 ; =gMapManager
ldrb r1, [sp, #0x10]
ldr r0, [r0]
mov r2, #0
@@ -13071,7 +13071,7 @@ _02178218:
bl func_ov00_0208726c
b _02178298
_02178274:
ldr r0, _02178318 ; =data_027e0e60
ldr r0, _02178318 ; =gMapManager
mov r1, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083958Ei
@@ -13115,7 +13115,7 @@ _02178308: .word data_027e0fe4
_0217830c: .word 0x504c444d
_02178310: .word data_027e0f94
_02178314: .word data_027e0fac
_02178318: .word data_027e0e60
_02178318: .word gMapManager
_0217831c: .word data_027e0f64
_02178320: .word data_027e0fcc
_02178324: .word data_027e0fd4
@@ -13530,7 +13530,7 @@ _02178880:
_021788b8:
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r2, [r0]
ldr r1, _021789f8 ; =data_027e0e60
ldr r1, _021789f8 ; =gMapManager
str r2, [sp, #0xc]
ldr r2, [r0, #4]
ldr r6, [r1]
@@ -13614,7 +13614,7 @@ _021789e8: .word data_ov23_0217ab40
_021789ec: .word data_ov00_020eec9c
_021789f0: .word data_027e0e58
_021789f4: .word 0x000001a7
_021789f8: .word data_027e0e60
_021789f8: .word gMapManager
.global func_ov23_021789fc
arm_func_start func_ov23_021789fc
@@ -13631,7 +13631,7 @@ func_ov23_021789fc: ; 0x021789fc
str r1, [r0, #8]
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r1, _02178aa4 ; =data_027e0e60
ldr r1, _02178aa4 ; =gMapManager
add r3, sp, #8
ldr r4, [r1]
ldmia r0, {r0, r1, r2}
@@ -13663,7 +13663,7 @@ func_ov23_021789fc: ; 0x021789fc
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov23_021789fc
_02178aa4: .word data_027e0e60
_02178aa4: .word gMapManager
_02178aa8: .word data_027e0e58
_02178aac: .word data_027e0ffc
@@ -13675,7 +13675,7 @@ func_ov23_02178ab0: ; 0x02178ab0
mov r10, r0
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r2, r0
ldr r1, _02179014 ; =data_027e0e60
ldr r1, _02179014 ; =gMapManager
add r0, sp, #8
ldr r4, [r1]
add r2, r2, #0x20
@@ -13742,7 +13742,7 @@ _02178b10:
mov r0, r4
str r3, [sp, #0x34]
bl func_01ff9bc4
ldr r0, _02179014 ; =data_027e0e60
ldr r0, _02179014 ; =gMapManager
mov r2, r4
ldr r9, [r0]
add r0, sp, #6
@@ -13751,7 +13751,7 @@ _02178b10:
mov r0, r9
add r1, sp, #6
bl _ZN10MapManager16MapData_vfunc_60Ev
ldr r1, _02179014 ; =data_027e0e60
ldr r1, _02179014 ; =gMapManager
str r0, [sp, #0x30]
ldr r1, [r1]
add r0, sp, #0x10
@@ -13888,7 +13888,7 @@ _02178dcc:
sublt r0, r0, #0x800
strlt r0, [sp, #0x20]
_02178de8:
ldr r1, _02179014 ; =data_027e0e60
ldr r1, _02179014 ; =gMapManager
add r0, sp, #4
ldr r4, [r1]
add r2, sp, #0x20
@@ -13897,7 +13897,7 @@ _02178de8:
add r1, sp, #4
mov r0, r4
bl _ZN10MapManager16MapData_vfunc_60Ev
ldr r1, _02179014 ; =data_027e0e60
ldr r1, _02179014 ; =gMapManager
str r0, [sp, #0x24]
ldr r1, [r1]
add r0, sp, #0xc
@@ -14037,7 +14037,7 @@ _02178fd8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov23_02178ab0
_02179014: .word data_027e0e60
_02179014: .word gMapManager
_02179018: .word data_02050f54
_0217901c: .word 0x00000333
_02179020: .word data_027e0d38
asm/ov24.inc
+1 -1
View File
@@ -84,7 +84,7 @@
.extern data_027e0c68
.extern data_027e0d0c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov24.s
+45 -45
View File
@@ -164,7 +164,7 @@ _0216d878:
add r0, r9, r4
cmp r9, r0
bge _0216d914
ldr r6, _0216da24 ; =data_027e0e60
ldr r6, _0216da24 ; =gMapManager
add r8, sp, #4
mov r7, #1
_0216d8b4:
@@ -265,7 +265,7 @@ _0216d914:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov24_0216d824
_0216da24: .word data_027e0e60
_0216da24: .word gMapManager
_0216da28: .word data_027e0f6c
.global func_ov24_0216da2c
@@ -492,7 +492,7 @@ func_ov24_0216dcac: ; 0x0216dcac
func_ov24_0216dcbc: ; 0x0216dcbc
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x18
ldr r1, _0216dd58 ; =data_027e0e60
ldr r1, _0216dd58 ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager18func_ov00_0208412cEv
@@ -517,7 +517,7 @@ _0216dd0c:
add r1, sp, #0
ldr r2, [r2, #0x2c]
blx r2
ldr r0, _0216dd58 ; =data_027e0e60
ldr r0, _0216dd58 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_0208412cEv
sub r1, r0, #0x800
@@ -533,7 +533,7 @@ _0216dd0c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov24_0216dcbc
_0216dd58: .word data_027e0e60
_0216dd58: .word gMapManager
_0216dd5c: .word 0xfffff667
.global func_ov24_0216dd60
@@ -703,7 +703,7 @@ _0216df44:
str r0, [r4, #0x84]
str r0, [r4, #0x88]
ldr r1, [r4, #0x7c]
ldr r0, _0216dffc ; =data_027e0e60
ldr r0, _0216dffc ; =gMapManager
str r1, [r4, #0x8c]
ldr r1, [r4, #0x80]
str r1, [r4, #0x90]
@@ -715,7 +715,7 @@ _0216df44:
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
str r0, [r4, #0x228]
mov r1, #0
ldr r0, _0216dffc ; =data_027e0e60
ldr r0, _0216dffc ; =gMapManager
str r1, [r4, #0x22c]
ldr r0, [r0]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
@@ -731,7 +731,7 @@ _0216dfec: .word data_ov24_02179224
_0216dff0: .word data_027e0fec
_0216dff4: .word data_ov24_02179f04
_0216dff8: .word data_ov24_02179204
_0216dffc: .word data_027e0e60
_0216dffc: .word gMapManager
.global func_ov24_0216e000
arm_func_start func_ov24_0216e000
@@ -917,7 +917,7 @@ _0216e258:
ldr r2, [r0, r2, lsl #2]
add r0, r4, #0x16c
bl Approach_thunk
ldr r0, _0216e4b0 ; =data_027e0e60
ldr r0, _0216e4b0 ; =gMapManager
ldr r1, [r4, #0x16c]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_0208413cEi
@@ -995,7 +995,7 @@ _0216e378:
ldr r2, [r0, r2, lsl #2]
add r0, r4, #0x16c
bl Approach_thunk
ldr r0, _0216e4b0 ; =data_027e0e60
ldr r0, _0216e4b0 ; =gMapManager
ldr r1, [r4, #0x16c]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_0208413cEi
@@ -1074,7 +1074,7 @@ _0216e4a0: .word data_027e0f64
_0216e4a4: .word data_027e0ffc
_0216e4a8: .word 0x00000355
_0216e4ac: .word data_ov24_021791e4
_0216e4b0: .word data_027e0e60
_0216e4b0: .word gMapManager
_0216e4b4: .word data_ov24_021791ec
_0216e4b8: .word data_ov24_021791fc
_0216e4bc: .word 0x00000356
@@ -1103,7 +1103,7 @@ _0216e4f4:
mov r1, #1
str r2, [r4, #0x16c]
bl func_ov24_0216e740
ldr r0, _0216e6f0 ; =data_027e0e60
ldr r0, _0216e6f0 ; =gMapManager
ldr r1, [r4, #0x16c]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_0208413cEi
@@ -1130,7 +1130,7 @@ _0216e558:
mov r1, #0
str r2, [r4, #0x16c]
bl func_ov24_0216e740
ldr r0, _0216e6f0 ; =data_027e0e60
ldr r0, _0216e6f0 ; =gMapManager
ldr r1, [r4, #0x16c]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_0208413cEi
@@ -1236,7 +1236,7 @@ _0216e6e4:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov24_0216e4c8
_0216e6f0: .word data_027e0e60
_0216e6f0: .word gMapManager
_0216e6f4: .word gAdventureFlags
.global func_ov24_0216e6f8
@@ -1332,7 +1332,7 @@ _0216e810:
strh r1, [r0, #0x18]
cmp r3, #2
blo _0216e810
ldr r0, _0216e87c ; =data_027e0e60
ldr r0, _0216e87c ; =gMapManager
ldrb r1, [r5, #0x159]
ldr r0, [r0]
add r2, sp, #0x18
@@ -1357,7 +1357,7 @@ _0216e860:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov24_0216e7b8
_0216e87c: .word data_027e0e60
_0216e87c: .word gMapManager
.global func_ov24_0216e880
arm_func_start func_ov24_0216e880
@@ -1373,13 +1373,13 @@ func_ov24_0216e880: ; 0x0216e880
movne r0, #0
ldmia sp!, {r3, pc}
_0216e8a8:
ldr r0, _0216e8b8 ; =data_027e0e60
ldr r0, _0216e8b8 ; =gMapManager
ldr r0, [r0]
ldrb r0, [r0, #9]
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_0216e880
_0216e8b8: .word data_027e0e60
_0216e8b8: .word gMapManager
.global func_ov24_0216e8bc
arm_func_start func_ov24_0216e8bc
@@ -1392,7 +1392,7 @@ func_ov24_0216e8bc: ; 0x0216e8bc
bl _ZN5Actor18func_Ov00_020c1bfcEi
ldmia sp!, {r3, pc}
_0216e8d8:
ldr r0, _0216e8f4 ; =data_027e0e60
ldr r0, _0216e8f4 ; =gMapManager
ldr r0, [r0]
ldrb r0, [r0, #9]
cmp r0, #0
@@ -1401,7 +1401,7 @@ _0216e8d8:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov24_0216e8bc
_0216e8f4: .word data_027e0e60
_0216e8f4: .word gMapManager
.global func_ov24_0216e8f8
arm_func_start func_ov24_0216e8f8
@@ -1692,7 +1692,7 @@ _0216ec38:
cmp r1, r0
bne _0216ed20
ldr r0, [r4, #0x48]
ldr r3, _0216eddc ; =data_027e0e60
ldr r3, _0216eddc ; =gMapManager
str r0, [r4, #0x478]
ldr r0, [r4, #0x4c]
mov r1, #2
@@ -1782,7 +1782,7 @@ _0216edcc: .word data_ov24_0217922c
_0216edd0: .word data_ov24_0217a00c
_0216edd4: .word data_ov24_0217a010
_0216edd8: .word func_ov24_0216e960
_0216eddc: .word data_027e0e60
_0216eddc: .word gMapManager
.global func_ov24_0216ede0
arm_func_start func_ov24_0216ede0
@@ -1874,7 +1874,7 @@ _0216eee4:
bne _0216ef1c
mov r0, #0
strb r0, [r5, #0x487]
ldr r0, _0216ef28 ; =data_027e0e60
ldr r0, _0216ef28 ; =gMapManager
ldrb r1, [r5, #0x2a]
ldr r0, [r0]
mov r2, #3
@@ -1886,7 +1886,7 @@ _0216ef1c:
.align 2, 0
arm_func_end func_ov24_0216ee88
_0216ef24: .word 0x4d55544f
_0216ef28: .word data_027e0e60
_0216ef28: .word gMapManager
.global func_ov24_0216ef2c
arm_func_start func_ov24_0216ef2c
@@ -2606,7 +2606,7 @@ func_ov24_0216f79c: ; 0x0216f79c
ldr ip, [ip, #0x10]
add r1, sp, #8
blx ip
ldr r0, _0216f888 ; =data_027e0e60
ldr r0, _0216f888 ; =gMapManager
ldr r1, [r0]
ldrb r1, [r1, #9]
strb r1, [r4, #0x60]
@@ -2632,7 +2632,7 @@ _0216f86c:
.align 2, 0
arm_func_end func_ov24_0216f79c
_0216f884: .word 0x00001333
_0216f888: .word data_027e0e60
_0216f888: .word gMapManager
.global func_ov24_0216f88c
arm_func_start func_ov24_0216f88c
@@ -2662,7 +2662,7 @@ func_ov24_0216f88c: ; 0x0216f88c
str r1, [r4, #0x70]
ldrsh ip, [r4, #0x74]
mov r2, #0
ldr r1, _0216f9b0 ; =data_027e0e60
ldr r1, _0216f9b0 ; =gMapManager
add ip, ip, #0x3e8
strh ip, [r4, #0x74]
ldrh ip, [r4, #0x74]
@@ -2704,7 +2704,7 @@ _0216f974:
ldr r3, [r3, #0x80]
blx r3
_0216f990:
ldr r0, _0216f9b0 ; =data_027e0e60
ldr r0, _0216f9b0 ; =gMapManager
ldr r0, [r0]
ldrb r0, [r0, #9]
strb r0, [r4, #0x60]
@@ -2714,7 +2714,7 @@ _0216f990:
_0216f9a4: .word 0x00001555
_0216f9a8: .word data_02050f54
_0216f9ac: .word 0x00000333
_0216f9b0: .word data_027e0e60
_0216f9b0: .word gMapManager
.global func_ov24_0216f9b4
arm_func_start func_ov24_0216f9b4
@@ -2830,13 +2830,13 @@ func_ov24_0216fa3c: ; 0x0216fa3c
cmp r0, #0
ldrneh r1, [r4, #0x24]
strneb r1, [r0, #0x159]
ldr r0, _0216fbd0 ; =data_027e0e60
ldr r0, _0216fbd0 ; =gMapManager
ldr r1, [r0]
ldrb r0, [r1, #9]
cmp r0, #0
moveq r2, #1
movne r2, #0
ldr r0, _0216fbd0 ; =data_027e0e60
ldr r0, _0216fbd0 ; =gMapManager
strb r2, [r1, #9]
ldr r0, [r0]
ldrb r0, [r0, #9]
@@ -2867,7 +2867,7 @@ _0216fbc0: .word data_027e0fc8
_0216fbc4: .word gAdventureFlags
_0216fbc8: .word data_027e0fe4
_0216fbcc: .word 0x574c4354
_0216fbd0: .word data_027e0e60
_0216fbd0: .word gMapManager
.global func_ov24_0216fbd4
arm_func_start func_ov24_0216fbd4
@@ -5251,7 +5251,7 @@ _02171950:
_02171994:
ldrh r1, [r4, #0x22]
ldr r2, [r4, #0x48]
ldr r0, _02171e54 ; =data_027e0e60
ldr r0, _02171e54 ; =gMapManager
add r6, r2, r1, lsl #12
str r6, [sp, #0x14]
ldrh r1, [r4, #0x24]
@@ -5579,7 +5579,7 @@ _02171e40:
_02171e48: .word data_027e0fe4
_02171e4c: .word data_027e0e58
_02171e50: .word 0x000001b3
_02171e54: .word data_027e0e60
_02171e54: .word gMapManager
_02171e58: .word data_027e0764
_02171e5c: .word data_027e0ffc
_02171e60: .word 0x0000027d
@@ -8619,7 +8619,7 @@ _021745e8:
_02174630:
ldrh r1, [r4, #0x22]
ldr r2, [r4, #0x48]
ldr r0, _02174bb4 ; =data_027e0e60
ldr r0, _02174bb4 ; =gMapManager
add r6, r2, r1, lsl #12
str r6, [sp, #0x14]
ldrh r1, [r4, #0x24]
@@ -8996,7 +8996,7 @@ _02174ba0:
_02174ba8: .word data_027e0fe4
_02174bac: .word data_027e0e58
_02174bb0: .word 0x000001b3
_02174bb4: .word data_027e0e60
_02174bb4: .word gMapManager
_02174bb8: .word data_027e0764
_02174bbc: .word data_027e0ffc
_02174bc0: .word 0x0000027d
@@ -9504,7 +9504,7 @@ _021752ac: ; jump table
b _021752c4 ; case 4
b _021752c4 ; case 5
_021752c4:
ldr r0, _02175eb8 ; =data_027e0e60
ldr r0, _02175eb8 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_0208412cEv
ldr r1, [r4, #0x4c]
@@ -9514,7 +9514,7 @@ _021752c4:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, pc}
_021752e8:
ldr r0, _02175eb8 ; =data_027e0e60
ldr r0, _02175eb8 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_0208412cEv
ldr r1, [r4, #0x4c]
@@ -9829,7 +9829,7 @@ _021756e8:
mov r0, #4
str r0, [sp, #8]
str r2, [sp, #0xc]
ldr r0, _02175eb8 ; =data_027e0e60
ldr r0, _02175eb8 ; =gMapManager
str r2, [sp, #0x10]
add r3, r4, #0x2a8
add r2, r3, #0x400
@@ -10327,7 +10327,7 @@ _02175eac:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov24_02175290
_02175eb8: .word data_027e0e60
_02175eb8: .word gMapManager
_02175ebc: .word data_027e0fe4
_02175ec0: .word data_ov24_021792e4
_02175ec4: .word 0x00000b33
@@ -13357,11 +13357,11 @@ _021783f8:
str r0, [sp, #0x64]
b _0217852c
_02178504:
ldr r0, _0217869c ; =data_027e0e60
ldr r0, _0217869c ; =gMapManager
add r1, sp, #0x5c
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldr r0, _0217869c ; =data_027e0e60
ldr r0, _0217869c ; =gMapManager
add r1, sp, #0x5c
ldr r0, [r0]
mov r2, #0
@@ -13463,7 +13463,7 @@ _0217866c:
_02178690: .word data_027e0fe4
_02178694: .word data_027e0f64
_02178698: .word 0x57534253
_0217869c: .word data_027e0e60
_0217869c: .word gMapManager
.global func_ov24_021786a0
arm_func_start func_ov24_021786a0
@@ -14062,7 +14062,7 @@ func_ov24_02178e20: ; 0x02178e20
add r0, r7, #2
cmp r7, r0
bge _02178ee8
ldr r4, _02179010 ; =data_027e0e60
ldr r4, _02179010 ; =gMapManager
add r5, sp, #2
mov r11, #1
_02178e4c:
@@ -14187,7 +14187,7 @@ _02178fa4:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov24_02178e20
_02179010: .word data_027e0e60
_02179010: .word gMapManager
_02179014: .word data_027e0f6c
.global func_ov24_02179018
asm/ov25.inc
+1 -1
View File
@@ -108,7 +108,7 @@
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov25.s
+27 -27
View File
@@ -395,7 +395,7 @@ _0216db80:
ldrh r2, [r4, #0x24]
ldrh r1, [r4, #0x26]
ldr r3, _0216dccc ; =data_027e0f94
ldr r0, _0216dcd0 ; =data_027e0e60
ldr r0, _0216dcd0 ; =gMapManager
strh r1, [sp, #0x22]
strh r2, [sp, #0x20]
ldrh r6, [r4, #0x28]
@@ -456,7 +456,7 @@ _0216db80:
arm_func_end func_ov25_0216daa4
_0216dcc8: .word data_027e0fe8
_0216dccc: .word data_027e0f94
_0216dcd0: .word data_027e0e60
_0216dcd0: .word gMapManager
_0216dcd4: .word data_027e0fac
.global func_ov25_0216dcd8
@@ -611,7 +611,7 @@ _0216de80:
strh r2, [r0, #0x22]
str ip, [r4, #0x674]
str r1, [r4, #0x678]
ldr r0, _0216dff0 ; =data_027e0e60
ldr r0, _0216dff0 ; =gMapManager
add r2, sp, #0
ldr r0, [r0]
mov r1, #1
@@ -687,7 +687,7 @@ _0216dfd0:
arm_func_end func_ov25_0216de38
_0216dfe8: .word gAdventureFlags
_0216dfec: .word data_ov25_02179be0
_0216dff0: .word data_027e0e60
_0216dff0: .word gMapManager
.global func_ov25_0216dff4
arm_func_start func_ov25_0216dff4
@@ -4558,7 +4558,7 @@ _02171504: .word 0x43425333
func_ov25_02171508: ; 0x02171508
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x38
ldr r2, _021715dc ; =data_027e0e60
ldr r2, _021715dc ; =gMapManager
mov r5, r0
ldr r0, [r2]
mov r4, r1
@@ -4611,7 +4611,7 @@ func_ov25_02171508: ; 0x02171508
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov25_02171508
_021715dc: .word data_027e0e60
_021715dc: .word gMapManager
_021715e0: .word data_027e0fe8
_021715e4: .word 0x4e4b4559
_021715e8: .word data_027e0fe4
@@ -7971,7 +7971,7 @@ _021741f4:
cmpne r0, #0xa
bne _02174248
ldr r1, [r4, #0x48]
ldr r0, _0217507c ; =data_027e0e60
ldr r0, _0217507c ; =gMapManager
str r1, [sp, #0xe8]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -8057,7 +8057,7 @@ _02174328:
strb r2, [sp, #0x10]
strb r2, [sp, #0x11]
bl func_ov00_020c5374
ldr r0, _0217507c ; =data_027e0e60
ldr r0, _0217507c ; =gMapManager
add r1, sp, #0x10
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_78Ev
@@ -8078,7 +8078,7 @@ _02174374:
strb r2, [sp, #0xe]
strb r2, [sp, #0xf]
bl func_ov00_020c5374
ldr r0, _0217507c ; =data_027e0e60
ldr r0, _0217507c ; =gMapManager
add r1, sp, #0xe
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_78Ev
@@ -8239,7 +8239,7 @@ _021745a8:
bl func_ov25_021732fc
_021745e0:
ldr r1, _02175088 ; =data_027e0f94
ldr r0, _0217507c ; =data_027e0e60
ldr r0, _0217507c ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp, #0xdc]
@@ -8306,7 +8306,7 @@ _021746a8:
mov r2, #0x7b
bl func_ov25_021732fc
ldr r1, _02175088 ; =data_027e0f94
ldr r0, _0217507c ; =data_027e0e60
ldr r0, _0217507c ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp, #0xc4]
@@ -8398,7 +8398,7 @@ _0217480c:
mov r0, r4
bl func_ov25_02173250
ldr r1, _02175088 ; =data_027e0f94
ldr r0, _0217507c ; =data_027e0e60
ldr r0, _0217507c ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp, #0xac]
@@ -8857,7 +8857,7 @@ _02174ee8:
ldrh r0, [r4, #0x20]
cmp r0, #3
bne _02174f80
ldr r0, _0217507c ; =data_027e0e60
ldr r0, _0217507c ; =gMapManager
mov r6, #0
sub r3, r6, #2
mov r7, #0x47
@@ -8953,7 +8953,7 @@ _0217503c:
arm_func_end func_ov25_02174100
_02175074: .word gAdventureFlags
_02175078: .word 0x00000152
_0217507c: .word data_027e0e60
_0217507c: .word gMapManager
_02175080: .word 0xb60b60b7
_02175084: .word 0x00000171
_02175088: .word data_027e0f94
@@ -9107,7 +9107,7 @@ _02175278:
strb r2, [sp, #0xc]
strb r2, [sp, #0xd]
bl func_ov00_020c5374
ldr r0, _0217507c ; =data_027e0e60
ldr r0, _0217507c ; =gMapManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084164Ev
@@ -9866,7 +9866,7 @@ func_ov25_02175c54: ; 0x02175c54
ldrsh r1, [r0, #0x78]
add r0, sp, #0x18
bl func_ov00_020c5a5c
ldr r0, _02175d18 ; =data_027e0e60
ldr r0, _02175d18 ; =gMapManager
add r2, sp, #0
ldr r0, [r0]
mov r1, #1
@@ -9911,7 +9911,7 @@ _02175cb0:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov25_02175c54
_02175d18: .word data_027e0e60
_02175d18: .word gMapManager
.global func_ov25_02175d1c
arm_func_start func_ov25_02175d1c
@@ -10444,7 +10444,7 @@ _021763e4:
str r0, [r4, #0x1cc]
cmp r0, #0x384
blt _0217641c
ldr r0, _02176954 ; =data_027e0e60
ldr r0, _02176954 ; =gMapManager
mov r2, #1
ldr r0, [r0]
mov r3, r2
@@ -10822,7 +10822,7 @@ _0217694c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov25_021763a4
_02176954: .word data_027e0e60
_02176954: .word gMapManager
_02176958: .word gAdventureFlags
_0217695c: .word data_027e0c68
_02176960: .word data_027e0fe4
@@ -11624,7 +11624,7 @@ func_ov25_021772ec: ; 0x021772ec
addne sp, sp, #8
movne r0, #0
ldmneia sp!, {r4, pc}
ldr r1, _02177368 ; =data_027e0e60
ldr r1, _02177368 ; =gMapManager
add r0, sp, #4
ldr r1, [r1]
add r2, r2, #0x48
@@ -11647,7 +11647,7 @@ func_ov25_021772ec: ; 0x021772ec
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov25_021772ec
_02177368: .word data_027e0e60
_02177368: .word gMapManager
.global func_ov25_0217736c
arm_func_start func_ov25_0217736c
@@ -11925,7 +11925,7 @@ _021775e8:
ldr r0, [r0]
bl func_ov00_020c47cc
ldr r1, [r0, #4]
ldr r3, _021777d8 ; =data_027e0e60
ldr r3, _021777d8 ; =gMapManager
str r1, [r4, #0x48]
ldr r2, [r0, #8]
add r1, sp, #0
@@ -12023,7 +12023,7 @@ _021777c8:
arm_func_end func_ov25_021775a4
_021777d0: .word data_ov00_020e8398
_021777d4: .word data_027e0ff0
_021777d8: .word data_027e0e60
_021777d8: .word gMapManager
_021777dc: .word data_027e0ffc
_021777e0: .word 0x00000251
@@ -12859,7 +12859,7 @@ _0217831c:
add r3, sp, #0xc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02178500 ; =data_027e0e60
ldr r0, _02178500 ; =gMapManager
ldr lr, [sp, #0xc]
ldr ip, [sp, #0x10]
ldr r3, [sp, #0x14]
@@ -12986,7 +12986,7 @@ _021784e8:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov25_02178218
_02178500: .word data_027e0e60
_02178500: .word gMapManager
_02178504: .word gItemManager
_02178508: .word 0x66666667
@@ -13313,7 +13313,7 @@ func_ov25_021788a4: ; 0x021788a4
str r0, [r4, #0x84]
str r0, [r4, #0x88]
ldr r1, [r4, #0x7c]
ldr r0, _021789b8 ; =data_027e0e60
ldr r0, _021789b8 ; =gMapManager
str r1, [r4, #0x8c]
ldr r2, [r4, #0x80]
add r1, sp, #0xc
@@ -13379,7 +13379,7 @@ _021789ac:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov25_021788a4
_021789b8: .word data_027e0e60
_021789b8: .word gMapManager
_021789bc: .word data_027e0f68
.global func_ov25_021789c0
asm/ov26.inc
+1 -1
View File
@@ -94,7 +94,7 @@
.extern data_027e0d3c
.extern data_027e0d78
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov26.s
+70 -70
View File
@@ -1036,7 +1036,7 @@ func_ov26_0216e11c: ; 0x0216e11c
ldrb r2, [r9, #0x15]
cmp r0, #0
sub r1, r0, #1
ldr r0, _0216e320 ; =data_027e0e60
ldr r0, _0216e320 ; =gMapManager
moveq r1, #5
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02083e34Ecci
@@ -1045,7 +1045,7 @@ func_ov26_0216e11c: ; 0x0216e11c
add r0, r7, #5
cmp r7, r0
bge _0216e1e4
ldr r10, _0216e320 ; =data_027e0e60
ldr r10, _0216e320 ; =gMapManager
add r5, sp, #4
mov r4, #1
_0216e190:
@@ -1155,7 +1155,7 @@ _0216e308:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov26_0216e11c
_0216e320: .word data_027e0e60
_0216e320: .word gMapManager
_0216e324: .word data_027e0f6c
.global func_ov26_0216e328
@@ -1937,7 +1937,7 @@ _0216ebe8:
_0216ebec:
cmp r0, #0
bne _0216ec8c
ldr r0, _0216ec9c ; =data_027e0e60
ldr r0, _0216ec9c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084a50Ev
cmp r0, #0
@@ -1983,7 +1983,7 @@ _0216ec94:
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov26_0216ebc0
_0216ec9c: .word data_027e0e60
_0216ec9c: .word gMapManager
_0216eca0: .word data_027e0c68
_0216eca4: .word gAdventureFlags
_0216eca8: .word data_027e071c
@@ -2278,7 +2278,7 @@ _0216f024:
mov r6, #1
cmpne r0, #2
beq _0216f0d4
ldr r0, _0216f200 ; =data_027e0e60
ldr r0, _0216f200 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084a50Ev
cmp r0, #0
@@ -2385,7 +2385,7 @@ _0216f0d4:
arm_func_end func_ov26_0216efb4
_0216f1f8: .word data_027e0c38
_0216f1fc: .word data_027e0618
_0216f200: .word data_027e0e60
_0216f200: .word gMapManager
_0216f204: .word data_027e0fd4
_0216f208: .word data_ov26_0217933c
@@ -2491,7 +2491,7 @@ _0216f368:
bne _0216f38c
cmp r0, #0x1e
ble _0216f38c
ldr r0, _0216f39c ; =data_027e0e60
ldr r0, _0216f39c ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084a50Ev
cmp r0, #0
@@ -2504,7 +2504,7 @@ _0216f394:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_0216f334
_0216f39c: .word data_027e0e60
_0216f39c: .word gMapManager
.global func_ov26_0216f3a0
arm_func_start func_ov26_0216f3a0
@@ -2830,7 +2830,7 @@ func_ov26_0216f7c4: ; 0x0216f7c4
sub sp, sp, #0xc
mov r4, r0
ldr r1, [r4, #0x14]
ldr r0, _0216f820 ; =data_027e0e60
ldr r0, _0216f820 ; =gMapManager
str r1, [r4, #0x48]
ldr r2, [r4, #0x18]
add r1, sp, #0
@@ -2851,7 +2851,7 @@ func_ov26_0216f7c4: ; 0x0216f7c4
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov26_0216f7c4
_0216f820: .word data_027e0e60
_0216f820: .word gMapManager
.global func_ov26_0216f824
arm_func_start func_ov26_0216f824
@@ -2866,7 +2866,7 @@ func_ov26_0216f828: ; 0x0216f828
sub sp, sp, #0xc
mov r4, r0
ldr r1, [r4, #0x48]
ldr r0, _0216f8b4 ; =data_027e0e60
ldr r0, _0216f8b4 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -2900,7 +2900,7 @@ _0216f88c:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov26_0216f828
_0216f8b4: .word data_027e0e60
_0216f8b4: .word gMapManager
.global func_ov26_0216f8b8
arm_func_start func_ov26_0216f8b8
@@ -2909,7 +2909,7 @@ func_ov26_0216f8b8: ; 0x0216f8b8
sub sp, sp, #0xc
mov r4, r0
ldr r1, [r4, #0x48]
ldr r0, _0216f910 ; =data_027e0e60
ldr r0, _0216f910 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -2929,7 +2929,7 @@ func_ov26_0216f8b8: ; 0x0216f8b8
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov26_0216f8b8
_0216f910: .word data_027e0e60
_0216f910: .word gMapManager
.global func_ov26_0216f914
arm_func_start func_ov26_0216f914
@@ -2946,7 +2946,7 @@ func_ov26_0216f920: ; 0x0216f920
sub sp, sp, #0x24
mov r4, r0
ldr lr, [r4, #0x48]
ldr r0, _0216f9f4 ; =data_027e0e60
ldr r0, _0216f9f4 ; =gMapManager
str lr, [sp, #0x18]
ldr ip, [r4, #0x4c]
ldr r0, [r0]
@@ -2998,7 +2998,7 @@ _0216f9d8:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov26_0216f920
_0216f9f4: .word data_027e0e60
_0216f9f4: .word gMapManager
.global func_ov26_0216f9f8
arm_func_start func_ov26_0216f9f8
@@ -3059,7 +3059,7 @@ _0216fa94:
strb r2, [sp]
strb r2, [sp, #1]
bl func_ov00_020c5374
ldr r0, _0216fb18 ; =data_027e0e60
ldr r0, _0216fb18 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084164Ev
@@ -3083,7 +3083,7 @@ _0216fa94:
arm_func_end func_ov26_0216fa04
_0216fb10: .word data_027e0f94
_0216fb14: .word 0x000004cd
_0216fb18: .word data_027e0e60
_0216fb18: .word gMapManager
.global func_ov26_0216fb1c
arm_func_start func_ov26_0216fb1c
@@ -3234,7 +3234,7 @@ _0216fc2c:
add r0, r5, #0x48
add r1, sp, #0
bl func_ov00_020c5374
ldr r0, _0216fd94 ; =data_027e0e60
ldr r0, _0216fd94 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084164Ev
@@ -3261,7 +3261,7 @@ _0216fd84: .word data_027e0764
_0216fd88: .word 0x00008001
_0216fd8c: .word data_02050f54
_0216fd90: .word data_027e0d0c
_0216fd94: .word data_027e0e60
_0216fd94: .word gMapManager
.global func_ov26_0216fd98
arm_func_start func_ov26_0216fd98
@@ -3295,7 +3295,7 @@ func_ov26_0216fdb0: ; 0x0216fdb0
str r3, [sp, #0x10]
bl func_0202da8c
ldr r1, [sp, #0xc]
ldr r0, _0216fe84 ; =data_027e0e60
ldr r0, _0216fe84 ; =gMapManager
str r1, [r4, #0x60]
ldr r2, [sp, #0x10]
add r1, sp, #0
@@ -3333,7 +3333,7 @@ _0216fe68:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov26_0216fdb0
_0216fe84: .word data_027e0e60
_0216fe84: .word gMapManager
.global func_ov26_0216fe88
arm_func_start func_ov26_0216fe88
@@ -3405,7 +3405,7 @@ func_ov26_0216ff14: ; 0x0216ff14
mov r0, #0xff
strh r0, [r4, #0x9c]
ldr r1, [r4, #0x48]
ldr r0, _0216ff68 ; =data_027e0e60
ldr r0, _0216ff68 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -3422,7 +3422,7 @@ func_ov26_0216ff14: ; 0x0216ff14
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov26_0216ff14
_0216ff68: .word data_027e0e60
_0216ff68: .word gMapManager
.global func_ov26_0216ff6c
arm_func_start func_ov26_0216ff6c
@@ -3456,7 +3456,7 @@ func_ov26_0216ffb8: ; 0x0216ffb8
sub sp, sp, #0xc
mov r4, r0
ldr r1, [r4, #0x48]
ldr r0, _02170010 ; =data_027e0e60
ldr r0, _02170010 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -3476,7 +3476,7 @@ func_ov26_0216ffb8: ; 0x0216ffb8
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov26_0216ffb8
_02170010: .word data_027e0e60
_02170010: .word gMapManager
.global func_ov26_02170014
arm_func_start func_ov26_02170014
@@ -3543,7 +3543,7 @@ func_ov26_02170088: ; 0x02170088
mov r1, #0x148
bl func_0202da8c
ldr r1, [r4, #0x48]
ldr r0, _02170130 ; =data_027e0e60
ldr r0, _02170130 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -3574,7 +3574,7 @@ _02170114:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov26_02170088
_02170130: .word data_027e0e60
_02170130: .word gMapManager
.global func_ov26_02170134
arm_func_start func_ov26_02170134
@@ -3653,7 +3653,7 @@ func_ov26_02170194: ; 0x02170194
add r1, sp, #0
add r0, r4, #0x48
bl func_ov00_020c5374
ldr r0, _02170260 ; =data_027e0e60
ldr r0, _02170260 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084164Ev
@@ -3677,7 +3677,7 @@ func_ov26_02170194: ; 0x02170194
arm_func_end func_ov26_02170194
_02170258: .word data_027e0f94
_0217025c: .word 0x000004cd
_02170260: .word data_027e0e60
_02170260: .word gMapManager
.global func_ov26_02170264
arm_func_start func_ov26_02170264
@@ -3869,7 +3869,7 @@ func_ov26_02170320: ; 0x02170320
strb r2, [sp, #4]
strb r2, [sp, #5]
bl func_ov00_020c5374
ldr r0, _0217058c ; =data_027e0e60
ldr r0, _0217058c ; =gMapManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084164Ev
@@ -3897,7 +3897,7 @@ _0217057c: .word data_02050f54
_02170580: .word 0x0000019a
_02170584: .word data_027e0f94
_02170588: .word data_027e0fa0
_0217058c: .word data_027e0e60
_0217058c: .word gMapManager
.global func_ov26_02170590
arm_func_start func_ov26_02170590
@@ -4020,7 +4020,7 @@ func_ov26_02170704: ; 0x02170704
add r3, sp, #0xc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0217078c ; =data_027e0e60
ldr r0, _0217078c ; =gMapManager
ldr lr, [sp, #0xc]
ldr ip, [sp, #0x10]
ldr r3, [sp, #0x14]
@@ -4050,7 +4050,7 @@ _02170780:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02170704
_0217078c: .word data_027e0e60
_0217078c: .word gMapManager
_02170790: .word data_027e0f94
.global func_ov26_02170794
@@ -5722,7 +5722,7 @@ func_ov26_02171e4c: ; 0x02171e4c
cmp r0, #0
movne r0, #1
ldmneia sp!, {r4, pc}
ldr r0, _02171e94 ; =data_027e0e60
ldr r0, _02171e94 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084cc8Ei
@@ -5731,7 +5731,7 @@ func_ov26_02171e4c: ; 0x02171e4c
arm_func_end func_ov26_02171e4c
_02171e8c: .word gAdventureFlags
_02171e90: .word data_ov26_0217944c
_02171e94: .word data_027e0e60
_02171e94: .word gMapManager
.global func_ov26_02171e98
arm_func_start func_ov26_02171e98
@@ -6146,7 +6146,7 @@ func_ov26_021723d4: ; 0x021723d4
cmp r0, #1
bne _02172454
ldr r0, [r4, #0x18]
ldr r1, _021725a0 ; =data_027e0e60
ldr r1, _021725a0 ; =gMapManager
add r0, r0, #0x3fc
add r0, r0, #0x400
str r0, [r4, #0x18]
@@ -6159,7 +6159,7 @@ func_ov26_021723d4: ; 0x021723d4
strb r3, [sp, #5]
bl _ZN10MapManager18func_ov00_020826a0Eiii
ldrb r2, [sp, #4]
ldr r0, _021725a0 ; =data_027e0e60
ldr r0, _021725a0 ; =gMapManager
add r1, sp, #4
add r3, r2, #1
ldr r0, [r0]
@@ -6231,7 +6231,7 @@ _02172454:
mov r3, #6
str ip, [sp]
bl func_02018c90
ldr r0, _021725a0 ; =data_027e0e60
ldr r0, _021725a0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084cc8Ei
@@ -6253,7 +6253,7 @@ _0217258c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov26_021723d4
_021725a0: .word data_027e0e60
_021725a0: .word gMapManager
_021725a4: .word data_ov26_02179468
_021725a8: .word func_ov26_021728f8
@@ -6396,7 +6396,7 @@ _0217273c:
mov r2, #1
bl func_ov00_0208ba08
_02172788:
ldr r0, _021727b0 ; =data_027e0e60
ldr r0, _021727b0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
@@ -6409,7 +6409,7 @@ _0217279c:
arm_func_end func_ov26_02172648
_021727a8: .word gAdventureFlags
_021727ac: .word 0xfffff666
_021727b0: .word data_027e0e60
_021727b0: .word gMapManager
.global func_ov26_021727b4
arm_func_start func_ov26_021727b4
@@ -7919,14 +7919,14 @@ func_ov26_02173b3c: ; 0x02173b3c
movne r0, #1
ldmneia sp!, {r4, pc}
_02173b64:
ldr r0, _02173b78 ; =data_027e0e60
ldr r0, _02173b78 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084cc8Ei
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02173b3c
_02173b78: .word data_027e0e60
_02173b78: .word gMapManager
.global func_ov26_02173b7c
thumb_func_start func_ov26_02173b7c
@@ -12275,7 +12275,7 @@ func_ov26_02176b44: ; 0x02176b44
mov r2, #4
str r3, [sp, #4]
blx ip
ldr r0, _02176cb0 ; =data_027e0e60
ldr r0, _02176cb0 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084cc8Ei
@@ -12299,7 +12299,7 @@ _02176c94:
.align 2, 0
arm_func_end func_ov26_02176b44
_02176cac: .word 0x0000059a
_02176cb0: .word data_027e0e60
_02176cb0: .word gMapManager
.global func_ov26_02176cb4
arm_func_start func_ov26_02176cb4
@@ -12343,7 +12343,7 @@ _02176d0c:
mov r0, r4
mov r2, r1
bl func_ov00_0208ba08
ldr r0, _02176d88 ; =data_027e0e60
ldr r0, _02176d88 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
mov r2, #1
@@ -12362,7 +12362,7 @@ _02176d7c:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov26_02176cb4
_02176d88: .word data_027e0e60
_02176d88: .word gMapManager
.global func_ov26_02176d8c
arm_func_start func_ov26_02176d8c
@@ -12541,22 +12541,22 @@ func_ov26_02176fc8: ; 0x02176fc8
stmdb sp!, {r4, r5, r6, lr}
mov r6, r0
ldrh r4, [r6, #0x28]
ldr r0, _0217702c ; =data_027e0e60
ldr r0, _0217702c ; =gMapManager
ldrh r5, [r6, #0x2a]
ldr r0, [r0]
mov r1, r4
bl _ZN10MapManager18func_ov00_020823d4Ei
ldr r1, _0217702c ; =data_027e0e60
ldr r1, _0217702c ; =gMapManager
str r0, [r6, #0xd4]
ldr r0, [r1]
mov r1, r4
bl _ZN10MapManager18func_ov00_020823e4Ei
ldr r1, _0217702c ; =data_027e0e60
ldr r1, _0217702c ; =gMapManager
str r0, [r6, #0xd8]
ldr r0, [r1]
mov r1, r5
bl _ZN10MapManager18func_ov00_020823d4Ei
ldr r1, _0217702c ; =data_027e0e60
ldr r1, _0217702c ; =gMapManager
str r0, [r6, #0xdc]
ldr r0, [r1]
mov r1, r5
@@ -12565,7 +12565,7 @@ func_ov26_02176fc8: ; 0x02176fc8
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov26_02176fc8
_0217702c: .word data_027e0e60
_0217702c: .word gMapManager
.global func_ov26_02177030
arm_func_start func_ov26_02177030
@@ -12588,7 +12588,7 @@ func_ov26_02177030: ; 0x02177030
mov r0, r5
ldr r1, _021770fc ; =data_ov26_021795a0
bl func_0201933c
ldr r0, _02177100 ; =data_027e0e60
ldr r0, _02177100 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_b4Ev
mov r4, r0
@@ -12624,7 +12624,7 @@ _021770f0: .word data_ov26_02179564
_021770f4: .word data_ov26_02179578
_021770f8: .word data_ov26_0217958c
_021770fc: .word data_ov26_021795a0
_02177100: .word data_027e0e60
_02177100: .word gMapManager
.global func_ov26_02177104
arm_func_start func_ov26_02177104
@@ -13237,7 +13237,7 @@ func_ov26_02177878: ; 0x02177878
func_ov26_02177880: ; 0x02177880
stmdb sp!, {r4, r5, r6, r7, r8, lr}
sub sp, sp, #0x80
ldr r5, _021778e0 ; =data_027e0e60
ldr r5, _021778e0 ; =gMapManager
ldr r4, _021778e4 ; =data_027e0d3c
mvn r7, #0
mov r8, #0
@@ -13263,7 +13263,7 @@ _021778d4:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov26_02177880
_021778e0: .word data_027e0e60
_021778e0: .word gMapManager
_021778e4: .word data_027e0d3c
.global func_ov26_021778e8
@@ -13686,7 +13686,7 @@ func_ov26_02177e14: ; 0x02177e14
mov r2, #0x10000
str r0, [r7, #0x90]
ldr r0, [r7, #0x84]
ldr r1, _02177f60 ; =data_027e0e60
ldr r1, _02177f60 ; =gMapManager
str r0, [r7, #0x94]
ldr r4, [r7, #0x88]
add r0, sp, #4
@@ -13699,7 +13699,7 @@ func_ov26_02177e14: ; 0x02177e14
add r2, r7, #0x48
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r4, _02177f64 ; =data_ov26_0217af64
ldr r6, _02177f60 ; =data_027e0e60
ldr r6, _02177f60 ; =gMapManager
add r9, sp, #2
mov r8, #1
_02177e90:
@@ -13720,7 +13720,7 @@ _02177e90:
cmp r5, #0x12
blo _02177e90
mov r0, #0
ldr r8, _02177f60 ; =data_027e0e60
ldr r8, _02177f60 ; =gMapManager
strb r0, [sp]
strb r0, [sp, #1]
mov r6, #6
@@ -13759,7 +13759,7 @@ _02177ef4:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov26_02177e14
_02177f60: .word data_027e0e60
_02177f60: .word gMapManager
_02177f64: .word data_ov26_0217af64
_02177f68: .word 0xffffeccd
@@ -14004,7 +14004,7 @@ _02178224: .word data_027e103c
.global func_ov26_02178228
arm_func_start func_ov26_02178228
func_ov26_02178228: ; 0x02178228
ldr r1, _02178244 ; =data_027e0e60
ldr r1, _02178244 ; =gMapManager
mov r2, r0
ldr r0, [r1]
ldr r1, [r2, #0x15c]
@@ -14013,7 +14013,7 @@ func_ov26_02178228: ; 0x02178228
bx ip
.align 2, 0
arm_func_end func_ov26_02178228
_02178244: .word data_027e0e60
_02178244: .word gMapManager
_02178248: .word _ZN10MapManager18func_ov00_020836dcEii
.global func_ov26_0217824c
@@ -14130,7 +14130,7 @@ _02178354:
bl func_ov00_020d7180
cmp r0, #0
bne _02178384
ldr r0, _021783b4 ; =data_027e0e60
ldr r0, _021783b4 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
@@ -14153,7 +14153,7 @@ _02178384:
_021783a8: .word data_027e0f64
_021783ac: .word data_ov26_0217968c
_021783b0: .word data_ov00_020eec68
_021783b4: .word data_027e0e60
_021783b4: .word gMapManager
.global func_ov26_021783b8
arm_func_start func_ov26_021783b8
@@ -14307,14 +14307,14 @@ func_ov26_0217855c: ; 0x0217855c
sub sp, sp, #0x20
mov r10, r0
ldrb r2, [r10, #0x15]
ldr r0, _021786d4 ; =data_027e0e60
ldr r0, _021786d4 ; =gMapManager
ldrb r1, [r10, #0x14]
ldr r0, [r0]
sub r2, r2, #1
bl _ZN10MapManager18func_ov00_02083e34Ecci
str r0, [r10, #0x1c]
ldr r1, [r10, #0x18]
ldr r0, _021786d4 ; =data_027e0e60
ldr r0, _021786d4 ; =gMapManager
add r1, r1, #0x800
str r1, [r10, #0x18]
str r1, [r10, #0x50]
@@ -14363,7 +14363,7 @@ _02178620:
cmp r11, r0
add r9, r1, #0xc
bge _0217868c
ldr r4, _021786d4 ; =data_027e0e60
ldr r4, _021786d4 ; =gMapManager
add r6, sp, #4
mov r5, #1
_02178648:
@@ -14407,7 +14407,7 @@ _0217868c:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_0217855c
_021786d4: .word data_027e0e60
_021786d4: .word gMapManager
.global func_ov26_021786d8
arm_func_start func_ov26_021786d8
asm/ov27.inc
+1 -1
View File
@@ -93,7 +93,7 @@
.extern data_027e0d38
.extern data_027e0dbc
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f84
asm/ov27.s
+44 -44
View File
@@ -357,7 +357,7 @@ _0216db58:
add r0, r0, #0x800
str r0, [r5, #0x48]
ldr r1, [r5, #0x4c]
ldr r0, _0216e91c ; =data_027e0e60
ldr r0, _0216e91c ; =gMapManager
add r1, r1, #0x2800
str r1, [r5, #0x4c]
ldr r3, [r5, #0x50]
@@ -1262,7 +1262,7 @@ _0216e8fc:
arm_func_end func_ov27_0216da38
_0216e914: .word 0x00000ccd
_0216e918: .word data_027e0d0c
_0216e91c: .word data_027e0e60
_0216e91c: .word gMapManager
_0216e920: .word data_027e0c68
_0216e924: .word 0x00060003
_0216e928: .word gAdventureFlags
@@ -1414,7 +1414,7 @@ _0216eadc:
bne _0216eb48
mov r1, #2
strb r1, [r4, #0x4ad]
ldr r0, _0216ed44 ; =data_027e0e60
ldr r0, _0216ed44 ; =gMapManager
add r1, sp, #0xc
ldr r0, [r0]
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -1462,7 +1462,7 @@ _0216eb54:
strb r2, [sp, #0x94]
ldr r0, [r0, #4]
bl func_ov00_02087d34
ldr r0, _0216ed44 ; =data_027e0e60
ldr r0, _0216ed44 ; =gMapManager
ldr r2, _0216ed4c ; =0x00001333
mov r3, #0xc000
ldr r0, [r0]
@@ -1564,7 +1564,7 @@ _0216ed38:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov27_0216eabc
_0216ed44: .word data_027e0e60
_0216ed44: .word gMapManager
_0216ed48: .word data_027e0f64
_0216ed4c: .word 0x00001333
_0216ed50: .word gAdventureFlags
@@ -2094,7 +2094,7 @@ _0216f43c:
cmp r0, #4
cmpne r0, #7
bne _0216f4b0
ldr r0, _0216f574 ; =data_027e0e60
ldr r0, _0216f574 ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -2163,7 +2163,7 @@ _0216f544:
_0216f568: .word data_ov00_020eec68
_0216f56c: .word data_027e0f64
_0216f570: .word data_ov27_02178e20
_0216f574: .word data_027e0e60
_0216f574: .word gMapManager
_0216f578: .word data_027e0ff8
.global func_ov27_0216f57c
@@ -2193,7 +2193,7 @@ func_ov27_0216f57c: ; 0x0216f57c
func_ov27_0216f5c0: ; 0x0216f5c0
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _0216f604 ; =data_027e0e60
ldr r0, _0216f604 ; =gMapManager
ldrh r1, [r4, #0x22]
ldr r0, [r0]
mov r2, #0
@@ -2210,7 +2210,7 @@ func_ov27_0216f5c0: ; 0x0216f5c0
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov27_0216f5c0
_0216f604: .word data_027e0e60
_0216f604: .word gMapManager
.global func_ov27_0216f608
arm_func_start func_ov27_0216f608
@@ -2252,7 +2252,7 @@ func_ov27_0216f608: ; 0x0216f608
str r2, [r4, #0x64]
str r1, [r4, #0x68]
ldr r1, [r4, #0x48]
ldr r0, _0216f8e8 ; =data_027e0e60
ldr r0, _0216f8e8 ; =gMapManager
str r1, [sp, #4]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -2406,7 +2406,7 @@ _0216f8a8:
arm_func_end func_ov27_0216f608
_0216f8e0: .word data_02050f54
_0216f8e4: .word 0x00000133
_0216f8e8: .word data_027e0e60
_0216f8e8: .word gMapManager
_0216f8ec: .word 0x00000171
_0216f8f0: .word 0x0000071c
_0216f8f4: .word 0x00000333
@@ -3155,7 +3155,7 @@ _021702d0:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r1, [r4, #0x48]
ldr r0, _02170470 ; =data_027e0e60
ldr r0, _02170470 ; =gMapManager
str r1, [sp, #8]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -3261,7 +3261,7 @@ _02170444:
_02170464: .word 0x00000e39
_02170468: .word 0x0000019a
_0217046c: .word 0x000004cd
_02170470: .word data_027e0e60
_02170470: .word gMapManager
_02170474: .word data_027e0e58
_02170478: .word 0x00000163
_0217047c: .word data_027e0764
@@ -4000,7 +4000,7 @@ func_ov27_02170e24: ; 0x02170e24
mov r0, #0x3000
str r0, [r4, #0x4c]
ldr r1, [r4, #0x48]
ldr r0, _02170f84 ; =data_027e0e60
ldr r0, _02170f84 ; =gMapManager
str r1, [sp, #0xc]
ldr r2, [r4, #0x4c]
ldr r0, [r0]
@@ -4034,7 +4034,7 @@ _02170f5c:
_02170f78: .word 0x0000071c
_02170f7c: .word data_02050f54
_02170f80: .word 0x00000266
_02170f84: .word data_027e0e60
_02170f84: .word gMapManager
.global func_ov27_02170f88
arm_func_start func_ov27_02170f88
@@ -4914,7 +4914,7 @@ func_ov27_02171b14: ; 0x02171b14
mov ip, #1
str r0, [sp, #0x28]
ldr r1, [r6, #0x54]
ldr r0, _02171c9c ; =data_027e0e60
ldr r0, _02171c9c ; =gMapManager
str r1, [sp, #0x14]
ldr r2, [r6, #0x58]
add r1, r6, #0xb8
@@ -4976,7 +4976,7 @@ _02171c90:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end func_ov27_02171b14
_02171c9c: .word data_027e0e60
_02171c9c: .word gMapManager
.global func_ov27_02171ca0
arm_func_start func_ov27_02171ca0
@@ -5421,7 +5421,7 @@ _02172284:
cmp r0, #0
bne _021722d0
ldr r1, [r6, #0x48]
ldr r0, _02172484 ; =data_027e0e60
ldr r0, _02172484 ; =gMapManager
str r1, [sp, #0x18]
ldr r1, [r6, #0x4c]
ldr r0, [r0]
@@ -5456,7 +5456,7 @@ _021722d0:
add r0, r6, #0x300
ldrsh r1, [r0, #0x96]
mov r2, #0
ldr r0, _02172484 ; =data_027e0e60
ldr r0, _02172484 ; =gMapManager
add r1, r1, #0x4000
strh r1, [r6, #0x78]
str r2, [r6, #0x6c]
@@ -5552,7 +5552,7 @@ _0217245c:
_02172478: .word gAdventureFlags
_0217247c: .word data_02050f54
_02172480: .word 0x0000019a
_02172484: .word data_027e0e60
_02172484: .word gMapManager
_02172488: .word 0x00000b33
_0217248c: .word 0xffff699a
_02172490: .word data_027e0d0c
@@ -5774,7 +5774,7 @@ func_ov27_02172598: ; 0x02172598
ldr r0, [sp, #0x28]
ldr r1, [sp, #0x24]
str r0, [sp, #0x1c]
ldr r0, _02172838 ; =data_027e0e60
ldr r0, _02172838 ; =gMapManager
str r1, [sp, #0x18]
ldr r1, [sp, #0x2c]
ldr r0, [r0]
@@ -5811,7 +5811,7 @@ func_ov27_02172598: ; 0x02172598
_0217282c: .word data_02050f54
_02172830: .word 0xfffff99a
_02172834: .word 0xfffffa66
_02172838: .word data_027e0e60
_02172838: .word gMapManager
_0217283c: .word 0x00000a8f
_02172840: .word data_ov00_020e9370
@@ -5962,7 +5962,7 @@ func_ov27_0217296c: ; 0x0217296c
str r2, [sp, #8]
add r1, sp, #0x14
str r1, [sp, #0xc]
ldr r1, _02172aa0 ; =data_027e0e60
ldr r1, _02172aa0 ; =gMapManager
str r0, [sp, #0x10]
ldr r0, [r1]
add r1, sp, #0x40
@@ -5977,7 +5977,7 @@ func_ov27_0217296c: ; 0x0217296c
arm_func_end func_ov27_0217296c
_02172a98: .word 0x0000ffff
_02172a9c: .word data_ov27_021796d4
_02172aa0: .word data_027e0e60
_02172aa0: .word gMapManager
.global func_ov27_02172aa4
arm_func_start func_ov27_02172aa4
@@ -6640,7 +6640,7 @@ func_ov27_02173330: ; 0x02173330
ldreqb r0, [r4, #0x5af]
cmpeq r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _021733a8 ; =data_027e0e60
ldr r0, _021733a8 ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -6665,7 +6665,7 @@ func_ov27_02173330: ; 0x02173330
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov27_02173330
_021733a8: .word data_027e0e60
_021733a8: .word gMapManager
_021733ac: .word data_027e0c68
_021733b0: .word 0x00060007
@@ -7017,7 +7017,7 @@ func_ov27_02173830: ; 0x02173830
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _021738d8 ; =data_027e0e60
ldr r0, _021738d8 ; =gMapManager
mov lr, #0
ldr r0, [r0]
sub ip, lr, #2
@@ -7050,7 +7050,7 @@ func_ov27_02173830: ; 0x02173830
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov27_02173830
_021738d8: .word data_027e0e60
_021738d8: .word gMapManager
_021738dc: .word data_027e0d38
.global func_ov27_021738e0
@@ -7442,7 +7442,7 @@ func_ov27_02173d78: ; 0x02173d78
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r2, [sp, #0x24]
ldr r0, _02173e30 ; =data_027e0e60
ldr r0, _02173e30 ; =gMapManager
ldr r1, [sp, #0x28]
str r2, [sp, #0x18]
ldr r2, [sp, #0x2c]
@@ -7470,7 +7470,7 @@ func_ov27_02173d78: ; 0x02173d78
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov27_02173d78
_02173e30: .word data_027e0e60
_02173e30: .word gMapManager
_02173e34: .word 0x0000099a
_02173e38: .word data_ov00_020e9370
@@ -7965,7 +7965,7 @@ func_ov27_0217440c: ; 0x0217440c
bl _ZN5Actor18func_Ov00_020c1bfcEi
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02174450 ; =data_027e0e60
ldr r0, _02174450 ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -7978,7 +7978,7 @@ func_ov27_0217440c: ; 0x0217440c
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov27_0217440c
_02174450: .word data_027e0e60
_02174450: .word gMapManager
.global func_ov27_02174454
arm_func_start func_ov27_02174454
@@ -8033,7 +8033,7 @@ func_ov27_02174454: ; 0x02174454
strb r1, [r4, #0x1c1]
bl _ZN5Actor10SetUnk_11cEc
ldr r1, [r4, #0x48]
ldr r0, _021746f8 ; =data_027e0e60
ldr r0, _021746f8 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -8154,7 +8154,7 @@ _021746e8: .word data_027e0fac
_021746ec: .word data_02050f54
_021746f0: .word data_027e0c68
_021746f4: .word 0x00060015
_021746f8: .word data_027e0e60
_021746f8: .word gMapManager
_021746fc: .word data_027e0f64
_02174700: .word gAdventureFlags
@@ -8200,7 +8200,7 @@ func_ov27_02174748: ; 0x02174748
mov r0, #0x2000
str r0, [r4, #0x4c]
ldr r1, [r4, #0x48]
ldr r0, _021747d0 ; =data_027e0e60
ldr r0, _021747d0 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -8219,7 +8219,7 @@ func_ov27_02174748: ; 0x02174748
.align 2, 0
arm_func_end func_ov27_02174748
_021747cc: .word data_027e0d0c
_021747d0: .word data_027e0e60
_021747d0: .word gMapManager
.global func_ov27_021747d4
arm_func_start func_ov27_021747d4
@@ -8228,7 +8228,7 @@ func_ov27_021747d4: ; 0x021747d4
sub sp, sp, #0xc
mov r5, r0
ldr r1, [r5, #0x48]
ldr r0, _021748d4 ; =data_027e0e60
ldr r0, _021748d4 ; =gMapManager
str r1, [sp]
ldr r1, [r5, #0x4c]
ldr r0, [r0]
@@ -8293,7 +8293,7 @@ _021748c8:
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov27_021747d4
_021748d4: .word data_027e0e60
_021748d4: .word gMapManager
_021748d8: .word 0x00000222
_021748dc: .word gAdventureFlags
_021748e0: .word 0x00000266
@@ -9142,7 +9142,7 @@ func_ov27_021752a8: ; 0x021752a8
bic r0, r0, #0x1f
orr r0, r0, #9
str r0, [sp, #4]
ldr r0, _021753d4 ; =data_027e0e60
ldr r0, _021753d4 ; =gMapManager
str ip, [sp, #8]
str r3, [sp, #0xc]
ldr r1, [r1, #8]
@@ -9177,7 +9177,7 @@ _021753c4: .word func_ov27_02174f08
_021753c8: .word data_ov27_0217903c
_021753cc: .word func_ov27_02175048
_021753d0: .word data_027e0d0c
_021753d4: .word data_027e0e60
_021753d4: .word gMapManager
.global func_ov27_021753d8
arm_func_start func_ov27_021753d8
@@ -9236,7 +9236,7 @@ _02175454:
mov r2, r1
bl _ZN5Actor18func_ov00_020c243cEiPi
_021754a4:
ldr r0, _02175554 ; =data_027e0e60
ldr r0, _02175554 ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -9286,7 +9286,7 @@ _02175538:
.align 2, 0
arm_func_end func_ov27_021753d8
_02175550: .word data_027e0cbc
_02175554: .word data_027e0e60
_02175554: .word gMapManager
_02175558: .word data_027e0fc8
_0217555c: .word data_027e0f6c
@@ -9377,7 +9377,7 @@ func_ov27_02175660: ; 0x02175660
ldrb r0, [r4, #0x285]
cmp r0, #0
bne _021757e4
ldr r0, _02175810 ; =data_027e0e60
ldr r0, _02175810 ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -9484,7 +9484,7 @@ _021757e4:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov27_02175660
_02175810: .word data_027e0e60
_02175810: .word gMapManager
_02175814: .word 0x0000038e
_02175818: .word 0x00000e39
_0217581c: .word 0x000078e4
asm/ov28.inc
+1 -1
View File
@@ -102,7 +102,7 @@
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov28.s
+37 -37
View File
@@ -3512,7 +3512,7 @@ func_ov28_021704b0: ; 0x021704b0
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02170524
ldr r0, _02170630 ; =data_027e0e60
ldr r0, _02170630 ; =gMapManager
mov r1, #1
ldr r0, [r0]
mov r2, r1
@@ -3532,7 +3532,7 @@ _02170524:
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02170570
ldr r0, _02170630 ; =data_027e0e60
ldr r0, _02170630 ; =gMapManager
mov r2, #1
ldr r0, [r0]
mov r3, r2
@@ -3552,7 +3552,7 @@ _02170570:
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _021705bc
ldr r0, _02170630 ; =data_027e0e60
ldr r0, _02170630 ; =gMapManager
mov r2, #1
ldr r0, [r0]
mov r3, r2
@@ -3572,7 +3572,7 @@ _021705bc:
bl _ZN14AdventureFlags3GetEj
cmp r0, #0
beq _02170604
ldr r0, _02170630 ; =data_027e0e60
ldr r0, _02170630 ; =gMapManager
mov r2, #1
ldr r0, [r0]
mov r3, r2
@@ -3593,7 +3593,7 @@ _02170618:
_02170624: .word gAdventureFlags
_02170628: .word 0x00000126
_0217062c: .word 0x0000012a
_02170630: .word data_027e0e60
_02170630: .word gMapManager
_02170634: .word 0x00000127
_02170638: .word 0x0000012b
_0217063c: .word 0x00000129
@@ -3941,7 +3941,7 @@ _021709a4:
mov r2, #0
strb r2, [r4, #0x48d]
ldr r1, [r4, #0x48]
ldr r0, _02170a94 ; =data_027e0e60
ldr r0, _02170a94 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r6, [r0]
@@ -3981,7 +3981,7 @@ _02170a84:
.align 2, 0
arm_func_end func_ov28_02170930
_02170a90: .word data_ov28_0217827c
_02170a94: .word data_027e0e60
_02170a94: .word gMapManager
_02170a98: .word 0xffffec78
.global func_ov28_02170a9c
@@ -5545,7 +5545,7 @@ func_ov28_02171d10: ; 0x02171d10
add r0, r7, #2
cmp r7, r0
bge _02171f28
ldr r10, _02171f74 ; =data_027e0e60
ldr r10, _02171f74 ; =gMapManager
add r5, sp, #4
mov r4, #1
_02171ed4:
@@ -5595,7 +5595,7 @@ _02171f58:
.align 2, 0
arm_func_end func_ov28_02171d10
_02171f70: .word data_027e0f6c
_02171f74: .word data_027e0e60
_02171f74: .word gMapManager
.global func_ov28_02171f78
arm_func_start func_ov28_02171f78
@@ -5660,7 +5660,7 @@ _02172008:
add r0, r4, #0x70
mov r1, #3
bl func_ov00_02094884
ldr r0, _021720d0 ; =data_027e0e60
ldr r0, _021720d0 ; =gMapManager
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
@@ -5685,7 +5685,7 @@ _02172068:
add r0, r4, #0x70
mov r1, #1
bl func_ov00_02094884
ldr r0, _021720d0 ; =data_027e0e60
ldr r0, _021720d0 ; =gMapManager
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
@@ -5698,7 +5698,7 @@ _021720c4:
.align 2, 0
arm_func_end func_ov28_02171fe8
_021720cc: .word data_027e0f68
_021720d0: .word data_027e0e60
_021720d0: .word gMapManager
.global func_ov28_021720d4
arm_func_start func_ov28_021720d4
@@ -5927,7 +5927,7 @@ func_ov28_02172280: ; 0x02172280
add r0, r7, #2
cmp r7, r0
bge _02172404
ldr r10, _02172450 ; =data_027e0e60
ldr r10, _02172450 ; =gMapManager
add r5, sp, #4
mov r4, #1
_021723b0:
@@ -5977,7 +5977,7 @@ _02172434:
.align 2, 0
arm_func_end func_ov28_02172280
_0217244c: .word 0x0000059a
_02172450: .word data_027e0e60
_02172450: .word gMapManager
.global func_ov28_02172454
arm_func_start func_ov28_02172454
@@ -6061,7 +6061,7 @@ _02172528:
add r0, r4, #0x38
mov r1, #0
bl func_ov00_02094884
ldr r0, _021725e4 ; =data_027e0e60
ldr r0, _021725e4 ; =gMapManager
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #0
@@ -6084,7 +6084,7 @@ _02172580:
add r0, r4, #0x38
mov r1, #3
bl func_ov00_02094884
ldr r0, _021725e4 ; =data_027e0e60
ldr r0, _021725e4 ; =gMapManager
add r1, r4, #0x38
ldr r0, [r0]
mov r2, #1
@@ -6099,7 +6099,7 @@ _021725d8:
.align 2, 0
arm_func_end func_ov28_02172508
_021725e0: .word data_027e0f68
_021725e4: .word data_027e0e60
_021725e4: .word gMapManager
.global func_ov28_021725e8
arm_func_start func_ov28_021725e8
@@ -6536,7 +6536,7 @@ _02172af4: .word data_ov28_02179274
func_ov28_02172af8: ; 0x02172af8
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _02172b3c ; =data_027e0e60
ldr r0, _02172b3c ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -6553,7 +6553,7 @@ func_ov28_02172af8: ; 0x02172af8
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_02172af8
_02172b3c: .word data_027e0e60
_02172b3c: .word gMapManager
.global func_ov28_02172b40
arm_func_start func_ov28_02172b40
@@ -6611,7 +6611,7 @@ _02172bc4: .word data_ov28_02179274
func_ov28_02172bc8: ; 0x02172bc8
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _02172c24 ; =data_027e0e60
ldr r0, _02172c24 ; =gMapManager
ldrh r1, [r4, #0x22]
ldr r0, [r0]
mov r2, #0
@@ -6634,7 +6634,7 @@ func_ov28_02172bc8: ; 0x02172bc8
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_02172bc8
_02172c24: .word data_027e0e60
_02172c24: .word gMapManager
.global func_ov28_02172c28
arm_func_start func_ov28_02172c28
@@ -8451,7 +8451,7 @@ func_ov28_021742b0: ; 0x021742b0
strb r2, [sp, #0x10]
strb r2, [sp, #0x16]
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
ldr r1, _02174384 ; =data_027e0e60
ldr r1, _02174384 ; =gMapManager
str r0, [r4, #0x228]
ldr r0, [r1]
add r1, r4, #0x48
@@ -8467,7 +8467,7 @@ func_ov28_021742b0: ; 0x021742b0
_02174378: .word 0x00000666
_0217437c: .word data_ov28_021794e4
_02174380: .word gAdventureFlags
_02174384: .word data_027e0e60
_02174384: .word gMapManager
.global func_ov28_02174388
arm_func_start func_ov28_02174388
@@ -8947,7 +8947,7 @@ func_ov28_02174958: ; 0x02174958
func_ov28_0217496c: ; 0x0217496c
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x18
ldr r1, _02174a0c ; =data_027e0e60
ldr r1, _02174a0c ; =gMapManager
mov lr, #0
mov r4, r0
ldr r0, [r1]
@@ -8970,7 +8970,7 @@ func_ov28_0217496c: ; 0x0217496c
ldr r2, _02174a14 ; =0x00000004
mov r1, #2
blx _ZN14OverlayManager15LoadIfNotLoadedEjj
ldr r0, _02174a0c ; =data_027e0e60
ldr r0, _02174a0c ; =gMapManager
mov r2, #1
ldr r0, [r0]
add r1, sp, #0
@@ -8987,7 +8987,7 @@ func_ov28_0217496c: ; 0x0217496c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov28_0217496c
_02174a0c: .word data_027e0e60
_02174a0c: .word gMapManager
_02174a10: .word gOverlayManager
_02174a14: .word 0x00000004
_02174a18: .word 0x00000005
@@ -9501,7 +9501,7 @@ _0217504c:
bl func_ov28_02174948
ldrb ip, [r4, #0x2a]
ldrsb r3, [r0, #0xb]
ldr r1, _0217509c ; =data_027e0e60
ldr r1, _0217509c ; =gMapManager
ldrb r2, [r4, #0x28]
ldr r0, [r1]
add r1, ip, r3
@@ -9520,7 +9520,7 @@ _0217504c:
.align 2, 0
arm_func_end func_ov28_02175028
_02175098: .word data_027e0e58
_0217509c: .word data_027e0e60
_0217509c: .word gMapManager
_021750a0: .word data_ov28_02179684
.global func_ov28_021750a4
@@ -9617,7 +9617,7 @@ _02175184:
bl func_ov28_02174948
ldrsb r1, [r0, #0xb]
ldrb r3, [r4, #0x2a]
ldr r0, _0217525c ; =data_027e0e60
ldr r0, _0217525c ; =gMapManager
ldrb r2, [r4, #0x28]
add r1, r3, r1
ldr r0, [r0]
@@ -9662,7 +9662,7 @@ _0217524c: .word 0x000001bd
_02175250: .word data_027e0ffc
_02175254: .word 0x000001a9
_02175258: .word data_ov28_02178348
_0217525c: .word data_027e0e60
_0217525c: .word gMapManager
_02175260: .word data_ov28_02179684
_02175264: .word data_ov00_020eec68
_02175268: .word data_027e0c68
@@ -9728,7 +9728,7 @@ _02175308:
ldr r0, [r2, #0x44]
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _021753dc ; =data_027e0e60
ldr r0, _021753dc ; =gMapManager
ldrb r2, [r4, #0x29]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084be0Eii
@@ -9743,7 +9743,7 @@ _02175364:
bl func_ov28_02174948
ldrb ip, [r4, #0x2a]
ldrsb r3, [r0, #0xb]
ldr r1, _021753dc ; =data_027e0e60
ldr r1, _021753dc ; =gMapManager
ldrb r2, [r4, #0x28]
ldr r0, [r1]
add r1, ip, r3
@@ -9774,7 +9774,7 @@ _021753c0:
.align 2, 0
arm_func_end func_ov28_02175274
_021753d8: .word data_027e0c68
_021753dc: .word data_027e0e60
_021753dc: .word gMapManager
_021753e0: .word data_ov00_020eec9c
_021753e4: .word 0x00000403
_021753e8: .word 0x00000404
@@ -9790,7 +9790,7 @@ func_ov28_021753f0: ; 0x021753f0
bl func_ov28_02174948
ldrb ip, [r4, #0x2a]
ldrsb r3, [r0, #0xb]
ldr r1, _02175464 ; =data_027e0e60
ldr r1, _02175464 ; =gMapManager
ldrb r2, [r4, #0x28]
ldr r0, [r1]
add r1, ip, r3
@@ -9814,7 +9814,7 @@ func_ov28_021753f0: ; 0x021753f0
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov28_021753f0
_02175464: .word data_027e0e60
_02175464: .word gMapManager
_02175468: .word data_ov28_02178348
_0217546c: .word data_ov28_02179684
@@ -12080,7 +12080,7 @@ _021772a0: ; jump table
b _02177300 ; case 2
b _021773f8 ; case 3
_021772b0:
ldr r0, _02177478 ; =data_027e0e60
ldr r0, _02177478 ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -12206,7 +12206,7 @@ _02177458:
_0217746c: .word data_027e0e58
_02177470: .word data_ov00_020eec9c
_02177474: .word 0x0000042a
_02177478: .word data_027e0e60
_02177478: .word gMapManager
_0217747c: .word 0x00000ccd
_02177480: .word data_027e0ffc
_02177484: .word 0x00000429
asm/ov29.inc
+1 -1
View File
@@ -90,7 +90,7 @@
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov29.s
+19 -19
View File
@@ -1502,7 +1502,7 @@ func_ov29_0216ea08: ; 0x0216ea08
ldr r0, [r4, #0x4dc]
cmp r0, #2
ldmneia sp!, {r4, pc}
ldr r0, _0216ea68 ; =data_027e0e60
ldr r0, _0216ea68 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020846a4Ev
cmp r0, #0xd
@@ -1522,7 +1522,7 @@ _0216ea58:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov29_0216ea08
_0216ea68: .word data_027e0e60
_0216ea68: .word gMapManager
.global func_ov29_0216ea6c
arm_func_start func_ov29_0216ea6c
@@ -2282,13 +2282,13 @@ _0216f4b0:
_0216f4bc:
cmp r3, #2
blo _0216f4b0
ldr r0, _0216f6a4 ; =data_027e0e60
ldr r0, _0216f6a4 ; =gMapManager
add r1, sp, #4
ldr r0, [r0]
mov r2, #0
bl _ZN10MapManager18func_ov00_02083928EPci
ldrb r1, [sp, #8]
ldr r0, _0216f6a4 ; =data_027e0e60
ldr r0, _0216f6a4 ; =gMapManager
add r2, r4, #0x1f0
strb r1, [r4, #0x1c7]
ldrh r1, [r4, #0x22]
@@ -2298,12 +2298,12 @@ _0216f4bc:
and r5, r3, #0xff
mov r6, #1
bl _ZN10MapManager18func_ov00_02083908EcPi
ldr r0, _0216f6a4 ; =data_027e0e60
ldr r0, _0216f6a4 ; =gMapManager
mov r1, r5
ldr r0, [r0]
add r2, r4, #0x20c
bl _ZN10MapManager18func_ov00_02083908EcPi
ldr r0, _0216f6a4 ; =data_027e0e60
ldr r0, _0216f6a4 ; =gMapManager
mov r1, r6
ldr r0, [r0]
add r2, r4, #0x228
@@ -2404,7 +2404,7 @@ _0216f4bc:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov29_0216f470
_0216f6a4: .word data_027e0e60
_0216f6a4: .word gMapManager
_0216f6a8: .word data_02052f54
_0216f6ac: .word data_027e0f68
_0216f6b0: .word data_ov29_0217933c
@@ -2645,14 +2645,14 @@ _0216f9a0:
mov r3, #0
bl func_ov00_02087400
_0216f9b0:
ldr r0, _0216fbf8 ; =data_027e0e60
ldr r0, _0216fbf8 ; =gMapManager
ldrb r5, [r4, #0x22c]
ldr r0, [r0]
mov r1, #0
bl _ZN10MapManager18func_ov00_02083938Ei
cmp r0, r5
beq _0216fbe8
ldr r0, _0216fbf8 ; =data_027e0e60
ldr r0, _0216fbf8 ; =gMapManager
ldrb r1, [r4, #0x22c]
ldr r0, [r0]
mov r2, #0
@@ -2679,14 +2679,14 @@ _0216fa1c:
mov r3, #0
bl func_ov00_02087400
_0216fa2c:
ldr r0, _0216fbf8 ; =data_027e0e60
ldr r0, _0216fbf8 ; =gMapManager
ldrb r5, [r4, #0x1f4]
ldr r0, [r0]
mov r1, #0
bl _ZN10MapManager18func_ov00_02083938Ei
cmp r0, r5
beq _0216fbe8
ldr r0, _0216fbf8 ; =data_027e0e60
ldr r0, _0216fbf8 ; =gMapManager
ldrb r1, [r4, #0x1f4]
ldr r0, [r0]
mov r2, #0
@@ -2713,14 +2713,14 @@ _0216fa98:
mov r3, #0
bl func_ov00_02087400
_0216faa8:
ldr r0, _0216fbf8 ; =data_027e0e60
ldr r0, _0216fbf8 ; =gMapManager
ldrb r5, [r4, #0x210]
ldr r0, [r0]
mov r1, #0
bl _ZN10MapManager18func_ov00_02083938Ei
cmp r0, r5
beq _0216fbe8
ldr r0, _0216fbf8 ; =data_027e0e60
ldr r0, _0216fbf8 ; =gMapManager
ldrb r1, [r4, #0x210]
ldr r0, [r0]
mov r2, #0
@@ -2802,7 +2802,7 @@ _0216fbe8:
.align 2, 0
arm_func_end func_ov29_0216f918
_0216fbf4: .word data_027e0f64
_0216fbf8: .word data_027e0e60
_0216fbf8: .word gMapManager
_0216fbfc: .word data_027e0f6c
_0216fc00: .word data_027e0e58
_0216fc04: .word data_ov00_020eec9c
@@ -2887,7 +2887,7 @@ func_ov29_0216fc94: ; 0x0216fc94
func_ov29_0216fcd4: ; 0x0216fcd4
stmdb sp!, {lr}
sub sp, sp, #0x1c
ldr r2, _0216fd78 ; =data_027e0e60
ldr r2, _0216fd78 ; =gMapManager
ldrb r1, [r0, #0x1c6]
ldr r0, [r2]
mov r2, #0
@@ -2895,7 +2895,7 @@ func_ov29_0216fcd4: ; 0x0216fcd4
cmp r0, #0
beq _0216fd6c
ldr r1, _0216fd7c ; =data_027e0f94
ldr r0, _0216fd78 ; =data_027e0e60
ldr r0, _0216fd78 ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp, #0x10]
@@ -2930,7 +2930,7 @@ _0216fd6c:
ldmia sp!, {pc}
.align 2, 0
arm_func_end func_ov29_0216fcd4
_0216fd78: .word data_027e0e60
_0216fd78: .word gMapManager
_0216fd7c: .word data_027e0f94
.global func_ov29_0216fd80
@@ -10598,7 +10598,7 @@ func_ov29_021765f0: ; 0x021765f0
add r0, r7, #2
cmp r7, r0
bge _021766b8
ldr r4, _02176784 ; =data_027e0e60
ldr r4, _02176784 ; =gMapManager
add r5, sp, #2
mov r11, #1
_0217661c:
@@ -10700,7 +10700,7 @@ _0217673c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021765f0
_02176784: .word data_027e0e60
_02176784: .word gMapManager
_02176788: .word data_027e0f6c
.global func_ov29_0217678c
asm/ov30.inc
+1 -1
View File
@@ -84,7 +84,7 @@
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f90
asm/ov30.s
+61 -61
View File
@@ -229,7 +229,7 @@ _0217c050:
stmia sp, {r0, r6}
mov r0, #0
str r0, [sp, #8]
ldr r0, _0217c104 ; =data_027e0e60
ldr r0, _0217c104 ; =gMapManager
mov r3, r7
ldr r0, [r0]
add r1, sp, #0x18
@@ -251,7 +251,7 @@ _0217c0f4:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_0217c020
_0217c104: .word data_027e0e60
_0217c104: .word gMapManager
.global func_ov30_0217c108
arm_func_start func_ov30_0217c108
@@ -1558,7 +1558,7 @@ func_ov30_0217d09c: ; 0x0217d09c
addeq sp, sp, #0x58
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldr r0, _0217d390 ; =data_027e0e60
ldr r0, _0217d390 ; =gMapManager
ldr lr, [r4]
ldr ip, [r4, #4]
ldr r3, [r4, #8]
@@ -1722,7 +1722,7 @@ _0217d2cc:
str r0, [sp, #4]
add r1, sp, #0xc
str r1, [sp, #8]
ldr r0, _0217d390 ; =data_027e0e60
ldr r0, _0217d390 ; =gMapManager
add r1, sp, #0x1c
ldr r0, [r0]
add r2, sp, #0x10
@@ -1745,7 +1745,7 @@ _0217d37c:
arm_func_end func_ov30_0217d09c
_0217d388: .word data_027e0f90
_0217d38c: .word data_027e0f94
_0217d390: .word data_027e0e60
_0217d390: .word gMapManager
_0217d394: .word 0xffff8001
_0217d398: .word 0x00002aaa
_0217d39c: .word 0x00005555
@@ -1777,7 +1777,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8
addeq sp, sp, #0x20
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _0217d4e0 ; =data_027e0e60
ldr r0, _0217d4e0 ; =gMapManager
ldr lr, [r4]
ldr ip, [r4, #4]
ldr r3, [r4, #8]
@@ -1840,7 +1840,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8
arm_func_end func_ov30_0217d3b8
_0217d4d8: .word data_027e0f90
_0217d4dc: .word data_027e0f94
_0217d4e0: .word data_027e0e60
_0217d4e0: .word gMapManager
_0217d4e4: .word 0x0000019a
.global func_ov30_0217d4e8
@@ -1857,7 +1857,7 @@ func_ov30_0217d4e8: ; 0x0217d4e8
movne r0, #0
ldmneia sp!, {r4, r5, r6, pc}
ldr r1, [r4]
ldr r0, _0217d684 ; =data_027e0e60
ldr r0, _0217d684 ; =gMapManager
str r1, [sp]
ldr r1, [r4, #4]
ldr r0, [r0]
@@ -1956,7 +1956,7 @@ _0217d664:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov30_0217d4e8
_0217d684: .word data_027e0e60
_0217d684: .word gMapManager
_0217d688: .word 0xffff8001
_0217d68c: .word 0x00002aaa
@@ -1973,7 +1973,7 @@ func_ov30_0217d690: ; 0x0217d690
addne sp, sp, #0x48
movne r0, #0
ldmneia sp!, {r4, r5, r6, pc}
ldr r0, _0217d7d0 ; =data_027e0e60
ldr r0, _0217d7d0 ; =gMapManager
ldr ip, [r4]
ldr r6, [r4, #4]
ldr r3, [r4, #8]
@@ -2028,7 +2028,7 @@ func_ov30_0217d690: ; 0x0217d690
mov r0, #6
str r0, [sp]
ldrh r2, [r5, #0x9c]
ldr r0, _0217d7d0 ; =data_027e0e60
ldr r0, _0217d7d0 ; =gMapManager
add r1, sp, #0x18
str r2, [sp, #4]
ldr r3, [r5, #0xa0]
@@ -2045,7 +2045,7 @@ func_ov30_0217d690: ; 0x0217d690
.align 2, 0
arm_func_end func_ov30_0217d690
_0217d7cc: .word data_027e0f94
_0217d7d0: .word data_027e0e60
_0217d7d0: .word gMapManager
_0217d7d4: .word 0x00000333
.global func_ov30_0217d7d8
@@ -2057,7 +2057,7 @@ func_ov30_0217d7d8: ; 0x0217d7d8
mov r11, #0
ldr r5, [r3]
ldr r4, [r3, #4]
ldr r2, _0217d98c ; =data_027e0e60
ldr r2, _0217d98c ; =gMapManager
mov r10, r0
ldr r0, [r2]
str r1, [sp]
@@ -2086,7 +2086,7 @@ func_ov30_0217d7d8: ; 0x0217d7d8
mov r4, r2, lsl #0x10
_0217d85c:
ldr r0, [sp, #4]
ldr r5, _0217d98c ; =data_027e0e60
ldr r5, _0217d98c ; =gMapManager
mov r0, r0, lsl #0x10
mov r8, #0
mov r7, r0, asr #0x10
@@ -2154,7 +2154,7 @@ _0217d934:
blt _0217d85c
cmp r11, #0
beq _0217d97c
ldr r0, _0217d98c ; =data_027e0e60
ldr r0, _0217d98c ; =gMapManager
ldr r2, [sp]
ldr r0, [r0]
add r1, sp, #0x10
@@ -2166,7 +2166,7 @@ _0217d97c:
.align 2, 0
arm_func_end func_ov30_0217d7d8
_0217d988: .word data_027e0f94
_0217d98c: .word data_027e0e60
_0217d98c: .word gMapManager
.global func_ov30_0217d990
arm_func_start func_ov30_0217d990
@@ -4030,7 +4030,7 @@ _0217f250:
add r3, sp, #0x5c
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0217f548 ; =data_027e0e60
ldr r0, _0217f548 ; =gMapManager
ldr r2, [sp, #0x5c]
ldr r4, [sp, #0x60]
ldr r3, [sp, #0x64]
@@ -4090,7 +4090,7 @@ _0217f2f4:
ldr r0, [r0]
bl func_ov00_020c47cc
ldr r6, [r0, #4]
ldr r2, _0217f548 ; =data_027e0e60
ldr r2, _0217f548 ; =gMapManager
str r6, [sp, #0x50]
ldr r4, [r0, #8]
add r1, sp, #8
@@ -4214,7 +4214,7 @@ _0217f53c:
.align 2, 0
arm_func_end func_ov30_0217f1c4
_0217f544: .word gAdventureFlags
_0217f548: .word data_027e0e60
_0217f548: .word gMapManager
_0217f54c: .word data_027e0ffc
_0217f550: .word data_ov00_020e8398
_0217f554: .word data_027e0ff0
@@ -4296,7 +4296,7 @@ _0217f5f8:
add r1, sp, #0x24
ldr r0, [r0]
bl func_ov00_020c47cc
ldr r1, _0217f750 ; =data_027e0e60
ldr r1, _0217f750 ; =gMapManager
ldr r5, [r0, #4]
ldr r3, [r0, #8]
ldr r7, [r0, #0xc]
@@ -4360,7 +4360,7 @@ _0217f730:
_0217f744: .word data_ov00_020e8398
_0217f748: .word data_027e0ff0
_0217f74c: .word data_027e0f94
_0217f750: .word data_027e0e60
_0217f750: .word gMapManager
_0217f754: .word data_027e0f64
.global func_ov30_0217f758
@@ -4467,7 +4467,7 @@ _0217f880:
add r3, sp, #0xc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0217faa0 ; =data_027e0e60
ldr r0, _0217faa0 ; =gMapManager
ldr r2, [sp, #0xc]
ldr ip, [sp, #0x10]
ldr r3, [sp, #0x14]
@@ -4596,7 +4596,7 @@ _0217fa98:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov30_0217f77c
_0217faa0: .word data_027e0e60
_0217faa0: .word gMapManager
_0217faa4: .word data_027e0ffc
_0217faa8: .word data_027e10b4
@@ -4701,7 +4701,7 @@ _0217fbb4:
add r3, sp, #0xc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0217fd3c ; =data_027e0e60
ldr r0, _0217fd3c ; =gMapManager
ldr r2, [sp, #0xc]
ldr ip, [sp, #0x10]
ldr r3, [sp, #0x14]
@@ -4788,7 +4788,7 @@ _0217fcf8:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov30_0217fb7c
_0217fd3c: .word data_027e0e60
_0217fd3c: .word gMapManager
_0217fd40: .word data_027e0ffc
.global func_ov30_0217fd44
@@ -5410,7 +5410,7 @@ func_ov30_02180548: ; 0x02180548
bl func_ov00_020a5e9c
cmp r0, #0x25
bne _02180594
ldr r0, _021805a0 ; =data_027e0e60
ldr r0, _021805a0 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, #7
@@ -5428,7 +5428,7 @@ _02180594:
.align 2, 0
arm_func_end func_ov30_02180548
_0218059c: .word data_027e0d38
_021805a0: .word data_027e0e60
_021805a0: .word gMapManager
_021805a4: .word gAdventureFlags
_021805a8: .word data_ov30_021887ac
@@ -5442,7 +5442,7 @@ func_ov30_021805ac: ; 0x021805ac
bl func_ov00_020a5e9c
cmp r0, #0x25
bne _021805f8
ldr r0, _02180604 ; =data_027e0e60
ldr r0, _02180604 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02082d08Ev
cmp r0, #7
@@ -5460,7 +5460,7 @@ _021805f8:
.align 2, 0
arm_func_end func_ov30_021805ac
_02180600: .word data_027e0d38
_02180604: .word data_027e0e60
_02180604: .word gMapManager
_02180608: .word gAdventureFlags
_0218060c: .word data_ov30_021887b4
@@ -8261,7 +8261,7 @@ func_ov30_021824cc: ; 0x021824cc
str r2, [sp, #4]
str r1, [sp, #8]
str r0, [sp, #0xc]
ldr r0, _02182628 ; =data_027e0e60
ldr r0, _02182628 ; =gMapManager
str r3, [sp, #0x10]
add r2, r4, #0x860
ldr r0, [r0]
@@ -8315,7 +8315,7 @@ _02182618:
.align 2, 0
arm_func_end func_ov30_021824cc
_02182624: .word 0x0000ffff
_02182628: .word data_027e0e60
_02182628: .word gMapManager
_0218262c: .word data_027e0fe4
_02182630: .word 0x424f4d42
@@ -8356,7 +8356,7 @@ func_ov30_02182634: ; 0x02182634
str r0, [sp, #8]
str r2, [sp, #0xc]
str r2, [sp, #0x10]
ldr r0, _02182ab8 ; =data_027e0e60
ldr r0, _02182ab8 ; =gMapManager
add r2, r4, #0x860
ldr r0, [r0]
add r1, sp, #0x13c
@@ -8618,7 +8618,7 @@ _02182960:
.align 2, 0
arm_func_end func_ov30_02182634
_02182ab4: .word 0x0000ffff
_02182ab8: .word data_027e0e60
_02182ab8: .word gMapManager
_02182abc: .word _ZTV11FilterActor
_02182ac0: .word 0x424f4d42
_02182ac4: .word data_027e0fe4
@@ -10040,7 +10040,7 @@ func_ov30_02183ca8: ; 0x02183ca8
ldr r2, [r2, #0x8c]
ldr r1, [r0]
ldr r4, [r2, #0x98]
ldr r2, _02183d7c ; =data_027e0e60
ldr r2, _02183d7c ; =gMapManager
str r1, [sp, #0x30]
ldr r3, [r0, #4]
add r1, sp, #0x30
@@ -10051,7 +10051,7 @@ func_ov30_02183ca8: ; 0x02183ca8
mov r2, #1
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr r2, [r7]
ldr r1, _02183d7c ; =data_027e0e60
ldr r1, _02183d7c ; =gMapManager
str r2, [sp, #0x24]
ldr r2, [r7, #4]
add r5, r4, r0
@@ -10076,7 +10076,7 @@ func_ov30_02183ca8: ; 0x02183ca8
str r1, [sp]
str r0, [sp, #4]
ldr r1, [r2, #0xa0]
ldr r0, _02183d7c ; =data_027e0e60
ldr r0, _02183d7c ; =gMapManager
str r1, [sp, #8]
ldr r0, [r0]
add r1, sp, #0x18
@@ -10088,7 +10088,7 @@ func_ov30_02183ca8: ; 0x02183ca8
.align 2, 0
arm_func_end func_ov30_02183ca8
_02183d78: .word data_ov30_021894a0
_02183d7c: .word data_027e0e60
_02183d7c: .word gMapManager
.global func_ov30_02183d80
arm_func_start func_ov30_02183d80
@@ -10516,7 +10516,7 @@ _021841ec:
ldr r0, _02184304 ; =data_ov00_020eec68
mov r1, #0xf
bl func_ov00_020d716c
ldr r0, _02184308 ; =data_027e0e60
ldr r0, _02184308 ; =gMapManager
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084740Ev
mov r1, r0
@@ -10524,7 +10524,7 @@ _021841ec:
mov r2, #0
mov r3, #0x7f
bl func_ov00_020d70a4
ldr r0, _02184308 ; =data_027e0e60
ldr r0, _02184308 ; =gMapManager
mov r1, #0
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084924Ej
@@ -10545,7 +10545,7 @@ _0218424c:
mov r2, #0
mov r3, #0x7f
bl func_ov00_020d70a4
ldr r0, _02184308 ; =data_027e0e60
ldr r0, _02184308 ; =gMapManager
mov r1, #1
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084924Ej
@@ -10581,7 +10581,7 @@ _021842d4:
_021842fc: .word data_027e0fc8
_02184300: .word data_027e0fe4
_02184304: .word data_ov00_020eec68
_02184308: .word data_027e0e60
_02184308: .word gMapManager
_0218430c: .word data_ov00_020eec9c
.global func_ov30_02184310
@@ -11340,7 +11340,7 @@ _021848f4:
ldrh r10, [r4, #0x20]
ble _021849cc
ldr r9, [sp, #0x18]
ldr r11, _02185254 ; =data_027e0e60
ldr r11, _02185254 ; =gMapManager
ldr r5, _02185250 ; =data_027e0fe4
_02184940:
ldr r1, [sp, #0x530]
@@ -11428,7 +11428,7 @@ _02184a34:
ldrh r10, [r4, #0x20]
ble _02184b10
ldr r9, [sp, #0x14]
ldr r11, _02185254 ; =data_027e0e60
ldr r11, _02185254 ; =gMapManager
ldr r5, _02185250 ; =data_027e0fe4
_02184a84:
ldr r1, [sp, #0x4a4]
@@ -11528,7 +11528,7 @@ _02184ba8:
ldrh r10, [r4, #0x20]
ble _02184c84
ldr r9, [sp, #0x10]
ldr r11, _02185254 ; =data_027e0e60
ldr r11, _02185254 ; =gMapManager
ldr r5, _02185250 ; =data_027e0fe4
_02184bf8:
ldr r1, [sp, #0x3d0]
@@ -11626,7 +11626,7 @@ _02184d18:
ldrh r10, [r4, #0x20]
ble _02184df0
ldr r9, [sp, #0xc]
ldr r11, _02185254 ; =data_027e0e60
ldr r11, _02185254 ; =gMapManager
ldr r5, _02185250 ; =data_027e0fe4
_02184d64:
ldr r1, [sp, #0x2fc]
@@ -11724,7 +11724,7 @@ _02184e84:
ldrh r10, [r4, #0x20]
ble _02184f50
ldr r9, [sp, #8]
ldr r5, _02185254 ; =data_027e0e60
ldr r5, _02185254 ; =gMapManager
ldr r6, _02185250 ; =data_027e0fe4
mov r11, r7
_02184ed4:
@@ -11819,7 +11819,7 @@ _02184fe4:
ldrh r10, [r4, #0x20]
ble _021850b0
ldr r9, [sp, #4]
ldr r5, _02185254 ; =data_027e0e60
ldr r5, _02185254 ; =gMapManager
ldr r6, _02185250 ; =data_027e0fe4
mov r11, r7
_02185034:
@@ -11914,7 +11914,7 @@ _02185144:
ldrh r10, [r4, #0x20]
ble _02185210
ldr r9, [sp]
ldr r5, _02185254 ; =data_027e0e60
ldr r5, _02185254 ; =gMapManager
ldr r6, _02185250 ; =data_027e0fe4
mov r11, r7
_02185194:
@@ -11973,7 +11973,7 @@ _02185240:
arm_func_end func_ov30_02184868
_0218524c: .word data_ov30_02188b08
_02185250: .word data_027e0fe4
_02185254: .word data_027e0e60
_02185254: .word gMapManager
_02185258: .word _ZTV11FilterActor
_0218525c: .word 0x57544352
_02185260: .word 0x43485352
@@ -14280,7 +14280,7 @@ func_ov30_021872c4: ; 0x021872c4
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r2, [r1]
ldr r3, _02187300 ; =data_027e0e60
ldr r3, _02187300 ; =gMapManager
str r2, [sp]
ldr ip, [r1, #4]
mov r2, r0
@@ -14294,12 +14294,12 @@ func_ov30_021872c4: ; 0x021872c4
ldmia sp!, {pc}
.align 2, 0
arm_func_end func_ov30_021872c4
_02187300: .word data_027e0e60
_02187300: .word gMapManager
.global func_ov30_02187304
arm_func_start func_ov30_02187304
func_ov30_02187304: ; 0x02187304
ldr r2, _02187320 ; =data_027e0e60
ldr r2, _02187320 ; =gMapManager
mov r3, r0
ldr r0, [r2]
mov r2, r1
@@ -14308,7 +14308,7 @@ func_ov30_02187304: ; 0x02187304
bx ip
.align 2, 0
arm_func_end func_ov30_02187304
_02187320: .word data_027e0e60
_02187320: .word gMapManager
_02187324: .word _ZN10MapManager18func_ov00_0208439cEv
.global func_ov30_02187328
@@ -14373,7 +14373,7 @@ func_ov30_02187388: ; 0x02187388
func_ov30_021873bc: ; 0x021873bc
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #8
ldr r2, _02187568 ; =data_027e0e60
ldr r2, _02187568 ; =gMapManager
mov r5, r0
ldr r0, [r2]
mov r4, r1
@@ -14465,13 +14465,13 @@ _021874e8:
sub r0, r0, #1
strh r0, [sp, #2]
_02187524:
ldr r0, _02187568 ; =data_027e0e60
ldr r0, _02187568 ; =gMapManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_a4Ev
cmp r0, #0
beq _0218755c
ldr r0, _02187568 ; =data_027e0e60
ldr r0, _02187568 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_a4Ev
@@ -14485,7 +14485,7 @@ _0218755c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov30_021873bc
_02187568: .word data_027e0e60
_02187568: .word gMapManager
.global func_ov30_0218756c
arm_func_start func_ov30_0218756c
@@ -14522,14 +14522,14 @@ _021875d0: .word 0x000016a1
.global func_ov30_021875d4
arm_func_start func_ov30_021875d4
func_ov30_021875d4: ; 0x021875d4
ldr r2, _021875e8 ; =data_027e0e60
ldr r2, _021875e8 ; =gMapManager
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
_021875e8: .word gMapManager
_021875ec: .word _ZN10MapManager16MapData_vfunc_a4Ev
.global func_ov30_021875f0
@@ -15178,7 +15178,7 @@ func_ov30_02187e18: ; 0x02187e18
mov r7, r3
ldr r6, [sp, #0x60]
bl func_ov30_02187dfc
ldr r11, _02187eec ; =data_027e0e60
ldr r11, _02187eec ; =gMapManager
add r5, sp, #0x24
mov r4, #6
_02187e44:
@@ -15231,7 +15231,7 @@ func_ov30_02187ee4: ; 0x02187ee4
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_02187ee4
_02187eec: .word data_027e0e60
_02187eec: .word gMapManager
.global func_ov30_02187ef0
arm_func_start func_ov30_02187ef0
asm/ov31.inc
+1 -1
View File
@@ -72,7 +72,7 @@
.extern data_027e0d78
.extern data_027e0dbc
.extern data_027e0e28
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f94
.extern data_027e0fc8
asm/ov31.s
+2 -2
View File
@@ -269,7 +269,7 @@ _0217c040:
mov r2, ip
mov r1, #0x44
bl func_ov00_02087338
ldr r0, _0217c218 ; =data_027e0e60
ldr r0, _0217c218 ; =gMapManager
mov r1, #0x45
ldr r0, [r0]
add r2, sp, #0x50
@@ -362,7 +362,7 @@ _0217c184:
.align 2, 0
arm_func_end func_ov31_0217bfb4
_0217c214: .word data_027e0f64
_0217c218: .word data_027e0e60
_0217c218: .word gMapManager
_0217c21c: .word 0x0000ffff
_0217c220: .word data_027e0fc8
asm/ov32.inc
+1 -1
View File
@@ -90,7 +90,7 @@
.extern data_027e0d78
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov32.s
+27 -27
View File
@@ -1366,7 +1366,7 @@ func_ov32_0217cdd8: ; 0x0217cdd8
bl func_ov32_0217d354
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _0217ce1c ; =data_027e0e60
ldr r0, _0217ce1c ; =gMapManager
ldrh r1, [r4, #0x24]
ldr r0, [r0]
mov r2, #0
@@ -1380,7 +1380,7 @@ func_ov32_0217cdd8: ; 0x0217cdd8
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov32_0217cdd8
_0217ce1c: .word data_027e0e60
_0217ce1c: .word gMapManager
.global func_ov32_0217ce20
arm_func_start func_ov32_0217ce20
@@ -1525,7 +1525,7 @@ _0217cfc4:
bl func_ov00_020cca50
cmp r0, #0
beq _0217d030
ldr r0, _0217d174 ; =data_027e0e60
ldr r0, _0217d174 ; =gMapManager
ldrh r1, [r5, #0x24]
ldr r0, [r0]
mov r2, #0
@@ -1625,7 +1625,7 @@ _0217d0f8:
.align 2, 0
arm_func_end func_ov32_0217cfa4
_0217d170: .word data_027e0f90
_0217d174: .word data_027e0e60
_0217d174: .word gMapManager
_0217d178: .word 0x0000071c
_0217d17c: .word data_027e0764
_0217d180: .word 0x0000038e
@@ -1929,7 +1929,7 @@ _0217d500:
cmpne r0, #1
bne _0217d570
ldr r1, [r5, #0x48]
ldr r0, _0217d750 ; =data_027e0e60
ldr r0, _0217d750 ; =gMapManager
str r1, [sp, #0x10]
ldr r1, [r5, #0x4c]
ldr r0, [r0]
@@ -2074,7 +2074,7 @@ _0217d744:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov32_0217d478
_0217d750: .word data_027e0e60
_0217d750: .word gMapManager
_0217d754: .word func_ov32_0217c850
_0217d758: .word data_027e0e58
_0217d75c: .word 0x00000239
@@ -3065,7 +3065,7 @@ _0217e3e4:
bl func_ov00_020cca50
cmp r0, #0
beq _0217e448
ldr r0, _0217e590 ; =data_027e0e60
ldr r0, _0217e590 ; =gMapManager
ldrh r1, [r5, #0x24]
ldr r0, [r0]
mov r2, #0
@@ -3166,7 +3166,7 @@ _0217e514:
.align 2, 0
arm_func_end func_ov32_0217e3c4
_0217e58c: .word data_027e0f90
_0217e590: .word data_027e0e60
_0217e590: .word gMapManager
_0217e594: .word 0x0000071c
_0217e598: .word data_027e0764
_0217e59c: .word 0x0000038e
@@ -5190,7 +5190,7 @@ func_ov32_0217feac: ; 0x0217feac
cmp r0, #0
beq _0217ff6c
ldr r1, _02180048 ; =data_027e0f94
ldr r0, _0218004c ; =data_027e0e60
ldr r0, _0218004c ; =gMapManager
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp, #8]
@@ -5274,7 +5274,7 @@ _0217ffd0:
arm_func_end func_ov32_0217feac
_02180044: .word data_027e0f90
_02180048: .word data_027e0f94
_0218004c: .word data_027e0e60
_0218004c: .word gMapManager
_02180050: .word data_027e0764
_02180054: .word 0x0000ffff
_02180058: .word data_02050f54
@@ -6827,7 +6827,7 @@ _0218158c:
blx r3
ldmia sp!, {r4, pc}
_021815b8:
ldr r0, _02181624 ; =data_027e0e60
ldr r0, _02181624 ; =gMapManager
ldrsh r1, [r4, #0x34]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084cc8Ei
@@ -6858,7 +6858,7 @@ _02181614:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov32_02181558
_02181624: .word data_027e0e60
_02181624: .word gMapManager
.global func_ov32_02181628
arm_func_start func_ov32_02181628
@@ -7977,7 +7977,7 @@ func_ov32_0218252c: ; 0x0218252c
add r1, r4, #0x78
mov r2, r0
bl func_01ff9bc4
ldr r1, _0218269c ; =data_027e0e60
ldr r1, _0218269c ; =gMapManager
mov r0, r4
ldr r5, [r1]
bl func_ov00_0208b9cc
@@ -8039,7 +8039,7 @@ _02182670:
arm_func_end func_ov32_0218252c
_02182694: .word 0x0000ffff
_02182698: .word data_ov32_02185c24
_0218269c: .word data_027e0e60
_0218269c: .word gMapManager
_021826a0: .word 0x0000019a
_021826a4: .word data_027e0e58
_021826a8: .word data_027e0ffc
@@ -8063,14 +8063,14 @@ func_ov32_021826c4: ; 0x021826c4
cmp r1, #0
moveq r0, #1
ldmeqia sp!, {r3, pc}
ldr r0, _021826ec ; =data_027e0e60
ldr r0, _021826ec ; =gMapManager
mov r2, #3
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02084be0Eii
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov32_021826c4
_021826ec: .word data_027e0e60
_021826ec: .word gMapManager
.global func_ov32_021826f0
arm_func_start func_ov32_021826f0
@@ -8992,7 +8992,7 @@ func_ov32_0218318c: ; 0x0218318c
mov r6, r2, lsr #0xc
orr r6, r6, r0, lsl #20
ldr r0, [r4, #0x50]
ldr r5, _02183344 ; =data_027e0e60
ldr r5, _02183344 ; =gMapManager
add r0, r0, r6
str r0, [r4, #0x238]
ldr r0, [r5]
@@ -9037,7 +9037,7 @@ _02183334: .word 0x00000e39
_02183338: .word 0xfffff8e4
_0218333c: .word 0x00001801
_02183340: .word data_02050f54
_02183344: .word data_027e0e60
_02183344: .word gMapManager
.global func_ov32_02183348
arm_func_start func_ov32_02183348
@@ -9098,7 +9098,7 @@ _02183414:
ldr r5, [lr]
str r0, [sp, #0xc]
ldr r0, [r4, #0x4c]
ldr ip, _0218353c ; =data_027e0e60
ldr ip, _0218353c ; =gMapManager
str r0, [sp, #0x10]
ldr r6, [r4, #0x50]
ldr r0, [lr, #4]
@@ -9132,7 +9132,7 @@ _02183498:
ldr r5, [lr]
str r0, [sp]
ldr r0, [r4, #0x4c]
ldr ip, _0218353c ; =data_027e0e60
ldr ip, _0218353c ; =gMapManager
str r0, [sp, #4]
ldr r6, [r4, #0x50]
ldr r0, [lr, #4]
@@ -9172,7 +9172,7 @@ _02183518:
arm_func_end func_ov32_02183348
_02183534: .word data_027e0764
_02183538: .word 0x00002001
_0218353c: .word data_027e0e60
_0218353c: .word gMapManager
.global func_ov32_02183540
arm_func_start func_ov32_02183540
@@ -9384,7 +9384,7 @@ func_ov32_02183818: ; 0x02183818
mov r4, r0
ldmia r1, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _021838cc ; =data_027e0e60
ldr r0, _021838cc ; =gMapManager
ldr lr, [sp, #0x18]
ldr ip, [sp, #0x1c]
ldr r3, [sp, #0x20]
@@ -9424,7 +9424,7 @@ func_ov32_02183818: ; 0x02183818
.align 2, 0
arm_func_end func_ov32_02183818
_021838c8: .word data_027e0f94
_021838cc: .word data_027e0e60
_021838cc: .word gMapManager
_021838d0: .word 0x00000333
.global func_ov32_021838d4
@@ -10633,7 +10633,7 @@ func_ov32_02184890: ; 0x02184890
cmp r3, #0
beq _021848f8
ldr r1, [r3, #0x48]
ldr r0, _02184948 ; =data_027e0e60
ldr r0, _02184948 ; =gMapManager
str r1, [r4, #0x48]
ldr r2, [r3, #0x4c]
add r1, sp, #0
@@ -10678,7 +10678,7 @@ _0218493c:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov32_02184890
_02184948: .word data_027e0e60
_02184948: .word gMapManager
.global func_ov32_0218494c
arm_func_start func_ov32_0218494c
@@ -10810,7 +10810,7 @@ func_ov32_02184a9c: ; 0x02184a9c
mov r1, r1, lsl #0x2
ldrsh r1, [r0, r1]
ldr r2, [sp, #0x24]
ldr lr, _02184b9c ; =data_027e0e60
ldr lr, _02184b9c ; =gMapManager
smulbb r1, r1, ip
add r1, r1, #0x800
add r3, r2, r1, asr #12
@@ -10859,7 +10859,7 @@ func_ov32_02184a9c: ; 0x02184a9c
arm_func_end func_ov32_02184a9c
_02184b94: .word data_02050f54
_02184b98: .word 0x00000266
_02184b9c: .word data_027e0e60
_02184b9c: .word gMapManager
_02184ba0: .word 0x0000059a
_02184ba4: .word data_ov00_020e9370
asm/ov33.inc
+1 -1
View File
@@ -68,7 +68,7 @@
.extern data_027e0c68
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
asm/ov33.s
+9 -9
View File
@@ -846,7 +846,7 @@ func_ov33_0217c808: ; 0x0217c808
sub sp, sp, #0xc
mov r4, r0
ldr r1, [r4, #0x48]
ldr r0, _0217c8ec ; =data_027e0e60
ldr r0, _0217c8ec ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -901,7 +901,7 @@ func_ov33_0217c808: ; 0x0217c808
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov33_0217c808
_0217c8ec: .word data_027e0e60
_0217c8ec: .word gMapManager
_0217c8f0: .word data_02050f54
_0217c8f4: .word 0x00000666
_0217c8f8: .word data_027e0ffc
@@ -917,7 +917,7 @@ func_ov33_0217c8fc: ; 0x0217c8fc
mov r3, #0
str r0, [sp, #0x18]
ldr r1, [r4, #0x4c]
ldr r0, _0217c988 ; =data_027e0e60
ldr r0, _0217c988 ; =gMapManager
str r1, [sp, #0x1c]
ldr r2, [r4, #0x50]
add r1, sp, #0x18
@@ -947,7 +947,7 @@ _0217c97c:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov33_0217c8fc
_0217c988: .word data_027e0e60
_0217c988: .word gMapManager
.global func_ov33_0217c98c
arm_func_start func_ov33_0217c98c
@@ -1126,7 +1126,7 @@ _0217cb94: ; jump table
b _0217cc8c ; case 3
b _0217ccc8 ; case 4
_0217cba8:
ldr r0, _0217cf20 ; =data_027e0e60
ldr r0, _0217cf20 ; =gMapManager
ldrh r1, [r5, #0x22]
ldr r0, [r0]
mov r2, #0
@@ -1162,7 +1162,7 @@ _0217cc24:
mov r0, r5
bl func_ov33_0217c98c
ldr r1, [r5, #0x48]
ldr r0, _0217cf20 ; =data_027e0e60
ldr r0, _0217cf20 ; =gMapManager
str r1, [sp, #0x1c]
ldr r1, [r5, #0x4c]
ldr r0, [r0]
@@ -1276,7 +1276,7 @@ _0217cdbc: ; jump table
b _0217ceb4 ; case 3
b _0217cef0 ; case 4
_0217cdd0:
ldr r0, _0217cf20 ; =data_027e0e60
ldr r0, _0217cf20 ; =gMapManager
ldrh r1, [r5, #0x22]
ldr r0, [r0]
mov r2, #0
@@ -1312,7 +1312,7 @@ _0217ce4c:
mov r0, r5
bl func_ov33_0217c98c
ldr r1, [r5, #0x48]
ldr r0, _0217cf20 ; =data_027e0e60
ldr r0, _0217cf20 ; =gMapManager
str r1, [sp, #0x10]
ldr r1, [r5, #0x4c]
ldr r0, [r0]
@@ -1368,7 +1368,7 @@ _0217cf08:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov33_0217ca88
_0217cf20: .word data_027e0e60
_0217cf20: .word gMapManager
_0217cf24: .word data_027e0ffc
_0217cf28: .word 0x000001fb
asm/ov34.inc
+1 -1
View File
@@ -71,7 +71,7 @@
.extern data_027e0764
.extern data_027e0d0c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f94
asm/ov34.s
+13 -13
View File
@@ -1321,7 +1321,7 @@ func_ov34_0217ceb0: ; 0x0217ceb0
func_ov34_0217cf74: ; 0x0217cf74
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x1c
ldr r0, _0217d008 ; =data_027e0e60
ldr r0, _0217d008 ; =gMapManager
mov r3, #0
mov r1, #0xff
strb r1, [sp, #4]
@@ -1359,7 +1359,7 @@ _0217cfa4:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov34_0217cf74
_0217d008: .word data_027e0e60
_0217d008: .word gMapManager
_0217d00c: .word data_027e0f64
.global func_ov34_0217d010
@@ -1367,7 +1367,7 @@ _0217d00c: .word data_027e0f64
func_ov34_0217d010: ; 0x0217d010
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x1c
ldr r0, _0217d0a4 ; =data_027e0e60
ldr r0, _0217d0a4 ; =gMapManager
mov r3, #0
mov r1, #0xff
strb r1, [sp, #4]
@@ -1405,7 +1405,7 @@ _0217d040:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov34_0217d010
_0217d0a4: .word data_027e0e60
_0217d0a4: .word gMapManager
_0217d0a8: .word data_027e0f64
.global func_ov34_0217d0ac
@@ -1413,7 +1413,7 @@ _0217d0a8: .word data_027e0f64
func_ov34_0217d0ac: ; 0x0217d0ac
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x1c
ldr r0, _0217d140 ; =data_027e0e60
ldr r0, _0217d140 ; =gMapManager
mov r3, #0
mov r1, #0xff
strb r1, [sp, #4]
@@ -1451,7 +1451,7 @@ _0217d0dc:
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov34_0217d0ac
_0217d140: .word data_027e0e60
_0217d140: .word gMapManager
_0217d144: .word data_027e0f64
.global func_ov34_0217d148
@@ -2223,7 +2223,7 @@ _0217db48:
ldr r0, [r0]
ldr r1, _0217decc ; =0x000b00df
bl func_ov00_020cfc70
ldr r0, _0217ded0 ; =data_027e0e60
ldr r0, _0217ded0 ; =gMapManager
mov r1, #1
ldr r0, [r0]
mov r2, #0
@@ -2386,7 +2386,7 @@ _0217dec0: .word data_ov34_02186308
_0217dec4: .word data_ov34_02186320
_0217dec8: .word data_027e103c
_0217decc: .word 0x000b00df
_0217ded0: .word data_027e0e60
_0217ded0: .word gMapManager
.global func_ov34_0217ded4
arm_func_start func_ov34_0217ded4
@@ -6619,7 +6619,7 @@ _02181b50:
add r2, r6, #0x1000
ldrh r4, [r0, #0x86]
ldr r3, [r2, #0xd04]
ldr r1, _02181d00 ; =data_027e0e60
ldr r1, _02181d00 ; =gMapManager
str r3, [sp, #0xc]
ldr r3, [r2, #0xd08]
ldr r0, [r1]
@@ -6722,7 +6722,7 @@ _02181c8c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov34_02181a00
_02181d00: .word data_027e0e60
_02181d00: .word gMapManager
_02181d04: .word data_02050f54
_02181d08: .word data_027e0ffc
_02181d0c: .word 0x000002fa
@@ -10712,13 +10712,13 @@ _021853d8: .word func_ov00_020b7d74
func_ov34_021853dc: ; 0x021853dc
stmdb sp!, {r4, lr}
sub sp, sp, #0x30
ldr r1, _02185580 ; =data_027e0e60
ldr r1, _02185580 ; =gMapManager
mov r4, r0
ldr r1, [r1]
add r0, sp, #8
add r2, r4, #0x48
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldr r0, _02185580 ; =data_027e0e60
ldr r0, _02185580 ; =gMapManager
add r1, sp, #8
ldr r0, [r0]
bl _ZN10MapManager16MapData_vfunc_54Ev
@@ -10821,7 +10821,7 @@ _02185568:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov34_021853dc
_02185580: .word data_027e0e60
_02185580: .word gMapManager
_02185584: .word data_027e0fec
_02185588: .word data_027e0f6c
_0218558c: .word data_027e0e58
asm/ov35.inc
+1 -1
View File
@@ -90,7 +90,7 @@
.extern data_027e0c68
.extern data_027e0d0c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f90
.extern data_027e0f94
asm/ov35.s
+7 -7
View File
@@ -2798,7 +2798,7 @@ func_ov35_0217e320: ; 0x0217e320
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r2, [sp, #0x24]
ldr r0, _0217e3d4 ; =data_027e0e60
ldr r0, _0217e3d4 ; =gMapManager
ldr r1, [sp, #0x28]
str r2, [sp, #0x18]
ldr r2, [sp, #0x2c]
@@ -2826,7 +2826,7 @@ func_ov35_0217e320: ; 0x0217e320
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov35_0217e320
_0217e3d4: .word data_027e0e60
_0217e3d4: .word gMapManager
_0217e3d8: .word data_ov00_020e9370
.global func_ov35_0217e3dc
@@ -8082,7 +8082,7 @@ _02182d70:
str r1, [sp, #0xac]
str r0, [sp, #0xb4]
_02182d84:
ldr r0, _02182f94 ; =data_027e0e60
ldr r0, _02182f94 ; =gMapManager
add r2, sp, #0x94
ldr r0, [r0]
mov r1, #1
@@ -8177,7 +8177,7 @@ _02182e40:
str r8, [sp, #0xc]
mov r1, #1
str r1, [sp, #0x10]
ldr r0, _02182f94 ; =data_027e0e60
ldr r0, _02182f94 ; =gMapManager
add r1, sp, #0xb8
ldr r0, [r0]
add r2, sp, #0x28
@@ -8217,7 +8217,7 @@ _02182e40:
_02182f88: .word data_027e0f64
_02182f8c: .word data_027e0f94
_02182f90: .word data_027e0764
_02182f94: .word data_027e0e60
_02182f94: .word gMapManager
_02182f98: .word 0x0000ffff
_02182f9c: .word 0x0000099a
_02182fa0: .word data_027e0fe8
@@ -9242,7 +9242,7 @@ _02183d8c:
adc r0, r0, #0
mov r1, r1, lsr #0xc
ldr r2, [sp, #0x24]
ldr lr, _02183e90 ; =data_027e0e60
ldr lr, _02183e90 ; =gMapManager
adds r8, ip, #0x800
orr r1, r1, r0, lsl #20
add ip, r2, r1
@@ -9293,7 +9293,7 @@ _02183e80: .word 0x0000019a
_02183e84: .word 0x00000ccd
_02183e88: .word 0x00000555
_02183e8c: .word data_02050f54
_02183e90: .word data_027e0e60
_02183e90: .word gMapManager
_02183e94: .word data_ov00_020e9370
.global func_ov35_02183e98
asm/ov36.inc
+1 -1
View File
@@ -76,7 +76,7 @@
.extern data_027e0d0c
.extern data_027e0d3c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f90
asm/ov36.s
+33 -33
View File
@@ -1824,13 +1824,13 @@ _0217d56c:
ldr r1, [r1, #0x28]
add r0, r0, #0x1800
bl func_ov17_02168660
ldr r0, _0217d6b0 ; =data_027e0e60
ldr r0, _0217d6b0 ; =gMapManager
mov r1, #3
ldr r0, [r0]
mov r2, r1
mov r3, #0
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _0217d6b0 ; =data_027e0e60
ldr r0, _0217d6b0 ; =gMapManager
mov r1, #4
ldr r0, [r0]
mov r2, #3
@@ -1871,7 +1871,7 @@ _0217d6a0: .word data_ov36_0218683e
_0217d6a4: .word 0x00000333
_0217d6a8: .word 0x00001610
_0217d6ac: .word data_027e0fec
_0217d6b0: .word data_027e0e60
_0217d6b0: .word gMapManager
_0217d6b4: .word 0x0000011e
_0217d6b8: .word 0x0000011f
@@ -2371,7 +2371,7 @@ func_ov36_0217dd98: ; 0x0217dd98
moveq r0, #0
streq r0, [r4, #0x138]
ldmeqia sp!, {r4, pc}
ldr r0, _0217ddfc ; =data_027e0e60
ldr r0, _0217ddfc ; =gMapManager
ldrh r1, [r4, #0x20]
ldr r0, [r0]
mov r2, #0
@@ -2391,7 +2391,7 @@ _0217ddf0:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov36_0217dd98
_0217ddfc: .word data_027e0e60
_0217ddfc: .word gMapManager
.global func_ov36_0217de00
arm_func_start func_ov36_0217de00
@@ -3203,7 +3203,7 @@ _0217e970:
str r0, [r6, #0x88]
_0217e978:
ldr r1, [r6, #0x48]
ldr r0, _0217eb4c ; =data_027e0e60
ldr r0, _0217eb4c ; =gMapManager
str r1, [sp, #0xc]
ldr r1, [r6, #0x4c]
ldr r0, [r0]
@@ -3323,7 +3323,7 @@ _0217eb3c: .word data_027e0fc8
_0217eb40: .word data_027e0fe4
_0217eb44: .word 0x504c444d
_0217eb48: .word 0x0000219a
_0217eb4c: .word data_027e0e60
_0217eb4c: .word gMapManager
_0217eb50: .word data_02050f54
_0217eb54: .word data_027e0e58
@@ -3510,7 +3510,7 @@ func_ov36_0217ed50: ; 0x0217ed50
b _0217eef8
_0217ede8:
ldr r1, [r4, #0x48]
ldr r0, _0217ef0c ; =data_027e0e60
ldr r0, _0217ef0c ; =gMapManager
str r1, [sp]
ldr r1, [r4, #0x4c]
ldr r0, [r0]
@@ -3525,21 +3525,21 @@ _0217ede8:
movne r0, #0
cmp r0, #0
beq _0217eee8
ldr r0, _0217ef0c ; =data_027e0e60
ldr r0, _0217ef0c ; =gMapManager
ldr r1, [r4, #0x54]
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _0217ef0c ; =data_027e0e60
ldr r1, _0217ef0c ; =gMapManager
mov r6, r0
ldr r0, [r1]
ldr r1, [r4, #0x5c]
bl _ZN10MapManager18func_ov00_020839f8Ev
ldr r1, _0217ef0c ; =data_027e0e60
ldr r1, _0217ef0c ; =gMapManager
mov r7, r0
ldr r0, [r1]
ldr r1, [r4, #0x48]
bl _ZN10MapManager18func_ov00_020839d4Ev
ldr r1, _0217ef0c ; =data_027e0e60
ldr r1, _0217ef0c ; =gMapManager
mov r5, r0
ldr r0, [r1]
ldr r1, [r4, #0x50]
@@ -3589,7 +3589,7 @@ _0217eef8:
arm_func_end func_ov36_0217ed50
_0217ef04: .word data_ov36_02186c9c
_0217ef08: .word data_027e0d0c
_0217ef0c: .word data_027e0e60
_0217ef0c: .word gMapManager
.global func_ov36_0217ef10
arm_func_start func_ov36_0217ef10
@@ -5422,7 +5422,7 @@ _02180774:
str r0, [sp, #0x14]
ldr r0, [r7, #8]
stmia sp, {r0, r9, r11}
ldr r0, _02180994 ; =data_027e0e60
ldr r0, _02180994 ; =gMapManager
ldr r0, [r0]
bl func_01ffe1cc
cmp r0, #0
@@ -5518,7 +5518,7 @@ _02180984: .word data_ov36_02186cd4
_02180988: .word data_ov36_02186838
_0218098c: .word data_02050f54
_02180990: .word 0x000004cd
_02180994: .word data_027e0e60
_02180994: .word gMapManager
_02180998: .word data_027e0f64
_0218099c: .word gAdventureFlags
_021809a0: .word data_027e0c68
@@ -6914,7 +6914,7 @@ _02181dc8:
bl func_0202d7ac
cmp r0, #0
bne _02181e34
ldr r0, _02181f30 ; =data_027e0e60
ldr r0, _02181f30 ; =gMapManager
mov r1, #2
ldr r0, [r0]
mov r2, #1
@@ -6969,7 +6969,7 @@ _02181e34:
str r0, [r4, #0x66c]
ldr r0, _02181f34 ; =0x0000011e
bl func_ov19_0216e7b0
ldr r0, _02181f30 ; =data_027e0e60
ldr r0, _02181f30 ; =gMapManager
mov r1, #3
ldr r0, [r0]
mov r2, r1
@@ -6977,13 +6977,13 @@ _02181e34:
cmp r0, #0
addne sp, sp, #0x14
ldmneia sp!, {r3, r4, pc}
ldr r0, _02181f30 ; =data_027e0e60
ldr r0, _02181f30 ; =gMapManager
mov r1, #3
ldr r0, [r0]
mov r2, r1
mov r3, #1
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _02181f30 ; =data_027e0e60
ldr r0, _02181f30 ; =gMapManager
mov r1, #4
ldr r0, [r0]
mov r2, #3
@@ -7003,7 +7003,7 @@ _02181f20: .word data_ov36_02186ce4
_02181f24: .word data_027e0e58
_02181f28: .word 0x000002c7
_02181f2c: .word data_027e071c
_02181f30: .word data_027e0e60
_02181f30: .word gMapManager
_02181f34: .word 0x0000011e
_02181f38: .word data_027e0f90
@@ -7016,12 +7016,12 @@ func_ov36_02181f3c: ; 0x02181f3c
mov r1, #3
orr r2, r0, #0x100000
str r2, [r4, #0x878]
ldr r0, _02181fc8 ; =data_027e0e60
ldr r0, _02181fc8 ; =gMapManager
mov r2, r1
ldr r0, [r0]
mov r3, #0
bl _ZN10MapManager18func_ov00_02084b38Eiii
ldr r0, _02181fc8 ; =data_027e0e60
ldr r0, _02181fc8 ; =gMapManager
mov r1, #4
ldr r0, [r0]
mov r2, #3
@@ -7047,7 +7047,7 @@ func_ov36_02181f3c: ; 0x02181f3c
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov36_02181f3c
_02181fc8: .word data_027e0e60
_02181fc8: .word gMapManager
_02181fcc: .word data_027e0f64
.global func_ov36_02181fd0
@@ -7658,14 +7658,14 @@ _021828dc:
strh r1, [r0, #0x18]
cmp r3, #2
blo _021828dc
ldr r0, _0218298c ; =data_027e0e60
ldr r0, _0218298c ; =gMapManager
add r2, sp, #0x2c
ldr r0, [r0]
mov r1, #0x5b
bl _ZN10MapManager18func_ov00_02083918EiPi
cmp r0, #0
beq _02182934
ldr r0, _0218298c ; =data_027e0e60
ldr r0, _0218298c ; =gMapManager
ldrb r1, [sp, #0x30]
ldr r0, [r0]
mov r2, #0
@@ -7701,14 +7701,14 @@ _0218297c: .word 0x0000199a
_02182980: .word 0x00001003
_02182984: .word 0x000002c2
_02182988: .word 0x000002cd
_0218298c: .word data_027e0e60
_0218298c: .word gMapManager
.global func_ov36_02182990
arm_func_start func_ov36_02182990
func_ov36_02182990: ; 0x02182990
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x124
ldr r1, _02182c64 ; =data_027e0e60
ldr r1, _02182c64 ; =gMapManager
mov r4, r0
ldr r0, [r1]
mov r1, #0
@@ -7892,7 +7892,7 @@ _02182a7c:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov36_02182990
_02182c64: .word data_027e0e60
_02182c64: .word gMapManager
_02182c68: .word data_027e0f64
_02182c6c: .word data_027e0ffc
_02182c70: .word data_027e0fc8
@@ -10044,13 +10044,13 @@ _02184a9c:
add r1, sp, #0
bl func_ov00_02087d34
mov r1, #0
ldr r0, _02184de0 ; =data_027e0e60
ldr r0, _02184de0 ; =gMapManager
str r1, [sp, #0x1c]
ldr r0, [r0]
str r1, [sp, #0x20]
str r1, [sp, #0x24]
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
ldr r1, _02184de0 ; =data_027e0e60
ldr r1, _02184de0 ; =gMapManager
mov r4, r0
ldr r0, [r1]
bl _ZN10MapManager18Get_MapData_Unk_d0Ev
@@ -10245,7 +10245,7 @@ _02184dc8:
arm_func_end func_ov36_02184a64
_02184dd8: .word gAdventureFlags
_02184ddc: .word data_027e0f64
_02184de0: .word data_027e0e60
_02184de0: .word gMapManager
_02184de4: .word 0x0000038e
_02184de8: .word 0x00001e84
@@ -10366,7 +10366,7 @@ func_ov36_02184f44: ; 0x02184f44
mov r4, r0
_02184f6c:
ldr r1, [r6, #0x48]
ldr r0, _0218504c ; =data_027e0e60
ldr r0, _0218504c ; =gMapManager
str r1, [sp]
ldr r1, [r6, #0x4c]
ldr r0, [r0]
@@ -10429,7 +10429,7 @@ _02185040:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov36_02184f44
_0218504c: .word data_027e0e60
_0218504c: .word gMapManager
.global func_ov36_02185050
arm_func_start func_ov36_02185050
asm/ov37.inc
+1 -1
View File
@@ -79,7 +79,7 @@
.extern data_027e0c54
.extern data_027e0d0c
.extern data_027e0e58
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f90
asm/ov37.s
+26 -26
View File
@@ -3058,14 +3058,14 @@ _0217e78c:
strh r1, [r0, #0x18]
cmp r3, #2
blo _0217e78c
ldr r0, _0217f0f4 ; =data_027e0e60
ldr r0, _0217f0f4 ; =gMapManager
add r2, sp, #0x7c
ldr r0, [r0]
mov r1, #3
bl _ZN10MapManager18func_ov00_02083908EcPi
cmp r0, #0
beq _0217e7ec
ldr r0, _0217f0f4 ; =data_027e0e60
ldr r0, _0217f0f4 ; =gMapManager
mov r1, #3
ldr r0, [r0]
mov r2, #0
@@ -3171,14 +3171,14 @@ _0217e93c:
strh r1, [r0, #0x18]
cmp r3, #2
blo _0217e93c
ldr r0, _0217f0f4 ; =data_027e0e60
ldr r0, _0217f0f4 ; =gMapManager
add r2, sp, #0x54
ldr r0, [r0]
mov r1, #1
bl _ZN10MapManager18func_ov00_02083908EcPi
cmp r0, #0
beq _0217e99c
ldr r0, _0217f0f4 ; =data_027e0e60
ldr r0, _0217f0f4 ; =gMapManager
mov r1, #1
ldr r0, [r0]
mov r2, #0
@@ -3675,7 +3675,7 @@ _0217f0e8:
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0217f0f4: .word data_027e0e60
_0217f0f4: .word gMapManager
_0217f0f8: .word data_027e0e58
_0217f0fc: .word 0x00001020
_0217f100: .word 0x00001021
@@ -3929,7 +3929,7 @@ func_ov37_0217f468: ; 0x0217f468
add r3, sp, #0xc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0217f4d0 ; =data_027e0e60
ldr r0, _0217f4d0 ; =gMapManager
ldr lr, [sp, #0xc]
ldr ip, [sp, #0x10]
ldr r3, [sp, #0x14]
@@ -3948,7 +3948,7 @@ func_ov37_0217f468: ; 0x0217f468
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov37_0217f468
_0217f4d0: .word data_027e0e60
_0217f4d0: .word gMapManager
.global func_ov37_0217f4d4
arm_func_start func_ov37_0217f4d4
@@ -3962,7 +3962,7 @@ func_ov37_0217f4d4: ; 0x0217f4d4
add r3, sp, #0xc
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0217f53c ; =data_027e0e60
ldr r0, _0217f53c ; =gMapManager
ldr lr, [sp, #0xc]
ldr ip, [sp, #0x10]
ldr r3, [sp, #0x14]
@@ -3981,7 +3981,7 @@ func_ov37_0217f4d4: ; 0x0217f4d4
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov37_0217f4d4
_0217f53c: .word data_027e0e60
_0217f53c: .word gMapManager
.global func_ov37_0217f540
arm_func_start func_ov37_0217f540
@@ -3993,7 +3993,7 @@ func_ov37_0217f540: ; 0x0217f540
mov r5, r0
ldmia r4, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0217f650 ; =data_027e0e60
ldr r0, _0217f650 ; =gMapManager
ldr lr, [sp, #0x20]
ldr ip, [sp, #0x24]
ldr r3, [sp, #0x28]
@@ -4056,7 +4056,7 @@ func_ov37_0217f540: ; 0x0217f540
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov37_0217f540
_0217f650: .word data_027e0e60
_0217f650: .word gMapManager
_0217f654: .word data_027e0e58
_0217f658: .word 0x00001013
_0217f65c: .word 0x00001014
@@ -6741,7 +6741,7 @@ _02181b64:
add r3, sp, #0x224
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02181f34 ; =data_027e0e60
ldr r0, _02181f34 ; =gMapManager
ldr r6, [sp, #0x224]
ldr r4, [sp, #0x228]
ldr r3, [sp, #0x22c]
@@ -6795,7 +6795,7 @@ _02181c30:
add r3, sp, #0x218
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02181f34 ; =data_027e0e60
ldr r0, _02181f34 ; =gMapManager
ldr r6, [sp, #0x218]
ldr r4, [sp, #0x21c]
ldr r3, [sp, #0x220]
@@ -6928,7 +6928,7 @@ _02181e2c:
add r3, sp, #0x1f4
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02181f34 ; =data_027e0e60
ldr r0, _02181f34 ; =gMapManager
ldr r2, [sp, #0x1f4]
ldr r6, [sp, #0x1f8]
ldr r3, [sp, #0x1fc]
@@ -6984,7 +6984,7 @@ _02181f24: .word 0x0000100f
_02181f28: .word 0x00001010
_02181f2c: .word data_ov37_0218801c
_02181f30: .word 0x00001011
_02181f34: .word data_027e0e60
_02181f34: .word gMapManager
_02181f38: .word 0x00000153
_02181f3c: .word data_ov37_02188028
_02181f40: .word 0x000002ae
@@ -7157,7 +7157,7 @@ _0218219c:
add r3, sp, #0x1b8
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02181f34 ; =data_027e0e60
ldr r0, _02181f34 ; =gMapManager
ldr r2, [sp, #0x1b8]
ldr r6, [sp, #0x1bc]
ldr r3, [sp, #0x1c0]
@@ -7276,7 +7276,7 @@ _02182368:
add r3, sp, #0x194
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02181f34 ; =data_027e0e60
ldr r0, _02181f34 ; =gMapManager
ldr r6, [sp, #0x194]
ldr r4, [sp, #0x198]
ldr r3, [sp, #0x19c]
@@ -7331,7 +7331,7 @@ _02182438:
add r3, sp, #0x188
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02181f34 ; =data_027e0e60
ldr r0, _02181f34 ; =gMapManager
ldr r6, [sp, #0x188]
ldr r4, [sp, #0x18c]
ldr r3, [sp, #0x190]
@@ -12114,7 +12114,7 @@ func_ov37_02186458: ; 0x02186458
add r1, r4, #0x48
bl func_ov00_020c5330
ldr r1, [r4, #0x48]
ldr r0, _02186670 ; =data_027e0e60
ldr r0, _02186670 ; =gMapManager
str r1, [sp, #8]
ldr r2, [r4, #0x4c]
ldr r0, [r0]
@@ -12153,7 +12153,7 @@ _02186660: .word data_027e0f6c
_02186664: .word data_027e0fe8
_02186668: .word 0x57534243
_0218666c: .word data_027e0fe4
_02186670: .word data_027e0e60
_02186670: .word gMapManager
.global func_ov37_02186674
arm_func_start func_ov37_02186674
@@ -12286,7 +12286,7 @@ func_ov37_02186720: ; 0x02186720
str r1, [sp, #4]
str r0, [sp, #8]
str r5, [sp, #0xc]
ldr r0, _02186858 ; =data_027e0e60
ldr r0, _02186858 ; =gMapManager
str r5, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x44
@@ -12302,7 +12302,7 @@ func_ov37_02186720: ; 0x02186720
arm_func_end func_ov37_02186720
_02186850: .word data_027e0fe4
_02186854: .word 0x0000ffff
_02186858: .word data_027e0e60
_02186858: .word gMapManager
.global func_ov37_0218685c
arm_func_start func_ov37_0218685c
@@ -12593,7 +12593,7 @@ func_ov37_02186b68: ; 0x02186b68
add r3, sp, #0x14
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02186cac ; =data_027e0e60
ldr r0, _02186cac ; =gMapManager
ldr lr, [sp, #0x14]
ldr ip, [sp, #0x18]
ldr r3, [sp, #0x1c]
@@ -12632,7 +12632,7 @@ func_ov37_02186b68: ; 0x02186b68
.align 2, 0
arm_func_end func_ov37_02186b68
_02186ca8: .word 0x66666667
_02186cac: .word data_027e0e60
_02186cac: .word gMapManager
_02186cb0: .word data_027e0e58
_02186cb4: .word 0x000001a9
_02186cb8: .word data_027e0ffc
@@ -13254,7 +13254,7 @@ _021874d8:
add r3, sp, #0x20
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02187770 ; =data_027e0e60
ldr r0, _02187770 ; =gMapManager
ldr ip, [sp, #0x20]
ldr r4, [sp, #0x24]
ldr r3, [sp, #0x28]
@@ -13422,7 +13422,7 @@ _02187760: .word 0x000002b9
_02187764: .word 0x00000191
_02187768: .word data_ov00_020eec68
_0218776c: .word 0x00000333
_02187770: .word data_027e0e60
_02187770: .word gMapManager
_02187774: .word data_027e0e58
_02187778: .word 0x00001011
_0218777c: .word 0x000002ba
asm/ov38.inc
+1 -1
View File
@@ -75,7 +75,7 @@
.extern data_027e0d0c
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f94
asm/ov38.s
+12 -12
View File
@@ -10962,7 +10962,7 @@ _02185790:
ldr r0, [r2, #0x78]
cmp r0, #0
ldmneia sp!, {r4, pc}
ldr r0, _02185828 ; =data_027e0e60
ldr r0, _02185828 ; =gMapManager
mov r1, #3
ldr r0, [r0]
mov r2, #1
@@ -11002,7 +11002,7 @@ _02185818:
.align 2, 0
arm_func_end func_ov38_02185720
_02185824: .word 0x00000708
_02185828: .word data_027e0e60
_02185828: .word gMapManager
_0218582c: .word data_ov29_0217a4ac
.global func_ov38_02185830
@@ -11045,7 +11045,7 @@ _021858ac:
ldr r0, [r4, #0x2d8]
cmp r0, #0x10
ldmneia sp!, {r4, pc}
ldr r0, _02185a64 ; =data_027e0e60
ldr r0, _02185a64 ; =gMapManager
mov r1, #3
ldr r0, [r0]
mov r2, #1
@@ -11060,14 +11060,14 @@ _021858ac:
bl func_ov29_021772f8
ldmia sp!, {r4, pc}
_021858f0:
ldr r0, _02185a64 ; =data_027e0e60
ldr r0, _02185a64 ; =gMapManager
mov r1, #6
ldr r0, [r0]
mov r2, #1
bl _ZN10MapManager18func_ov00_02084be0Eii
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _02185a64 ; =data_027e0e60
ldr r0, _02185a64 ; =gMapManager
mov r1, #6
ldr r0, [r0]
mov r2, #1
@@ -11100,7 +11100,7 @@ _02185968:
bl func_ov38_02185720
ldmia sp!, {r4, pc}
_02185984:
ldr r0, _02185a64 ; =data_027e0e60
ldr r0, _02185a64 ; =gMapManager
mov r1, #5
ldr r0, [r0]
mov r2, #1
@@ -11113,7 +11113,7 @@ _02185984:
ldmneia sp!, {r4, pc}
mov r1, #0
bl func_ov29_021772f8
ldr r0, _02185a64 ; =data_027e0e60
ldr r0, _02185a64 ; =gMapManager
mov r1, #5
ldr r0, [r0]
mov r2, #1
@@ -11143,7 +11143,7 @@ _021859e4:
mov r1, #5
mov r2, #1
bl func_ov38_0217bf0c
ldr r0, _02185a64 ; =data_027e0e60
ldr r0, _02185a64 ; =gMapManager
mov r2, #1
ldr r0, [r0]
mov r3, r2
@@ -11160,7 +11160,7 @@ _02185a58:
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov38_02185830
_02185a64: .word data_027e0e60
_02185a64: .word gMapManager
_02185a68: .word data_ov29_0217a4ac
_02185a6c: .word gItemManager
@@ -11493,7 +11493,7 @@ _02185ef8:
str r0, [r1, #0x210]
cmp r0, #0x82
ble _02185f3c
ldr r0, _02186a14 ; =data_027e0e60
ldr r0, _02186a14 ; =gMapManager
mov r1, #1
ldr r0, [r0]
mov r2, r1
@@ -11738,7 +11738,7 @@ _02186268:
add sp, sp, #0x154
ldmia sp!, {r4, r5, pc}
_021862c8:
ldr r0, _02186a14 ; =data_027e0e60
ldr r0, _02186a14 ; =gMapManager
mov r1, #2
ldr r0, [r0]
mov r2, #1
@@ -12220,7 +12220,7 @@ _021869dc:
.align 2, 0
arm_func_end func_ov38_02185ebc
_02186a10: .word data_ov38_021891e0
_02186a14: .word data_027e0e60
_02186a14: .word gMapManager
_02186a18: .word 0x00000ccd
_02186a1c: .word data_027e0f94
_02186a20: .word data_027e0fc8

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