diff --git a/asm/itcm.inc b/asm/itcm.inc index 77612b92..f282df4a 100644 --- a/asm/itcm.inc +++ b/asm/itcm.inc @@ -52,15 +52,15 @@ .extern func_ov00_0207e968 .extern func_ov00_0207e96c .extern func_ov00_02081ef4 -.extern func_ov00_0208335c -.extern func_ov00_02083368 -.extern func_ov00_020839d4 -.extern func_ov00_020839f8 -.extern func_ov00_02083ee0 -.extern func_ov00_02083ef8 -.extern func_ov00_020840c4 -.extern func_ov00_02086284 -.extern func_ov00_02086a84 +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager17Get_MapData_Unk2aEv +.extern _ZN10MapManager18func_ov00_020839d4Ev +.extern _ZN10MapManager18func_ov00_020839f8Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ +.extern _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ .extern func_ov00_0208e4f8 .extern func_ov00_0208ed74 .extern func_ov00_0208ee00 diff --git a/asm/itcm.s b/asm/itcm.s index cb895711..bc5b45df 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -5041,11 +5041,11 @@ func_01ffc118: ; 0x01ffc118 beq _01ffc530 ldr r1, [sp, #0x260] ldr r0, [sp, #0x14] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev str r0, [sp, #0x4c] ldr r0, [sp, #0x14] ldr r1, [sp, #0x268] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev add r1, r8, #0x800 str r0, [sp, #0x48] mov r0, r1, asr #0xc @@ -5055,10 +5055,10 @@ func_01ffc118: ; 0x01ffc118 sub r0, r0, r1, asr #12 str r0, [sp, #0x44] ldr r0, [sp, #0x14] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0x38] ldr r0, [sp, #0x14] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp, #0x34] ldr r1, [sp, #0x44] ldr r0, [sp, #0x40] @@ -5106,7 +5106,7 @@ _01ffc24c: strb r0, [sp, #0x69] ldr r0, [sp, #0x14] strb r2, [sp, #0x68] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _01ffc508 ldr r1, [r5, #4] @@ -5240,7 +5240,7 @@ _01ffc398: str r0, [sp, #0xc] ldr r0, [sp, #0x14] mov r2, ip - bl func_ov00_02086284 + bl _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ cmp r0, #0 mov r0, #1 beq _01ffc4dc @@ -5434,7 +5434,7 @@ _01ffc73c: str r0, [sp, #0xc] ldr r0, [sp, #0x14] mov r2, r6 - bl func_ov00_02086284 + bl _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ cmp r0, #0 mov r1, r5, lsl #0x1 beq _01ffc840 @@ -6172,22 +6172,22 @@ func_01ffd1e0: ; 0x01ffd1e0 bl func_ov00_0208ee00 ldr r0, [sp, #0x14] ldr r1, [sp, #0x298] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev sub r0, r0, #1 str r0, [sp, #0x3c] ldr r0, [sp, #0x14] ldr r1, [sp, #0x2a0] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev sub r0, r0, #1 str r0, [sp, #0x28] ldr r0, [sp, #0x14] ldr r1, [sp, #0x2a4] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev add r0, r0, #1 str r0, [sp, #0x38] ldr r0, [sp, #0x14] ldr r1, [sp, #0x2ac] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev add r0, r0, #1 str r0, [sp, #0x34] mov r0, #0 @@ -6207,10 +6207,10 @@ func_01ffd1e0: ; 0x01ffd1e0 add r2, sp, #0x2b0 bl func_01ff9bf8 ldr r0, [sp, #0x14] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0x30] ldr r0, [sp, #0x14] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp, #0x2c] ldr r1, [sp, #0x28] ldr r0, [sp, #0x34] @@ -6252,7 +6252,7 @@ _01ffd398: strb r0, [sp, #0x5d] ldr r0, [sp, #0x14] strb r4, [sp, #0x5c] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _01ffd650 ldr r1, [r5, #4] @@ -6386,7 +6386,7 @@ _01ffd4e4: add r2, sp, #0x26c str r2, [sp, #0x10] mov r2, ip - bl func_ov00_02086a84 + bl _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ cmp r0, #0 mov r0, #1 beq _01ffd624 @@ -6571,7 +6571,7 @@ _01ffd858: add r1, sp, #0x230 str r1, [sp, #0x10] mov r1, r4 - bl func_ov00_02086a84 + bl _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ cmp r0, #0 mov r1, r5, lsl #0x1 beq _01ffd964 @@ -7092,7 +7092,7 @@ _01ffdfa8: mov r1, r7 mov r2, r9 str r4, [sp, #0x31c] - bl func_ov00_02083ef8 + bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ ldr r1, [sp, #0x1d4] add r0, r0, r8 cmp r1, r0 @@ -7222,25 +7222,25 @@ func_01ffe1cc: ; 0x01ffe1cc bl func_ov00_0208ee00 ldr r0, [sp, #0xc] ldr r1, [sp, #0x48] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev str r0, [sp, #0x24] ldr r0, [sp, #0xc] ldr r1, [sp, #0x50] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r6, r0 ldr r0, [sp, #0xc] ldr r1, [sp, #0x54] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev mov r4, r0 ldr r0, [sp, #0xc] ldr r1, [sp, #0x5c] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev str r0, [sp, #0x20] ldr r0, [sp, #0xc] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0x1c] ldr r0, [sp, #0xc] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp, #0x18] ldr r0, [sp, #0x20] cmp r6, r0 @@ -7274,7 +7274,7 @@ _01ffe314: strb r0, [sp, #0x31] ldr r0, [sp, #0xc] strb r5, [sp, #0x30] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r7, r0 beq _01ffe43c ldr r1, [r0] @@ -9193,7 +9193,7 @@ func_01fffd04: ; 0x01fffd04 str r1, [sp, #0x30] moveq r2, #0 add r1, sp, #0x2c - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r3, [r6, #0x4c] ldr r1, [sp, #0x54] ldr r2, [sp, #0x5c] diff --git a/asm/main/main_02000000.inc b/asm/main/main_02000000.inc index f55a7b3b..60b5442b 100644 --- a/asm/main/main_02000000.inc +++ b/asm/main/main_02000000.inc @@ -375,10 +375,10 @@ .extern func_ov00_0207bcb4 .extern func_ov00_0207be84 .extern func_ov00_0207c0f0 -.extern func_ov00_02082614 -.extern func_ov00_020838e8 -.extern func_ov00_02084740 -.extern func_ov00_02086044 +.extern _ZN10MapManager18func_ov00_02082614Eii +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02084740Ev +.extern _ZN10MapManager18func_ov00_02086044Eiii .extern func_ov00_02087d98 .extern func_ov00_02089068 .extern func_ov00_0208b180 diff --git a/asm/main/main_02000000.s b/asm/main/main_02000000.s index 52244b07..e9f932fc 100644 --- a/asm/main/main_02000000.s +++ b/asm/main/main_02000000.s @@ -58489,7 +58489,7 @@ func_0202bf58: ; 0x0202bf58 ldr ip, [r1, #8] add r1, sp, #0xc str ip, [sp, #8] - bl func_ov00_02086044 + bl _ZN10MapManager18func_ov00_02086044Eiii add sp, sp, #0x18 ldmia sp!, {r3, pc} .align 2, 0 @@ -76862,7 +76862,7 @@ _020382e8: ldr r0, [r0] ldr r1, [r4, #4] add r2, sp, #0 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _02038368 ldr r0, _020385a0 ; =data_027e0d38 @@ -76955,7 +76955,7 @@ _02038444: _0203846c: ldr r0, _0203859c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084740 + bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 ldr r2, [r4, #4] ldr r0, _020385ac ; =data_ov00_020eec68 @@ -80340,7 +80340,7 @@ _0203acc0: add r1, sp, #8 ldr r0, [r0] and r2, r2, #0xff - bl func_ov00_02082614 + bl _ZN10MapManager18func_ov00_02082614Eii ldr r0, _0203ae94 ; =data_027e103c add r1, sp, #8 ldr r0, [r0] diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 869800e4..e490c88b 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -1,4 +1,9 @@ #pragma once +.extern _ZN10MapManager18func_ov00_02083570Eii +.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084be0Eii +.extern _ZN10MapManager18func_ov00_02084c5cEii .extern _ZN10PlayerBase18EquipItem_vfunc_2cEv .extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder @@ -10,6 +15,7 @@ .extern _ZN12ActorManager18func_ov00_020c39acEjPjb .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13PlayerControl13StopFollowingEv +.extern _ZN14AdventureFlags18func_ov00_02097738Ev .extern _ZN9SysObjectdlEPv .extern _ZNK11ItemManager19GetActiveFairyLevelEi .extern data_02050f54 @@ -20,7 +26,6 @@ .extern data_027e0d0c .extern data_027e0d3c .extern data_027e0e60 -.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac @@ -47,13 +52,7 @@ .extern func_ov00_0207a188 .extern func_ov00_0207a1c8 .extern func_ov00_0207b89c -.extern func_ov00_02083570 -.extern func_ov00_02083ef8 -.extern func_ov00_02084b38 -.extern func_ov00_02084be0 -.extern func_ov00_02084c5c .extern func_ov00_02087ef0 -.extern _ZN14AdventureFlags18func_ov00_02097738Ev .extern func_ov00_020bc46c .extern func_ov00_020bc7f8 .extern func_ov00_020bc854 @@ -73,4 +72,5 @@ .extern func_ov14_0213dadc .extern func_ov14_0213ddd4 .extern func_ov14_0213defc +.extern gAdventureFlags .extern gItemManager diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 5250f84a..0f7fa178 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -205,7 +205,7 @@ _020c1784: .word func_ov00_02087ef0 arm_func_start _ZN5Actor18func_ov00_020c1788Ev _ZN5Actor18func_ov00_020c1788Ev: ; 0x020c1788 ldr r3, _020c17a0 ; =data_027e0e60 - ldr ip, _020c17a4 ; =func_ov00_02083570 + ldr ip, _020c17a4 ; =_ZN10MapManager18func_ov00_02083570Eii ldrb r1, [r0, #0x10] ldrb r2, [r0, #0x11] ldr r0, [r3] @@ -213,7 +213,7 @@ _ZN5Actor18func_ov00_020c1788Ev: ; 0x020c1788 .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c1788Ev _020c17a0: .word data_027e0e60 -_020c17a4: .word func_ov00_02083570 +_020c17a4: .word _ZN10MapManager18func_ov00_02083570Eii .global _ZN5Actor8vfunc_2cEv arm_func_start _ZN5Actor8vfunc_2cEv @@ -682,14 +682,14 @@ _ZN5Actor18func_Ov00_020c1bfcEi: ; 0x020c1bfc add r2, r0, r1 ldr r0, _020c1c18 ; =data_027e0e60 ldrb r1, [r2, #0x2a] - ldr ip, _020c1c1c ; =func_ov00_02084be0 + ldr ip, _020c1c1c ; =_ZN10MapManager18func_ov00_02084be0Eii ldrb r2, [r2, #0x28] ldr r0, [r0] bx ip .align 2, 0 arm_func_end _ZN5Actor18func_Ov00_020c1bfcEi _020c1c18: .word data_027e0e60 -_020c1c1c: .word func_ov00_02084be0 +_020c1c1c: .word _ZN10MapManager18func_ov00_02084be0Eii .global _ZN5Actor18func_ov00_020c1c20Eiii arm_func_start _ZN5Actor18func_ov00_020c1c20Eiii @@ -701,7 +701,7 @@ _ZN5Actor18func_ov00_020c1c20Eiii: ; 0x020c1c20 ldrb r1, [ip, #0x2a] ldrb r2, [ip, #0x28] ldr r0, [r0] - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldmia sp!, {r3, pc} .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c1c20Eiii @@ -2323,7 +2323,7 @@ _ZN5Actor18func_ov00_020c3094Ev: ; 0x020c3094 ldr ip, [r5, #0x5c] mov r3, r4 str ip, [sp, #8] - bl func_ov00_02083ef8 + bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ ldr r1, [r5, #0x4c] cmp r1, r0 movle r4, #1 @@ -2385,7 +2385,7 @@ _ZN5Actor18func_ov00_020c3158Ev: ; 0x020c3158 ldr r0, _020c317c ; =data_027e0e60 mov r2, #1 ldr r0, [r0] - bl func_ov00_02084c5c + bl _ZN10MapManager18func_ov00_02084c5cEii ldmia sp!, {r3, pc} .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c3158Ev diff --git a/asm/ov00/Actor/ActorManager.inc b/asm/ov00/Actor/ActorManager.inc index f6b3c7c3..3feda380 100644 --- a/asm/ov00/Actor/ActorManager.inc +++ b/asm/ov00/Actor/ActorManager.inc @@ -1,4 +1,5 @@ #pragma once +.extern _ZN10MapManager18func_ov00_020836ccEjP4AABBj .extern _ZN5Actor10SetUnk_129Eb .extern _ZN5Actor14DistanceToLinkEv .extern _ZN5Actor14StopLinkFollowEv @@ -8,7 +9,6 @@ .extern data_027e0e60 .extern data_027e103c .extern func_01ff9ec0 -.extern func_ov00_020836cc .extern func_ov00_0208e72c .extern func_ov00_0208e7a4 .extern func_ov00_0208f318 diff --git a/asm/ov00/Actor/ActorManager.s b/asm/ov00/Actor/ActorManager.s index bf9a3318..cff6edf7 100644 --- a/asm/ov00/Actor/ActorManager.s +++ b/asm/ov00/Actor/ActorManager.s @@ -620,7 +620,7 @@ _ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0 add r2, sp, #0x14 ldr r0, [r0] mov r3, #8 - bl func_ov00_020836cc + bl _ZN10MapManager18func_ov00_020836ccEjP4AABBj mov r5, r0 cmp r5, #0 addle sp, sp, #0xd4 @@ -708,7 +708,7 @@ _ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8 mov r10, r2 add r2, sp, #0xc mov r3, #8 - bl func_ov00_020836cc + bl _ZN10MapManager18func_ov00_020836ccEjP4AABBj mov r5, r0 cmp r5, #0 addle sp, sp, #0xcc diff --git a/asm/ov00/Item/ItemManager.inc b/asm/ov00/Item/ItemManager.inc index 871cc044..8288875e 100644 --- a/asm/ov00/Item/ItemManager.inc +++ b/asm/ov00/Item/ItemManager.inc @@ -1,9 +1,12 @@ #pragma once .extern LoadTreasureItemFanfare +.extern _ZN10MapManager10GetNumKeysEv +.extern _ZN10MapManager10SetNumKeysEi .extern _ZN11ItemManager12GetEquipItemEi +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern _ZNK11ItemManager10GetMaxAmmoEi .extern data_027e0e60 -.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0fbc .extern data_027e103c @@ -12,15 +15,12 @@ .extern data_ov00_020eec68 .extern func_020196bc .extern func_020196fc -.extern strcat .extern func_ov00_02079ffc -.extern func_ov00_02084b08 -.extern func_ov00_02084b14 -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020cf374 .extern func_ov00_020d73bc .extern func_ov05_02104004 .extern func_ov09_0211c700 .extern func_ov09_0211ca20 +.extern gAdventureFlags .extern gItemManager +.extern strcat diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index ccf8fb70..ba83e597 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -1114,13 +1114,13 @@ _020ae34c: .word data_027e103c arm_func_start _ZNK11ItemManager18func_ov00_020ae350Ev _ZNK11ItemManager18func_ov00_020ae350Ev: ; 0x020ae350 ldr r0, _020ae360 ; =data_027e0e60 - ldr ip, _020ae364 ; =func_ov00_02084b14 + ldr ip, _020ae364 ; =_ZN10MapManager10GetNumKeysEv ldr r0, [r0] bx ip .align 2, 0 arm_func_end _ZNK11ItemManager18func_ov00_020ae350Ev _020ae360: .word data_027e0e60 -_020ae364: .word func_ov00_02084b14 +_020ae364: .word _ZN10MapManager10GetNumKeysEv .global _ZN11ItemManager8GiveKeysEj thumb_func_start _ZN11ItemManager8GiveKeysEj @@ -1129,7 +1129,7 @@ _ZN11ItemManager8GiveKeysEj: ; 0x020ae368 ldr r0, _020ae38c ; =data_027e0e60 add r4, r1, #0 ldr r0, [r0] - blx func_ov00_02084b14 + blx _ZN10MapManager10GetNumKeysEv add r1, r4, r0 cmp r1, #8 blt _020ae37c @@ -1141,7 +1141,7 @@ _020ae37c: _020ae382: ldr r0, _020ae38c ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02084b08 + blx _ZN10MapManager10SetNumKeysEi pop {r4, pc} .align 2, 0 thumb_func_end _ZN11ItemManager8GiveKeysEj diff --git a/asm/ov00/Item/ItemManager_func_ov00_020ad790.inc b/asm/ov00/Item/ItemManager_func_ov00_020ad790.inc index 52adae5a..fe397d2b 100644 --- a/asm/ov00/Item/ItemManager_func_ov00_020ad790.inc +++ b/asm/ov00/Item/ItemManager_func_ov00_020ad790.inc @@ -32,7 +32,7 @@ _020ad800: lda r0, data_027e0e60 ldr r4, [r6, #8] ldr r0, [r0] - bl func_ov00_020849f8 + bl _ZN10MapManager18func_ov00_020849f8Ei cmp r0, #0 moveq r2, #1 ldr r1, [r6] diff --git a/asm/ov00/Player/LinkStateFollow.inc b/asm/ov00/Player/LinkStateFollow.inc index e6df7599..7844a71f 100644 --- a/asm/ov00/Player/LinkStateFollow.inc +++ b/asm/ov00/Player/LinkStateFollow.inc @@ -1,4 +1,7 @@ #pragma once +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi .extern _ZN10PlayerBase13GetEquipSwordEv .extern _ZN13LinkStateBase12GetPlayerPosEv .extern _ZN13LinkStateBase12GetPlayerVelEv @@ -14,9 +17,6 @@ .extern func_01fffcd8 .extern func_0202b308 .extern func_0202d95c -.extern func_ov00_02083a1c -.extern func_ov00_02083c7c -.extern func_ov00_020840c4 .extern func_ov04_0210ad94 .extern func_ov04_0210adb0 .extern func_ov04_0210adf8 diff --git a/asm/ov00/Player/LinkStateFollow.s b/asm/ov00/Player/LinkStateFollow.s index 9fbf9a80..d9a6bf8f 100644 --- a/asm/ov00/Player/LinkStateFollow.s +++ b/asm/ov00/Player/LinkStateFollow.s @@ -33,7 +33,7 @@ _ZN15LinkStateFollow16MoveTowardTargetEv: ; 0x020a8f80 ldr r2, _020a9020 ; =data_027e0e60 add r1, r0, #0xc4 ldr r0, [r2] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 addeq sp, sp, #0xc ldmeqia sp!, {r4, r5, pc} @@ -87,10 +87,10 @@ _020a904c: ldr r4, [r1] add r2, r5, #0x24 mov r1, r4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r4 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 ldmeqia sp!, {r3, r4, r5, pc} ldr r1, [r0] @@ -213,7 +213,7 @@ _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p: ; 0x020a9180 strb r1, [r3, #1] ldr r2, [r3] mov r1, r4 - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _020a91f0: diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index c96e5130..b8790e5c 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -20,9 +20,9 @@ .extern func_01ffec34 .extern func_01fffcec .extern func_ov00_0207c5d4 -.extern func_ov00_02082af4 -.extern func_ov00_02083624 -.extern func_ov00_02083ee0 +.extern _ZN10MapManager18func_ov00_02082af4Ev +.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi +.extern _ZN10MapManager16MapData_vfunc_68Ev .extern func_ov00_0208ae94 .extern func_ov00_0208f030 .extern _ZN14AdventureFlags18func_ov00_02097700Ev diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index e2be8543..f8977340 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -296,7 +296,7 @@ _ZN10PlayerBase8TeleportEP5Vec3psibb: ; 0x020a7df4 mov r2, r4 strb lr, [sp, #0x16] str ip, [sp, #0x18] - bl func_ov00_02083624 + bl _ZN10MapManager14GetEntrancePosEP5Vec3pi str r6, [sp] mov r0, #0 str r0, [sp, #4] @@ -341,7 +341,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70 str r3, [sp, #4] ldr r3, [r5, #8] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr ip, [r5, #4] ldr r2, _020a7f6c ; =data_027e0fac cmp ip, r0 @@ -368,7 +368,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70 beq _020a7f40 ldr r0, _020a7f68 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082af4 + bl _ZN10MapManager18func_ov00_02082af4Ev ldr r0, _020a7f80 ; =gAdventureFlags ldr r0, [r0] bl _ZN14AdventureFlags18func_ov00_02097700Ev diff --git a/asm/ov00/Player/PlayerControl.inc b/asm/ov00/Player/PlayerControl.inc index 457a4bf4..5fdbb0fb 100644 --- a/asm/ov00/Player/PlayerControl.inc +++ b/asm/ov00/Player/PlayerControl.inc @@ -1,8 +1,17 @@ #pragma once +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager18func_ov00_02085108EPi +.extern _ZN10MapManager18func_ov00_02085594Ev .extern _ZN11ItemManager12GetEquipItemEi .extern _ZN11ItemManager18func_ov00_020ad790Ei .extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori .extern _ZN12ActorManager8GetActorEP8ActorRef +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev .extern _ZN5Actor16XzDistanceToLinkEv .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZNK11ItemManager15GetEquippedItemEv @@ -19,7 +28,6 @@ .extern data_027e0e2c .extern data_027e0e60 .extern data_027e0f64 -.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac @@ -44,16 +52,7 @@ .extern func_0202b2e8 .extern func_0202d95c .extern func_ov00_02078b40 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083c7c -.extern func_ov00_020840c4 -.extern func_ov00_02085108 -.extern func_ov00_02085594 .extern func_ov00_0208b180 -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags18func_ov00_02097750Ev .extern func_ov00_020a5e9c .extern func_ov00_020b78a0 .extern func_ov00_020b7924 @@ -76,4 +75,5 @@ .extern func_ov15_0213dcb0 .extern func_ov15_0213dcb8 .extern func_ov24_02178348 +.extern gAdventureFlags .extern gItemManager diff --git a/asm/ov00/Player/PlayerControl.s b/asm/ov00/Player/PlayerControl.s index 49fc6958..1ac075f6 100644 --- a/asm/ov00/Player/PlayerControl.s +++ b/asm/ov00/Player/PlayerControl.s @@ -646,7 +646,7 @@ _020af620: ldr r0, _020af6d8 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02085108 + bl _ZN10MapManager18func_ov00_02085108EPi cmp r0, #3 cmpne r0, #7 moveq r0, #1 @@ -725,7 +725,7 @@ _020af72c: add r0, sp, #0 ldr r1, [r1] mov r2, r6 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r0, [sp] mov r2, #1 mov r1, #0 @@ -886,7 +886,7 @@ _020af97c: ldr r0, _020afad0 ; =data_027e0e60 add r1, sp, #8 ldr r0, [r0] - bl func_ov00_02085108 + bl _ZN10MapManager18func_ov00_02085108EPi ldr r2, _020afad4 ; =data_027e0f94 mov r1, r0 ldr r0, [r2, #4] @@ -1002,7 +1002,7 @@ _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p: ; 0x020afad8 ldr r0, _020afb68 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02085594 + bl _ZN10MapManager18func_ov00_02085594Ev cmp r0, #0 movne r0, #1 add sp, sp, #0xc @@ -1139,7 +1139,7 @@ _020afcf4: ldr r0, _020afe84 ; =data_027e0e60 add r1, r9, #0x9c ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev str r0, [r9, #0xa0] cmp r0, #0 beq _020afd88 @@ -1184,7 +1184,7 @@ _020afd88: strb r3, [r5] strb r2, [r5, #1] ldr r2, [r5] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r5, #2 mov r6, #3 _020afdc4: @@ -1868,11 +1868,11 @@ _020b06e0: add r0, sp, #0 ldr r1, [r1] add r2, sp, #4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _020b0774 ; =data_027e0e60 ldrb r1, [sp] ldr r0, [r0] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei ldr r1, [sp, #4] ldr r2, _020b0774 ; =data_027e0e60 sub r0, r0, r1 @@ -1881,7 +1881,7 @@ _020b06e0: ldrb r1, [sp, #1] ldr r0, [r2] str r3, [sp, #4] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei ldr r2, [sp, #0xc] mov r1, r4 sub r0, r0, r2 diff --git a/asm/ov00/Save/AdventureFlags.inc b/asm/ov00/Save/AdventureFlags.inc index 00feb695..60618808 100644 --- a/asm/ov00/Save/AdventureFlags.inc +++ b/asm/ov00/Save/AdventureFlags.inc @@ -8,7 +8,7 @@ .extern func_ov00_0207b2f0 .extern func_ov00_0207b334 .extern func_ov00_0207ba94 -.extern func_ov00_020838f8 +.extern _ZN10MapManager18func_ov00_020838f8EPi .extern func_ov00_020980f4 .extern func_ov00_020980f8 .extern func_ov00_020980fc diff --git a/asm/ov00/Save/AdventureFlags.s b/asm/ov00/Save/AdventureFlags.s index 06cb74e9..9555e442 100644 --- a/asm/ov00/Save/AdventureFlags.s +++ b/asm/ov00/Save/AdventureFlags.s @@ -328,7 +328,7 @@ _ZN14AdventureFlags18func_ov00_02097968Ei: ; 0x02097968 ldr r0, _02097a40 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020838f8 + bl _ZN10MapManager18func_ov00_020838f8EPi strb r0, [sp, #0x26] ldr r0, [r5, #0x44] add r1, sp, #0x18 diff --git a/asm/ov00/ov00_020773c0.inc b/asm/ov00/ov00_020773c0.inc index 36224a79..cc2cf301 100644 --- a/asm/ov00/ov00_020773c0.inc +++ b/asm/ov00/ov00_020773c0.inc @@ -130,14 +130,14 @@ .extern __register_global_object .extern func_ov00_0207bc48 .extern func_ov00_0207c170 -.extern func_ov00_02082e1c -.extern func_ov00_0208306c -.extern func_ov00_02083394 -.extern func_ov00_020833a0 -.extern func_ov00_020833ac -.extern func_ov00_020833b8 -.extern func_ov00_02083588 -.extern func_ov00_020849c0 +.extern _ZN10MapManager18func_ov00_02082e1cEPiS0_ +.extern _ZN10MapManager18func_ov00_0208306cEv +.extern _ZN10MapManager13GetCourseMinXEv +.extern _ZN10MapManager13GetCourseMinZEv +.extern _ZN10MapManager13GetCourseMaxXEv +.extern _ZN10MapManager13GetCourseMaxZEv +.extern _ZN10MapManager18func_ov00_02083588Ev +.extern _ZN10MapManager18func_ov00_020849c0Ev .extern func_ov00_02088074 .extern _ZN14AdventureFlags15Get_FlagsUnk_48Ei .extern func_ov00_0209d738 diff --git a/asm/ov00/ov00_020773c0.s b/asm/ov00/ov00_020773c0.s index 92ed8ad2..4f4c32d4 100644 --- a/asm/ov00/ov00_020773c0.s +++ b/asm/ov00/ov00_020773c0.s @@ -3878,7 +3878,7 @@ func_ov00_02078f80: ; 0x02078f80 ldr r1, _02078fa8 ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_02083588 + bl _ZN10MapManager18func_ov00_02083588Ev ldr r1, [r4, #0x44] cmp r1, r0 movne r0, #1 @@ -4045,16 +4045,16 @@ func_ov00_0207914c: ; 0x0207914c mov r0, r7 mov r9, r2 mov r8, r3 - bl func_ov00_02083394 + bl _ZN10MapManager13GetCourseMinXEv mov r6, r0 mov r0, r7 - bl func_ov00_020833a0 + bl _ZN10MapManager13GetCourseMinZEv mov r5, r0 mov r0, r7 - bl func_ov00_020833ac + bl _ZN10MapManager13GetCourseMaxXEv mov r4, r0 mov r0, r7 - bl func_ov00_020833b8 + bl _ZN10MapManager13GetCourseMaxZEv ldr r1, [r10, #8] sub r0, r0, r5 sub r1, r1, r5 @@ -4104,16 +4104,16 @@ func_ov00_0207920c: ; 0x0207920c mov r0, r7 mov r9, r2 mov r8, r3 - bl func_ov00_02083394 + bl _ZN10MapManager13GetCourseMinXEv mov r6, r0 mov r0, r7 - bl func_ov00_020833a0 + bl _ZN10MapManager13GetCourseMinZEv mov r5, r0 mov r0, r7 - bl func_ov00_020833ac + bl _ZN10MapManager13GetCourseMaxXEv mov r4, r0 mov r0, r7 - bl func_ov00_020833b8 + bl _ZN10MapManager13GetCourseMaxZEv sub r3, r4, r6 ldr r1, [r10, #8] sub r0, r0, r5 @@ -4164,19 +4164,19 @@ _020792f4: ldr r0, _020793b4 ; =data_027e0e60 ldr r6, [r0] mov r0, r6 - bl func_ov00_02083394 + bl _ZN10MapManager13GetCourseMinXEv mov r5, r0 mov r0, r6 - bl func_ov00_020833a0 + bl _ZN10MapManager13GetCourseMinZEv mov r4, r0 mov r0, r6 - bl func_ov00_020833ac + bl _ZN10MapManager13GetCourseMaxXEv sub r2, r0, r5 mov r0, r6 mov r1, r2, asr #0x7 add r1, r2, r1, lsr #24 mov r6, r1, asr #0x8 - bl func_ov00_020833b8 + bl _ZN10MapManager13GetCourseMaxZEv sub r0, r0, r4 mov r1, #0xc0 bl func_01ff9b4c @@ -4344,13 +4344,13 @@ _02079564: mov r1, r5 ldr r0, [r0] mov r2, r4 - bl func_ov00_02082e1c + bl _ZN10MapManager18func_ov00_02082e1cEPiS0_ cmp r0, #0 movne r0, #0 bne _02079614 ldr r0, _0207967c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 beq _020795f8 ldrb r0, [sp, #0x38] @@ -4361,7 +4361,7 @@ _02079564: mov r1, r5 ldr r0, [r0] mov r2, r4 - bl func_ov00_0208306c + bl _ZN10MapManager18func_ov00_0208306cEv ldr r1, [r4] mov r0, #0xc0000 mov r1, r1, lsl #0xc @@ -4514,7 +4514,7 @@ func_ov00_0207977c: ; 0x0207977c mov r1, r5 ldr r0, [r0] mov r2, r4 - bl func_ov00_02082e1c + bl _ZN10MapManager18func_ov00_02082e1cEPiS0_ cmp r0, #0 beq _0207984c mov r0, r8 diff --git a/asm/ov00/ov00_0207af9c.s b/asm/ov00/ov00_0207af9c.s index ce2fb4ef..1809f9f8 100644 --- a/asm/ov00/ov00_0207af9c.s +++ b/asm/ov00/ov00_0207af9c.s @@ -809,7 +809,7 @@ _0207b62c: str r0, [r5, #0x44] ldr r0, _0207b808 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02082d08 + blx _ZN10MapManager18func_ov00_02082d08Ev add r1, r5, #0 add r1, #0x56 strb r0, [r1] @@ -956,13 +956,13 @@ _0207b740: beq _0207b7f0 ldr r0, _0207b808 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083328 + blx _ZN10MapManager18func_ov00_02083328Ev cmp r0, #0 beq _0207b7f0 ldr r0, _0207b808 ; =data_027e0e60 ldrb r1, [r4, #0x12] ldr r0, [r0] - blx func_ov00_02083318 + blx _ZN10MapManager18func_ov00_02083318Ei cmp r0, #0 bne _0207b7f0 ldr r0, [r5] @@ -5080,7 +5080,7 @@ func_ov00_0207e4b8: ; 0x0207e4b8 mov r4, r2 add r0, sp, #8 mov r2, r9 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r0, r8 ldr r2, [r0] add r1, sp, #8 @@ -5423,7 +5423,7 @@ func_ov00_0207e970: ; 0x0207e970 add r0, sp, #0xc mov r2, r9 mov r7, r3 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r0, r8 ldr r2, [r0] add r1, sp, #0xc @@ -5739,7 +5739,7 @@ func_ov00_0207ee14: ; 0x0207ee14 ldr r1, [r0] add r0, sp, #8 mov r2, r9 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r0, #0x20 str r0, [sp] mov r1, #0 @@ -5868,7 +5868,7 @@ func_ov00_0207eff4: ; 0x0207eff4 ldr r1, [r0] add r0, sp, #8 mov r2, r8 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r4, sp, #0xc ldmia r8, {r0, r1, r2} stmia r4, {r0, r1, r2} @@ -5951,7 +5951,7 @@ func_ov00_0207f104: ; 0x0207f104 mov r4, r2 add r0, sp, #0 mov r2, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r0, r6 ldr r2, [r0] add r1, sp, #0 @@ -6018,7 +6018,7 @@ func_ov00_0207f1f4: ; 0x0207f1f4 mov r8, r2 add r0, sp, #8 mov r2, r9 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r4, sp, #0x24 ldmia r9, {r0, r1, r2} stmia r4, {r0, r1, r2} @@ -9891,29 +9891,29 @@ func_ov00_020820d0: ; 0x020820d0 ldmia sp!, {r4, pc} arm_func_end func_ov00_020820d0 - .global func_ov00_020820ec - arm_func_start func_ov00_020820ec -func_ov00_020820ec: ; 0x020820ec + .global _ZN10MapManager18func_ov00_020820ecEPi + arm_func_start _ZN10MapManager18func_ov00_020820ecEPi +_ZN10MapManager18func_ov00_020820ecEPi: ; 0x020820ec ldr ip, _020820f8 ; =func_ov00_0207ca00 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_020820ec + arm_func_end _ZN10MapManager18func_ov00_020820ecEPi _020820f8: .word func_ov00_0207ca00 - .global func_ov00_020820fc - arm_func_start func_ov00_020820fc -func_ov00_020820fc: ; 0x020820fc + .global _ZN10MapManager18func_ov00_020820fcEiii + arm_func_start _ZN10MapManager18func_ov00_020820fcEiii +_ZN10MapManager18func_ov00_020820fcEiii: ; 0x020820fc ldr ip, _02082108 ; =func_ov00_0207ca28 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_020820fc + arm_func_end _ZN10MapManager18func_ov00_020820fcEiii _02082108: .word func_ov00_0207ca28 - .global func_ov00_0208210c - arm_func_start func_ov00_0208210c -func_ov00_0208210c: ; 0x0208210c + .global _ZN10MapManager18func_ov00_0208210cEii + arm_func_start _ZN10MapManager18func_ov00_0208210cEii +_ZN10MapManager18func_ov00_0208210cEii: ; 0x0208210c stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x30 mov lr, #0 @@ -9941,7 +9941,7 @@ func_ov00_0208210c: ; 0x0208210c b _02082190 _02082170: add r1, sp, #0x18 - bl func_ov00_02082348 + bl _ZN10MapManager18func_ov00_02082348Ei add r0, sp, #0x18 bl func_ov00_020a5e9c str r0, [r4] @@ -10042,14 +10042,14 @@ _02082190: add sp, sp, #0x30 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_0208210c + arm_func_end _ZN10MapManager18func_ov00_0208210cEii _02082300: .word data_027e0d38 _02082304: .word data_027e0f70 _02082308: .word data_027e0f7c - .global func_ov00_0208230c - arm_func_start func_ov00_0208230c -func_ov00_0208230c: ; 0x0208230c + .global _ZN10MapManager18func_ov00_0208230cEi + arm_func_start _ZN10MapManager18func_ov00_0208230cEi +_ZN10MapManager18func_ov00_0208230cEi: ; 0x0208230c stmdb sp!, {r3, lr} ldr r3, [r0] mov r2, #0xa @@ -10065,11 +10065,11 @@ func_ov00_0208230c: ; 0x0208230c ldrb r0, [r0, #0xc] strb r0, [r1, #0x13] ldmia sp!, {r3, pc} - arm_func_end func_ov00_0208230c + arm_func_end _ZN10MapManager18func_ov00_0208230cEi - .global func_ov00_02082348 - arm_func_start func_ov00_02082348 -func_ov00_02082348: ; 0x02082348 + .global _ZN10MapManager18func_ov00_02082348Ei + arm_func_start _ZN10MapManager18func_ov00_02082348Ei +_ZN10MapManager18func_ov00_02082348Ei: ; 0x02082348 stmdb sp!, {r4, lr} sub sp, sp, #0x18 mov ip, #0 @@ -10087,89 +10087,89 @@ func_ov00_02082348: ; 0x02082348 strb ip, [sp, #0x13] strb ip, [sp, #0x14] strb ip, [sp, #0x15] - bl func_ov00_0208230c + bl _ZN10MapManager18func_ov00_0208230cEi add r0, sp, #0 mov r1, r4 blx func_ov00_02078bf0 add sp, sp, #0x18 ldmia sp!, {r4, pc} - arm_func_end func_ov00_02082348 + arm_func_end _ZN10MapManager18func_ov00_02082348Ei - .global func_ov00_020823a4 - arm_func_start func_ov00_020823a4 -func_ov00_020823a4: ; 0x020823a4 + .global _ZN10MapManager18func_ov00_020823a4Ei + arm_func_start _ZN10MapManager18func_ov00_020823a4Ei +_ZN10MapManager18func_ov00_020823a4Ei: ; 0x020823a4 ldr ip, _020823b0 ; =func_ov00_0207de68 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020823a4 + arm_func_end _ZN10MapManager18func_ov00_020823a4Ei _020823b0: .word func_ov00_0207de68 - .global func_ov00_020823b4 - arm_func_start func_ov00_020823b4 -func_ov00_020823b4: ; 0x020823b4 + .global _ZN10MapManager18func_ov00_020823b4Ev + arm_func_start _ZN10MapManager18func_ov00_020823b4Ev +_ZN10MapManager18func_ov00_020823b4Ev: ; 0x020823b4 ldr ip, _020823c0 ; =func_ov00_0207de88 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020823b4 + arm_func_end _ZN10MapManager18func_ov00_020823b4Ev _020823c0: .word func_ov00_0207de88 - .global func_ov00_020823c4 - arm_func_start func_ov00_020823c4 -func_ov00_020823c4: ; 0x020823c4 + .global _ZN10MapManager18func_ov00_020823c4EPii + arm_func_start _ZN10MapManager18func_ov00_020823c4EPii +_ZN10MapManager18func_ov00_020823c4EPii: ; 0x020823c4 ldr ip, _020823d0 ; =func_ov00_0207e08c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020823c4 + arm_func_end _ZN10MapManager18func_ov00_020823c4EPii _020823d0: .word func_ov00_0207e08c - .global func_ov00_020823d4 - arm_func_start func_ov00_020823d4 -func_ov00_020823d4: ; 0x020823d4 + .global _ZN10MapManager18func_ov00_020823d4Ei + arm_func_start _ZN10MapManager18func_ov00_020823d4Ei +_ZN10MapManager18func_ov00_020823d4Ei: ; 0x020823d4 ldr ip, _020823e0 ; =func_ov00_0207e0f0 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020823d4 + arm_func_end _ZN10MapManager18func_ov00_020823d4Ei _020823e0: .word func_ov00_0207e0f0 - .global func_ov00_020823e4 - arm_func_start func_ov00_020823e4 -func_ov00_020823e4: ; 0x020823e4 + .global _ZN10MapManager18func_ov00_020823e4Ei + arm_func_start _ZN10MapManager18func_ov00_020823e4Ei +_ZN10MapManager18func_ov00_020823e4Ei: ; 0x020823e4 ldr ip, _020823f0 ; =func_ov00_0207e28c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020823e4 + arm_func_end _ZN10MapManager18func_ov00_020823e4Ei _020823f0: .word func_ov00_0207e28c - .global func_ov00_020823f4 - arm_func_start func_ov00_020823f4 -func_ov00_020823f4: ; 0x020823f4 + .global _ZN10MapManager16MapData_vfunc_b4Ev + arm_func_start _ZN10MapManager16MapData_vfunc_b4Ev +_ZN10MapManager16MapData_vfunc_b4Ev: ; 0x020823f4 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r1, [r0] ldr r1, [r1, #0xb4] blx r1 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020823f4 + arm_func_end _ZN10MapManager16MapData_vfunc_b4Ev - .global func_ov00_0208240c - arm_func_start func_ov00_0208240c -func_ov00_0208240c: ; 0x0208240c + .global _ZN10MapManager16MapData_vfunc_9cEv + arm_func_start _ZN10MapManager16MapData_vfunc_9cEv +_ZN10MapManager16MapData_vfunc_9cEv: ; 0x0208240c stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r1, [r0] ldr r1, [r1, #0x9c] blx r1 ldmia sp!, {r3, pc} - arm_func_end func_ov00_0208240c + arm_func_end _ZN10MapManager16MapData_vfunc_9cEv - .global func_ov00_02082424 - arm_func_start func_ov00_02082424 -func_ov00_02082424: ; 0x02082424 + .global _ZN10MapManager18func_ov00_02082424Ev + arm_func_start _ZN10MapManager18func_ov00_02082424Ev +_ZN10MapManager18func_ov00_02082424Ev: ; 0x02082424 stmdb sp!, {r4, lr} mov r4, r0 ldr r0, [r4, #4] @@ -10182,11 +10182,11 @@ func_ov00_02082424: ; 0x02082424 ldr r0, [r4, #4] bl func_ov15_02129c14 ldmia sp!, {r4, pc} - arm_func_end func_ov00_02082424 + arm_func_end _ZN10MapManager18func_ov00_02082424Ev - .global func_ov00_02082454 - arm_func_start func_ov00_02082454 -func_ov00_02082454: ; 0x02082454 + .global _ZN10MapManager18func_ov00_02082454Eii + arm_func_start _ZN10MapManager18func_ov00_02082454Eii +_ZN10MapManager18func_ov00_02082454Eii: ; 0x02082454 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldr r0, [r6, #4] @@ -10203,11 +10203,11 @@ func_ov00_02082454: ; 0x02082454 mov r2, r4 bl func_ov15_02129c24 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02082454 + arm_func_end _ZN10MapManager18func_ov00_02082454Eii - .global func_ov00_02082494 - arm_func_start func_ov00_02082494 -func_ov00_02082494: ; 0x02082494 + .global _ZN10MapManager18func_ov00_02082494Ei + arm_func_start _ZN10MapManager18func_ov00_02082494Ei +_ZN10MapManager18func_ov00_02082494Ei: ; 0x02082494 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, [r5, #4] @@ -10222,11 +10222,11 @@ func_ov00_02082494: ; 0x02082494 mov r1, r4 bl func_ov15_02129c34 ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_02082494 + arm_func_end _ZN10MapManager18func_ov00_02082494Ei - .global func_ov00_020824cc - arm_func_start func_ov00_020824cc -func_ov00_020824cc: ; 0x020824cc + .global _ZN10MapManager18func_ov00_020824ccEi + arm_func_start _ZN10MapManager18func_ov00_020824ccEi +_ZN10MapManager18func_ov00_020824ccEi: ; 0x020824cc stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, [r5, #4] @@ -10241,11 +10241,11 @@ func_ov00_020824cc: ; 0x020824cc mov r1, r4 bl func_ov15_02129c44 ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_020824cc + arm_func_end _ZN10MapManager18func_ov00_020824ccEi - .global func_ov00_02082504 - arm_func_start func_ov00_02082504 -func_ov00_02082504: ; 0x02082504 + .global _ZN10MapManager18func_ov00_02082504Ev + arm_func_start _ZN10MapManager18func_ov00_02082504Ev +_ZN10MapManager18func_ov00_02082504Ev: ; 0x02082504 stmdb sp!, {r4, lr} mov r4, r0 ldr r0, [r4, #4] @@ -10259,11 +10259,11 @@ func_ov00_02082504: ; 0x02082504 add r0, r0, #0x100 ldrsh r0, [r0, #0xac] ldmia sp!, {r4, pc} - arm_func_end func_ov00_02082504 + arm_func_end _ZN10MapManager18func_ov00_02082504Ev - .global func_ov00_02082538 - arm_func_start func_ov00_02082538 -func_ov00_02082538: ; 0x02082538 + .global _ZN10MapManager18func_ov00_02082538Ev + arm_func_start _ZN10MapManager18func_ov00_02082538Ev +_ZN10MapManager18func_ov00_02082538Ev: ; 0x02082538 stmdb sp!, {r3, r4, lr} sub sp, sp, #0xc mov r4, r0 @@ -10287,36 +10287,36 @@ func_ov00_02082538: ; 0x02082538 add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 - arm_func_end func_ov00_02082538 + arm_func_end _ZN10MapManager18func_ov00_02082538Ev _02082590: .word data_027e0f94 - .global func_ov00_02082594 - arm_func_start func_ov00_02082594 -func_ov00_02082594: ; 0x02082594 + .global _ZN10MapManager18func_ov00_02082594Ev + arm_func_start _ZN10MapManager18func_ov00_02082594Ev +_ZN10MapManager18func_ov00_02082594Ev: ; 0x02082594 ldr r0, _020825a4 ; =data_027e0f68 ldr ip, _020825a8 ; =func_ov00_0208d620 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_02082594 + arm_func_end _ZN10MapManager18func_ov00_02082594Ev _020825a4: .word data_027e0f68 _020825a8: .word func_ov00_0208d620 - .global func_ov00_020825ac - arm_func_start func_ov00_020825ac -func_ov00_020825ac: ; 0x020825ac + .global _ZN10MapManager18func_ov00_020825acEv + arm_func_start _ZN10MapManager18func_ov00_020825acEv +_ZN10MapManager18func_ov00_020825acEv: ; 0x020825ac ldr r0, _020825bc ; =data_027e0f68 ldr ip, _020825c0 ; =func_ov00_0208d680 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_020825ac + arm_func_end _ZN10MapManager18func_ov00_020825acEv _020825bc: .word data_027e0f68 _020825c0: .word func_ov00_0208d680 - .global func_ov00_020825c4 - arm_func_start func_ov00_020825c4 -func_ov00_020825c4: ; 0x020825c4 + .global _ZN10MapManager17GetCourseFilePathEPcS0_ + arm_func_start _ZN10MapManager17GetCourseFilePathEPcS0_ +_ZN10MapManager17GetCourseFilePathEPcS0_: ; 0x020825c4 ldr ip, _020825dc ; =func_0200c8d0 mov r3, r1 mov r0, r2 @@ -10324,13 +10324,13 @@ func_ov00_020825c4: ; 0x020825c4 mov r2, r3 bx ip .align 2, 0 - arm_func_end func_ov00_020825c4 + arm_func_end _ZN10MapManager17GetCourseFilePathEPcS0_ _020825dc: .word func_0200c8d0 _020825e0: .word data_ov00_020e2528 - .global func_ov00_020825e4 - arm_func_start func_ov00_020825e4 -func_ov00_020825e4: ; 0x020825e4 + .global _ZN10MapManager18func_ov00_020825e4Eii + arm_func_start _ZN10MapManager18func_ov00_020825e4Eii +_ZN10MapManager18func_ov00_020825e4Eii: ; 0x020825e4 stmdb sp!, {r3, r4, r5, lr} ldr r3, _02082610 ; =data_027e0f7c mov r5, r0 @@ -10340,15 +10340,15 @@ func_ov00_020825e4: ; 0x020825e4 mov r1, r0 mov r0, r5 mov r2, r4 - bl func_ov00_020825c4 + bl _ZN10MapManager17GetCourseFilePathEPcS0_ ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_020825e4 + arm_func_end _ZN10MapManager18func_ov00_020825e4Eii _02082610: .word data_027e0f7c - .global func_ov00_02082614 - arm_func_start func_ov00_02082614 -func_ov00_02082614: ; 0x02082614 + .global _ZN10MapManager18func_ov00_02082614Eii + arm_func_start _ZN10MapManager18func_ov00_02082614Eii +_ZN10MapManager18func_ov00_02082614Eii: ; 0x02082614 stmdb sp!, {r3, lr} mov r3, #4 str r3, [sp] @@ -10358,52 +10358,52 @@ func_ov00_02082614: ; 0x02082614 mov r2, #0 bl func_ov00_0207ce20 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02082614 + arm_func_end _ZN10MapManager18func_ov00_02082614Eii - .global func_ov00_02082638 - arm_func_start func_ov00_02082638 -func_ov00_02082638: ; 0x02082638 + .global _ZN10MapManager16MapData_vfunc_b0Ev + arm_func_start _ZN10MapManager16MapData_vfunc_b0Ev +_ZN10MapManager16MapData_vfunc_b0Ev: ; 0x02082638 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r3, [r0] ldr r3, [r3, #0xb0] blx r3 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02082638 + arm_func_end _ZN10MapManager16MapData_vfunc_b0Ev - .global func_ov00_02082650 - arm_func_start func_ov00_02082650 -func_ov00_02082650: ; 0x02082650 + .global _ZN10MapManager18func_ov00_02082650Eiii + arm_func_start _ZN10MapManager18func_ov00_02082650Eiii +_ZN10MapManager18func_ov00_02082650Eiii: ; 0x02082650 ldr ip, _0208265c ; =func_ov00_0208005c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02082650 + arm_func_end _ZN10MapManager18func_ov00_02082650Eiii _0208265c: .word func_ov00_0208005c - .global func_ov00_02082660 - arm_func_start func_ov00_02082660 -func_ov00_02082660: ; 0x02082660 + .global _ZN10MapManager18func_ov00_02082660Eii + arm_func_start _ZN10MapManager18func_ov00_02082660Eii +_ZN10MapManager18func_ov00_02082660Eii: ; 0x02082660 ldr ip, _0208266c ; =func_ov00_0208007c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02082660 + arm_func_end _ZN10MapManager18func_ov00_02082660Eii _0208266c: .word func_ov00_0208007c - .global func_ov00_02082670 - arm_func_start func_ov00_02082670 -func_ov00_02082670: ; 0x02082670 + .global _ZN10MapManager18func_ov00_02082670Eii + arm_func_start _ZN10MapManager18func_ov00_02082670Eii +_ZN10MapManager18func_ov00_02082670Eii: ; 0x02082670 ldr ip, _0208267c ; =func_ov00_0208006c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02082670 + arm_func_end _ZN10MapManager18func_ov00_02082670Eii _0208267c: .word func_ov00_0208006c - .global func_ov00_02082680 - arm_func_start func_ov00_02082680 -func_ov00_02082680: ; 0x02082680 + .global _ZN10MapManager18func_ov00_02082680Eii + arm_func_start _ZN10MapManager18func_ov00_02082680Eii +_ZN10MapManager18func_ov00_02082680Eii: ; 0x02082680 stmdb sp!, {r3, lr} ldr r0, [r0, #4] mov r3, r2 @@ -10412,11 +10412,11 @@ func_ov00_02082680: ; 0x02082680 ldr ip, [ip, #0x98] blx ip ldmia sp!, {r3, pc} - arm_func_end func_ov00_02082680 + arm_func_end _ZN10MapManager18func_ov00_02082680Eii - .global func_ov00_020826a0 - arm_func_start func_ov00_020826a0 -func_ov00_020826a0: ; 0x020826a0 + .global _ZN10MapManager18func_ov00_020826a0Eiii + arm_func_start _ZN10MapManager18func_ov00_020826a0Eiii +_ZN10MapManager18func_ov00_020826a0Eiii: ; 0x020826a0 stmdb sp!, {r3, lr} ldr r0, [r0, #4] mov r3, r2 @@ -10425,11 +10425,11 @@ func_ov00_020826a0: ; 0x020826a0 ldr ip, [ip, #0x98] blx ip ldmia sp!, {r3, pc} - arm_func_end func_ov00_020826a0 + arm_func_end _ZN10MapManager18func_ov00_020826a0Eiii - .global func_ov00_020826c0 - arm_func_start func_ov00_020826c0 -func_ov00_020826c0: ; 0x020826c0 + .global _ZN10MapManager9CreateMapEiii + arm_func_start _ZN10MapManager9CreateMapEiii +_ZN10MapManager9CreateMapEiii: ; 0x020826c0 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldr r0, [r6, #4] @@ -10503,12 +10503,12 @@ _020827b4: str r0, [r6, #4] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_020826c0 + arm_func_end _ZN10MapManager9CreateMapEiii _020827bc: .word data_027e0ce0 - .global func_ov00_020827c0 - arm_func_start func_ov00_020827c0 -func_ov00_020827c0: ; 0x020827c0 + .global _ZN10MapManager10DestroyMapEv + arm_func_start _ZN10MapManager10DestroyMapEv +_ZN10MapManager10DestroyMapEv: ; 0x020827c0 stmdb sp!, {r4, lr} mov r4, r0 ldr r0, [r4, #4] @@ -10522,22 +10522,22 @@ _020827e4: mov r0, #0 str r0, [r4, #4] ldmia sp!, {r4, pc} - arm_func_end func_ov00_020827c0 + arm_func_end _ZN10MapManager10DestroyMapEv - .global func_ov00_020827f0 - arm_func_start func_ov00_020827f0 -func_ov00_020827f0: ; 0x020827f0 + .global _ZN10MapManager16MapData_vfunc_44Ev + arm_func_start _ZN10MapManager16MapData_vfunc_44Ev +_ZN10MapManager16MapData_vfunc_44Ev: ; 0x020827f0 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r1, [r0] ldr r1, [r1, #0x44] blx r1 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020827f0 + arm_func_end _ZN10MapManager16MapData_vfunc_44Ev - .global func_ov00_02082808 - arm_func_start func_ov00_02082808 -func_ov00_02082808: ; 0x02082808 + .global _ZN10MapManager18func_ov00_02082808Ev + arm_func_start _ZN10MapManager18func_ov00_02082808Ev +_ZN10MapManager18func_ov00_02082808Ev: ; 0x02082808 stmdb sp!, {r3, r4, r5, lr} ldr r2, _020828b4 ; =data_027e0d38 mov r5, r1 @@ -10545,7 +10545,7 @@ func_ov00_02082808: ; 0x02082808 ldr r1, [r1, #0x14] cmp r1, #1 ldmeqia sp!, {r3, r4, r5, pc} - bl func_ov00_02084740 + bl _ZN10MapManager18func_ov00_02084740Ev mov r4, r0 cmp r5, #0 beq _0208286c @@ -10585,14 +10585,14 @@ _02082890: bl func_ov00_020d72b8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_02082808 + arm_func_end _ZN10MapManager18func_ov00_02082808Ev _020828b4: .word data_027e0d38 _020828b8: .word data_ov15_02190458 _020828bc: .word data_ov00_020eec68 - .global func_ov00_020828c0 - arm_func_start func_ov00_020828c0 -func_ov00_020828c0: ; 0x020828c0 + .global _ZN10MapManager16MapData_vfunc_7cEv + arm_func_start _ZN10MapManager16MapData_vfunc_7cEv +_ZN10MapManager16MapData_vfunc_7cEv: ; 0x020828c0 stmdb sp!, {r3, lr} ldr ip, [sp, #8] str ip, [sp] @@ -10601,40 +10601,40 @@ func_ov00_020828c0: ; 0x020828c0 ldr ip, [ip, #0x7c] blx ip ldmia sp!, {r3, pc} - arm_func_end func_ov00_020828c0 + arm_func_end _ZN10MapManager16MapData_vfunc_7cEv - .global func_ov00_020828e0 - arm_func_start func_ov00_020828e0 -func_ov00_020828e0: ; 0x020828e0 + .global _ZN10MapManager16MapData_vfunc_84Ev + arm_func_start _ZN10MapManager16MapData_vfunc_84Ev +_ZN10MapManager16MapData_vfunc_84Ev: ; 0x020828e0 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r2, [r0] ldr r2, [r2, #0x84] blx r2 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020828e0 + arm_func_end _ZN10MapManager16MapData_vfunc_84Ev - .global func_ov00_020828f8 - arm_func_start func_ov00_020828f8 -func_ov00_020828f8: ; 0x020828f8 + .global _ZN10MapManager18func_ov00_020828f8EPi + arm_func_start _ZN10MapManager18func_ov00_020828f8EPi +_ZN10MapManager18func_ov00_020828f8EPi: ; 0x020828f8 ldr ip, _02082904 ; =func_ov00_0207f38c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020828f8 + arm_func_end _ZN10MapManager18func_ov00_020828f8EPi _02082904: .word func_ov00_0207f38c - .global func_ov00_02082908 - arm_func_start func_ov00_02082908 -func_ov00_02082908: ; 0x02082908 + .global _ZN10MapManager20GetCourseData_Unk_b0Ev + arm_func_start _ZN10MapManager20GetCourseData_Unk_b0Ev +_ZN10MapManager20GetCourseData_Unk_b0Ev: ; 0x02082908 ldr r0, [r0] ldrb r0, [r0, #0xb0] bx lr - arm_func_end func_ov00_02082908 + arm_func_end _ZN10MapManager20GetCourseData_Unk_b0Ev - .global func_ov00_02082914 - arm_func_start func_ov00_02082914 -func_ov00_02082914: ; 0x02082914 + .global _ZN10MapManager18func_ov00_02082914Ei + arm_func_start _ZN10MapManager18func_ov00_02082914Ei +_ZN10MapManager18func_ov00_02082914Ei: ; 0x02082914 stmdb sp!, {r4, r5, r6, r7, r8, r9, lr} sub sp, sp, #0x34 mov r8, r1 @@ -10712,7 +10712,7 @@ _02082a1c: ; jump table b _02082a7c ; case 3 _02082a2c: mov r0, r9 - bl func_ov00_020833e8 + bl _ZN10MapManager18func_ov00_020833e8Ev sub r0, r0, r6 mov r4, #0x8000 str r0, [sp, #8] @@ -10720,14 +10720,14 @@ _02082a2c: b _02082a90 _02082a48: mov r0, r9 - bl func_ov00_020833d0 + bl _ZN10MapManager18func_ov00_020833d0Ev add r0, r6, r0 str r0, [sp, #8] mov r4, #0 b _02082a90 _02082a60: mov r0, r9 - bl func_ov00_020833dc + bl _ZN10MapManager18func_ov00_020833dcEv sub r0, r0, r5 mov r4, #0x4000 str r0, [sp] @@ -10735,7 +10735,7 @@ _02082a60: b _02082a90 _02082a7c: mov r0, r9 - bl func_ov00_020833c4 + bl _ZN10MapManager18func_ov00_020833c4Ev add r0, r5, r0 str r0, [sp] mov r4, #0x4000 @@ -10756,34 +10756,34 @@ _02082ac0: add sp, sp, #0x34 ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 - arm_func_end func_ov00_02082914 + arm_func_end _ZN10MapManager18func_ov00_02082914Ei _02082ac8: .word data_027e0d38 - .global func_ov00_02082acc - arm_func_start func_ov00_02082acc -func_ov00_02082acc: ; 0x02082acc + .global _ZN10MapManager18func_ov00_02082accEv + arm_func_start _ZN10MapManager18func_ov00_02082accEv +_ZN10MapManager18func_ov00_02082accEv: ; 0x02082acc ldr ip, _02082ad8 ; =func_ov00_0207d7bc ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_02082acc + arm_func_end _ZN10MapManager18func_ov00_02082accEv _02082ad8: .word func_ov00_0207d7bc - .global func_ov00_02082adc - arm_func_start func_ov00_02082adc -func_ov00_02082adc: ; 0x02082adc + .global _ZN10MapManager18func_ov00_02082adcEv + arm_func_start _ZN10MapManager18func_ov00_02082adcEv +_ZN10MapManager18func_ov00_02082adcEv: ; 0x02082adc ldr r0, _02082aec ; =data_027e0f70 ldr ip, _02082af0 ; =func_ov00_02096418 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_02082adc + arm_func_end _ZN10MapManager18func_ov00_02082adcEv _02082aec: .word data_027e0f70 _02082af0: .word func_ov00_02096418 - .global func_ov00_02082af4 - arm_func_start func_ov00_02082af4 -func_ov00_02082af4: ; 0x02082af4 + .global _ZN10MapManager18func_ov00_02082af4Ev + arm_func_start _ZN10MapManager18func_ov00_02082af4Ev +_ZN10MapManager18func_ov00_02082af4Ev: ; 0x02082af4 stmdb sp!, {r4, lr} ldr r1, _02082b38 ; =data_027e0f68 mov r4, r0 @@ -10795,19 +10795,19 @@ func_ov00_02082af4: ; 0x02082af4 blx r1 mov r0, r4 mov r1, #0 - bl func_ov00_02082808 + bl _ZN10MapManager18func_ov00_02082808Ev mov r0, #1 strb r0, [r4, #0xa] mov r0, #0 strb r0, [r4, #0xb] ldmia sp!, {r4, pc} .align 2, 0 - arm_func_end func_ov00_02082af4 + arm_func_end _ZN10MapManager18func_ov00_02082af4Ev _02082b38: .word data_027e0f68 - .global func_ov00_02082b3c - arm_func_start func_ov00_02082b3c -func_ov00_02082b3c: ; 0x02082b3c + .global _ZN10MapManager18func_ov00_02082b3cEi + arm_func_start _ZN10MapManager18func_ov00_02082b3cEi +_ZN10MapManager18func_ov00_02082b3cEi: ; 0x02082b3c stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r1 mov r6, r0 @@ -10816,12 +10816,12 @@ func_ov00_02082b3c: ; 0x02082b3c add r0, sp, #0 bl func_ov00_0207cb7c mov r0, r6 - bl func_ov00_02082d28 + bl _ZN10MapManager20GetCourseData_Unk_1cEv ldrb r1, [sp] cmp r1, r0 bne _02082bac mov r0, r6 - bl func_ov00_02082d34 + bl _ZN10MapManager20GetCourseData_Unk_1dEv ldrb r1, [sp, #1] cmp r1, r0 bne _02082bac @@ -10847,7 +10847,7 @@ _02082bac: ldr r1, _02082cec ; =data_027e0fe4 mov r0, r6 ldr r4, [r1] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev mov r3, r0 ldrb r1, [sp] ldrb r2, [sp, #1] @@ -10918,7 +10918,7 @@ _02082cd8: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 - arm_func_end func_ov00_02082b3c + arm_func_end _ZN10MapManager18func_ov00_02082b3cEi _02082ce0: .word data_027e0d38 _02082ce4: .word gAdventureFlags _02082ce8: .word data_027e0f64 @@ -10930,9 +10930,9 @@ _02082cfc: .word data_027e103c _02082d00: .word data_027e0f90 _02082d04: .word data_027e0c68 - .global func_ov00_02082d08 - arm_func_start func_ov00_02082d08 -func_ov00_02082d08: ; 0x02082d08 + .global _ZN10MapManager18func_ov00_02082d08Ev + arm_func_start _ZN10MapManager18func_ov00_02082d08Ev +_ZN10MapManager18func_ov00_02082d08Ev: ; 0x02082d08 ldr r3, [r0] mov r0, #0xa ldrb r2, [r3, #0x1c] @@ -10941,27 +10941,27 @@ func_ov00_02082d08: ; 0x02082d08 add r0, r0, r1 ldrb r0, [r0, #0x20] bx lr - arm_func_end func_ov00_02082d08 + arm_func_end _ZN10MapManager18func_ov00_02082d08Ev - .global func_ov00_02082d28 - arm_func_start func_ov00_02082d28 -func_ov00_02082d28: ; 0x02082d28 + .global _ZN10MapManager20GetCourseData_Unk_1cEv + arm_func_start _ZN10MapManager20GetCourseData_Unk_1cEv +_ZN10MapManager20GetCourseData_Unk_1cEv: ; 0x02082d28 ldr r0, [r0] ldrb r0, [r0, #0x1c] bx lr - arm_func_end func_ov00_02082d28 + arm_func_end _ZN10MapManager20GetCourseData_Unk_1cEv - .global func_ov00_02082d34 - arm_func_start func_ov00_02082d34 -func_ov00_02082d34: ; 0x02082d34 + .global _ZN10MapManager20GetCourseData_Unk_1dEv + arm_func_start _ZN10MapManager20GetCourseData_Unk_1dEv +_ZN10MapManager20GetCourseData_Unk_1dEv: ; 0x02082d34 ldr r0, [r0] ldrb r0, [r0, #0x1d] bx lr - arm_func_end func_ov00_02082d34 + arm_func_end _ZN10MapManager20GetCourseData_Unk_1dEv - .global func_ov00_02082d40 - arm_func_start func_ov00_02082d40 -func_ov00_02082d40: ; 0x02082d40 + .global _ZN10MapManager18func_ov00_02082d40Ev + arm_func_start _ZN10MapManager18func_ov00_02082d40Ev +_ZN10MapManager18func_ov00_02082d40Ev: ; 0x02082d40 ldr r3, [r0] ldr r0, [r3, #4] cmp r0, #2 @@ -10976,33 +10976,33 @@ func_ov00_02082d40: ; 0x02082d40 _02082d6c: ldrb r0, [r3, #0xb1] bx lr - arm_func_end func_ov00_02082d40 + arm_func_end _ZN10MapManager18func_ov00_02082d40Ev - .global func_ov00_02082d74 - arm_func_start func_ov00_02082d74 -func_ov00_02082d74: ; 0x02082d74 + .global _ZN10MapManager18func_ov00_02082d74Ei + arm_func_start _ZN10MapManager18func_ov00_02082d74Ei +_ZN10MapManager18func_ov00_02082d74Ei: ; 0x02082d74 ldr ip, _02082d80 ; =func_ov00_02078bc4 mov r0, r1 bx ip .align 2, 0 - arm_func_end func_ov00_02082d74 + arm_func_end _ZN10MapManager18func_ov00_02082d74Ei _02082d80: .word func_ov00_02078bc4 - .global func_ov00_02082d84 - arm_func_start func_ov00_02082d84 -func_ov00_02082d84: ; 0x02082d84 + .global _ZN10MapManager18func_ov00_02082d84Ev + arm_func_start _ZN10MapManager18func_ov00_02082d84Ev +_ZN10MapManager18func_ov00_02082d84Ev: ; 0x02082d84 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r8, r0 mov r7, r1 mov r6, r2 mov r5, r3 - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev mov r1, r0, lsl #0xc mov r0, #0x100000 bl Divide mov r4, r0 mov r0, r8 - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r1, r0, lsl #0xc mov r0, #0xc0000 bl Divide @@ -11029,11 +11029,11 @@ func_ov00_02082d84: ; 0x02082d84 mov r0, r0, asr #0xc str r0, [r5] ldmia sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end func_ov00_02082d84 + arm_func_end _ZN10MapManager18func_ov00_02082d84Ev - .global func_ov00_02082e1c - arm_func_start func_ov00_02082e1c -func_ov00_02082e1c: ; 0x02082e1c + .global _ZN10MapManager18func_ov00_02082e1cEPiS0_ + arm_func_start _ZN10MapManager18func_ov00_02082e1cEPiS0_ +_ZN10MapManager18func_ov00_02082e1cEPiS0_: ; 0x02082e1c stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x34 mov r8, r0 @@ -11125,7 +11125,7 @@ _02082f1c: str r1, [sp] ldrb r3, [sp, #6] mov r1, r8 - bl func_ov00_02083a54 + bl _ZN10MapManager18func_ov00_02083a54EiPS_iii ldr r0, [r8] bl func_ov00_0207d5c4 ldrb r1, [sp, #4] @@ -11191,12 +11191,12 @@ _02083050: add sp, sp, #0x34 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 - arm_func_end func_ov00_02082e1c + arm_func_end _ZN10MapManager18func_ov00_02082e1cEPiS0_ _02083068: .word data_027e0d38 - .global func_ov00_0208306c - arm_func_start func_ov00_0208306c -func_ov00_0208306c: ; 0x0208306c + .global _ZN10MapManager18func_ov00_0208306cEv + arm_func_start _ZN10MapManager18func_ov00_0208306cEv +_ZN10MapManager18func_ov00_0208306cEv: ; 0x0208306c stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x20 mov r6, r0 @@ -11222,12 +11222,12 @@ func_ov00_0208306c: ; 0x0208306c add r2, sp, #0x14 mov r1, r6 str r3, [sp, #0x1c] - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #4 mov r0, r6 mov r2, r5 mov r3, r4 - bl func_ov00_02082d84 + bl _ZN10MapManager18func_ov00_02082d84Ev add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, pc} _020830f0: @@ -11246,7 +11246,7 @@ _020830f0: str r4, [sp] ldr r1, [ip, #0x28] ldrb r1, [r1, #0x56] - bl func_ov00_02083244 + bl _ZN10MapManager18func_ov00_02083244EjPiS0_S0_ add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, pc} _02083138: @@ -11258,13 +11258,13 @@ _02083138: add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_0208306c + arm_func_end _ZN10MapManager18func_ov00_0208306cEv _02083154: .word data_027e0f94 _02083158: .word data_027e0d38 - .global func_ov00_0208315c - arm_func_start func_ov00_0208315c -func_ov00_0208315c: ; 0x0208315c + .global _ZN10MapManager18func_ov00_0208315cEPiS0_ + arm_func_start _ZN10MapManager18func_ov00_0208315cEPiS0_ +_ZN10MapManager18func_ov00_0208315cEPiS0_: ; 0x0208315c stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x1c mov r6, r0 @@ -11287,13 +11287,13 @@ func_ov00_0208315c: ; 0x0208315c str r2, [sp, #0x14] ldr r1, [r1, #8] str r1, [sp, #0x18] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev mov r1, r0 add r2, sp, #0x10 mov r0, r6 mov r3, r5 str r4, [sp] - bl func_ov00_02083298 + bl _ZN10MapManager18func_ov00_02083298EjPiS0_S0_ add sp, sp, #0x1c ldmia sp!, {r3, r4, r5, r6, pc} _020831d8: @@ -11312,7 +11312,7 @@ _020831d8: str r4, [sp] ldr r1, [ip, #0x28] ldrb r1, [r1, #0x56] - bl func_ov00_02083298 + bl _ZN10MapManager18func_ov00_02083298EjPiS0_S0_ add sp, sp, #0x1c ldmia sp!, {r3, r4, r5, r6, pc} _02083220: @@ -11324,13 +11324,13 @@ _02083220: add sp, sp, #0x1c ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_0208315c + arm_func_end _ZN10MapManager18func_ov00_0208315cEPiS0_ _0208323c: .word data_027e0f94 _02083240: .word data_027e0d38 - .global func_ov00_02083244 - arm_func_start func_ov00_02083244 -func_ov00_02083244: ; 0x02083244 + .global _ZN10MapManager18func_ov00_02083244EjPiS0_S0_ + arm_func_start _ZN10MapManager18func_ov00_02083244EjPiS0_S0_ +_ZN10MapManager18func_ov00_02083244EjPiS0_S0_: ; 0x02083244 stmdb sp!, {r3, lr} ldr r0, _02083290 ; =data_ov00_020e24e8 cmp r1, #4 @@ -11351,13 +11351,13 @@ func_ov00_02083244: ; 0x02083244 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 - arm_func_end func_ov00_02083244 + arm_func_end _ZN10MapManager18func_ov00_02083244EjPiS0_S0_ _02083290: .word data_ov00_020e24e8 _02083294: .word data_ov00_020e24ec - .global func_ov00_02083298 - arm_func_start func_ov00_02083298 -func_ov00_02083298: ; 0x02083298 + .global _ZN10MapManager18func_ov00_02083298EjPiS0_S0_ + arm_func_start _ZN10MapManager18func_ov00_02083298EjPiS0_S0_ +_ZN10MapManager18func_ov00_02083298EjPiS0_S0_: ; 0x02083298 stmdb sp!, {r3, lr} ldr r0, _020832fc ; =data_ov00_020e24e8 cmp r1, #4 @@ -11384,175 +11384,175 @@ func_ov00_02083298: ; 0x02083298 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 - arm_func_end func_ov00_02083298 + arm_func_end _ZN10MapManager18func_ov00_02083298EjPiS0_S0_ _020832fc: .word data_ov00_020e24e8 _02083300: .word data_ov00_020e24c8 _02083304: .word data_ov00_020e24ec _02083308: .word data_ov00_020e24cc - .global func_ov00_0208330c - arm_func_start func_ov00_0208330c -func_ov00_0208330c: ; 0x0208330c + .global _ZN10MapManager21GetCourseData_Unk_25cEv + arm_func_start _ZN10MapManager21GetCourseData_Unk_25cEv +_ZN10MapManager21GetCourseData_Unk_25cEv: ; 0x0208330c ldr r0, [r0] ldrb r0, [r0, #0x25c] bx lr - arm_func_end func_ov00_0208330c + arm_func_end _ZN10MapManager21GetCourseData_Unk_25cEv - .global func_ov00_02083318 - arm_func_start func_ov00_02083318 -func_ov00_02083318: ; 0x02083318 + .global _ZN10MapManager18func_ov00_02083318Ei + arm_func_start _ZN10MapManager18func_ov00_02083318Ei +_ZN10MapManager18func_ov00_02083318Ei: ; 0x02083318 ldr ip, _02083324 ; =func_ov00_0207d4e4 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_02083318 + arm_func_end _ZN10MapManager18func_ov00_02083318Ei _02083324: .word func_ov00_0207d4e4 - .global func_ov00_02083328 - arm_func_start func_ov00_02083328 -func_ov00_02083328: ; 0x02083328 + .global _ZN10MapManager18func_ov00_02083328Ev + arm_func_start _ZN10MapManager18func_ov00_02083328Ev +_ZN10MapManager18func_ov00_02083328Ev: ; 0x02083328 stmdb sp!, {r4, lr} mov r4, r0 - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev mov r1, r0 ldr r0, [r4] bl func_ov00_0207d4e4 ldmia sp!, {r4, pc} - arm_func_end func_ov00_02083328 + arm_func_end _ZN10MapManager18func_ov00_02083328Ev - .global func_ov00_02083344 - arm_func_start func_ov00_02083344 -func_ov00_02083344: ; 0x02083344 + .global _ZN10MapManager20GetCourseData_Unk_86Ev + arm_func_start _ZN10MapManager20GetCourseData_Unk_86Ev +_ZN10MapManager20GetCourseData_Unk_86Ev: ; 0x02083344 ldr r0, [r0] ldrb r0, [r0, #0x86] bx lr - arm_func_end func_ov00_02083344 + arm_func_end _ZN10MapManager20GetCourseData_Unk_86Ev - .global func_ov00_02083350 - arm_func_start func_ov00_02083350 -func_ov00_02083350: ; 0x02083350 + .global _ZN10MapManager20GetCourseData_Unk_87Ev + arm_func_start _ZN10MapManager20GetCourseData_Unk_87Ev +_ZN10MapManager20GetCourseData_Unk_87Ev: ; 0x02083350 ldr r0, [r0] ldrb r0, [r0, #0x87] bx lr - arm_func_end func_ov00_02083350 + arm_func_end _ZN10MapManager20GetCourseData_Unk_87Ev - .global func_ov00_0208335c - arm_func_start func_ov00_0208335c -func_ov00_0208335c: ; 0x0208335c + .global _ZN10MapManager17Get_MapData_Unk28Ev + arm_func_start _ZN10MapManager17Get_MapData_Unk28Ev +_ZN10MapManager17Get_MapData_Unk28Ev: ; 0x0208335c ldr r0, [r0, #4] ldrh r0, [r0, #0x28] bx lr - arm_func_end func_ov00_0208335c + arm_func_end _ZN10MapManager17Get_MapData_Unk28Ev - .global func_ov00_02083368 - arm_func_start func_ov00_02083368 -func_ov00_02083368: ; 0x02083368 + .global _ZN10MapManager17Get_MapData_Unk2aEv + arm_func_start _ZN10MapManager17Get_MapData_Unk2aEv +_ZN10MapManager17Get_MapData_Unk2aEv: ; 0x02083368 ldr r0, [r0, #4] ldrh r0, [r0, #0x2a] bx lr - arm_func_end func_ov00_02083368 + arm_func_end _ZN10MapManager17Get_MapData_Unk2aEv - .global func_ov00_02083374 - arm_func_start func_ov00_02083374 -func_ov00_02083374: ; 0x02083374 + .global _ZN10MapManager18func_ov00_02083374Ev + arm_func_start _ZN10MapManager18func_ov00_02083374Ev +_ZN10MapManager18func_ov00_02083374Ev: ; 0x02083374 stmdb sp!, {r3, lr} - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev mov r0, r0, lsl #0xc ldmia sp!, {r3, pc} - arm_func_end func_ov00_02083374 + arm_func_end _ZN10MapManager18func_ov00_02083374Ev - .global func_ov00_02083384 - arm_func_start func_ov00_02083384 -func_ov00_02083384: ; 0x02083384 + .global _ZN10MapManager18func_ov00_02083384Ev + arm_func_start _ZN10MapManager18func_ov00_02083384Ev +_ZN10MapManager18func_ov00_02083384Ev: ; 0x02083384 stmdb sp!, {r3, lr} - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r0, r0, lsl #0xc ldmia sp!, {r3, pc} - arm_func_end func_ov00_02083384 + arm_func_end _ZN10MapManager18func_ov00_02083384Ev - .global func_ov00_02083394 - arm_func_start func_ov00_02083394 -func_ov00_02083394: ; 0x02083394 + .global _ZN10MapManager13GetCourseMinXEv + arm_func_start _ZN10MapManager13GetCourseMinXEv +_ZN10MapManager13GetCourseMinXEv: ; 0x02083394 ldr r0, [r0] ldr r0, [r0, #0x98] bx lr - arm_func_end func_ov00_02083394 + arm_func_end _ZN10MapManager13GetCourseMinXEv - .global func_ov00_020833a0 - arm_func_start func_ov00_020833a0 -func_ov00_020833a0: ; 0x020833a0 + .global _ZN10MapManager13GetCourseMinZEv + arm_func_start _ZN10MapManager13GetCourseMinZEv +_ZN10MapManager13GetCourseMinZEv: ; 0x020833a0 ldr r0, [r0] ldr r0, [r0, #0xa0] bx lr - arm_func_end func_ov00_020833a0 + arm_func_end _ZN10MapManager13GetCourseMinZEv - .global func_ov00_020833ac - arm_func_start func_ov00_020833ac -func_ov00_020833ac: ; 0x020833ac + .global _ZN10MapManager13GetCourseMaxXEv + arm_func_start _ZN10MapManager13GetCourseMaxXEv +_ZN10MapManager13GetCourseMaxXEv: ; 0x020833ac ldr r0, [r0] ldr r0, [r0, #0xa4] bx lr - arm_func_end func_ov00_020833ac + arm_func_end _ZN10MapManager13GetCourseMaxXEv - .global func_ov00_020833b8 - arm_func_start func_ov00_020833b8 -func_ov00_020833b8: ; 0x020833b8 + .global _ZN10MapManager13GetCourseMaxZEv + arm_func_start _ZN10MapManager13GetCourseMaxZEv +_ZN10MapManager13GetCourseMaxZEv: ; 0x020833b8 ldr r0, [r0] ldr r0, [r0, #0xac] bx lr - arm_func_end func_ov00_020833b8 + arm_func_end _ZN10MapManager13GetCourseMaxZEv - .global func_ov00_020833c4 - arm_func_start func_ov00_020833c4 -func_ov00_020833c4: ; 0x020833c4 + .global _ZN10MapManager18func_ov00_020833c4Ev + arm_func_start _ZN10MapManager18func_ov00_020833c4Ev +_ZN10MapManager18func_ov00_020833c4Ev: ; 0x020833c4 ldr r0, [r0, #4] ldr r0, [r0, #0xdc] bx lr - arm_func_end func_ov00_020833c4 + arm_func_end _ZN10MapManager18func_ov00_020833c4Ev - .global func_ov00_020833d0 - arm_func_start func_ov00_020833d0 -func_ov00_020833d0: ; 0x020833d0 + .global _ZN10MapManager18func_ov00_020833d0Ev + arm_func_start _ZN10MapManager18func_ov00_020833d0Ev +_ZN10MapManager18func_ov00_020833d0Ev: ; 0x020833d0 ldr r0, [r0, #4] ldr r0, [r0, #0xe4] bx lr - arm_func_end func_ov00_020833d0 + arm_func_end _ZN10MapManager18func_ov00_020833d0Ev - .global func_ov00_020833dc - arm_func_start func_ov00_020833dc -func_ov00_020833dc: ; 0x020833dc + .global _ZN10MapManager18func_ov00_020833dcEv + arm_func_start _ZN10MapManager18func_ov00_020833dcEv +_ZN10MapManager18func_ov00_020833dcEv: ; 0x020833dc ldr r0, [r0, #4] ldr r0, [r0, #0xe8] bx lr - arm_func_end func_ov00_020833dc + arm_func_end _ZN10MapManager18func_ov00_020833dcEv - .global func_ov00_020833e8 - arm_func_start func_ov00_020833e8 -func_ov00_020833e8: ; 0x020833e8 + .global _ZN10MapManager18func_ov00_020833e8Ev + arm_func_start _ZN10MapManager18func_ov00_020833e8Ev +_ZN10MapManager18func_ov00_020833e8Ev: ; 0x020833e8 ldr r0, [r0, #4] ldr r0, [r0, #0xf0] bx lr - arm_func_end func_ov00_020833e8 + arm_func_end _ZN10MapManager18func_ov00_020833e8Ev - .global func_ov00_020833f4 - arm_func_start func_ov00_020833f4 -func_ov00_020833f4: ; 0x020833f4 + .global _ZN10MapManager18Get_MapData_Unk_d0Ev + arm_func_start _ZN10MapManager18Get_MapData_Unk_d0Ev +_ZN10MapManager18Get_MapData_Unk_d0Ev: ; 0x020833f4 ldr r0, [r0, #4] ldr r0, [r0, #0xd0] bx lr - arm_func_end func_ov00_020833f4 + arm_func_end _ZN10MapManager18Get_MapData_Unk_d0Ev - .global func_ov00_02083400 - arm_func_start func_ov00_02083400 -func_ov00_02083400: ; 0x02083400 + .global _ZN10MapManager18Get_MapData_Unk_d8Ev + arm_func_start _ZN10MapManager18Get_MapData_Unk_d8Ev +_ZN10MapManager18Get_MapData_Unk_d8Ev: ; 0x02083400 ldr r0, [r0, #4] ldr r0, [r0, #0xd8] bx lr - arm_func_end func_ov00_02083400 + arm_func_end _ZN10MapManager18Get_MapData_Unk_d8Ev - .global func_ov00_0208340c - arm_func_start func_ov00_0208340c -func_ov00_0208340c: ; 0x0208340c + .global _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p + arm_func_start _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p +_ZN10MapManager17GetMapData_Unk_dcEP5Vec3p: ; 0x0208340c ldr r2, [r0, #4] ldr r0, [r2, #0xdc] str r0, [r1] @@ -11561,11 +11561,11 @@ func_ov00_0208340c: ; 0x0208340c ldr r0, [r2, #0xe4] str r0, [r1, #8] bx lr - arm_func_end func_ov00_0208340c + arm_func_end _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p - .global func_ov00_0208342c - arm_func_start func_ov00_0208342c -func_ov00_0208342c: ; 0x0208342c + .global _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p + arm_func_start _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p +_ZN10MapManager17GetMapData_Unk_e8EP5Vec3p: ; 0x0208342c ldr r2, [r0, #4] ldr r0, [r2, #0xe8] str r0, [r1] @@ -11574,11 +11574,11 @@ func_ov00_0208342c: ; 0x0208342c ldr r0, [r2, #0xf0] str r0, [r1, #8] bx lr - arm_func_end func_ov00_0208342c + arm_func_end _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p - .global func_ov00_0208344c - arm_func_start func_ov00_0208344c -func_ov00_0208344c: ; 0x0208344c + .global _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p + arm_func_start _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +_ZN10MapManager17GetMapData_Unk_d0EP5Vec3p: ; 0x0208344c ldr r2, [r0, #4] ldr r0, [r2, #0xd0] str r0, [r1] @@ -11587,24 +11587,24 @@ func_ov00_0208344c: ; 0x0208344c ldr r0, [r2, #0xd8] str r0, [r1, #8] bx lr - arm_func_end func_ov00_0208344c + arm_func_end _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p - .global func_ov00_0208346c - arm_func_start func_ov00_0208346c -func_ov00_0208346c: ; 0x0208346c + .global _ZN10MapManager18func_ov00_0208346cEP4AABB + arm_func_start _ZN10MapManager18func_ov00_0208346cEP4AABB +_ZN10MapManager18func_ov00_0208346cEP4AABB: ; 0x0208346c stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl func_ov00_020833c4 + bl _ZN10MapManager18func_ov00_020833c4Ev str r0, [r4] mov r0, r5 - bl func_ov00_020833d0 + bl _ZN10MapManager18func_ov00_020833d0Ev str r0, [r4, #8] mov r0, r5 - bl func_ov00_020833dc + bl _ZN10MapManager18func_ov00_020833dcEv str r0, [r4, #0xc] mov r0, r5 - bl func_ov00_020833e8 + bl _ZN10MapManager18func_ov00_020833e8Ev ldr r1, _020834b8 ; =0x00001333 str r0, [r4, #0x14] str r1, [r4, #0x10] @@ -11612,12 +11612,12 @@ func_ov00_0208346c: ; 0x0208346c str r0, [r4, #4] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_0208346c + arm_func_end _ZN10MapManager18func_ov00_0208346cEP4AABB _020834b8: .word 0x00001333 - .global func_ov00_020834bc - arm_func_start func_ov00_020834bc -func_ov00_020834bc: ; 0x020834bc + .global _ZN10MapManager18func_ov00_020834bcEP5Vec3pii + arm_func_start _ZN10MapManager18func_ov00_020834bcEP5Vec3pii +_ZN10MapManager18func_ov00_020834bcEP5Vec3pii: ; 0x020834bc stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, [r5] @@ -11634,21 +11634,21 @@ func_ov00_020834bc: ; 0x020834bc ldr r1, [r0, #8] mov r0, r5 str r1, [r4, #8] - bl func_ov00_02083374 + bl _ZN10MapManager18func_ov00_02083374Ev ldr r1, [r4] sub r1, r1, r0, asr #1 mov r0, r5 str r1, [r4] - bl func_ov00_02083384 + bl _ZN10MapManager18func_ov00_02083384Ev ldr r1, [r4, #8] sub r0, r1, r0, asr #1 str r0, [r4, #8] ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_020834bc + arm_func_end _ZN10MapManager18func_ov00_020834bcEP5Vec3pii - .global func_ov00_02083524 - arm_func_start func_ov00_02083524 -func_ov00_02083524: ; 0x02083524 + .global _ZN10MapManager18func_ov00_02083524EP5Vec3pii + arm_func_start _ZN10MapManager18func_ov00_02083524EP5Vec3pii +_ZN10MapManager18func_ov00_02083524EP5Vec3pii: ; 0x02083524 stmdb sp!, {r4, lr} ldr r0, [r0] mov ip, #0xa @@ -11664,64 +11664,64 @@ func_ov00_02083524: ; 0x02083524 ldr r0, [r0, #8] str r0, [r4, #8] ldmia sp!, {r4, pc} - arm_func_end func_ov00_02083524 + arm_func_end _ZN10MapManager18func_ov00_02083524EP5Vec3pii - .global func_ov00_02083560 - arm_func_start func_ov00_02083560 -func_ov00_02083560: ; 0x02083560 + .global _ZN10MapManager18func_ov00_02083560EiPS_j + arm_func_start _ZN10MapManager18func_ov00_02083560EiPS_j +_ZN10MapManager18func_ov00_02083560EiPS_j: ; 0x02083560 ldr ip, _0208356c ; =func_ov00_0207cb7c ldr r1, [r1] bx ip .align 2, 0 - arm_func_end func_ov00_02083560 + arm_func_end _ZN10MapManager18func_ov00_02083560EiPS_j _0208356c: .word func_ov00_0207cb7c - .global func_ov00_02083570 - arm_func_start func_ov00_02083570 -func_ov00_02083570: ; 0x02083570 + .global _ZN10MapManager18func_ov00_02083570Eii + arm_func_start _ZN10MapManager18func_ov00_02083570Eii +_ZN10MapManager18func_ov00_02083570Eii: ; 0x02083570 ldr r3, [r0] mov r0, #0xa mla r0, r1, r0, r3 add r0, r0, r2 ldrb r0, [r0, #0x20] bx lr - arm_func_end func_ov00_02083570 + arm_func_end _ZN10MapManager18func_ov00_02083570Eii - .global func_ov00_02083588 - arm_func_start func_ov00_02083588 -func_ov00_02083588: ; 0x02083588 + .global _ZN10MapManager18func_ov00_02083588Ev + arm_func_start _ZN10MapManager18func_ov00_02083588Ev +_ZN10MapManager18func_ov00_02083588Ev: ; 0x02083588 stmdb sp!, {r4, lr} mov r4, r0 - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev mov r1, r0 ldr r0, [r4] bl func_ov00_0207cc6c ldmia sp!, {r4, pc} - arm_func_end func_ov00_02083588 + arm_func_end _ZN10MapManager18func_ov00_02083588Ev - .global func_ov00_020835a4 - arm_func_start func_ov00_020835a4 -func_ov00_020835a4: ; 0x020835a4 + .global _ZN10MapManager18func_ov00_020835a4Ev + arm_func_start _ZN10MapManager18func_ov00_020835a4Ev +_ZN10MapManager18func_ov00_020835a4Ev: ; 0x020835a4 ldr ip, _020835b0 ; =func_ov00_0207d61c ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_020835a4 + arm_func_end _ZN10MapManager18func_ov00_020835a4Ev _020835b0: .word func_ov00_0207d61c - .global func_ov00_020835b4 - arm_func_start func_ov00_020835b4 -func_ov00_020835b4: ; 0x020835b4 + .global _ZN10MapManager18func_ov00_020835b4Ev + arm_func_start _ZN10MapManager18func_ov00_020835b4Ev +_ZN10MapManager18func_ov00_020835b4Ev: ; 0x020835b4 ldr ip, _020835c0 ; =func_ov00_0207d628 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_020835b4 + arm_func_end _ZN10MapManager18func_ov00_020835b4Ev _020835c0: .word func_ov00_0207d628 - .global func_ov00_020835c4 - arm_func_start func_ov00_020835c4 -func_ov00_020835c4: ; 0x020835c4 + .global _ZN10MapManager18func_ov00_020835c4Eii + arm_func_start _ZN10MapManager18func_ov00_020835c4Eii +_ZN10MapManager18func_ov00_020835c4Eii: ; 0x020835c4 stmdb sp!, {r3, lr} mov r3, #3 str r3, [sp] @@ -11730,51 +11730,51 @@ func_ov00_020835c4: ; 0x020835c4 mov r2, #0 bl func_ov00_0207d404 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020835c4 + arm_func_end _ZN10MapManager18func_ov00_020835c4Eii - .global func_ov00_020835e4 - arm_func_start func_ov00_020835e4 -func_ov00_020835e4: ; 0x020835e4 + .global _ZN10MapManager18func_ov00_020835e4EiPiS0_ + arm_func_start _ZN10MapManager18func_ov00_020835e4EiPiS0_ +_ZN10MapManager18func_ov00_020835e4EiPiS0_: ; 0x020835e4 ldr ip, _020835f0 ; =func_ov00_0207caa8 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_020835e4 + arm_func_end _ZN10MapManager18func_ov00_020835e4EiPiS0_ _020835f0: .word func_ov00_0207caa8 - .global func_ov00_020835f4 - arm_func_start func_ov00_020835f4 -func_ov00_020835f4: ; 0x020835f4 + .global _ZN10MapManager18func_ov00_020835f4Ei + arm_func_start _ZN10MapManager18func_ov00_020835f4Ei +_ZN10MapManager18func_ov00_020835f4Ei: ; 0x020835f4 ldr ip, _02083600 ; =func_ov00_0207cb30 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_020835f4 + arm_func_end _ZN10MapManager18func_ov00_020835f4Ei _02083600: .word func_ov00_0207cb30 - .global func_ov00_02083604 - arm_func_start func_ov00_02083604 -func_ov00_02083604: ; 0x02083604 + .global _ZN10MapManager18func_ov00_02083604Ei + arm_func_start _ZN10MapManager18func_ov00_02083604Ei +_ZN10MapManager18func_ov00_02083604Ei: ; 0x02083604 ldr ip, _02083610 ; =func_ov00_0207cbe8 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_02083604 + arm_func_end _ZN10MapManager18func_ov00_02083604Ei _02083610: .word func_ov00_0207cbe8 - .global func_ov00_02083614 - arm_func_start func_ov00_02083614 -func_ov00_02083614: ; 0x02083614 + .global _ZN10MapManager18func_ov00_02083614Ei + arm_func_start _ZN10MapManager18func_ov00_02083614Ei +_ZN10MapManager18func_ov00_02083614Ei: ; 0x02083614 ldr ip, _02083620 ; =func_ov00_0207cc24 ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_02083614 + arm_func_end _ZN10MapManager18func_ov00_02083614Ei _02083620: .word func_ov00_0207cc24 - .global func_ov00_02083624 - arm_func_start func_ov00_02083624 -func_ov00_02083624: ; 0x02083624 + .global _ZN10MapManager14GetEntrancePosEP5Vec3pi + arm_func_start _ZN10MapManager14GetEntrancePosEP5Vec3pi +_ZN10MapManager14GetEntrancePosEP5Vec3pi: ; 0x02083624 stmdb sp!, {r4, lr} ldr r0, [r0, #4] mov r4, r1 @@ -11791,11 +11791,11 @@ func_ov00_02083624: ; 0x02083624 ldr r1, [r3, #0x10] str r1, [r4, #0x10] ldmia sp!, {r4, pc} - arm_func_end func_ov00_02083624 + arm_func_end _ZN10MapManager14GetEntrancePosEP5Vec3pi - .global func_ov00_02083664 - arm_func_start func_ov00_02083664 -func_ov00_02083664: ; 0x02083664 + .global _ZN10MapManager18func_ov00_02083664EP5Vec3pi + arm_func_start _ZN10MapManager18func_ov00_02083664EP5Vec3pi +_ZN10MapManager18func_ov00_02083664EP5Vec3pi: ; 0x02083664 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x14 mov r4, r1 @@ -11804,7 +11804,7 @@ func_ov00_02083664: ; 0x02083664 add r1, sp, #0 strb ip, [sp, #0xe] str r3, [sp, #0x10] - bl func_ov00_02083624 + bl _ZN10MapManager14GetEntrancePosEP5Vec3pi cmp r0, #0 addeq sp, sp, #0x14 moveq r0, #0 @@ -11818,31 +11818,31 @@ func_ov00_02083664: ; 0x02083664 str r1, [r4, #8] add sp, sp, #0x14 ldmia sp!, {r3, r4, pc} - arm_func_end func_ov00_02083664 + arm_func_end _ZN10MapManager18func_ov00_02083664EP5Vec3pi - .global func_ov00_020836bc - arm_func_start func_ov00_020836bc -func_ov00_020836bc: ; 0x020836bc + .global _ZN10MapManager18func_ov00_020836bcEjPi + arm_func_start _ZN10MapManager18func_ov00_020836bcEjPi +_ZN10MapManager18func_ov00_020836bcEjPi: ; 0x020836bc ldr ip, _020836c8 ; =func_ov00_0207faac ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020836bc + arm_func_end _ZN10MapManager18func_ov00_020836bcEjPi _020836c8: .word func_ov00_0207faac - .global func_ov00_020836cc - arm_func_start func_ov00_020836cc -func_ov00_020836cc: ; 0x020836cc + .global _ZN10MapManager18func_ov00_020836ccEjP4AABBj + arm_func_start _ZN10MapManager18func_ov00_020836ccEjP4AABBj +_ZN10MapManager18func_ov00_020836ccEjP4AABBj: ; 0x020836cc ldr ip, _020836d8 ; =func_ov00_0207fb64 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020836cc + arm_func_end _ZN10MapManager18func_ov00_020836ccEjP4AABBj _020836d8: .word func_ov00_0207fb64 - .global func_ov00_020836dc - arm_func_start func_ov00_020836dc -func_ov00_020836dc: ; 0x020836dc + .global _ZN10MapManager18func_ov00_020836dcEii + arm_func_start _ZN10MapManager18func_ov00_020836dcEii +_ZN10MapManager18func_ov00_020836dcEii: ; 0x020836dc stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc cmp r2, #0 @@ -11877,37 +11877,37 @@ _02083750: add r2, sp, #0 mov r0, r5 mov r1, r4 - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_020836dc + arm_func_end _ZN10MapManager18func_ov00_020836dcEii _02083768: .word data_027e0f94 _0208376c: .word data_027e0fe4 - .global func_ov00_02083770 - arm_func_start func_ov00_02083770 -func_ov00_02083770: ; 0x02083770 + .global _ZN10MapManager18func_ov00_02083770Eji + arm_func_start _ZN10MapManager18func_ov00_02083770Eji +_ZN10MapManager18func_ov00_02083770Eji: ; 0x02083770 ldr ip, _0208377c ; =func_ov00_0207fd58 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02083770 + arm_func_end _ZN10MapManager18func_ov00_02083770Eji _0208377c: .word func_ov00_0207fd58 - .global func_ov00_02083780 - arm_func_start func_ov00_02083780 -func_ov00_02083780: ; 0x02083780 + .global _ZN10MapManager18func_ov00_02083780Ei + arm_func_start _ZN10MapManager18func_ov00_02083780Ei +_ZN10MapManager18func_ov00_02083780Ei: ; 0x02083780 ldr ip, _0208378c ; =func_ov00_0207fc2c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02083780 + arm_func_end _ZN10MapManager18func_ov00_02083780Ei _0208378c: .word func_ov00_0207fc2c - .global func_ov00_02083790 - arm_func_start func_ov00_02083790 -func_ov00_02083790: ; 0x02083790 + .global _ZN10MapManager18func_ov00_02083790Ei + arm_func_start _ZN10MapManager18func_ov00_02083790Ei +_ZN10MapManager18func_ov00_02083790Ei: ; 0x02083790 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 movs r4, r1 @@ -11930,7 +11930,7 @@ func_ov00_02083790: ; 0x02083790 add r1, sp, #4 add r2, sp, #0 mov r0, r5 - bl func_ov00_02082e1c + bl _ZN10MapManager18func_ov00_02082e1cEPiS0_ cmp r0, #0 bne _0208381c ldr r0, _02083838 ; =data_027e0d3c @@ -11950,15 +11950,15 @@ _0208381c: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_02083790 + arm_func_end _ZN10MapManager18func_ov00_02083790Ei _02083830: .word data_027e0f64 _02083834: .word data_027e0d38 _02083838: .word data_027e0d3c _0208383c: .word data_027e0fe4 - .global func_ov00_02083840 - arm_func_start func_ov00_02083840 -func_ov00_02083840: ; 0x02083840 + .global _ZN10MapManager18func_ov00_02083840Ei + arm_func_start _ZN10MapManager18func_ov00_02083840Ei +_ZN10MapManager18func_ov00_02083840Ei: ; 0x02083840 stmdb sp!, {r3, r4, r5, lr} movs r4, r1 mov r5, r0 @@ -11992,123 +11992,123 @@ _020838ac: bl func_ov00_02080d80 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_02083840 + arm_func_end _ZN10MapManager18func_ov00_02083840Ei _020838bc: .word data_027e0f64 _020838c0: .word data_027e0d3c _020838c4: .word data_027e0fe4 - .global func_ov00_020838c8 - arm_func_start func_ov00_020838c8 -func_ov00_020838c8: ; 0x020838c8 + .global _ZN10MapManager18func_ov00_020838c8Ei + arm_func_start _ZN10MapManager18func_ov00_020838c8Ei +_ZN10MapManager18func_ov00_020838c8Ei: ; 0x020838c8 ldr ip, _020838d4 ; =func_ov00_0207fe80 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020838c8 + arm_func_end _ZN10MapManager18func_ov00_020838c8Ei _020838d4: .word func_ov00_0207fe80 - .global func_ov00_020838d8 - arm_func_start func_ov00_020838d8 -func_ov00_020838d8: ; 0x020838d8 + .global _ZN10MapManager18func_ov00_020838d8Ei + arm_func_start _ZN10MapManager18func_ov00_020838d8Ei +_ZN10MapManager18func_ov00_020838d8Ei: ; 0x020838d8 ldr ip, _020838e4 ; =func_ov00_0207ff88 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020838d8 + arm_func_end _ZN10MapManager18func_ov00_020838d8Ei _020838e4: .word func_ov00_0207ff88 - .global func_ov00_020838e8 - arm_func_start func_ov00_020838e8 -func_ov00_020838e8: ; 0x020838e8 + .global _ZN10MapManager18func_ov00_020838e8EjPi + arm_func_start _ZN10MapManager18func_ov00_020838e8EjPi +_ZN10MapManager18func_ov00_020838e8EjPi: ; 0x020838e8 ldr ip, _020838f4 ; =func_ov00_0208039c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020838e8 + arm_func_end _ZN10MapManager18func_ov00_020838e8EjPi _020838f4: .word func_ov00_0208039c - .global func_ov00_020838f8 - arm_func_start func_ov00_020838f8 -func_ov00_020838f8: ; 0x020838f8 + .global _ZN10MapManager18func_ov00_020838f8EPi + arm_func_start _ZN10MapManager18func_ov00_020838f8EPi +_ZN10MapManager18func_ov00_020838f8EPi: ; 0x020838f8 ldr ip, _02083904 ; =func_ov00_02080140 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020838f8 + arm_func_end _ZN10MapManager18func_ov00_020838f8EPi _02083904: .word func_ov00_02080140 - .global func_ov00_02083908 - arm_func_start func_ov00_02083908 -func_ov00_02083908: ; 0x02083908 + .global _ZN10MapManager18func_ov00_02083908EcPi + arm_func_start _ZN10MapManager18func_ov00_02083908EcPi +_ZN10MapManager18func_ov00_02083908EcPi: ; 0x02083908 ldr ip, _02083914 ; =func_ov00_02080510 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02083908 + arm_func_end _ZN10MapManager18func_ov00_02083908EcPi _02083914: .word func_ov00_02080510 - .global func_ov00_02083918 - arm_func_start func_ov00_02083918 -func_ov00_02083918: ; 0x02083918 + .global _ZN10MapManager18func_ov00_02083918EiPi + arm_func_start _ZN10MapManager18func_ov00_02083918EiPi +_ZN10MapManager18func_ov00_02083918EiPi: ; 0x02083918 ldr ip, _02083924 ; =func_ov00_020805d0 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02083918 + arm_func_end _ZN10MapManager18func_ov00_02083918EiPi _02083924: .word func_ov00_020805d0 - .global func_ov00_02083928 - arm_func_start func_ov00_02083928 -func_ov00_02083928: ; 0x02083928 + .global _ZN10MapManager18func_ov00_02083928EPci + arm_func_start _ZN10MapManager18func_ov00_02083928EPci +_ZN10MapManager18func_ov00_02083928EPci: ; 0x02083928 ldr ip, _02083934 ; =func_ov00_02080688 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02083928 + arm_func_end _ZN10MapManager18func_ov00_02083928EPci _02083934: .word func_ov00_02080688 - .global func_ov00_02083938 - arm_func_start func_ov00_02083938 -func_ov00_02083938: ; 0x02083938 + .global _ZN10MapManager18func_ov00_02083938Ei + arm_func_start _ZN10MapManager18func_ov00_02083938Ei +_ZN10MapManager18func_ov00_02083938Ei: ; 0x02083938 ldr ip, _02083944 ; =func_ov00_02080780 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02083938 + arm_func_end _ZN10MapManager18func_ov00_02083938Ei _02083944: .word func_ov00_02080780 - .global func_ov00_02083948 - arm_func_start func_ov00_02083948 -func_ov00_02083948: ; 0x02083948 + .global _ZN10MapManager18Set_MapData_Unk_16Eci + arm_func_start _ZN10MapManager18Set_MapData_Unk_16Eci +_ZN10MapManager18Set_MapData_Unk_16Eci: ; 0x02083948 ldr r0, [r0, #4] add r0, r0, r2 strb r1, [r0, #0x16] bx lr - arm_func_end func_ov00_02083948 + arm_func_end _ZN10MapManager18Set_MapData_Unk_16Eci - .global func_ov00_02083958 - arm_func_start func_ov00_02083958 -func_ov00_02083958: ; 0x02083958 + .global _ZN10MapManager18func_ov00_02083958Ei + arm_func_start _ZN10MapManager18func_ov00_02083958Ei +_ZN10MapManager18func_ov00_02083958Ei: ; 0x02083958 ldr ip, _02083964 ; =func_ov00_0207f924 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02083958 + arm_func_end _ZN10MapManager18func_ov00_02083958Ei _02083964: .word func_ov00_0207f924 - .global func_ov00_02083968 - arm_func_start func_ov00_02083968 -func_ov00_02083968: ; 0x02083968 + .global _ZN10MapManager18func_ov00_02083968EjPc + arm_func_start _ZN10MapManager18func_ov00_02083968EjPc +_ZN10MapManager18func_ov00_02083968EjPc: ; 0x02083968 ldr ip, _02083974 ; =func_ov00_02080824 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02083968 + arm_func_end _ZN10MapManager18func_ov00_02083968EjPc _02083974: .word func_ov00_02080824 - .global func_ov00_02083978 - arm_func_start func_ov00_02083978 -func_ov00_02083978: ; 0x02083978 + .global _ZN10MapManager18func_ov00_02083978EiP5Vec3p + arm_func_start _ZN10MapManager18func_ov00_02083978EiP5Vec3p +_ZN10MapManager18func_ov00_02083978EiP5Vec3p: ; 0x02083978 stmdb sp!, {r4, lr} ldr r0, [r0, #4] mov r4, r2 @@ -12124,78 +12124,78 @@ func_ov00_02083978: ; 0x02083978 mov r0, #1 str r1, [r4, #8] ldmia sp!, {r4, pc} - arm_func_end func_ov00_02083978 + arm_func_end _ZN10MapManager18func_ov00_02083978EiP5Vec3p - .global func_ov00_020839b4 - arm_func_start func_ov00_020839b4 -func_ov00_020839b4: ; 0x020839b4 + .global _ZN10MapManager18func_ov00_020839b4Ei + arm_func_start _ZN10MapManager18func_ov00_020839b4Ei +_ZN10MapManager18func_ov00_020839b4Ei: ; 0x020839b4 ldr ip, _020839c0 ; =func_ov00_020808d0 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020839b4 + arm_func_end _ZN10MapManager18func_ov00_020839b4Ei _020839c0: .word func_ov00_020808d0 - .global func_ov00_020839c4 - arm_func_start func_ov00_020839c4 -func_ov00_020839c4: ; 0x020839c4 + .global _ZN10MapManager18func_ov00_020839c4Ei + arm_func_start _ZN10MapManager18func_ov00_020839c4Ei +_ZN10MapManager18func_ov00_020839c4Ei: ; 0x020839c4 ldr ip, _020839d0 ; =func_ov00_020809b8 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_020839c4 + arm_func_end _ZN10MapManager18func_ov00_020839c4Ei _020839d0: .word func_ov00_020809b8 - .global func_ov00_020839d4 - arm_func_start func_ov00_020839d4 -func_ov00_020839d4: ; 0x020839d4 + .global _ZN10MapManager18func_ov00_020839d4Ev + arm_func_start _ZN10MapManager18func_ov00_020839d4Ev +_ZN10MapManager18func_ov00_020839d4Ev: ; 0x020839d4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev mov r1, r0 ldr r0, [r5, #4] sub r1, r4, r1 bl func_ov00_0207f778 ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_020839d4 + arm_func_end _ZN10MapManager18func_ov00_020839d4Ev - .global func_ov00_020839f8 - arm_func_start func_ov00_020839f8 -func_ov00_020839f8: ; 0x020839f8 + .global _ZN10MapManager18func_ov00_020839f8Ev + arm_func_start _ZN10MapManager18func_ov00_020839f8Ev +_ZN10MapManager18func_ov00_020839f8Ev: ; 0x020839f8 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev mov r1, r0 ldr r0, [r5, #4] sub r1, r4, r1 bl func_ov00_0207f7a0 ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_020839f8 + arm_func_end _ZN10MapManager18func_ov00_020839f8Ev - .global func_ov00_02083a1c - arm_func_start func_ov00_02083a1c -func_ov00_02083a1c: ; 0x02083a1c + .global _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p + arm_func_start _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +_ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p: ; 0x02083a1c stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r6, r1 mov r7, r0 ldr r1, [r5, #8] mov r0, r6 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r4, r0 ldr r1, [r5] mov r0, r6 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev strb r0, [r7] strb r4, [r7, #1] ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end func_ov00_02083a1c + arm_func_end _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - .global func_ov00_02083a54 - arm_func_start func_ov00_02083a54 -func_ov00_02083a54: ; 0x02083a54 + .global _ZN10MapManager18func_ov00_02083a54EiPS_iii + arm_func_start _ZN10MapManager18func_ov00_02083a54EiPS_iii +_ZN10MapManager18func_ov00_02083a54EiPS_iii: ; 0x02083a54 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x24 mov r6, r1 @@ -12203,7 +12203,7 @@ func_ov00_02083a54: ; 0x02083a54 mov r0, r6 mov r5, r2 mov r4, r3 - bl func_ov00_0208330c + bl _ZN10MapManager21GetCourseData_Unk_25cEv cmp r0, #0 beq _02083b58 mvn r0, #0 @@ -12212,7 +12212,7 @@ func_ov00_02083a54: ; 0x02083a54 cmpne r2, r0 bne _02083aa0 mov r0, r6 - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev mov r1, r0 b _02083ab4 _02083aa0: @@ -12223,14 +12223,14 @@ _02083aa0: ldrb r1, [r0, #0x20] _02083ab4: mov r0, r6 - bl func_ov00_02083318 + bl _ZN10MapManager18func_ov00_02083318Ei cmp r0, #0 beq _02083b2c ldr r3, [sp, #0x38] add r1, sp, #0x18 mov r0, r6 mov r2, r4 - bl func_ov00_02083524 + bl _ZN10MapManager18func_ov00_02083524EP5Vec3pii ldr r1, [r5] add r0, sp, #0 str r1, [sp] @@ -12255,11 +12255,11 @@ _02083ab4: _02083b2c: ldr r1, [r5, #8] mov r0, r6 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r4, r0 ldr r1, [r5] mov r0, r6 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev strb r0, [r7] add sp, sp, #0x24 strb r4, [r7, #1] @@ -12267,84 +12267,84 @@ _02083b2c: _02083b58: ldr r1, [r5, #8] mov r0, r6 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r4, r0 ldr r1, [r5] mov r0, r6 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev strb r0, [r7] strb r4, [r7, #1] add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, pc} - arm_func_end func_ov00_02083a54 + arm_func_end _ZN10MapManager18func_ov00_02083a54EiPS_iii - .global func_ov00_02083b84 - arm_func_start func_ov00_02083b84 -func_ov00_02083b84: ; 0x02083b84 + .global _ZN10MapManager18func_ov00_02083b84Ev + arm_func_start _ZN10MapManager18func_ov00_02083b84Ev +_ZN10MapManager18func_ov00_02083b84Ev: ; 0x02083b84 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev mov r4, r0 ldr r0, [r6, #4] mov r1, r5 bl func_ov00_0207f694 add r0, r4, r0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02083b84 + arm_func_end _ZN10MapManager18func_ov00_02083b84Ev - .global func_ov00_02083bac - arm_func_start func_ov00_02083bac -func_ov00_02083bac: ; 0x02083bac + .global _ZN10MapManager18func_ov00_02083bacEv + arm_func_start _ZN10MapManager18func_ov00_02083bacEv +_ZN10MapManager18func_ov00_02083bacEv: ; 0x02083bac stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev mov r4, r0 ldr r0, [r6, #4] mov r1, r5 bl func_ov00_0207f6a0 add r0, r4, r0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02083bac + arm_func_end _ZN10MapManager18func_ov00_02083bacEv - .global func_ov00_02083bd4 - arm_func_start func_ov00_02083bd4 -func_ov00_02083bd4: ; 0x02083bd4 + .global _ZN10MapManager18func_ov00_02083bd4Ev + arm_func_start _ZN10MapManager18func_ov00_02083bd4Ev +_ZN10MapManager18func_ov00_02083bd4Ev: ; 0x02083bd4 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev mov r4, r0 ldr r0, [r6, #4] mov r1, r5 bl func_ov00_0207f6ac add r0, r4, r0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02083bd4 + arm_func_end _ZN10MapManager18func_ov00_02083bd4Ev - .global func_ov00_02083bfc - arm_func_start func_ov00_02083bfc -func_ov00_02083bfc: ; 0x02083bfc + .global _ZN10MapManager18func_ov00_02083bfcEv + arm_func_start _ZN10MapManager18func_ov00_02083bfcEv +_ZN10MapManager18func_ov00_02083bfcEv: ; 0x02083bfc stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev mov r4, r0 ldr r0, [r6, #4] mov r1, r5 bl func_ov00_0207f6bc add r0, r4, r0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02083bfc + arm_func_end _ZN10MapManager18func_ov00_02083bfcEv - .global func_ov00_02083c24 - arm_func_start func_ov00_02083c24 -func_ov00_02083c24: ; 0x02083c24 + .global _ZN10MapManager18func_ov00_02083c24Ei + arm_func_start _ZN10MapManager18func_ov00_02083c24Ei +_ZN10MapManager18func_ov00_02083c24Ei: ; 0x02083c24 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev mov r4, r0 ldr r0, [r6, #4] mov r1, r5 @@ -12352,15 +12352,15 @@ func_ov00_02083c24: ; 0x02083c24 add r0, r4, r0 add r0, r0, #0x800 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02083c24 + arm_func_end _ZN10MapManager18func_ov00_02083c24Ei - .global func_ov00_02083c50 - arm_func_start func_ov00_02083c50 -func_ov00_02083c50: ; 0x02083c50 + .global _ZN10MapManager18func_ov00_02083c50Ei + arm_func_start _ZN10MapManager18func_ov00_02083c50Ei +_ZN10MapManager18func_ov00_02083c50Ei: ; 0x02083c50 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev mov r4, r0 ldr r0, [r6, #4] mov r1, r5 @@ -12368,22 +12368,22 @@ func_ov00_02083c50: ; 0x02083c50 add r0, r4, r0 add r0, r0, #0x800 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02083c50 + arm_func_end _ZN10MapManager18func_ov00_02083c50Ei - .global func_ov00_02083c7c - arm_func_start func_ov00_02083c7c -func_ov00_02083c7c: ; 0x02083c7c + .global _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi + arm_func_start _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +_ZN10MapManager18func_ov00_02083c7cEP5Vec3pi: ; 0x02083c7c stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc mov r4, r1 ldrb r1, [sp, #0x20] mov r5, r0 - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [r4] ldrb r1, [sp, #0x21] mov r0, r5 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei str r0, [r4, #8] ldr r0, [r4] add r1, sp, #0 @@ -12394,24 +12394,24 @@ func_ov00_02083c7c: ; 0x02083c7c ldr r3, [r4, #8] mov r2, #1 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #4] add sp, sp, #0xc ldmia sp!, {r4, r5, lr} add sp, sp, #0x10 bx lr - arm_func_end func_ov00_02083c7c + arm_func_end _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi - .global func_ov00_02083ce8 - arm_func_start func_ov00_02083ce8 -func_ov00_02083ce8: ; 0x02083ce8 + .global _ZN10MapManager18func_ov00_02083ce8Ecccci + arm_func_start _ZN10MapManager18func_ov00_02083ce8Ecccci +_ZN10MapManager18func_ov00_02083ce8Ecccci: ; 0x02083ce8 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x18 mov r6, r0 mov r5, r1 mov r4, r3 - bl func_ov00_0208330c + bl _ZN10MapManager21GetCourseData_Unk_25cEv cmp r0, #0 beq _02083dd0 mvn r0, #0 @@ -12420,7 +12420,7 @@ func_ov00_02083ce8: ; 0x02083ce8 cmpne r2, r0 bne _02083d30 mov r0, r6 - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev mov r1, r0 b _02083d44 _02083d30: @@ -12431,14 +12431,14 @@ _02083d30: ldrb r1, [r0, #0x20] _02083d44: mov r0, r6 - bl func_ov00_02083318 + bl _ZN10MapManager18func_ov00_02083318Ei cmp r0, #0 beq _02083da4 ldr r3, [sp, #0x38] add r1, sp, #0xc mov r0, r6 mov r2, r4 - bl func_ov00_02083524 + bl _ZN10MapManager18func_ov00_02083524EP5Vec3pii ldrb r1, [sp, #0x30] ldr r0, [r6, #4] bl func_ov00_0207f694 @@ -12487,17 +12487,17 @@ _02083df8: ldr r3, [r5, #8] mov r2, #1 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #4] add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, lr} add sp, sp, #0x10 bx lr - arm_func_end func_ov00_02083ce8 + arm_func_end _ZN10MapManager18func_ov00_02083ce8Ecccci - .global func_ov00_02083e34 - arm_func_start func_ov00_02083e34 -func_ov00_02083e34: ; 0x02083e34 + .global _ZN10MapManager18func_ov00_02083e34Ecci + arm_func_start _ZN10MapManager18func_ov00_02083e34Ecci +_ZN10MapManager18func_ov00_02083e34Ecci: ; 0x02083e34 stmdb sp!, {r3, lr} strb r1, [sp] strb r2, [sp, #1] @@ -12507,26 +12507,26 @@ func_ov00_02083e34: ; 0x02083e34 ldr r2, [r2, #0x60] blx r2 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02083e34 + arm_func_end _ZN10MapManager18func_ov00_02083e34Ecci - .global func_ov00_02083e58 - arm_func_start func_ov00_02083e58 -func_ov00_02083e58: ; 0x02083e58 + .global _ZN10MapManager16MapData_vfunc_60Ev + arm_func_start _ZN10MapManager16MapData_vfunc_60Ev +_ZN10MapManager16MapData_vfunc_60Ev: ; 0x02083e58 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r2, [r0] ldr r2, [r2, #0x60] blx r2 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02083e58 + arm_func_end _ZN10MapManager16MapData_vfunc_60Ev - .global func_ov00_02083e70 - arm_func_start func_ov00_02083e70 -func_ov00_02083e70: ; 0x02083e70 + .global _ZN10MapManager18func_ov00_02083e70Ev + arm_func_start _ZN10MapManager18func_ov00_02083e70Ev +_ZN10MapManager18func_ov00_02083e70Ev: ; 0x02083e70 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x2b bgt _02083e98 bge _02083eb0 @@ -12546,30 +12546,30 @@ _02083eb0: _02083eb8: mov r0, r5 mov r1, r4 - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev mov r4, r0 mov r0, r5 - bl func_ov00_02084114 + bl _ZN10MapManager17GetMapData_Unk_48Ev cmp r4, r0 movge r0, #1 movlt r0, #0 ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_02083e70 + arm_func_end _ZN10MapManager18func_ov00_02083e70Ev - .global func_ov00_02083ee0 - arm_func_start func_ov00_02083ee0 -func_ov00_02083ee0: ; 0x02083ee0 + .global _ZN10MapManager16MapData_vfunc_68Ev + arm_func_start _ZN10MapManager16MapData_vfunc_68Ev +_ZN10MapManager16MapData_vfunc_68Ev: ; 0x02083ee0 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r3, [r0] ldr r3, [r3, #0x68] blx r3 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02083ee0 + arm_func_end _ZN10MapManager16MapData_vfunc_68Ev - .global func_ov00_02083ef8 - arm_func_start func_ov00_02083ef8 -func_ov00_02083ef8: ; 0x02083ef8 + .global _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ + arm_func_start _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ +_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_: ; 0x02083ef8 stmdb sp!, {r3, r4, lr} sub sp, sp, #0xc add ip, sp, #0 @@ -12589,11 +12589,11 @@ func_ov00_02083ef8: ; 0x02083ef8 blx ip add sp, sp, #0xc ldmia sp!, {r3, r4, pc} - arm_func_end func_ov00_02083ef8 + arm_func_end _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ - .global func_ov00_02083f44 - arm_func_start func_ov00_02083f44 -func_ov00_02083f44: ; 0x02083f44 + .global _ZN10MapManager18func_ov00_02083f44EP5Vec3p + arm_func_start _ZN10MapManager18func_ov00_02083f44EP5Vec3p +_ZN10MapManager18func_ov00_02083f44EP5Vec3p: ; 0x02083f44 stmdb sp!, {r3, r4, lr} sub sp, sp, #0xc ldr ip, _02083f7c ; =data_ov00_020e24a4 @@ -12605,38 +12605,38 @@ func_ov00_02083f44: ; 0x02083f44 str lr, [sp] str ip, [sp, #4] str r4, [sp, #8] - bl func_ov00_02083ef8 + bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 - arm_func_end func_ov00_02083f44 + arm_func_end _ZN10MapManager18func_ov00_02083f44EP5Vec3p _02083f7c: .word data_ov00_020e24a4 - .global func_ov00_02083f80 - arm_func_start func_ov00_02083f80 -func_ov00_02083f80: ; 0x02083f80 + .global _ZN10MapManager16MapData_vfunc_6cEv + arm_func_start _ZN10MapManager16MapData_vfunc_6cEv +_ZN10MapManager16MapData_vfunc_6cEv: ; 0x02083f80 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr ip, [r0] ldr ip, [ip, #0x6c] blx ip ldmia sp!, {r3, pc} - arm_func_end func_ov00_02083f80 + arm_func_end _ZN10MapManager16MapData_vfunc_6cEv - .global func_ov00_02083f98 - arm_func_start func_ov00_02083f98 -func_ov00_02083f98: ; 0x02083f98 + .global _ZN10MapManager16MapData_vfunc_70Ev + arm_func_start _ZN10MapManager16MapData_vfunc_70Ev +_ZN10MapManager16MapData_vfunc_70Ev: ; 0x02083f98 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r2, [r0] ldr r2, [r2, #0x70] blx r2 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02083f98 + arm_func_end _ZN10MapManager16MapData_vfunc_70Ev - .global func_ov00_02083fb0 - arm_func_start func_ov00_02083fb0 -func_ov00_02083fb0: ; 0x02083fb0 + .global _ZN10MapManager18func_ov00_02083fb0EiPS_i + arm_func_start _ZN10MapManager18func_ov00_02083fb0EiPS_i +_ZN10MapManager18func_ov00_02083fb0EiPS_i: ; 0x02083fb0 stmdb sp!, {r4, r5, r6, lr} mov r6, r1 mov r4, r0 @@ -12652,7 +12652,7 @@ func_ov00_02083fb0: ; 0x02083fb0 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r5 - bl func_ov00_02083f98 + bl _ZN10MapManager16MapData_vfunc_70Ev ldr r1, _0208401c ; =0x0000ffff mov r2, r0 cmp r2, r1 @@ -12665,13 +12665,13 @@ func_ov00_02083fb0: ; 0x02083fb0 bl func_ov00_02093a1c ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_02083fb0 + arm_func_end _ZN10MapManager18func_ov00_02083fb0EiPS_i _0208401c: .word 0x0000ffff _02084020: .word data_027e0f6c - .global func_ov00_02084024 - arm_func_start func_ov00_02084024 -func_ov00_02084024: ; 0x02084024 + .global _ZN10MapManager18func_ov00_02084024EiP4AABB + arm_func_start _ZN10MapManager18func_ov00_02084024EiP4AABB +_ZN10MapManager18func_ov00_02084024EiP4AABB: ; 0x02084024 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0xc mov r6, r0 @@ -12679,10 +12679,10 @@ func_ov00_02084024: ; 0x02084024 mov r5, r2 bl func_ov00_0207f6cc mov r0, r6 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev mov r4, r0 mov r0, r6 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev str r0, [sp] mov r0, #0 str r0, [sp, #4] @@ -12697,22 +12697,22 @@ func_ov00_02084024: ; 0x02084024 bl func_01ff9bc4 add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end func_ov00_02084024 + arm_func_end _ZN10MapManager18func_ov00_02084024EiP4AABB - .global func_ov00_02084088 - arm_func_start func_ov00_02084088 -func_ov00_02084088: ; 0x02084088 + .global _ZN10MapManager16MapData_vfunc_54Ev + arm_func_start _ZN10MapManager16MapData_vfunc_54Ev +_ZN10MapManager16MapData_vfunc_54Ev: ; 0x02084088 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r2, [r0] ldr r2, [r2, #0x54] blx r2 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084088 + arm_func_end _ZN10MapManager16MapData_vfunc_54Ev - .global func_ov00_020840a0 - arm_func_start func_ov00_020840a0 -func_ov00_020840a0: ; 0x020840a0 + .global _ZN10MapManager18func_ov00_020840a0Ecci + arm_func_start _ZN10MapManager18func_ov00_020840a0Ecci +_ZN10MapManager18func_ov00_020840a0Ecci: ; 0x020840a0 stmdb sp!, {r3, lr} strb r1, [sp] strb r2, [sp, #1] @@ -12722,24 +12722,24 @@ func_ov00_020840a0: ; 0x020840a0 ldr r2, [r2, #0x54] blx r2 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020840a0 + arm_func_end _ZN10MapManager18func_ov00_020840a0Ecci - .global func_ov00_020840c4 - arm_func_start func_ov00_020840c4 -func_ov00_020840c4: ; 0x020840c4 + .global _ZN10MapManager16MapData_vfunc_78Ev + arm_func_start _ZN10MapManager16MapData_vfunc_78Ev +_ZN10MapManager16MapData_vfunc_78Ev: ; 0x020840c4 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r2, [r0] ldr r2, [r2, #0x78] blx r2 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020840c4 + arm_func_end _ZN10MapManager16MapData_vfunc_78Ev - .global func_ov00_020840dc - arm_func_start func_ov00_020840dc -func_ov00_020840dc: ; 0x020840dc + .global _ZN10MapManager18func_ov00_020840dcEv + arm_func_start _ZN10MapManager18func_ov00_020840dcEv +_ZN10MapManager18func_ov00_020840dcEv: ; 0x020840dc stmdb sp!, {r3, lr} - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 mvneq r0, #0 ldmeqia sp!, {r3, pc} @@ -12747,68 +12747,68 @@ func_ov00_020840dc: ; 0x020840dc ldr r1, [r1, #0x1c] blx r1 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020840dc + arm_func_end _ZN10MapManager18func_ov00_020840dcEv - .global func_ov00_02084100 - arm_func_start func_ov00_02084100 -func_ov00_02084100: ; 0x02084100 + .global _ZN10MapManager18func_ov00_02084100EiPS_ + arm_func_start _ZN10MapManager18func_ov00_02084100EiPS_ +_ZN10MapManager18func_ov00_02084100EiPS_: ; 0x02084100 ldr r1, [r1, #4] ldr r2, [r1, #0x40] ldr r1, [r1, #0x44] stmia r0, {r1, r2} bx lr - arm_func_end func_ov00_02084100 + arm_func_end _ZN10MapManager18func_ov00_02084100EiPS_ - .global func_ov00_02084114 - arm_func_start func_ov00_02084114 -func_ov00_02084114: ; 0x02084114 + .global _ZN10MapManager17GetMapData_Unk_48Ev + arm_func_start _ZN10MapManager17GetMapData_Unk_48Ev +_ZN10MapManager17GetMapData_Unk_48Ev: ; 0x02084114 ldr r0, [r0, #4] ldr r0, [r0, #0x48] bx lr - arm_func_end func_ov00_02084114 + arm_func_end _ZN10MapManager17GetMapData_Unk_48Ev - .global func_ov00_02084120 - arm_func_start func_ov00_02084120 -func_ov00_02084120: ; 0x02084120 + .global _ZN10MapManager17GetMapData_Unk_4cEv + arm_func_start _ZN10MapManager17GetMapData_Unk_4cEv +_ZN10MapManager17GetMapData_Unk_4cEv: ; 0x02084120 ldr r0, [r0, #4] ldr r0, [r0, #0x4c] bx lr - arm_func_end func_ov00_02084120 + arm_func_end _ZN10MapManager17GetMapData_Unk_4cEv - .global func_ov00_0208412c - arm_func_start func_ov00_0208412c -func_ov00_0208412c: ; 0x0208412c + .global _ZN10MapManager18func_ov00_0208412cEv + arm_func_start _ZN10MapManager18func_ov00_0208412cEv +_ZN10MapManager18func_ov00_0208412cEv: ; 0x0208412c ldr ip, _02084138 ; =func_ov00_0207f934 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_0208412c + arm_func_end _ZN10MapManager18func_ov00_0208412cEv _02084138: .word func_ov00_0207f934 - .global func_ov00_0208413c - arm_func_start func_ov00_0208413c -func_ov00_0208413c: ; 0x0208413c + .global _ZN10MapManager18func_ov00_0208413cEi + arm_func_start _ZN10MapManager18func_ov00_0208413cEi +_ZN10MapManager18func_ov00_0208413cEi: ; 0x0208413c ldr ip, _02084148 ; =func_ov00_0207f948 ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_0208413c + arm_func_end _ZN10MapManager18func_ov00_0208413cEi _02084148: .word func_ov00_0207f948 - .global func_ov00_0208414c - arm_func_start func_ov00_0208414c -func_ov00_0208414c: ; 0x0208414c + .global _ZN10MapManager16MapData_vfunc_58Ev + arm_func_start _ZN10MapManager16MapData_vfunc_58Ev +_ZN10MapManager16MapData_vfunc_58Ev: ; 0x0208414c stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r3, [r0] ldr r3, [r3, #0x58] blx r3 ldmia sp!, {r3, pc} - arm_func_end func_ov00_0208414c + arm_func_end _ZN10MapManager16MapData_vfunc_58Ev - .global func_ov00_02084164 - arm_func_start func_ov00_02084164 -func_ov00_02084164: ; 0x02084164 + .global _ZN10MapManager18func_ov00_02084164Ev + arm_func_start _ZN10MapManager18func_ov00_02084164Ev +_ZN10MapManager18func_ov00_02084164Ev: ; 0x02084164 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, [r5, #4] @@ -12822,7 +12822,7 @@ func_ov00_02084164: ; 0x02084164 ldmneia sp!, {r3, r4, r5, pc} mov r0, r5 mov r1, r4 - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x54 addls pc, pc, r0, lsl #2 b _02084304 @@ -12918,38 +12918,38 @@ _020842fc: _02084304: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_02084164 + arm_func_end _ZN10MapManager18func_ov00_02084164Ev - .global func_ov00_0208430c - arm_func_start func_ov00_0208430c -func_ov00_0208430c: ; 0x0208430c + .global _ZN10MapManager17GetMapData_Unk_0aEv + arm_func_start _ZN10MapManager17GetMapData_Unk_0aEv +_ZN10MapManager17GetMapData_Unk_0aEv: ; 0x0208430c ldr r0, [r0, #4] ldrb r0, [r0, #0xa] bx lr - arm_func_end func_ov00_0208430c + arm_func_end _ZN10MapManager17GetMapData_Unk_0aEv - .global func_ov00_02084318 - arm_func_start func_ov00_02084318 -func_ov00_02084318: ; 0x02084318 + .global _ZN10MapManager17GetMapData_Unk_0bEv + arm_func_start _ZN10MapManager17GetMapData_Unk_0bEv +_ZN10MapManager17GetMapData_Unk_0bEv: ; 0x02084318 ldr r0, [r0, #4] ldrb r0, [r0, #0xb] bx lr - arm_func_end func_ov00_02084318 + arm_func_end _ZN10MapManager17GetMapData_Unk_0bEv - .global func_ov00_02084324 - arm_func_start func_ov00_02084324 -func_ov00_02084324: ; 0x02084324 + .global _ZN10MapManager16MapData_vfunc_a4Ev + arm_func_start _ZN10MapManager16MapData_vfunc_a4Ev +_ZN10MapManager16MapData_vfunc_a4Ev: ; 0x02084324 stmdb sp!, {r3, lr} ldr r0, [r0, #4] ldr r2, [r0] ldr r2, [r2, #0xa4] blx r2 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084324 + arm_func_end _ZN10MapManager16MapData_vfunc_a4Ev - .global func_ov00_0208433c - arm_func_start func_ov00_0208433c -func_ov00_0208433c: ; 0x0208433c + .global _ZN10MapManager18func_ov00_0208433cEP5Vec3pi + arm_func_start _ZN10MapManager18func_ov00_0208433cEP5Vec3pi +_ZN10MapManager18func_ov00_0208433cEP5Vec3pi: ; 0x0208433c stmdb sp!, {r4, r5, lr} sub sp, sp, #0x1c add r3, sp, #0x10 @@ -12959,7 +12959,7 @@ func_ov00_0208433c: ; 0x0208433c stmia r3, {r0, r1, r2} add r1, sp, #4 mov r0, r5 - bl func_ov00_0208340c + bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p add r0, sp, #0x10 add r1, sp, #4 mov r2, r0 @@ -12974,11 +12974,11 @@ func_ov00_0208433c: ; 0x0208433c strh r0, [r4, #2] add sp, sp, #0x1c ldmia sp!, {r4, r5, pc} - arm_func_end func_ov00_0208433c + arm_func_end _ZN10MapManager18func_ov00_0208433cEP5Vec3pi - .global func_ov00_0208439c - arm_func_start func_ov00_0208439c -func_ov00_0208439c: ; 0x0208439c + .global _ZN10MapManager18func_ov00_0208439cEv + arm_func_start _ZN10MapManager18func_ov00_0208439cEv +_ZN10MapManager18func_ov00_0208439cEv: ; 0x0208439c stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc mov r5, r0 @@ -12987,7 +12987,7 @@ func_ov00_0208439c: ; 0x0208439c bl func_ov00_0207f630 add r1, sp, #0 mov r0, r5 - bl func_ov00_0208340c + bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p add r1, sp, #0 mov r0, r4 mov r2, r4 @@ -12995,15 +12995,15 @@ func_ov00_0208439c: ; 0x0208439c mov r0, r5 mov r1, r4 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #4] add sp, sp, #0xc ldmia sp!, {r4, r5, pc} - arm_func_end func_ov00_0208439c + arm_func_end _ZN10MapManager18func_ov00_0208439cEv - .global func_ov00_020843ec - arm_func_start func_ov00_020843ec -func_ov00_020843ec: ; 0x020843ec + .global _ZN10MapManager18func_ov00_020843ecEPi + arm_func_start _ZN10MapManager18func_ov00_020843ecEPi +_ZN10MapManager18func_ov00_020843ecEPi: ; 0x020843ec stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x6c mov r6, r1 @@ -13044,22 +13044,22 @@ _0208442c: str r6, [sp, #0x58] str r6, [sp, #0x4c] str r1, [sp, #0x50] - bl func_ov00_020833c4 + bl _ZN10MapManager18func_ov00_020833c4Ev ldr r1, [sp, #0x54] sub r0, r1, r0 str r0, [sp, #0x54] mov r0, r5 - bl func_ov00_020833d0 + bl _ZN10MapManager18func_ov00_020833d0Ev ldr r1, [sp, #0x5c] sub r0, r1, r0 str r0, [sp, #0x5c] mov r0, r5 - bl func_ov00_020833c4 + bl _ZN10MapManager18func_ov00_020833c4Ev ldr r1, [sp, #0x48] sub r0, r1, r0 str r0, [sp, #0x48] mov r0, r5 - bl func_ov00_020833d0 + bl _ZN10MapManager18func_ov00_020833d0Ev ldr r1, [sp, #0x50] add r2, sp, #0x54 sub r0, r1, r0 @@ -13121,22 +13121,22 @@ _02084574: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} mov r0, r5 - bl func_ov00_020833c4 + bl _ZN10MapManager18func_ov00_020833c4Ev ldr r1, [sp, #0x24] sub r0, r1, r0 str r0, [sp, #0x24] mov r0, r5 - bl func_ov00_020833d0 + bl _ZN10MapManager18func_ov00_020833d0Ev ldr r1, [sp, #0x2c] sub r0, r1, r0 str r0, [sp, #0x2c] mov r0, r5 - bl func_ov00_020833c4 + bl _ZN10MapManager18func_ov00_020833c4Ev ldr r1, [sp, #0x18] sub r0, r1, r0 str r0, [sp, #0x18] mov r0, r5 - bl func_ov00_020833d0 + bl _ZN10MapManager18func_ov00_020833d0Ev ldr r1, [sp, #0x20] add r2, sp, #0x24 sub r0, r1, r0 @@ -13183,19 +13183,19 @@ _02084678: bge _02084630 add sp, sp, #0x6c ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} - arm_func_end func_ov00_020843ec + arm_func_end _ZN10MapManager18func_ov00_020843ecEPi - .global func_ov00_02084698 - arm_func_start func_ov00_02084698 -func_ov00_02084698: ; 0x02084698 + .global _ZN10MapManager17GetMapData_Unk_38Ev + arm_func_start _ZN10MapManager17GetMapData_Unk_38Ev +_ZN10MapManager17GetMapData_Unk_38Ev: ; 0x02084698 ldr r0, [r0, #4] ldr r0, [r0, #0x38] bx lr - arm_func_end func_ov00_02084698 + arm_func_end _ZN10MapManager17GetMapData_Unk_38Ev - .global func_ov00_020846a4 - arm_func_start func_ov00_020846a4 -func_ov00_020846a4: ; 0x020846a4 + .global _ZN10MapManager18func_ov00_020846a4Ev + arm_func_start _ZN10MapManager18func_ov00_020846a4Ev +_ZN10MapManager18func_ov00_020846a4Ev: ; 0x020846a4 ldr r1, [r0, #4] ldr r1, [r1, #0x144] ldr r1, [r1, #4] @@ -13224,11 +13224,11 @@ _020846f0: _020846f8: mov r0, r1 bx lr - arm_func_end func_ov00_020846a4 + arm_func_end _ZN10MapManager18func_ov00_020846a4Ev - .global func_ov00_02084700 - arm_func_start func_ov00_02084700 -func_ov00_02084700: ; 0x02084700 + .global _ZN10MapManager18func_ov00_02084700Ev + arm_func_start _ZN10MapManager18func_ov00_02084700Ev +_ZN10MapManager18func_ov00_02084700Ev: ; 0x02084700 ldr r2, [r0, #4] mvn r1, #0 ldr r2, [r2, #0x34] @@ -13246,16 +13246,16 @@ _02084734: mov r0, r2 bx lr .align 2, 0 - arm_func_end func_ov00_02084700 + arm_func_end _ZN10MapManager18func_ov00_02084700Ev _0208473c: .word data_027e0fe4 - .global func_ov00_02084740 - arm_func_start func_ov00_02084740 -func_ov00_02084740: ; 0x02084740 + .global _ZN10MapManager18func_ov00_02084740Ev + arm_func_start _ZN10MapManager18func_ov00_02084740Ev +_ZN10MapManager18func_ov00_02084740Ev: ; 0x02084740 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x1bc mov r5, r0 - bl func_ov00_02084700 + bl _ZN10MapManager18func_ov00_02084700Ev ldr r1, _020847d4 ; =data_027e0d38 mov r4, r0 ldr r0, [r1] @@ -13271,12 +13271,12 @@ func_ov00_02084740: ; 0x02084740 ldr r2, [r0, #8] mov r0, r5 str r2, [sp, #8] - bl func_ov00_02083780 + bl _ZN10MapManager18func_ov00_02083780Ei mov r1, r0 cmp r1, #0 ble _020847a8 mov r0, r5 - bl func_ov00_020847f0 + bl _ZN10MapManager18func_ov00_020847f0Ev mov r4, r0 _020847a8: ldr r5, _020847dc ; =data_ov00_020d88f0 @@ -13292,23 +13292,23 @@ _020847b4: add sp, sp, #0x1bc ldmia sp!, {r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_02084740 + arm_func_end _ZN10MapManager18func_ov00_02084740Ev _020847d4: .word data_027e0d38 _020847d8: .word data_027e0f94 _020847dc: .word data_ov00_020d88f0 - .global func_ov00_020847e0 - arm_func_start func_ov00_020847e0 -func_ov00_020847e0: ; 0x020847e0 + .global _ZN10MapManager18func_ov00_020847e0Ev + arm_func_start _ZN10MapManager18func_ov00_020847e0Ev +_ZN10MapManager18func_ov00_020847e0Ev: ; 0x020847e0 ldr r0, [r0, #4] ldr r0, [r0, #0x144] ldr r0, [r0, #0xc] bx lr - arm_func_end func_ov00_020847e0 + arm_func_end _ZN10MapManager18func_ov00_020847e0Ev - .global func_ov00_020847f0 - arm_func_start func_ov00_020847f0 -func_ov00_020847f0: ; 0x020847f0 + .global _ZN10MapManager18func_ov00_020847f0Ev + arm_func_start _ZN10MapManager18func_ov00_020847f0Ev +_ZN10MapManager18func_ov00_020847f0Ev: ; 0x020847f0 stmdb sp!, {r4, lr} mov r4, r0 ldr r0, [r4, #4] @@ -13316,7 +13316,7 @@ func_ov00_020847f0: ; 0x020847f0 cmp r0, #0 bne _02084814 mov r0, r4 - bl func_ov00_02084700 + bl _ZN10MapManager18func_ov00_02084700Ev ldmia sp!, {r4, pc} _02084814: ldr r0, [r0, #0xc] @@ -13327,15 +13327,15 @@ _02084814: ldmltia sp!, {r4, pc} _0208482c: mov r0, r4 - bl func_ov00_02084700 + bl _ZN10MapManager18func_ov00_02084700Ev ldmia sp!, {r4, pc} - arm_func_end func_ov00_020847f0 + arm_func_end _ZN10MapManager18func_ov00_020847f0Ev - .global func_ov00_02084838 - arm_func_start func_ov00_02084838 -func_ov00_02084838: ; 0x02084838 + .global _ZN10MapManager18func_ov00_02084838Ev + arm_func_start _ZN10MapManager18func_ov00_02084838Ev +_ZN10MapManager18func_ov00_02084838Ev: ; 0x02084838 stmdb sp!, {r3, lr} - bl func_ov00_02084698 + bl _ZN10MapManager17GetMapData_Unk_38Ev cmp r0, #0x16 addls pc, pc, r0, lsl #2 b _020848b0 @@ -13369,13 +13369,13 @@ _020848a8: _020848b0: mov r0, #0 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084838 + arm_func_end _ZN10MapManager18func_ov00_02084838Ev - .global func_ov00_020848b8 - arm_func_start func_ov00_020848b8 -func_ov00_020848b8: ; 0x020848b8 + .global _ZN10MapManager18func_ov00_020848b8Ev + arm_func_start _ZN10MapManager18func_ov00_020848b8Ev +_ZN10MapManager18func_ov00_020848b8Ev: ; 0x020848b8 stmdb sp!, {r3, lr} - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #0x11 addls pc, pc, r0, lsl #2 b _0208491c @@ -13404,31 +13404,31 @@ _02084914: _0208491c: mov r0, #0 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020848b8 + arm_func_end _ZN10MapManager18func_ov00_020848b8Ev - .global func_ov00_02084924 - arm_func_start func_ov00_02084924 -func_ov00_02084924: ; 0x02084924 + .global _ZN10MapManager18func_ov00_02084924Ej + arm_func_start _ZN10MapManager18func_ov00_02084924Ej +_ZN10MapManager18func_ov00_02084924Ej: ; 0x02084924 ldr ip, _02084930 ; =func_ov00_0208008c ldr r0, [r0, #4] bx ip .align 2, 0 - arm_func_end func_ov00_02084924 + arm_func_end _ZN10MapManager18func_ov00_02084924Ej _02084930: .word func_ov00_0208008c - .global func_ov00_02084934 - arm_func_start func_ov00_02084934 -func_ov00_02084934: ; 0x02084934 + .global _ZN10MapManager18func_ov00_02084934Ev + arm_func_start _ZN10MapManager18func_ov00_02084934Ev +_ZN10MapManager18func_ov00_02084934Ev: ; 0x02084934 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0xc mov r6, r1 mov r7, r0 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldr r1, [r6, #8] ldr r4, [r6, #4] sub r5, r1, r0 mov r0, r7 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r2, [r6] add r1, sp, #0 sub r0, r2, r0 @@ -13439,41 +13439,41 @@ func_ov00_02084934: ; 0x02084934 bl func_ov00_0207f7e8 add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, pc} - arm_func_end func_ov00_02084934 + arm_func_end _ZN10MapManager18func_ov00_02084934Ev - .global func_ov00_02084984 - arm_func_start func_ov00_02084984 -func_ov00_02084984: ; 0x02084984 + .global _ZN10MapManager17GetMapData_Unk_06Ev + arm_func_start _ZN10MapManager17GetMapData_Unk_06Ev +_ZN10MapManager17GetMapData_Unk_06Ev: ; 0x02084984 ldr r0, [r0, #4] ldrb r0, [r0, #6] bx lr - arm_func_end func_ov00_02084984 + arm_func_end _ZN10MapManager17GetMapData_Unk_06Ev - .global func_ov00_02084990 - arm_func_start func_ov00_02084990 -func_ov00_02084990: ; 0x02084990 + .global _ZN10MapManager17GetMapData_Unk_07Ev + arm_func_start _ZN10MapManager17GetMapData_Unk_07Ev +_ZN10MapManager17GetMapData_Unk_07Ev: ; 0x02084990 ldr r0, [r0, #4] ldrb r0, [r0, #7] bx lr - arm_func_end func_ov00_02084990 + arm_func_end _ZN10MapManager17GetMapData_Unk_07Ev - .global func_ov00_0208499c - arm_func_start func_ov00_0208499c -func_ov00_0208499c: ; 0x0208499c + .global _ZN10MapManager18func_ov00_0208499cEv + arm_func_start _ZN10MapManager18func_ov00_0208499cEv +_ZN10MapManager18func_ov00_0208499cEv: ; 0x0208499c stmdb sp!, {r4, lr} mov r4, r0 - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} ldr r0, [r4] bl func_ov00_0207d47c ldmia sp!, {r4, pc} - arm_func_end func_ov00_0208499c + arm_func_end _ZN10MapManager18func_ov00_0208499cEv - .global func_ov00_020849c0 - arm_func_start func_ov00_020849c0 -func_ov00_020849c0: ; 0x020849c0 + .global _ZN10MapManager18func_ov00_020849c0Ev + arm_func_start _ZN10MapManager18func_ov00_020849c0Ev +_ZN10MapManager18func_ov00_020849c0Ev: ; 0x020849c0 ldr r1, [r0] mvn r0, #1 ldr r1, [r1, #8] @@ -13481,11 +13481,11 @@ func_ov00_020849c0: ; 0x020849c0 moveq r0, #1 movne r0, #0 bx lr - arm_func_end func_ov00_020849c0 + arm_func_end _ZN10MapManager18func_ov00_020849c0Ev - .global func_ov00_020849dc - arm_func_start func_ov00_020849dc -func_ov00_020849dc: ; 0x020849dc + .global _ZN10MapManager18func_ov00_020849dcEv + arm_func_start _ZN10MapManager18func_ov00_020849dcEv +_ZN10MapManager18func_ov00_020849dcEv: ; 0x020849dc ldr r1, [r0] mvn r0, #2 ldr r1, [r1, #8] @@ -13493,11 +13493,11 @@ func_ov00_020849dc: ; 0x020849dc moveq r0, #1 movne r0, #0 bx lr - arm_func_end func_ov00_020849dc + arm_func_end _ZN10MapManager18func_ov00_020849dcEv - .global func_ov00_020849f8 - arm_func_start func_ov00_020849f8 -func_ov00_020849f8: ; 0x020849f8 + .global _ZN10MapManager18func_ov00_020849f8Ei + arm_func_start _ZN10MapManager18func_ov00_020849f8Ei +_ZN10MapManager18func_ov00_020849f8Ei: ; 0x020849f8 stmdb sp!, {r4, lr} ldr r1, _02084a4c ; =data_027e0d38 mov r4, r0 @@ -13510,11 +13510,11 @@ func_ov00_020849f8: ; 0x020849f8 ldmia sp!, {r4, pc} _02084a20: mov r0, r4 - bl func_ov00_02084984 + bl _ZN10MapManager17GetMapData_Unk_06Ev cmp r0, #0 beq _02084a44 mov r0, r4 - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r4, pc} @@ -13522,20 +13522,20 @@ _02084a44: mov r0, #0 ldmia sp!, {r4, pc} .align 2, 0 - arm_func_end func_ov00_020849f8 + arm_func_end _ZN10MapManager18func_ov00_020849f8Ei _02084a4c: .word data_027e0d38 - .global func_ov00_02084a50 - arm_func_start func_ov00_02084a50 -func_ov00_02084a50: ; 0x02084a50 + .global _ZN10MapManager18func_ov00_02084a50Ev + arm_func_start _ZN10MapManager18func_ov00_02084a50Ev +_ZN10MapManager18func_ov00_02084a50Ev: ; 0x02084a50 ldr r0, [r0, #4] ldrb r0, [r0, #0x11] bx lr - arm_func_end func_ov00_02084a50 + arm_func_end _ZN10MapManager18func_ov00_02084a50Ev - .global func_ov00_02084a5c - arm_func_start func_ov00_02084a5c -func_ov00_02084a5c: ; 0x02084a5c + .global _ZN10MapManager8SpawnNPCEP5Vec3pii + arm_func_start _ZN10MapManager8SpawnNPCEP5Vec3pii +_ZN10MapManager8SpawnNPCEP5Vec3pii: ; 0x02084a5c stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x30 add r0, sp, #4 @@ -13561,13 +13561,13 @@ func_ov00_02084a5c: ; 0x02084a5c add sp, sp, #0x30 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_02084a5c + arm_func_end _ZN10MapManager8SpawnNPCEP5Vec3pii _02084abc: .word data_027e0fe8 _02084ac0: .word 0x45564943 - .global func_ov00_02084ac4 - arm_func_start func_ov00_02084ac4 -func_ov00_02084ac4: ; 0x02084ac4 + .global _ZN10MapManager18func_ov00_02084ac4Ej + arm_func_start _ZN10MapManager18func_ov00_02084ac4Ej +_ZN10MapManager18func_ov00_02084ac4Ej: ; 0x02084ac4 stmdb sp!, {r3, lr} ldr r0, _02084b00 ; =data_027e0fe4 ldr r0, [r0] @@ -13584,45 +13584,45 @@ func_ov00_02084ac4: ; 0x02084ac4 moveq r0, #1 ldmia sp!, {r3, pc} .align 2, 0 - arm_func_end func_ov00_02084ac4 + arm_func_end _ZN10MapManager18func_ov00_02084ac4Ej _02084b00: .word data_027e0fe4 _02084b04: .word 0x45564943 - .global func_ov00_02084b08 - arm_func_start func_ov00_02084b08 -func_ov00_02084b08: ; 0x02084b08 + .global _ZN10MapManager10SetNumKeysEi + arm_func_start _ZN10MapManager10SetNumKeysEi +_ZN10MapManager10SetNumKeysEi: ; 0x02084b08 ldr r0, [r0] str r1, [r0, #0x260] bx lr - arm_func_end func_ov00_02084b08 + arm_func_end _ZN10MapManager10SetNumKeysEi - .global func_ov00_02084b14 - arm_func_start func_ov00_02084b14 -func_ov00_02084b14: ; 0x02084b14 + .global _ZN10MapManager10GetNumKeysEv + arm_func_start _ZN10MapManager10GetNumKeysEv +_ZN10MapManager10GetNumKeysEv: ; 0x02084b14 ldr r0, [r0] ldr r0, [r0, #0x260] bx lr - arm_func_end func_ov00_02084b14 + arm_func_end _ZN10MapManager10GetNumKeysEv - .global func_ov00_02084b20 - arm_func_start func_ov00_02084b20 -func_ov00_02084b20: ; 0x02084b20 + .global _ZN10MapManager21SetCourseData_Unk_25cEc + arm_func_start _ZN10MapManager21SetCourseData_Unk_25cEc +_ZN10MapManager21SetCourseData_Unk_25cEc: ; 0x02084b20 ldr r0, [r0] strb r1, [r0, #0x25d] bx lr - arm_func_end func_ov00_02084b20 + arm_func_end _ZN10MapManager21SetCourseData_Unk_25cEc - .global func_ov00_02084b2c - arm_func_start func_ov00_02084b2c -func_ov00_02084b2c: ; 0x02084b2c + .global _ZN10MapManager21GetCourseData_Unk_25dEv + arm_func_start _ZN10MapManager21GetCourseData_Unk_25dEv +_ZN10MapManager21GetCourseData_Unk_25dEv: ; 0x02084b2c ldr r0, [r0] ldrb r0, [r0, #0x25d] bx lr - arm_func_end func_ov00_02084b2c + arm_func_end _ZN10MapManager21GetCourseData_Unk_25dEv - .global func_ov00_02084b38 - arm_func_start func_ov00_02084b38 -func_ov00_02084b38: ; 0x02084b38 + .global _ZN10MapManager18func_ov00_02084b38Eiii + arm_func_start _ZN10MapManager18func_ov00_02084b38Eiii +_ZN10MapManager18func_ov00_02084b38Eiii: ; 0x02084b38 stmdb sp!, {r3, lr} cmp r1, #0 ldmeqia sp!, {r3, pc} @@ -13671,11 +13671,11 @@ _02084bd0: mov r2, r3 bl func_ov00_0207d848 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084b38 + arm_func_end _ZN10MapManager18func_ov00_02084b38Eiii - .global func_ov00_02084be0 - arm_func_start func_ov00_02084be0 -func_ov00_02084be0: ; 0x02084be0 + .global _ZN10MapManager18func_ov00_02084be0Eii + arm_func_start _ZN10MapManager18func_ov00_02084be0Eii +_ZN10MapManager18func_ov00_02084be0Eii: ; 0x02084be0 stmdb sp!, {r3, lr} cmp r1, #0 moveq r0, #0 @@ -13713,42 +13713,42 @@ _02084c48: _02084c54: mov r0, #0 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084be0 + arm_func_end _ZN10MapManager18func_ov00_02084be0Eii - .global func_ov00_02084c5c - arm_func_start func_ov00_02084c5c -func_ov00_02084c5c: ; 0x02084c5c + .global _ZN10MapManager18func_ov00_02084c5cEii + arm_func_start _ZN10MapManager18func_ov00_02084c5cEii +_ZN10MapManager18func_ov00_02084c5cEii: ; 0x02084c5c ldr ip, _02084c68 ; =func_ov00_0207d8ec ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_02084c5c + arm_func_end _ZN10MapManager18func_ov00_02084c5cEii _02084c68: .word func_ov00_0207d8ec - .global func_ov00_02084c6c - arm_func_start func_ov00_02084c6c -func_ov00_02084c6c: ; 0x02084c6c + .global _ZN10MapManager18func_ov00_02084c6cEi + arm_func_start _ZN10MapManager18func_ov00_02084c6cEi +_ZN10MapManager18func_ov00_02084c6cEi: ; 0x02084c6c ldr ip, _02084c78 ; =func_ov00_0207d90c ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_02084c6c + arm_func_end _ZN10MapManager18func_ov00_02084c6cEi _02084c78: .word func_ov00_0207d90c - .global func_ov00_02084c7c - arm_func_start func_ov00_02084c7c -func_ov00_02084c7c: ; 0x02084c7c + .global _ZN10MapManager18func_ov00_02084c7cEi + arm_func_start _ZN10MapManager18func_ov00_02084c7cEi +_ZN10MapManager18func_ov00_02084c7cEi: ; 0x02084c7c stmdb sp!, {r3, lr} cmp r1, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] bl func_ov00_0207d924 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084c7c + arm_func_end _ZN10MapManager18func_ov00_02084c7cEi - .global func_ov00_02084c94 - arm_func_start func_ov00_02084c94 -func_ov00_02084c94: ; 0x02084c94 + .global _ZN10MapManager18func_ov00_02084c94Ei + arm_func_start _ZN10MapManager18func_ov00_02084c94Ei +_ZN10MapManager18func_ov00_02084c94Ei: ; 0x02084c94 stmdb sp!, {r3, lr} cmp r1, #0 movlt r0, #0 @@ -13756,22 +13756,22 @@ func_ov00_02084c94: ; 0x02084c94 ldr r0, [r0] bl func_ov00_0207d944 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084c94 + arm_func_end _ZN10MapManager18func_ov00_02084c94Ei - .global func_ov00_02084cb0 - arm_func_start func_ov00_02084cb0 -func_ov00_02084cb0: ; 0x02084cb0 + .global _ZN10MapManager18func_ov00_02084cb0Ei + arm_func_start _ZN10MapManager18func_ov00_02084cb0Ei +_ZN10MapManager18func_ov00_02084cb0Ei: ; 0x02084cb0 stmdb sp!, {r3, lr} cmp r1, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] bl func_ov00_0207d95c ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084cb0 + arm_func_end _ZN10MapManager18func_ov00_02084cb0Ei - .global func_ov00_02084cc8 - arm_func_start func_ov00_02084cc8 -func_ov00_02084cc8: ; 0x02084cc8 + .global _ZN10MapManager18func_ov00_02084cc8Ei + arm_func_start _ZN10MapManager18func_ov00_02084cc8Ei +_ZN10MapManager18func_ov00_02084cc8Ei: ; 0x02084cc8 stmdb sp!, {r3, lr} cmp r1, #0 movlt r0, #0 @@ -13779,22 +13779,22 @@ func_ov00_02084cc8: ; 0x02084cc8 ldr r0, [r0] bl func_ov00_0207d97c ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084cc8 + arm_func_end _ZN10MapManager18func_ov00_02084cc8Ei - .global func_ov00_02084ce4 - arm_func_start func_ov00_02084ce4 -func_ov00_02084ce4: ; 0x02084ce4 + .global _ZN10MapManager18func_ov00_02084ce4Ei + arm_func_start _ZN10MapManager18func_ov00_02084ce4Ei +_ZN10MapManager18func_ov00_02084ce4Ei: ; 0x02084ce4 stmdb sp!, {r3, lr} cmp r1, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] bl func_ov00_0207d994 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084ce4 + arm_func_end _ZN10MapManager18func_ov00_02084ce4Ei - .global func_ov00_02084cfc - arm_func_start func_ov00_02084cfc -func_ov00_02084cfc: ; 0x02084cfc + .global _ZN10MapManager18func_ov00_02084cfcEi + arm_func_start _ZN10MapManager18func_ov00_02084cfcEi +_ZN10MapManager18func_ov00_02084cfcEi: ; 0x02084cfc stmdb sp!, {r3, lr} cmp r1, #0 movlt r0, #0 @@ -13802,19 +13802,19 @@ func_ov00_02084cfc: ; 0x02084cfc ldr r0, [r0] bl func_ov00_0207d9b4 ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084cfc + arm_func_end _ZN10MapManager18func_ov00_02084cfcEi - .global func_ov00_02084d18 - arm_func_start func_ov00_02084d18 -func_ov00_02084d18: ; 0x02084d18 + .global _ZN10MapManager17GetMapData_Unk_09Ev + arm_func_start _ZN10MapManager17GetMapData_Unk_09Ev +_ZN10MapManager17GetMapData_Unk_09Ev: ; 0x02084d18 ldr r0, [r0, #4] ldrb r0, [r0, #9] bx lr - arm_func_end func_ov00_02084d18 + arm_func_end _ZN10MapManager17GetMapData_Unk_09Ev - .global func_ov00_02084d24 - arm_func_start func_ov00_02084d24 -func_ov00_02084d24: ; 0x02084d24 + .global _ZN10MapManager18func_ov00_02084d24Ecci + arm_func_start _ZN10MapManager18func_ov00_02084d24Ecci +_ZN10MapManager18func_ov00_02084d24Ecci: ; 0x02084d24 stmdb sp!, {r3, lr} strb r1, [sp] strb r2, [sp, #1] @@ -13825,11 +13825,11 @@ func_ov00_02084d24: ; 0x02084d24 ldr ip, [ip, #0x90] blx ip ldmia sp!, {r3, pc} - arm_func_end func_ov00_02084d24 + arm_func_end _ZN10MapManager18func_ov00_02084d24Ecci - .global func_ov00_02084d4c - arm_func_start func_ov00_02084d4c -func_ov00_02084d4c: ; 0x02084d4c + .global _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p + arm_func_start _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p +_ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p: ; 0x02084d4c stmdb sp!, {r4, lr} sub sp, sp, #0x38 add r4, sp, #0x20 @@ -13917,7 +13917,7 @@ _02084de4: add sp, sp, #0x38 ldmia sp!, {r4, pc} .align 2, 0 - arm_func_end func_ov00_02084d4c + arm_func_end _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p _02084ea0: .word data_027e0f64 _02084ea4: .word data_ov00_020ec964 _02084ea8: .word data_ov00_020e2510 @@ -13926,9 +13926,9 @@ _02084eb0: .word func_ov00_0207e968 _02084eb4: .word data_ov00_020ec9c8 _02084eb8: .word 0x0000019a - .global func_ov00_02084ebc - arm_func_start func_ov00_02084ebc -func_ov00_02084ebc: ; 0x02084ebc + .global _ZN10MapManager18func_ov00_02084ebcEi + arm_func_start _ZN10MapManager18func_ov00_02084ebcEi +_ZN10MapManager18func_ov00_02084ebcEi: ; 0x02084ebc stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 mov r6, r0 @@ -13936,10 +13936,10 @@ func_ov00_02084ebc: ; 0x02084ebc add r0, sp, #0 mov r1, r6 mov r2, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r6 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 beq _02084f50 ldr r1, [r0] @@ -13972,14 +13972,14 @@ _02084f44: _02084f50: add r1, sp, #0 mov r0, r6 - bl func_ov00_02083e70 + bl _ZN10MapManager18func_ov00_02083e70Ev cmp r0, #0 addne sp, sp, #8 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r1, sp, #0 mov r0, r6 - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x46 bgt _0208504c bge _0208506c @@ -14062,7 +14062,7 @@ _02085078: ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r5 - bl func_ov00_02083f98 + bl _ZN10MapManager16MapData_vfunc_70Ev ldr r1, _02085100 ; =0x0000ffff mov r2, r0 cmp r2, r1 @@ -14086,13 +14086,13 @@ _020850f4: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_02084ebc + arm_func_end _ZN10MapManager18func_ov00_02084ebcEi _02085100: .word 0x0000ffff _02085104: .word data_027e0f6c - .global func_ov00_02085108 - arm_func_start func_ov00_02085108 -func_ov00_02085108: ; 0x02085108 + .global _ZN10MapManager18func_ov00_02085108EPi + arm_func_start _ZN10MapManager18func_ov00_02085108EPi +_ZN10MapManager18func_ov00_02085108EPi: ; 0x02085108 stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x2c ldr r0, _02085274 ; =data_027e0f64 @@ -14138,7 +14138,7 @@ _020851a4: add r1, sp, #0x14 strb r5, [sp, #0x14] strb r6, [sp, #0x15] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 beq _02085244 ldr r1, [r4, #4] @@ -14190,13 +14190,13 @@ _02085268: add sp, sp, #0x2c ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 - arm_func_end func_ov00_02085108 + arm_func_end _ZN10MapManager18func_ov00_02085108EPi _02085274: .word data_027e0f64 _02085278: .word data_027e0e60 - .global func_ov00_0208527c - arm_func_start func_ov00_0208527c -func_ov00_0208527c: ; 0x0208527c + .global _ZN10MapManager18func_ov00_0208527cEv + arm_func_start _ZN10MapManager18func_ov00_0208527cEv +_ZN10MapManager18func_ov00_0208527cEv: ; 0x0208527c stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x2c ldr r3, _020853f4 ; =data_027e0f64 @@ -14227,10 +14227,10 @@ func_ov00_0208527c: ; 0x0208527c ldrb r9, [sp, #0x13] str r0, [sp, #4] mov r0, r4 - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev mov r5, r0 mov r0, r4 - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv cmp r11, #0 ldr r1, [sp, #8] movle r11, #0 @@ -14263,7 +14263,7 @@ _0208536c: mov r1, r6 strb r7, [sp, #0x10] strb r8, [sp, #0x11] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _020853cc ldr r1, [r5, #4] @@ -14297,13 +14297,13 @@ _020853e8: add sp, sp, #0x2c ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 - arm_func_end func_ov00_0208527c + arm_func_end _ZN10MapManager18func_ov00_0208527cEv _020853f4: .word data_027e0f64 _020853f8: .word data_027e0e60 - .global func_ov00_020853fc - arm_func_start func_ov00_020853fc -func_ov00_020853fc: ; 0x020853fc + .global _ZN10MapManager18func_ov00_020853fcEv + arm_func_start _ZN10MapManager18func_ov00_020853fcEv +_ZN10MapManager18func_ov00_020853fcEv: ; 0x020853fc stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x2c ldr r3, _0208558c ; =data_027e0f64 @@ -14335,10 +14335,10 @@ func_ov00_020853fc: ; 0x020853fc ldrb r8, [sp, #0x13] str r0, [sp] mov r0, r5 - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev mov r4, r0 mov r0, r5 - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r11, #0 ldr r1, [sp, #8] str r11, [sp, #0x24] @@ -14375,7 +14375,7 @@ _020854fc: ldr r0, [r0] strb r6, [sp, #0x10] strb r7, [sp, #0x11] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _0208555c ldr r0, [r5, #4] @@ -14410,13 +14410,13 @@ _02085580: add sp, sp, #0x2c ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 - arm_func_end func_ov00_020853fc + arm_func_end _ZN10MapManager18func_ov00_020853fcEv _0208558c: .word data_027e0f64 _02085590: .word data_027e0e60 - .global func_ov00_02085594 - arm_func_start func_ov00_02085594 -func_ov00_02085594: ; 0x02085594 + .global _ZN10MapManager18func_ov00_02085594Ev + arm_func_start _ZN10MapManager18func_ov00_02085594Ev +_ZN10MapManager18func_ov00_02085594Ev: ; 0x02085594 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x14 mov r7, r0 @@ -14424,10 +14424,10 @@ func_ov00_02085594: ; 0x02085594 add r0, sp, #0 mov r1, r7 mov r2, r6 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r7 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 mov r5, #1 beq _02085670 @@ -14482,7 +14482,7 @@ _02085670: ldrb r1, [sp] ldrb r2, [sp, #1] mov r0, r7 - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci cmp r0, #0x46 bgt _02085754 bge _02085774 @@ -14571,10 +14571,10 @@ _02085780: strb r0, [r3, #1] ldr r2, [r3] mov r0, r7 - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi add r1, sp, #8 mov r0, r7 - bl func_ov00_02083f98 + bl _ZN10MapManager16MapData_vfunc_70Ev ldr r1, _02085834 ; =0x0000ffff mov r2, r0 cmp r2, r1 @@ -14600,13 +14600,13 @@ _02085828: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 - arm_func_end func_ov00_02085594 + arm_func_end _ZN10MapManager18func_ov00_02085594Ev _02085834: .word 0x0000ffff _02085838: .word data_027e0f6c - .global func_ov00_0208583c - arm_func_start func_ov00_0208583c -func_ov00_0208583c: ; 0x0208583c + .global _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi + arm_func_start _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi +_ZN10MapManager18func_ov00_0208583cEiP5Vec3pi: ; 0x0208583c stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r3, r1 @@ -14614,10 +14614,10 @@ func_ov00_0208583c: ; 0x0208583c add r0, sp, #0 mov r1, r5 mov r2, r3 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -14636,12 +14636,12 @@ func_ov00_0208583c: ; 0x0208583c blx r2 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_0208583c + arm_func_end _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi _020858ac: .word data_027e077c - .global func_ov00_020858b0 - arm_func_start func_ov00_020858b0 -func_ov00_020858b0: ; 0x020858b0 + .global _ZN10MapManager18func_ov00_020858b0Ev + arm_func_start _ZN10MapManager18func_ov00_020858b0Ev +_ZN10MapManager18func_ov00_020858b0Ev: ; 0x020858b0 stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x1c mov r9, r2 @@ -14663,17 +14663,17 @@ _020858e4: bl func_ov00_02088000 _020858f8: mov r0, r10 - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0x10] mov r0, r10 - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp, #0xc] mvn r3, #0 add r0, sp, #0x18 mov r1, r10 mov r2, r11 str r3, [sp, #8] - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r3, [sp, #0x18] ldrb r2, [sp, #0x19] ldr r1, _02085a30 ; =data_027e0f94 @@ -14707,7 +14707,7 @@ _02085980: add r1, sp, #0x16 strb r4, [sp, #0x16] strb r8, [sp, #0x17] - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev subs r0, r0, r5 rsbmi r0, r0, #0 cmp r0, #0xcd @@ -14716,7 +14716,7 @@ _02085980: add r1, sp, #0x14 strb r4, [sp, #0x14] strb r8, [sp, #0x15] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _02085a04 ldrb r1, [sp, #0x18] @@ -14745,13 +14745,13 @@ _02085a20: add sp, sp, #0x1c ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 - arm_func_end func_ov00_020858b0 + arm_func_end _ZN10MapManager18func_ov00_020858b0Ev _02085a2c: .word data_027e0f64 _02085a30: .word data_027e0f94 - .global func_ov00_02085a34 - arm_func_start func_ov00_02085a34 -func_ov00_02085a34: ; 0x02085a34 + .global _ZN10MapManager18func_ov00_02085a34Eii + arm_func_start _ZN10MapManager18func_ov00_02085a34Eii +_ZN10MapManager18func_ov00_02085a34Eii: ; 0x02085a34 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x20 mov r4, r2 @@ -14767,17 +14767,17 @@ _02085a60: add r0, sp, #8 mov r1, r5 mov r2, r6 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r0, r5 mov r1, r6 - bl func_ov00_02084ebc + bl _ZN10MapManager18func_ov00_02084ebcEi cmp r0, #0 addeq sp, sp, #0x20 mvneq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} add r1, sp, #8 mov r0, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r6, r0 beq _02085b24 ldr r1, [r0] @@ -14804,7 +14804,7 @@ _02085ae0: bic r2, r1, #1 mov r1, r6 str r2, [r6, #4] - bl func_ov00_020828f8 + bl _ZN10MapManager18func_ov00_020828f8EPi b _02085b24 _02085afc: mov r0, r6 @@ -14849,14 +14849,14 @@ _02085b68: mov r0, r5 mov r1, #0x42 str r4, [sp] - bl func_ov00_020828c0 + bl _ZN10MapManager16MapData_vfunc_7cEv cmp r0, #0 addeq sp, sp, #0x20 mvneq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} add r1, sp, #8 mov r0, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _02085bd0 ldrsh r0, [r0, #0xe] @@ -14872,10 +14872,10 @@ _02085bdc: add r0, sp, #6 mov r1, r5 mov r2, r6 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #6 mov r0, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r6, r0 addeq sp, sp, #0x20 mvneq r0, #0 @@ -14904,11 +14904,11 @@ _02085c54: mvn r0, #0 add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_02085a34 + arm_func_end _ZN10MapManager18func_ov00_02085a34Eii - .global func_ov00_02085c60 - arm_func_start func_ov00_02085c60 -func_ov00_02085c60: ; 0x02085c60 + .global _ZN10MapManager18func_ov00_02085c60Eiiii + arm_func_start _ZN10MapManager18func_ov00_02085c60Eiiii +_ZN10MapManager18func_ov00_02085c60Eiiii: ; 0x02085c60 stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0xfc ldr r11, [sp, #0x120] @@ -15162,13 +15162,13 @@ _02085fb8: add sp, sp, #0xfc ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 - arm_func_end func_ov00_02085c60 + arm_func_end _ZN10MapManager18func_ov00_02085c60Eiiii _0208603c: .word data_027e0d3c _02086040: .word 0x0000ffff - .global func_ov00_02086044 - arm_func_start func_ov00_02086044 -func_ov00_02086044: ; 0x02086044 + .global _ZN10MapManager18func_ov00_02086044Eiii + arm_func_start _ZN10MapManager18func_ov00_02086044Eiii +_ZN10MapManager18func_ov00_02086044Eiii: ; 0x02086044 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0xb0 add r5, sp, #0x98 @@ -15193,19 +15193,19 @@ func_ov00_02086044: ; 0x02086044 bl func_ov00_0208ee00 ldr r1, [sp, #0x98] mov r0, r10 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev mov r6, r0 ldr r1, [sp, #0xa0] mov r0, r10 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev str r0, [sp, #0xc] ldr r1, [sp, #0xa4] mov r0, r10 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev str r0, [sp, #8] ldr r1, [sp, #0xac] mov r0, r10 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r11, r0 add r5, sp, #0x8c ldmia r9, {r0, r1, r2} @@ -15223,15 +15223,15 @@ func_ov00_02086044: ; 0x02086044 bl func_01ff9bf8 ldr r1, [r9] mov r0, r10 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev mov r4, r0 ldr r1, [r9, #8] mov r0, r10 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r2, r0 mov r1, r4 mov r0, r10 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [sp, #4] ldr r0, [sp, #8] cmp r6, r0 @@ -15246,7 +15246,7 @@ _02086164: mov r0, r10 mov r1, r6 mov r2, r7 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci ldr r1, [sp, #4] cmp r0, r1 ble _020861ec @@ -15256,7 +15256,7 @@ _02086164: add r2, sp, #0x68 strb r5, [sp, #0x12] strb r7, [sp, #0x13] - bl func_ov00_02084024 + bl _ZN10MapManager18func_ov00_02084024EiP4AABB ldr r0, [sp] mov r1, r9 add r2, sp, #0x5c @@ -15282,7 +15282,7 @@ _020861ec: add r1, sp, #0x10 strb r5, [sp, #0x10] strb r7, [sp, #0x11] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 beq _02086258 ldr r1, [r0] @@ -15319,12 +15319,12 @@ _02086274: add sp, sp, #0xb0 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 - arm_func_end func_ov00_02086044 + arm_func_end _ZN10MapManager18func_ov00_02086044Eiii _02086280: .word data_027e0e60 - .global func_ov00_02086284 - arm_func_start func_ov00_02086284 -func_ov00_02086284: ; 0x02086284 + .global _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ + arm_func_start _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ +_ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_: ; 0x02086284 stmdb sp!, {r4, r5, r6, r7, r8, r9, lr} sub sp, sp, #0x15c mov r9, r1 @@ -15862,11 +15862,11 @@ _02086a78: mov r0, #0 add sp, sp, #0x15c ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} - arm_func_end func_ov00_02086284 + arm_func_end _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ - .global func_ov00_02086a84 - arm_func_start func_ov00_02086a84 -func_ov00_02086a84: ; 0x02086a84 + .global _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ + arm_func_start _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ +_ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_: ; 0x02086a84 stmdb sp!, {r4, r5, r6, r7, r8, r9, lr} sub sp, sp, #0x84 mov r8, r2 @@ -16021,7 +16021,7 @@ _02086cc4: mov r0, #0 add sp, sp, #0x84 ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} - arm_func_end func_ov00_02086a84 + arm_func_end _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ .global func_ov00_02086cd0 arm_func_start func_ov00_02086cd0 @@ -16469,7 +16469,7 @@ _0208729c: ldrb r2, [r5, #0x1b8] ldr r0, [r0] add r1, sp, #0 - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci mov r3, #0 add r1, sp, #0 mov r0, r5 @@ -16806,7 +16806,7 @@ _02087724: ldrb r2, [r7, #0x1b8] ldr r0, [r0] add r1, sp, #0x6c - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci ldr r3, [r7, #0x260] ldr r0, [r7, #0x264] ldr r2, [r7, #0x268] @@ -16916,7 +16916,7 @@ _020878b8: ldrb r2, [r7, #0x1b8] ldr r0, [r0] add r1, sp, #0x6c - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci ldr r3, [r7, #0x260] ldr r0, [r7, #0x264] ldr r2, [r7, #0x268] @@ -17352,7 +17352,7 @@ func_ov00_02087e8c: ; 0x02087e8c ldr r0, _02087eec ; =data_027e0e60 mov r1, #0 ldr r0, [r0] - bl func_ov00_02083938 + bl _ZN10MapManager18func_ov00_02083938Ei sub r0, r0, #0x11 cmp r0, #0xa addls pc, pc, r0, lsl #2 @@ -17499,7 +17499,7 @@ func_ov00_02088010: ; 0x02088010 mov r5, r0 ldr r0, [r2] mov r4, r1 - bl func_ov00_02084934 + bl _ZN10MapManager18func_ov00_02084934Ev cmp r0, #0 addeq sp, sp, #0xc moveq r0, #0 @@ -18689,7 +18689,7 @@ func_ov00_02089068: ; 0x02089068 ldr r0, [r3] mov r4, r2 add r2, sp, #0x30 - bl func_ov00_02083968 + bl _ZN10MapManager18func_ov00_02083968EjPc cmp r0, #0 addeq sp, sp, #0x4c moveq r0, #0 @@ -18720,7 +18720,7 @@ _020890ec: ldr r0, _02089164 ; =data_027e0e60 add r1, sp, #0xc ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p add r0, sp, #0x34 add r1, sp, #0xc add r2, sp, #0x24 @@ -19314,7 +19314,7 @@ _02089910: ldrb r2, [r9, #0x1b8] ldr r0, [r0] add r1, sp, #0x20 - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci ldr r0, [sp, #0x20] bl func_ov00_02087d84 add r8, sp, #0x60 @@ -20156,7 +20156,7 @@ _0208a4d0: ldr r1, _0208a844 ; =data_027e0e60 add r0, sp, #0x18 ldr r1, [r1] - bl func_ov00_02084100 + bl _ZN10MapManager18func_ov00_02084100EiPS_ ldrsh r2, [r6, #4] add r1, r6, #0x260 mov r0, #0 @@ -20327,26 +20327,26 @@ _0208a4d0: _0208a77c: ldr r0, _0208a844 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r1, _0208a844 ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv ldr r1, _0208a844 ; =data_027e0e60 mov r5, r0 ldr r0, [r1] ldr r1, [r6, #0x308] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev strb r0, [r6, #0x320] ldr r0, _0208a844 ; =data_027e0e60 ldr r1, [r6, #0x310] ldr r0, [r0] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev strb r0, [r6, #0x321] ldr r0, _0208a844 ; =data_027e0e60 ldr r1, [r6, #0x314] ldr r0, [r0] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev and r1, r0, #0xff add r0, r1, #2 strb r0, [r6, #0x322] @@ -20361,7 +20361,7 @@ _0208a77c: ldr r0, _0208a844 ; =data_027e0e60 ldr r1, [r6, #0x31c] ldr r0, [r0] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev and r1, r0, #0xff add r0, r1, #1 strb r0, [r6, #0x323] @@ -20930,7 +20930,7 @@ _0208af04: ldr r0, _0208b114 ; =data_027e0e60 add r1, sp, #0x18 ldr r0, [r0] - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci ldr r0, [sp, #0x18] cmp r0, #0x31 bne _0208b0dc @@ -21873,14 +21873,14 @@ func_ov00_0208b9e4: ; 0x0208b9e4 add r2, r0, r1 ldr r0, _0208ba00 ; =data_027e0e60 ldrb r1, [r2, #0x2e] - ldr ip, _0208ba04 ; =func_ov00_02084be0 + ldr ip, _0208ba04 ; =_ZN10MapManager18func_ov00_02084be0Eii ldrb r2, [r2, #0x2c] ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov00_0208b9e4 _0208ba00: .word data_027e0e60 -_0208ba04: .word func_ov00_02084be0 +_0208ba04: .word _ZN10MapManager18func_ov00_02084be0Eii .global func_ov00_0208ba08 arm_func_start func_ov00_0208ba08 @@ -21892,7 +21892,7 @@ func_ov00_0208ba08: ; 0x0208ba08 ldrb r1, [ip, #0x2e] ldrb r2, [ip, #0x2c] ldr r0, [r0] - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_0208ba08 @@ -23419,7 +23419,7 @@ _0208cd78: ldr r0, [r0] mov r1, r5 mov r3, #0x40 - bl func_ov00_020836cc + bl _ZN10MapManager18func_ov00_020836ccEjP4AABBj mov r6, r0 cmp r6, #0 bgt _0208cddc @@ -23644,7 +23644,7 @@ _0208d064: ldr r0, [r0] mov r1, r5 mov r3, #0x40 - bl func_ov00_020836cc + bl _ZN10MapManager18func_ov00_020836ccEjP4AABBj mov r4, r0 cmp r4, #0 bgt _0208d0c8 @@ -26596,18 +26596,18 @@ _0208f7d4: cmp r8, #0 blt _0208f868 ldr r0, [r4] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev cmp r7, r0 bge _0208f868 ldr r0, [r4] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv cmp r8, r0 bge _0208f868 ldr r0, [r4] add r1, sp, #0 strb r7, [sp] strb r8, [sp, #1] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev add r1, sp, #8 str r0, [r1, r9, lsl #2] cmp r0, #0 @@ -27005,7 +27005,7 @@ _0208fcf8: ldr r0, [r4] ldr r2, [r5, #0x16c] mov r1, r6 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 bne _0208fd20 ldr r1, [r5, #0x164] @@ -27021,7 +27021,7 @@ _0208fd30: ldr r0, _0208fef4 ; =data_027e0e60 ldr r2, [r5, #0x16c] ldr r0, [r0] - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 beq _0208fda8 ldr r0, [r5, #0x160] @@ -27034,7 +27034,7 @@ _0208fd60: ldr r0, [r4] ldr r2, [r5, #0x16c] mov r1, r6 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 beq _0208fd88 ldr r1, [r5, #0x164] @@ -27063,7 +27063,7 @@ _0208fdc0: ldr r1, [r5, #0x160] ldr r0, [r0] ldr r2, [r5, #0x16c] - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 beq _0208fe3c ldr r1, [r5, #0x160] @@ -27078,7 +27078,7 @@ _0208fdfc: ldr r0, [r6] ldr r2, [r5, #0x16c] mov r1, r4 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 ldrne r0, [r5, #0x164] add r4, r4, #1 @@ -27103,7 +27103,7 @@ _0208fe54: ldr r0, [r4] ldr r2, [r5, #0x16c] mov r1, r7 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 moveq r6, #0 beq _0208fe80 @@ -27134,7 +27134,7 @@ _0208febc: ldr r0, [r4] ldr r2, [r5, #0x16c] add r1, r1, r6 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} @@ -27292,7 +27292,7 @@ _02090004: add r0, sp, #0x18 ldr r1, [r1] add r2, sp, #0x5c - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r0, sp, #0x74 add r1, sp, #0x5c bl func_01ff9ec0 @@ -27301,7 +27301,7 @@ _02090004: ldr r0, _02090320 ; =data_027e0e60 add r1, sp, #0x18 ldr r0, [r0] - bl func_ov00_02083e70 + bl _ZN10MapManager18func_ov00_02083e70Ev cmp r0, #0 beq _02090150 _02090144: @@ -27312,13 +27312,13 @@ _02090150: ldr r0, _02090320 ; =data_027e0e60 add r1, sp, #0x18 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 bne _020902f8 ldr r0, _02090320 ; =data_027e0e60 add r1, sp, #0x18 ldr r0, [r0] - bl func_ov00_02084164 + bl _ZN10MapManager18func_ov00_02084164Ev cmp r0, #0 subeq r6, r6, #1 addeq r5, r5, #1 @@ -27326,7 +27326,7 @@ _02090150: ldr r0, _02090320 ; =data_027e0e60 add r1, sp, #0x18 ldr r0, [r0] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x37 bgt _02090210 bge _02090250 @@ -27458,7 +27458,7 @@ _0209034c: ldr r2, [r7, #0x16c] mov r1, r6 mov r3, r5 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, [r7, #0x168] add r6, r6, #1 cmp r6, r0 @@ -29307,7 +29307,7 @@ _0209167c: ldr r0, _020917ac ; =data_027e0e60 ldr r6, _020917b0 ; =0x000004cd ldr r0, [r0] - bl func_ov00_020848b8 + bl _ZN10MapManager18func_ov00_020848b8Ev mov r1, #0 cmp r0, #0 ldr r0, _020917b4 ; =0x0000ffff @@ -29694,7 +29694,7 @@ _02091bd4: ldr r0, _02091d4c ; =data_027e0e60 ldr r4, _02091d50 ; =0x000004cd ldr r0, [r0] - bl func_ov00_020848b8 + bl _ZN10MapManager18func_ov00_020848b8Ev mov r1, #0 cmp r0, #0 ldr r0, _02091d54 ; =0x0000ffff @@ -31120,7 +31120,7 @@ _0209309c: _020930b4: ldr r0, _02093208 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082538 + bl _ZN10MapManager18func_ov00_02082538Ev add r3, sp, #0x28 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} @@ -31413,7 +31413,7 @@ _0209349c: _020934c8: ldr r0, _02093504 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082538 + bl _ZN10MapManager18func_ov00_02082538Ev add r3, sp, #0 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} @@ -32187,7 +32187,7 @@ func_ov00_02093e00: ; 0x02093e00 ldr r0, [r0] strb r2, [sp, #8] strb r3, [sp, #9] - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev str r0, [r10, #0x1c] ldr r0, [r10, #0x20] add r0, r0, #0x800 @@ -32263,7 +32263,7 @@ _02093e70: ldr r0, _020940cc ; =data_027e0e60 add r1, sp, #0x40 ldr r0, [r0] - bl func_ov00_020838f8 + bl _ZN10MapManager18func_ov00_020838f8EPi ldr r1, [sp, #0xc] bic r1, r1, #0x3f0000 orr r0, r1, r0, lsl #16 @@ -32308,18 +32308,18 @@ _02094000: mov r2, r5 strb r7, [sp, #6] strb r9, [sp, #7] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r11 mov r2, #1 strb r7, [sp, #4] strb r9, [sp, #5] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldr r0, [r4] mov r1, r8 mov r2, r9 mov r3, #9 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci ldrb r0, [r10, #0x15] add r9, r9, #1 add r0, r0, #2 @@ -33675,14 +33675,14 @@ func_ov00_02094e6c: ; 0x02094e6c strh r5, [r10, #4] ldr r0, [r0] mov r9, r3 - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldrh r1, [r10, #2] bl func_02002c14 mov r1, r0, lsl #0xc ldr r0, _02094f84 ; =data_027e0e60 str r1, [r10, #0xc] ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv ldrh r1, [r10, #4] bl func_02002c14 mov r0, r0, lsl #0xc @@ -33784,14 +33784,14 @@ func_ov00_02094fbc: ; 0x02094fbc ldmeqia sp!, {r4, r5, r6, r7, r8, pc} ldr r0, _02095124 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldrh r1, [r4, #2] bl func_02002c14 mov r1, r0, lsl #0xc ldr r0, _02095124 ; =data_027e0e60 str r1, [r4, #0xc] ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv ldrh r1, [r4, #4] bl func_02002c14 mov r0, r0, lsl #0xc @@ -33986,7 +33986,7 @@ func_ov00_02095278: ; 0x02095278 stmia ip, {r0, r1, r2} ldr r0, [r3] add r1, sp, #0 - bl func_ov00_0208340c + bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p add r0, sp, #0xc add r1, sp, #0 mov r2, r0 @@ -34195,12 +34195,12 @@ func_ov00_020954a0: ; 0x020954a0 str r1, [r6] ldrb r1, [r5, #1] ldr r0, [r0] - bl func_ov00_02083bac + bl _ZN10MapManager18func_ov00_02083bacEv ldr r2, _02095550 ; =data_027e0e60 mov r4, r0 ldrb r1, [r5, #2] ldr r0, [r2] - bl func_ov00_02083b84 + bl _ZN10MapManager18func_ov00_02083b84Ev mov r3, #0x5000 rsb r3, r3, #0 ldr r2, _02095550 ; =data_027e0e60 @@ -34209,12 +34209,12 @@ func_ov00_020954a0: ; 0x020954a0 ldr r0, [r2] str r3, [sp, #0x10] str r4, [sp, #0x14] - bl func_ov00_02083bfc + bl _ZN10MapManager18func_ov00_02083bfcEv ldr r2, _02095550 ; =data_027e0e60 mov r4, r0 ldrb r1, [r5, #4] ldr r0, [r2] - bl func_ov00_02083bd4 + bl _ZN10MapManager18func_ov00_02083bd4Ev ldr r1, [sp, #0xc] ldr r2, [sp, #0x10] str r1, [r6, #0x14] @@ -34246,12 +34246,12 @@ func_ov00_02095554: ; 0x02095554 str r1, [r6] ldrb r1, [r5, #1] ldr r0, [r0] - bl func_ov00_02083bac + bl _ZN10MapManager18func_ov00_02083bacEv ldr r2, _02095604 ; =data_027e0e60 mov r4, r0 ldrb r1, [r5, #2] ldr r0, [r2] - bl func_ov00_02083b84 + bl _ZN10MapManager18func_ov00_02083b84Ev mov r3, #0x5000 rsb r3, r3, #0 ldr r2, _02095604 ; =data_027e0e60 @@ -34260,12 +34260,12 @@ func_ov00_02095554: ; 0x02095554 ldr r0, [r2] str r3, [sp, #0x10] str r4, [sp, #0x14] - bl func_ov00_02083bfc + bl _ZN10MapManager18func_ov00_02083bfcEv ldr r2, _02095604 ; =data_027e0e60 mov r4, r0 ldrb r1, [r5, #4] ldr r0, [r2] - bl func_ov00_02083bd4 + bl _ZN10MapManager18func_ov00_02083bd4Ev ldr r1, [sp, #0xc] ldr r2, [sp, #0x10] str r1, [r6, #0x14] @@ -34334,12 +34334,12 @@ func_ov00_0209564c: ; 0x0209564c ldr r0, _0209571c ; =data_027e0e60 ldrb r1, [r5, #1] ldr r0, [r0] - bl func_ov00_02083bac + bl _ZN10MapManager18func_ov00_02083bacEv ldr r2, _0209571c ; =data_027e0e60 mov r4, r0 ldrb r1, [r5, #2] ldr r0, [r2] - bl func_ov00_02083b84 + bl _ZN10MapManager18func_ov00_02083b84Ev mov ip, #0x5000 str r0, [sp] rsb ip, ip, #0 @@ -35093,7 +35093,7 @@ func_ov00_02095fe0: ; 0x02095fe0 ldr r1, [r2, #0x44] add r2, sp, #0xc add r3, sp, #2 - bl func_ov00_020835e4 + bl _ZN10MapManager18func_ov00_020835e4EiPiS0_ cmp r0, #0 addeq sp, sp, #0x34 ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} @@ -35139,19 +35139,19 @@ _020960b0: str r3, [sp, #0x2c] ldr r3, [r8, #0x18] str r3, [sp, #0x30] - bl func_ov00_02083560 + bl _ZN10MapManager18func_ov00_02083560EiPS_j ldrb r2, [sp] ldrb r3, [sp, #1] ldr r0, [r4] mov r1, r6 - bl func_ov00_020834bc + bl _ZN10MapManager18func_ov00_020834bcEP5Vec3pii mov r0, r5 mov r1, r6 mov r2, r5 bl func_01ff9bf8 ldr r0, [r4] mov r1, r11 - bl func_ov00_0208340c + bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p mov r0, r5 mov r1, r11 mov r2, r5 diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index 66c4c9ee..5cf35abe 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -2,6 +2,23 @@ .extern Approach_thunk .extern Divide .extern FastDivide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_b0Ev +.extern _ZN10MapManager17GetMapData_Unk_06Ev +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18Get_MapData_Unk_d0Ev +.extern _ZN10MapManager18Get_MapData_Unk_d8Ev +.extern _ZN10MapManager18Set_MapData_Unk_16Eci +.extern _ZN10MapManager18func_ov00_02082424Ev +.extern _ZN10MapManager18func_ov00_02082538Ev +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02083908EcPi +.extern _ZN10MapManager18func_ov00_02083928EPci +.extern _ZN10MapManager18func_ov00_02083938Ei +.extern _ZN10MapManager18func_ov00_02083978EiP5Vec3p +.extern _ZN10MapManager18func_ov00_02084b38Eiii .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN10PlayerBase12SetUpdatePosEb .extern _ZN11ItemManager21LoadDungeonItemModelsEv @@ -189,23 +206,6 @@ .extern func_ov00_02080f20 .extern func_ov00_02080f64 .extern func_ov00_02080f94 -.extern func_ov00_02082424 -.extern func_ov00_02082538 -.extern func_ov00_02082638 -.extern func_ov00_02082d08 -.extern func_ov00_020833f4 -.extern func_ov00_02083400 -.extern func_ov00_0208344c -.extern func_ov00_020836dc -.extern func_ov00_020838e8 -.extern func_ov00_02083908 -.extern func_ov00_02083928 -.extern func_ov00_02083938 -.extern func_ov00_02083948 -.extern func_ov00_02083978 -.extern func_ov00_02083ee0 -.extern func_ov00_02084984 -.extern func_ov00_02084b38 .extern func_ov00_02086cd0 .extern func_ov00_02086ed4 .extern func_ov00_0208726c diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index 8449e284..5e1a5e28 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -314,7 +314,7 @@ _0209848c: ldrb r1, [r4, #0xe] ldr r0, [r0] add r2, sp, #0xc - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _020985bc ; =data_027e0d38 mov r2, #1 ldr r0, [r0] @@ -1482,7 +1482,7 @@ _020993b4: ldrb r1, [r6, #0x2b] ldr r0, [r0] add r2, sp, #8 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 addeq sp, sp, #0x20 ldmeqia sp!, {r4, r5, r6, pc} @@ -5635,7 +5635,7 @@ _0209c93c: ldr r0, _0209c954 ; =data_027e0e60 add r1, r4, #0xf8 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_0209c8f4 @@ -5746,11 +5746,11 @@ func_ov00_0209ca80: ; 0x0209ca80 ldr r0, _0209cbc0 ; =data_027e0e60 str r2, [r1] ldr r0, [r0] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldr r1, _0209cbc0 ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr ip, _0209cbc4 ; =0x04000470 mov r1, #0 str r0, [ip] @@ -5834,7 +5834,7 @@ func_ov00_0209cbd4: ; 0x0209cbd4 mov r5, r0 ldr r0, [r3] mov r4, r2 - bl func_ov00_02083978 + bl _ZN10MapManager18func_ov00_02083978EiP5Vec3p cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, r4, r5, pc} @@ -5892,7 +5892,7 @@ func_ov00_0209cc48: ; 0x0209cc48 ldrh r1, [r4, #0x1c] ldrh r2, [r4, #0x1e] ldr r0, [r0] - bl func_ov00_02082638 + bl _ZN10MapManager16MapData_vfunc_b0Ev ldr r0, _0209cce4 ; =data_027e0f68 ldrh r1, [r4, #0x1c] ldr r0, [r0] @@ -8279,7 +8279,7 @@ _0209e9c0: ldr r0, _0209eafc ; =data_027e0e60 add r1, sp, #0xc ldr r0, [r0] - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci ldrb r0, [sp, #0x10] add r2, r4, #0x168 strb r0, [r4, #0x162] @@ -8293,7 +8293,7 @@ _0209e9c0: ldr r0, _0209eafc ; =data_027e0e60 ldrb r1, [r4, #0x163] ldr r0, [r0] - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi ldrh r0, [r4, #0x22] cmp r0, #0 beq _0209ea30 @@ -8452,7 +8452,7 @@ _0209ec14: ldrb r1, [r4, #0x162] ldr r0, [r0] mov r2, r3 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _0209ecd4 ; =data_027e0f64 ldrb r1, [r4, #0x165] ldr r0, [r0] @@ -8483,7 +8483,7 @@ _0209ec9c: ldrb r1, [r4, #0x16c] ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci b _0209ecc8 _0209ecb4: ldr r0, _0209ecd4 ; =data_027e0f64 @@ -8513,7 +8513,7 @@ _0209ecf0: ldrb r1, [r0, #0x164] ldr r0, [r2] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii ldmia sp!, {r3, pc} _0209ed08: mov r1, #1 @@ -12506,7 +12506,7 @@ _020a1de8: ldrb r2, [r4, #0x29] ldr r0, [r0] mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii b _020a1e4c _020a1e0c: bl func_ov00_020a1e58 @@ -12515,7 +12515,7 @@ _020a1e0c: ldrb r2, [r4, #0x29] ldr r0, [r0] mov r3, #1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, [r4, #0x158] cmp r0, #0 bne _020a1e4c @@ -12613,7 +12613,7 @@ func_ov00_020a1f24: ; 0x020a1f24 bne _020a1f90 ldr r0, _020a1fc8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082538 + bl _ZN10MapManager18func_ov00_02082538Ev ldr r2, [r0] ldr r1, _020a1fc8 ; =data_027e0e60 str r2, [r4, #0x18] @@ -12622,7 +12622,7 @@ func_ov00_020a1f24: ; 0x020a1f24 ldr r0, [r0, #8] str r0, [r4, #0x20] ldr r0, [r1] - bl func_ov00_02082538 + bl _ZN10MapManager18func_ov00_02082538Ev ldr r1, [r0] str r1, [r4, #0x24] ldr r1, [r0, #4] @@ -12738,14 +12738,14 @@ func_ov00_020a1fd0: ; 0x020a1fd0 _020a2118: ldr r0, _020a2224 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev rsb r0, r0, #0 sub r0, r0, #0x4000 cmp r4, r0 blt _020a21d0 ldr r0, _020a2224 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev add r0, r4, r0 add r0, r0, #0x4000 mov r1, #0x4000 @@ -12836,7 +12836,7 @@ func_ov00_020a222c: ; 0x020a222c ldr r0, _020a22b4 ; =data_027e0e60 strgt r1, [r4, #0x28] ldr r0, [r0] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev ldr r1, [r4, #0x1c] ldr r2, [r4, #0x28] add r1, r1, #0x1000 @@ -12845,7 +12845,7 @@ func_ov00_020a222c: ; 0x020a222c ldmgeia sp!, {r4, pc} ldr r0, _020a22b4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev ldr r1, [r4, #0x1c] add r1, r1, #0x1000 add r0, r1, r0 @@ -13109,13 +13109,13 @@ _020a2614: beq _020a2680 ldr r0, _020a26e0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084984 + bl _ZN10MapManager17GetMapData_Unk_06Ev cmp r0, #0 bne _020a2680 ldr r0, _020a26e0 ; =data_027e0e60 mov r1, #0 ldr r0, [r0] - bl func_ov00_02083938 + bl _ZN10MapManager18func_ov00_02083938Ei bl func_ov00_02087d84 add r5, sp, #0x4c mov r6, r0 @@ -13476,7 +13476,7 @@ _020a2b28: mov r1, r3 ldr r0, [r0] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, #4] ldr r1, [sp, #8] ldr r2, [r2, #0x240] @@ -13774,7 +13774,7 @@ _020a2f18: ldrb r2, [r1, #0x1b8] ldr r0, [r0] add r1, sp, #0x10 - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci ldr r0, [sp, #0x10] bl func_ov00_02087d84 add lr, sp, #0x38 @@ -13871,7 +13871,7 @@ _020a3074: ldrb r2, [r1, #0x1b8] ldr r0, [r0] add r1, sp, #0x10 - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci ldr r0, [sp, #0x10] bl func_ov00_02087d84 add lr, sp, #0x38 @@ -15292,7 +15292,7 @@ func_ov00_020a41e4: ; 0x020a41e4 ldr r1, _020a42c8 ; =data_027e0e60 str r0, [r6] ldr r0, [r1] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev strb r0, [r6, #7] str r7, [r6, #0xc] ldr r0, [r5] @@ -15354,7 +15354,7 @@ func_ov00_020a42cc: ; 0x020a42cc ldr r1, _020a4344 ; =data_027e0e60 str r0, [r6] ldr r0, [r1] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev strb r0, [r6, #7] str r7, [r6, #0xc] ldr r0, [r5] @@ -16231,7 +16231,7 @@ func_ov00_020a4dd0: ; 0x020a4dd0 ldr r0, _020a4e08 ; =data_027e0e60 add r1, r4, #0x28 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020a4dd0 diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index 242ba27c..c94f1c44 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -1,5 +1,30 @@ #pragma once .extern Divide +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager17Get_MapData_Unk2aEv +.extern _ZN10MapManager18func_ov00_020833c4Ev +.extern _ZN10MapManager18func_ov00_020833d0Ev +.extern _ZN10MapManager18func_ov00_020833dcEv +.extern _ZN10MapManager18func_ov00_020833e8Ev +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_020839d4Ev +.extern _ZN10MapManager18func_ov00_020839f8Ev +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_020840a0Ecci +.extern _ZN10MapManager18func_ov00_0208412cEv +.extern _ZN10MapManager18func_ov00_02084164Ev +.extern _ZN10MapManager18func_ov00_020853fcEv .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN10PlayerBase13GetEquipSwordEv .extern _ZN10PlayerBase14GetEquipShieldEv @@ -301,31 +326,6 @@ .extern func_ov00_0207e96c .extern func_ov00_02081f4c .extern func_ov00_02081f50 -.extern func_ov00_0208335c -.extern func_ov00_02083368 -.extern func_ov00_020833c4 -.extern func_ov00_020833d0 -.extern func_ov00_020833dc -.extern func_ov00_020833e8 -.extern func_ov00_020836dc -.extern func_ov00_02083770 -.extern func_ov00_020838e8 -.extern func_ov00_020839d4 -.extern func_ov00_020839f8 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083c7c -.extern func_ov00_02083e34 -.extern func_ov00_02083ee0 -.extern func_ov00_02083f44 -.extern func_ov00_02083fb0 -.extern func_ov00_02084088 -.extern func_ov00_020840a0 -.extern func_ov00_020840c4 -.extern func_ov00_0208412c -.extern func_ov00_02084164 -.extern func_ov00_020853fc .extern func_ov00_020872e8 .extern func_ov00_02087e8c .extern func_ov00_0208b180 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 6170dbc0..5bfdb1fc 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -285,13 +285,13 @@ func_ov00_020b178c: ; 0x020b178c mov r4, r0 ldrb r2, [sp, #0xd] ldr r0, [r3] - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci cmp r0, r4 bgt _020b17d8 ldr r0, _020b17e8 ; =data_027e0e60 add r1, sp, #0xc ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r4, lr} @@ -446,14 +446,14 @@ func_ov00_020b199c: ; 0x020b199c bmi _020b19e4 ldr r0, _020b1a48 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev cmp r0, r6 ble _020b19e4 cmp r5, #0 blt _020b19e4 ldr r0, _020b1a48 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv cmp r0, r5 bgt _020b19f0 _020b19e4: @@ -466,7 +466,7 @@ _020b19f0: ldr r0, [r0] strb r6, [sp] strb r5, [sp, #1] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _020b1a30 ldr r1, [r0] @@ -481,7 +481,7 @@ _020b1a30: ldr r0, _020b1a48 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02084164 + bl _ZN10MapManager18func_ov00_02084164Ev add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 @@ -498,12 +498,12 @@ func_ov00_020b1a4c: ; 0x020b1a4c mov r9, r0 ldr r0, [r2] ldr r1, [r8] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev ldr r1, _020b1b48 ; =data_027e0e60 mov r5, r0 ldr r0, [r1] ldr r1, [r8, #8] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r6, r0 ldr r0, [r8] ldr r2, _020b1b4c ; =func_ov00_020b1940 @@ -572,7 +572,7 @@ func_ov00_020b1b54: ; 0x020b1b54 ldrb r1, [sp, #8] ldrb r2, [sp, #9] ldr r0, [r0] - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci cmp r0, #0x18 cmpne r0, #0x2c cmpne r0, #0x2d @@ -605,7 +605,7 @@ func_ov00_020b1ba4: ; 0x020b1ba4 add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp] mov r0, r0, lsr #0x9 and r0, r0, #3 @@ -630,7 +630,7 @@ func_ov00_020b1bfc: ; 0x020b1bfc ldr r0, [r1] mov r1, r6 mov r2, r5 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci ldrb r2, [sp, #0x1c] add r1, r5, #1 sub r3, sp, #4 @@ -1449,7 +1449,7 @@ func_ov00_020b2598: ; 0x020b2598 ldr r0, [r0] ldr r1, [r4, #0x5c] add r2, sp, #0 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _020b26b8 ldr r0, _020b2b94 ; =data_027e0d38 @@ -2303,7 +2303,7 @@ func_ov00_020b30e4: ; 0x020b30e4 ldr r0, _020b3270 ; =data_027e0e60 add r2, sp, #0 ldr r0, [r0] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _020b325c str r6, [r7, #0x5c] @@ -3117,7 +3117,7 @@ _020b3ce4: ldr r0, [r1] add r1, sp, #0 mov r2, #1 - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p mov r6, r0 cmp r6, r5 mov r0, r4 @@ -4612,7 +4612,7 @@ func_ov00_020b4d00: ; 0x020b4d00 ldr r1, [r1] add r0, sp, #0 add r2, #0x20 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r0, sp, #0 ldrb r1, [r0] strb r1, [r4, #0x1c] @@ -4651,7 +4651,7 @@ func_ov00_020b4d28: ; 0x020b4d28 ldr r0, [r0] add r1, r2, r1 sub r1, r1, #0x1000 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev ldr r3, [r7, #0x20] ldr r2, [r7, #0x2c] ldr r1, _020b502c ; =data_027e0e60 @@ -4659,14 +4659,14 @@ func_ov00_020b4d28: ; 0x020b4d28 sub r2, r3, r2 ldr r0, [r1] add r1, r2, #0x1000 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev ldr r2, [r9] mov r1, r0 cmp r2, #0 ble _020b4dd0 ldr r0, _020b502c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei mov r8, r0 b _020b4e60 _020b4dd0: @@ -4674,7 +4674,7 @@ _020b4dd0: ldr r0, _020b502c ; =data_027e0e60 mov r1, r8 ldr r0, [r0] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei mov r8, r0 b _020b4e60 _020b4dec: @@ -4699,24 +4699,24 @@ _020b4dec: bne _020b4e4c ldr r0, _020b502c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei mov r8, r0 b _020b4e60 _020b4e4c: ldr r0, _020b502c ; =data_027e0e60 mov r1, r8 ldr r0, [r0] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei mov r8, r0 _020b4e60: ldr r0, _020b502c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020833c4 + bl _ZN10MapManager18func_ov00_020833c4Ev cmp r8, r0 ble _020b4e88 ldr r0, _020b502c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020833dc + bl _ZN10MapManager18func_ov00_020833dcEv cmp r8, r0 blt _020b4e90 _020b4e88: @@ -4744,7 +4744,7 @@ _020b4ec8: ldr r0, [r0] add r1, r2, r1 sub r1, r1, #0x1000 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev ldr r3, [r7, #0x28] ldr r2, [r7, #0x2c] ldr r1, _020b502c ; =data_027e0e60 @@ -4752,14 +4752,14 @@ _020b4ec8: sub r2, r3, r2 ldr r0, [r1] add r1, r2, #0x1000 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev ldr r2, [r9, #8] mov r1, r0 cmp r2, #0 ble _020b4f28 ldr r0, _020b502c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r8, r0 b _020b4fb8 _020b4f28: @@ -4767,7 +4767,7 @@ _020b4f28: ldr r0, _020b502c ; =data_027e0e60 mov r1, r8 ldr r0, [r0] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r8, r0 b _020b4fb8 _020b4f44: @@ -4792,24 +4792,24 @@ _020b4f44: bne _020b4fa4 ldr r0, _020b502c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r8, r0 b _020b4fb8 _020b4fa4: ldr r0, _020b502c ; =data_027e0e60 mov r1, r8 ldr r0, [r0] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r8, r0 _020b4fb8: ldr r0, _020b502c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020833d0 + bl _ZN10MapManager18func_ov00_020833d0Ev cmp r8, r0 ble _020b4fe0 ldr r0, _020b502c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020833e8 + bl _ZN10MapManager18func_ov00_020833e8Ev cmp r8, r0 blt _020b4fe8 _020b4fe0: @@ -4857,7 +4857,7 @@ func_ov00_020b5034: ; 0x020b5034 strb r3, [ip] strb r2, [ip, #1] ldr r2, [ip] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi ldr r7, [r5, #4] mov r0, r6 mov r1, r5 @@ -5032,7 +5032,7 @@ func_ov00_020b5268: ; 0x020b5268 str r2, [sp, #0x30] add r1, sp, #0x28 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, #4] ldr r1, _020b5344 ; =0xfffff667 add r1, r2, r1 @@ -5529,7 +5529,7 @@ _020b5884: ldr r2, [r2] strb r4, [sp] strb r3, [sp, #1] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi ldr r0, [sp, #0x2c] ldr r1, [sp, #0x28] str r0, [sp, #8] @@ -6109,7 +6109,7 @@ _020b61e0: str r2, [r10, #8] ldr r1, [r1] add r2, r7, #0x20 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r2, [sp, #0x14] ldr r0, _020b6ac8 ; =data_027e0e60 add r1, r7, #0x1c @@ -6117,7 +6117,7 @@ _020b61e0: ldrb r2, [sp, #0x15] strb r2, [r7, #0x1d] ldr r0, [r0] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev ldrb r0, [r7, #0xbc] cmp r0, #0 beq _020b62ec @@ -6226,7 +6226,7 @@ _020b632c: ldr r3, [r10, #8] mov r2, #1 str r3, [sp, #0x7c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcc add r0, r0, #0x1c00 ldr r2, _020b6ac4 ; =0x0000ffff @@ -6288,10 +6288,10 @@ _020b64a4: ldr r1, [r10] ldr r8, [r0] mov r0, r8 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev mov r1, r0 mov r0, r8 - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei ldr r2, [r10] mov r1, #0 sub r2, r0, r2 @@ -6333,7 +6333,7 @@ _020b6538: ldr r0, _020b6ac8 ; =data_027e0e60 add r1, r7, #0xc4 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev ldr r1, [r0] mov r9, r0 ldr r1, [r1, #0x54] @@ -6545,7 +6545,7 @@ _020b6830: add r0, sp, #0x1c add r2, sp, #0x50 str r3, [sp, #0x58] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #0x1c] mov r1, r0 mov r0, r0, lsr #0x5 @@ -6727,7 +6727,7 @@ func_ov00_020b6af0: ; 0x020b6af0 ldrb r1, [r0, #9] cmp r1, #0 beq _020b6b84 - bl func_ov00_0208412c + bl _ZN10MapManager18func_ov00_0208412cEv ldr r1, _020b6b98 ; =data_027e0fe4 mov r4, r0 ldr r1, [r1] @@ -6751,7 +6751,7 @@ func_ov00_020b6af0: ; 0x020b6af0 ldr r3, [r5, #8] add r2, sp, #8 str r3, [sp, #0x10] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 addne sp, sp, #0x14 addne r0, r4, r6 @@ -7116,7 +7116,7 @@ _020b7000: str r6, [sp, #8] str r3, [sp, #0xc] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, #0x24] ldr r1, [r4, #0x2c] sub r1, r2, r1 @@ -7506,7 +7506,7 @@ _020b75b0: add r1, sp, #0x14 strb r4, [sp] strb r3, [sp, #1] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi add r0, sp, #0x14 add r1, r6, #0x20 mov r2, r0 @@ -7520,7 +7520,7 @@ _020b75b0: strb r1, [r3, #1] ldr r2, [r3] add r1, sp, #8 - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi add r0, sp, #8 add r1, r6, #0x20 mov r2, r0 @@ -9932,7 +9932,7 @@ _020b9278: ldr r1, [r0] add r0, sp, #4 add r2, r9, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r0, [sp, #4] strb r0, [r9, #0x288] ldrb r0, [sp, #5] @@ -10144,7 +10144,7 @@ _020b956c: str r5, [sp, #0xc] str r6, [sp, #0x10] str r3, [sp, #0x14] - bl func_ov00_020853fc + bl _ZN10MapManager18func_ov00_020853fcEv cmp r0, #0 ldrnesb r1, [r0, #0x12] cmpne r1, #1 @@ -11670,7 +11670,7 @@ _020ba958: str ip, [sp, #0xc] str r3, [sp, #0x10] str r7, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x1c] cmp r1, r0 movlt r0, #1 @@ -11739,7 +11739,7 @@ _020baab8: str r7, [sp] str r3, [sp, #4] str r4, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x1c] cmp r1, r0 movlt r0, #1 @@ -11955,7 +11955,7 @@ _020badf0: str r3, [sp, #0x10] ldr r3, [r6, #0x160] str r3, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r1, r0, #0x1000 str r1, [r6, #0x15c] mov r0, r6 @@ -12023,7 +12023,7 @@ _020baef0: str r3, [sp, #4] ldr r3, [r6, #0x160] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x1000 str r0, [r6, #0x15c] _020baf50: @@ -12102,7 +12102,7 @@ _020bb020: add r1, sp, #0 mov r2, #1 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x1000 str r0, [r5, #0x15c] ldr r1, [r5, #0x158] @@ -13919,7 +13919,7 @@ _020bc40c: str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p ldr r1, _020bc468 ; =data_027e0fac ldr r3, [sp, #0x10] ldrsh r2, [r1] @@ -14305,7 +14305,7 @@ func_ov00_020bc8b8: ; 0x020bc8b8 mov r4, r2 add r0, sp, #0 mov r2, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r1, [sp] add r2, r6, r4, lsl #1 add r0, r6, r4, lsl #2 @@ -14331,7 +14331,7 @@ func_ov00_020bc90c: ; 0x020bc90c mov r4, r1 ldrb r1, [r2, #0x2c] ldr r0, [r0] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [r4] add r0, r6, r5, lsl #2 ldr r0, [r0, #0x30] @@ -14340,7 +14340,7 @@ func_ov00_020bc90c: ; 0x020bc90c ldr r0, _020bc95c ; =data_027e0e60 ldrb r1, [r1, #0x2d] ldr r0, [r0] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei str r0, [r4, #8] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 @@ -16478,7 +16478,7 @@ _020be338: ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} ldrb r0, [r5, #0x2a] diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index 50984c89..253cb127 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -1,6 +1,26 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager17GetMapData_Unk_48Ev +.extern _ZN10MapManager17GetMapData_Unk_4cEv +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager18func_ov00_02083588Ev +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_020839d4Ev +.extern _ZN10MapManager18func_ov00_020839f8Ev +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_020840dcEv +.extern _ZN10MapManager18func_ov00_02084164Ev +.extern _ZN10MapManager18func_ov00_02084838Ev +.extern _ZN10MapManager18func_ov00_020849c0Ev +.extern _ZN10MapManager20GetCourseData_Unk_1cEv +.extern _ZN10MapManager20GetCourseData_Unk_1dEv .extern _ZN10PlayerBase13GetEquipSwordEv .extern _ZN10PlayerBase14GetEquipShieldEv .extern _ZN11ItemManager15SetEquippedItemEi @@ -500,26 +520,6 @@ .extern func_ov00_02081ef4 .extern func_ov00_02081f4c .extern func_ov00_02081f50 -.extern func_ov00_02082d28 -.extern func_ov00_02082d34 -.extern func_ov00_0208335c -.extern func_ov00_02083588 -.extern func_ov00_020836dc -.extern func_ov00_020839d4 -.extern func_ov00_020839f8 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083ee0 -.extern func_ov00_02083f44 -.extern func_ov00_02083fb0 -.extern func_ov00_020840c4 -.extern func_ov00_020840dc -.extern func_ov00_02084114 -.extern func_ov00_02084120 -.extern func_ov00_02084164 -.extern func_ov00_02084838 -.extern func_ov00_020849c0 .extern func_ov00_02087338 .extern func_ov00_0208766c .extern func_ov00_020876bc diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index 3c6b2f89..a1d1b9cb 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -320,12 +320,12 @@ _020c40b4: ldr r1, [r10, #8] str r1, [r2, #0x5c] ldr r0, [r0] - bl func_ov00_02082d28 + bl _ZN10MapManager20GetCourseData_Unk_1cEv ldr r2, [r6] ldr r1, _020c42d4 ; =data_027e0e60 strb r0, [r2, #0x10] ldr r0, [r1] - bl func_ov00_02082d34 + bl _ZN10MapManager20GetCourseData_Unk_1dEv ldr r2, [r6] add r1, r5, #1 strb r0, [r2, #0x11] @@ -933,7 +933,7 @@ _020c498c: str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #4] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -1611,19 +1611,19 @@ func_ov00_020c522c: ; 0x020c522c mov r5, r1 ldr r1, [r6] mov r0, r4 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev mov r1, r0 mov r0, r4 - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [r5] ldr r1, [r6, #4] mov r0, r4 str r1, [r5, #4] ldr r1, [r6, #8] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r1, r0 mov r0, r4 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei str r0, [r5, #8] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 @@ -1643,15 +1643,15 @@ func_ov00_020c5288: ; 0x020c5288 strb r2, [sp, #1] ldr r1, [r5] mov r0, r4 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev strb r0, [sp] ldr r1, [r5, #8] mov r0, r4 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev strb r0, [sp, #1] add r1, sp, #0 mov r0, r4 - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x1e addeq sp, sp, #0x14 moveq r0, #1 @@ -1665,7 +1665,7 @@ func_ov00_020c5288: ; 0x020c5288 ldr r3, [r5, #8] mov r1, r4 str r3, [sp, #0x10] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #4] mov r0, r0, lsr #0x9 and r0, r0, #3 @@ -1687,12 +1687,12 @@ func_ov00_020c5330: ; 0x020c5330 mov r5, r1 ldrb r1, [r6, #1] ldr r0, [r0] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei ldr r2, _020c5370 ; =data_027e0e60 mov r4, r0 ldrb r1, [r6] ldr r0, [r2] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [r5] mov r0, #0 stmib r5, {r0, r4} @@ -1711,7 +1711,7 @@ func_ov00_020c5374: ; 0x020c5374 ldr r1, [r3] mov r2, r0 add r0, sp, #0 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r0, [sp] strb r0, [r4] ldrb r0, [sp, #1] @@ -4560,10 +4560,10 @@ func_ov00_020c7764: ; 0x020c7764 str ip, [sp, #8] str r8, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r8, r0 mov r0, r4 - bl func_ov00_02084120 + bl _ZN10MapManager17GetMapData_Unk_4cEv add r0, r8, r0 str r0, [sp, #0x18] _020c77e0: @@ -4725,7 +4725,7 @@ _020c79b0: _020c7a38: ldr r0, _020c7e9c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084838 + bl _ZN10MapManager18func_ov00_02084838Ev cmp r0, #0 beq _020c7c8c cmp r7, #3 @@ -5111,10 +5111,10 @@ func_ov00_020c7f98: ; 0x020c7f98 str ip, [sp, #4] str r7, [sp, #8] str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r7, r0 mov r0, r4 - bl func_ov00_02084120 + bl _ZN10MapManager17GetMapData_Unk_4cEv add r0, r7, r0 str r0, [sp, #0x14] _020c7ffc: @@ -7694,10 +7694,10 @@ func_ov00_020ca094: ; 0x020ca094 mov r0, r7 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r6, r0 mov r0, r7 - bl func_ov00_02084120 + bl _ZN10MapManager17GetMapData_Unk_4cEv add r0, r6, r0 str r0, [r5, #0x4c] _020ca108: @@ -8585,7 +8585,7 @@ _020cab14: ldr r0, _020cace8 ; =data_027e0e60 add r1, sp, #4 ldr r0, [r0] - bl func_ov00_02084164 + bl _ZN10MapManager18func_ov00_02084164Ev cmp r0, #0 beq _020cab8c ldrb r0, [sp, #4] @@ -10375,7 +10375,7 @@ func_ov00_020cc180: ; 0x020cc180 add r1, sp, #0 str r2, [sp, #8] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x4c] cmp r1, r0 movge r0, #1 @@ -10465,7 +10465,7 @@ func_ov00_020cc27c: ; 0x020cc27c add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -13793,7 +13793,7 @@ func_ov00_020cecd8: ; 0x020cecd8 mov r5, r1 mov r4, r2 mov r7, r3 - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r2, [sp, #0x20] mov r1, r4 mla r3, r2, r0, r7 @@ -13844,7 +13844,7 @@ func_ov00_020ced7c: ; 0x020ced7c ldr r0, [r0] mov r4, r3 mov r6, r1 - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev mla r2, r4, r0, r5 ldr r3, [sp, #0x10] ldr r0, _020cedb8 ; =data_ov00_020eec9c @@ -14212,7 +14212,7 @@ func_ov00_020cf13c: ; 0x020cf13c _020cf168: ldr r0, _020cf1b0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083588 + bl _ZN10MapManager18func_ov00_02083588Ev mov r2, r0 mov r0, r4 mov r1, r5 @@ -15361,7 +15361,7 @@ _020cfd50: bne _020cfdb8 ldr r0, _020cfde0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, pc} @@ -19108,7 +19108,7 @@ func_ov00_020d2d38: ; 0x020d2d38 ldr r0, [r2] mov r4, r1 add r1, r5, #0x20 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev ldr r1, [r0] ldr r1, [r1, #0x78] blx r1 @@ -19166,7 +19166,7 @@ func_ov00_020d2de8: ; 0x020d2de8 ldr r0, [r2] mov r5, r1 add r1, r6, #0x20 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev mov r4, r0 add r0, sp, #0 bl func_02037628 @@ -20213,7 +20213,7 @@ func_ov00_020d3a04: ; 0x020d3a04 ldr r0, [r0] mov r2, #0 ldrh r5, [r4, #0x24] - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _020d3afc ldrb r0, [r4, #0x2a] @@ -21209,7 +21209,7 @@ func_ov00_020d454c: ; 0x020d454c add r1, sp, #0 str r2, [sp, #8] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r6, #0x15c] ldr r1, [r6, #0x48] mov r0, r5, lsl #0xc @@ -21278,7 +21278,7 @@ _020d4660: str r6, [sp, #0x58] str r4, [sp, #0x60] str r3, [sp, #0x5c] - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _020d484c ; =data_027e0e60 ldr r6, [sp, #0x58] ldr r4, [sp, #0x5c] @@ -21289,7 +21289,7 @@ _020d4660: str r6, [sp, #0x2c] str r4, [sp, #0x30] str r3, [sp, #0x34] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [sp, #0x58] ldr r4, [sp, #0x5c] ldr r3, [sp, #0x60] @@ -21301,7 +21301,7 @@ _020d4660: mov r2, #0 str r4, [sp, #0x24] str r3, [sp, #0x28] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p mov r4, r0 ldrb r0, [sp, #0x10] ldrb r1, [sp, #0x11] @@ -21367,7 +21367,7 @@ _020d4790: str r2, [sp, #0xc] mov r2, #0 str r8, [sp, #0x18] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p ldr r1, [sp, #0xc] subs r9, r0, r8 str r0, [sp, #4] @@ -21761,7 +21761,7 @@ _020d4d08: add r1, sp, #0x10 mov r2, #0 str r3, [sp, #0x18] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r4, r0 cmp r7, #0 beq _020d4d68 @@ -21774,7 +21774,7 @@ _020d4d68: ldr r0, _020d4de0 ; =data_027e0e60 ldr r5, [r10, #0x4c] ldr r0, [r0] - bl func_ov00_02084114 + bl _ZN10MapManager17GetMapData_Unk_48Ev cmp r0, r5 addlt r0, r4, #0x33 addlt r0, r0, #0x1300 @@ -22578,10 +22578,10 @@ func_ov00_020d573c: ; 0x020d573c mov r0, r5 mov r2, #0 str r3, [sp, #0xc] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p mov r4, r0 mov r0, r5 - bl func_ov00_02084120 + bl _ZN10MapManager17GetMapData_Unk_4cEv add r0, r4, r0 str r0, [r10, #0x4c] _020d57b0: diff --git a/asm/ov02.inc b/asm/ov02.inc index cc4b577f..6b85cfea 100644 --- a/asm/ov02.inc +++ b/asm/ov02.inc @@ -115,7 +115,7 @@ .extern func_0204f614 .extern func_0204f754 .extern func_ov00_0207b1fc -.extern func_ov00_020847e0 +.extern _ZN10MapManager18func_ov00_020847e0Ev .extern func_ov00_0208de04 .extern func_ov00_0208dec8 .extern func_ov00_0208def0 diff --git a/asm/ov02.s b/asm/ov02.s index 780e6a34..4775a3ab 100644 --- a/asm/ov02.s +++ b/asm/ov02.s @@ -6631,7 +6631,7 @@ _020f430c: bl func_ov00_020a1abc ldr r0, _020f4ce8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020847e0 + bl _ZN10MapManager18func_ov00_020847e0Ev str r0, [r7, #0x2c] ldr r0, _020f4cec ; =data_027e0f8c ldr r1, _020f4cf0 ; =0x020ecdf6 diff --git a/asm/ov03.inc b/asm/ov03.inc index 78b9c3a9..e5bafba2 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -266,24 +266,24 @@ .extern func_ov00_0207c0ac .extern func_ov00_0207c0cc .extern func_ov00_0207c5b0 -.extern func_ov00_02082614 -.extern func_ov00_02082acc -.extern func_ov00_02082d08 -.extern func_ov00_02082d40 -.extern func_ov00_02082d74 -.extern func_ov00_0208306c -.extern func_ov00_0208315c -.extern func_ov00_02083394 -.extern func_ov00_020833a0 -.extern func_ov00_020833ac -.extern func_ov00_020833b8 -.extern func_ov00_02083588 -.extern func_ov00_020835a4 -.extern func_ov00_020835b4 -.extern func_ov00_020835c4 -.extern func_ov00_020835f4 -.extern func_ov00_020836cc -.extern func_ov00_020849c0 +.extern _ZN10MapManager18func_ov00_02082614Eii +.extern _ZN10MapManager18func_ov00_02082accEv +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager18func_ov00_02082d40Ev +.extern _ZN10MapManager18func_ov00_02082d74Ei +.extern _ZN10MapManager18func_ov00_0208306cEv +.extern _ZN10MapManager18func_ov00_0208315cEPiS0_ +.extern _ZN10MapManager13GetCourseMinXEv +.extern _ZN10MapManager13GetCourseMinZEv +.extern _ZN10MapManager13GetCourseMaxXEv +.extern _ZN10MapManager13GetCourseMaxZEv +.extern _ZN10MapManager18func_ov00_02083588Ev +.extern _ZN10MapManager18func_ov00_020835a4Ev +.extern _ZN10MapManager18func_ov00_020835b4Ev +.extern _ZN10MapManager18func_ov00_020835c4Eii +.extern _ZN10MapManager18func_ov00_020835f4Ei +.extern _ZN10MapManager18func_ov00_020836ccEjP4AABBj +.extern _ZN10MapManager18func_ov00_020849c0Ev .extern func_ov00_0208b180 .extern func_ov00_0208b694 .extern func_ov00_0208b698 diff --git a/asm/ov03.s b/asm/ov03.s index 6a5f744a..ef9b6453 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -3625,18 +3625,18 @@ _020f08a4: ldr r0, _020f0aa4 ; =data_027e0e60 ldr r5, [r0] mov r0, r5 - bl func_ov00_02083394 + bl _ZN10MapManager13GetCourseMinXEv mov r11, r0 mov r0, r5 - bl func_ov00_020833a0 + bl _ZN10MapManager13GetCourseMinZEv str r0, [sp] mov r0, r5 - bl func_ov00_020833ac + bl _ZN10MapManager13GetCourseMaxXEv sub r0, r0, r11 add r4, r0, r0, lsr #31 mov r0, r5 mov r5, r4, asr #0x1 - bl func_ov00_020833b8 + bl _ZN10MapManager13GetCourseMaxZEv ldr r1, [sp] sub r0, r0, r1 mov r1, r5, asr #0x6 @@ -3784,19 +3784,19 @@ func_ov03_020f0aa8: ; 0x020f0aa8 mov r1, r5 ldr r0, [r0] mov r2, r4 - bl func_ov00_0208315c + bl _ZN10MapManager18func_ov00_0208315cEPiS0_ add sp, sp, #0x40 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _020f0b18: ldr r0, _020f0b84 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d40 + bl _ZN10MapManager18func_ov00_02082d40Ev ldr r1, _020f0b84 ; =data_027e0e60 mov r2, r0 ldr r0, [r1] add r1, sp, #0 - bl func_ov00_02082614 + bl _ZN10MapManager18func_ov00_02082614Eii ldr r0, _020f0b88 ; =data_027e0d3c add r1, sp, #0 ldr r0, [r0] @@ -3808,7 +3808,7 @@ _020f0b18: mov r1, r5 ldr r0, [r0] mov r2, r4 - bl func_ov00_0208306c + bl _ZN10MapManager18func_ov00_0208306cEv add sp, sp, #0x40 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} @@ -3900,7 +3900,7 @@ _020f0c7c: add r2, sp, #0x24 ldr r0, [r0] mov r3, #8 - bl func_ov00_020836cc + bl _ZN10MapManager18func_ov00_020836ccEjP4AABBj _020f0ca4: cmp r0, #0 ble _020f0d74 @@ -9797,7 +9797,7 @@ func_ov03_020f4778: ; 0x020f4778 ldr r0, [r0] add r1, sp, #4 lsr r2, r2, #0x18 - blx func_ov00_02082614 + blx _ZN10MapManager18func_ov00_02082614Eii ldr r0, _020f47dc ; =data_027e0d38 mov r4, #4 ldr r0, [r0] @@ -9822,7 +9822,7 @@ _020f47b6: lsl r1, r5, #0x18 ldr r0, [r0] lsr r1, r1, #0x18 - blx func_ov00_02082d74 + blx _ZN10MapManager18func_ov00_02082d74Ei add r2, r0, #0 lsl r0, r5, #0x18 asr r0, r0, #0x18 @@ -10424,11 +10424,11 @@ _020f4ce8: ldr r0, [r0] add r1, #0x50 add r2, r4, #0 - blx func_ov00_02082614 + blx _ZN10MapManager18func_ov00_02082614Eii ldr r0, _020f4d18 ; =data_027e0e60 add r1, r4, #0 ldr r0, [r0] - blx func_ov00_02082d74 + blx _ZN10MapManager18func_ov00_02082d74Ei add r5, #0x90 strh r0, [r5] ldr r0, _020f4d1c ; =data_027e077c @@ -10554,7 +10554,7 @@ func_ov03_020f4de0: ; 0x020f4de0 ldr r5, [r0] ldr r0, _020f4e4c ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083588 + blx _ZN10MapManager18func_ov00_02083588Ev ldr r1, _020f4e50 ; =data_ov00_020d878c add r2, r0, #0 ldr r1, [r1] @@ -10615,7 +10615,7 @@ func_ov03_020f4e5c: ; 0x020f4e5c ldr r5, [r0] ldr r0, _020f4f34 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083588 + blx _ZN10MapManager18func_ov00_02083588Ev add r1, r4, #0 add r2, r0, #0 add r0, r5, #0 @@ -10623,7 +10623,7 @@ func_ov03_020f4e5c: ; 0x020f4e5c bl func_ov00_02078e00 ldr r0, _020f4f34 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02082acc + blx _ZN10MapManager18func_ov00_02082accEv add r0, r4, #0 add r0, #0x99 ldrb r0, [r0] @@ -10731,7 +10731,7 @@ func_ov03_020f4f4c: ; 0x020f4f4c ldr r4, [r0] ldr r0, _020f4fac ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083588 + blx _ZN10MapManager18func_ov00_02083588Ev add r1, r5, #0 add r2, r0, #0 add r0, r4, #0 @@ -10785,7 +10785,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8 ldrsb r1, [r5, r1] ldr r0, [r0] add r2, sp, #0 - blx func_ov00_020835c4 + blx _ZN10MapManager18func_ov00_020835c4Eii ldr r0, _020f5000 ; =data_027e0d3c mov r2, #0x93 ldrsb r2, [r5, r2] @@ -10798,7 +10798,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8 ldr r0, _020f4ffc ; =data_027e0e60 ldrsb r1, [r5, r1] ldr r0, [r0] - blx func_ov00_020835f4 + blx _ZN10MapManager18func_ov00_020835f4Ei add r1, r0, #0 add r0, r4, #0 blx func_ov00_020cf414 @@ -12832,7 +12832,7 @@ _020f6578: bne _020f6600 ldr r0, _020f670c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083588 + bl _ZN10MapManager18func_ov00_02083588Ev cmp r0, #0 subgt r0, r0, #1 mov r4, #0 @@ -14234,7 +14234,7 @@ _020f7760: bne _020f7794 ldr r0, _020f7bb4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 beq _020f79e0 _020f7794: @@ -14864,16 +14864,16 @@ func_ov03_020f7f6c: ; 0x020f7f6c beq _020f7fbc ldr r0, _020f7fe4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083588 + bl _ZN10MapManager18func_ov00_02083588Ev cmp r0, #0 beq _020f7fbc ldr r0, _020f7fe4 ; =data_027e0e60 ldr r7, [r0] mov r0, r7 - bl func_ov00_020835a4 + bl _ZN10MapManager18func_ov00_020835a4Ev mov r5, r0 mov r0, r7 - bl func_ov00_020835b4 + bl _ZN10MapManager18func_ov00_020835b4Ev cmp r5, r0 movne r6, #1 _020f7fbc: @@ -14911,7 +14911,7 @@ func_ov03_020f8008: ; 0x020f8008 stmdb sp!, {r3, lr} ldr r0, _020f8020 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083588 + bl _ZN10MapManager18func_ov00_02083588Ev bl func_ov03_020f805c ldmia sp!, {r3, pc} .align 2, 0 @@ -14924,7 +14924,7 @@ func_ov03_020f8024: ; 0x020f8024 stmdb sp!, {r3, lr} ldr r0, _020f803c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020835a4 + bl _ZN10MapManager18func_ov00_020835a4Ev bl func_ov03_020f805c ldmia sp!, {r3, pc} .align 2, 0 @@ -14937,7 +14937,7 @@ func_ov03_020f8040: ; 0x020f8040 stmdb sp!, {r3, lr} ldr r0, _020f8058 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020835b4 + bl _ZN10MapManager18func_ov00_020835b4Ev bl func_ov03_020f805c ldmia sp!, {r3, pc} .align 2, 0 @@ -18003,7 +18003,7 @@ func_ov03_020fa528: ; 0x020fa528 bne _020fa568 ldr r0, _020fa5c8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev add r0, r0, #0xab mov r1, #1 strb r1, [r4, #0x14] diff --git a/asm/ov04.inc b/asm/ov04.inc index 26b00966..3f4f6d8b 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -1,4 +1,27 @@ #pragma once +.extern _ZN10MapManager10DestroyMapEv +.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi +.extern _ZN10MapManager16MapData_vfunc_44Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_9cEv +.extern _ZN10MapManager17GetCourseFilePathEPcS0_ +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager17Get_MapData_Unk2aEv +.extern _ZN10MapManager18func_ov00_020825e4Eii +.extern _ZN10MapManager18func_ov00_02082808Ev +.extern _ZN10MapManager18func_ov00_02082914Ei +.extern _ZN10MapManager18func_ov00_02082b3cEi +.extern _ZN10MapManager18func_ov00_02083588Ev +.extern _ZN10MapManager18func_ov00_020838f8EPi +.extern _ZN10MapManager18func_ov00_02083b84Ev +.extern _ZN10MapManager18func_ov00_02083bacEv +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager18func_ov00_02084838Ev +.extern _ZN10MapManager18func_ov00_02084c6cEi +.extern _ZN10MapManager9CreateMapEiii .extern _ZN11ItemManager12GetItemModelEj .extern _ZN11ItemManager13UnequipPotionEv .extern _ZN11ItemManager21ClearPrevEquippedItemEv @@ -425,29 +448,6 @@ .extern func_ov00_0208046c .extern func_ov00_02080de4 .extern func_ov00_02080edc -.extern func_ov00_0208240c -.extern func_ov00_020825c4 -.extern func_ov00_020825e4 -.extern func_ov00_020826c0 -.extern func_ov00_020827c0 -.extern func_ov00_020827f0 -.extern func_ov00_02082808 -.extern func_ov00_02082914 -.extern func_ov00_02082b3c -.extern func_ov00_0208335c -.extern func_ov00_02083368 -.extern func_ov00_0208344c -.extern func_ov00_02083588 -.extern func_ov00_02083624 -.extern func_ov00_020838f8 -.extern func_ov00_02083b84 -.extern func_ov00_02083bac -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083e34 -.extern func_ov00_02083ee0 -.extern func_ov00_02084838 -.extern func_ov00_02084c6c .extern func_ov00_02086ea0 .extern func_ov00_020872e8 .extern func_ov00_02087d84 diff --git a/asm/ov04.s b/asm/ov04.s index f5ef184e..dc1a28a3 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -923,7 +923,7 @@ _0210122a: str r0, [sp, #4] ldr r0, _02101388 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083588 + blx _ZN10MapManager18func_ov00_02083588Ev str r0, [sp, #8] ldr r0, _02101378 ; =data_027e0d38 ldr r0, [r0] @@ -974,7 +974,7 @@ _02101292: ldr r0, _02101388 ; =data_027e0e60 add r1, r5, #4 ldr r0, [r0] - blx func_ov00_02082b3c + blx _ZN10MapManager18func_ov00_02082b3cEi cmp r6, #0 beq _021012f2 cmp r7, #1 @@ -984,7 +984,7 @@ _02101292: _021012b0: ldr r0, _02101388 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083588 + blx _ZN10MapManager18func_ov00_02083588Ev add r1, r0, #0 ldr r0, [sp, #8] cmp r1, r0 @@ -2207,7 +2207,7 @@ _02101bda: ldr r0, _02101c0c ; =data_027e0e60 add r1, r7, #0 ldr r0, [r0] - blx func_ov00_0208344c + blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p add r0, r5, #0 add r1, r7, #0 add r2, r5, #0 @@ -2743,7 +2743,7 @@ func_ov04_02101f90: ; 0x02101f90 add r4, r0, #0 blx func_ov00_02095fa4 add r0, r4, #0 - blx func_ov00_020827c0 + blx _ZN10MapManager10DestroyMapEv ldr r5, [r4] cmp r5, #0 beq _02101fb6 @@ -3108,13 +3108,13 @@ func_ov04_02102264: ; 0x02102264 ldrh r2, [r7, #0x24] ldrh r3, [r7, #0x26] ldr r1, [r7, #0x20] - blx func_ov00_020826c0 + blx _ZN10MapManager9CreateMapEiii add r0, r5, #0 - blx func_ov00_020827f0 + blx _ZN10MapManager16MapData_vfunc_44Ev add r0, r5, #0 add r1, r7, #0 add r2, sp, #0x98 - blx func_ov00_020825c4 + blx _ZN10MapManager17GetCourseFilePathEPcS0_ mov r0, #0xf mvn r0, r0 str r0, [sp] @@ -3190,7 +3190,7 @@ _02102330: str r0, [sp, #8] ldr r1, [sp, #8] add r0, r5, #0 - blx func_ov00_020825e4 + blx _ZN10MapManager18func_ov00_020825e4Eii mov r0, #0xf mvn r0, r0 str r0, [sp] @@ -3308,7 +3308,7 @@ _02102382: cmp r0, #3 bne _02102478 add r0, r5, #0 - blx func_ov00_0208240c + blx _ZN10MapManager16MapData_vfunc_9cEv ldr r0, _021024bc ; =data_027e0f64 mov r2, #0 ldr r0, [r0] @@ -3377,7 +3377,7 @@ func_ov04_021024c4: ; 0x021024c4 blx r7 ldrb r1, [r4, #0x13] add r0, r5, #0 - blx func_ov00_02082914 + blx _ZN10MapManager18func_ov00_02082914Ei ldr r0, _021025b8 ; =data_027e0f6c mov r1, #0 ldr r0, [r0] @@ -3390,7 +3390,7 @@ func_ov04_021024c4: ; 0x021024c4 ldrb r2, [r4, #0x13] add r0, r5, #0 add r1, sp, #0x10 - blx func_ov00_02083624 + blx _ZN10MapManager14GetEntrancePosEP5Vec3pi ldr r0, _021025bc ; =data_027e0f90 ldrb r1, [r4, #0x13] ldr r0, [r0] @@ -3424,7 +3424,7 @@ func_ov04_021024c4: ; 0x021024c4 blx r1 add r0, r5, #0 add r1, r6, #0 - blx func_ov00_02082808 + blx _ZN10MapManager18func_ov00_02082808Ev ldr r0, [r4, #8] cmp r0, #1 bne _02102578 @@ -7458,7 +7458,7 @@ _021045bc: ldr r0, _021046bc ; =data_027e0e60 add r1, sp, #0x30 ldr r0, [r0] - blx func_ov00_0208344c + blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p mov r1, #0 ldr r0, [sp, #0x30] str r1, [sp, #0x1c] @@ -7528,7 +7528,7 @@ _02104682: ldr r0, _021046bc ; =data_027e0e60 add r1, sp, #0x18 ldr r0, [r0] - blx func_ov00_020838f8 + blx _ZN10MapManager18func_ov00_020838f8EPi add r2, sp, #0x54 strb r0, [r2, #0xf] ldr r0, [r6, #0x40] @@ -9866,7 +9866,7 @@ func_ov04_021058cc: ; 0x021058cc beq _021058f6 ldr r0, _02105948 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02084838 + blx _ZN10MapManager18func_ov00_02084838Ev cmp r0, #0 beq _021058f4 mov r6, #0x40 @@ -16582,7 +16582,7 @@ _02108c18: ldrh r1, [r4, #0x14] ldr r0, [r0] lsr r1, r1, #4 - blx func_ov00_02083b84 + blx _ZN10MapManager18func_ov00_02083b84Ev add r7, r0, #0 ldrh r0, [r4, #0x14] lsr r2, r0, #0x1f @@ -16605,7 +16605,7 @@ _02108c18: ldr r0, _02108d20 ; =data_027e0e60 lsr r1, r7, #4 ldr r0, [r0] - blx func_ov00_02083bac + blx _ZN10MapManager18func_ov00_02083bacEv str r0, [sp, #0x14] lsr r2, r7, #0x1f lsl r1, r7, #0x1c @@ -16796,11 +16796,11 @@ func_ov04_02108de0: ; 0x02108de0 add r7, r1, #0 ldr r0, [r0] str r2, [sp, #4] - blx func_ov00_0208335c + blx _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0xc] ldr r0, _02109090 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083368 + blx _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp, #8] ldrh r0, [r7, #8] mov r5, #0 @@ -17211,11 +17211,11 @@ func_ov04_021090c8: ; 0x021090c8 str r1, [sp, #4] ldr r0, [r0] str r2, [sp, #8] - blx func_ov00_0208335c + blx _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0x18] ldr r0, _021092d0 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083368 + blx _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp, #0x14] ldr r0, [sp, #4] mov r4, #0 @@ -17275,7 +17275,7 @@ _0210914a: ldr r0, [r0] lsl r1, r1, #0x10 lsr r1, r1, #0x10 - blx func_ov00_02084c6c + blx _ZN10MapManager18func_ov00_02084c6cEi cmp r0, #0 bne _0210916c add r0, sp, #0x5c @@ -17292,7 +17292,7 @@ _0210916e: ldr r0, _021092d0 ; =data_027e0e60 add r1, r7, #0 ldr r0, [r0] - blx func_ov00_02083c24 + blx _ZN10MapManager18func_ov00_02083c24Ei add r7, r0, #0 ldr r0, [sp, #0x10] mov r1, #1 @@ -17304,7 +17304,7 @@ _0210916e: ldr r0, _021092d0 ; =data_027e0e60 add r1, r6, #0 ldr r0, [r0] - blx func_ov00_02083c50 + blx _ZN10MapManager18func_ov00_02083c50Ei add r6, r0, #0 ldr r0, [sp, #0xc] mov r1, #1 @@ -17320,7 +17320,7 @@ _0210916e: add r1, sp, #0x7c ldr r0, [r0] mov r2, #0 - blx func_ov00_02083ee0 + blx _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [sp, #0x5c] ldr r1, _021092d4 ; =0x414e4353 str r0, [sp, #0x80] @@ -17766,7 +17766,7 @@ _021094b2: ldr r0, _021095b0 ; =data_027e0e60 add r1, r7, #0 ldr r0, [r0] - blx func_ov00_02083c50 + blx _ZN10MapManager18func_ov00_02083c50Ei str r0, [sp, #0x10] lsr r2, r5, #0x1f lsl r1, r5, #0x1c @@ -17785,12 +17785,12 @@ _021094b2: ldr r0, _021095b0 ; =data_027e0e60 ldr r1, [sp, #0xc] ldr r0, [r0] - blx func_ov00_02083e34 + blx _ZN10MapManager18func_ov00_02083e34Ecci add r5, r0, #0 ldr r0, _021095b0 ; =data_027e0e60 ldr r1, [sp, #0xc] ldr r0, [r0] - blx func_ov00_02083c24 + blx _ZN10MapManager18func_ov00_02083c24Ei add r7, r0, #0 lsr r2, r6, #0x1f lsl r1, r6, #0x1c @@ -17944,7 +17944,7 @@ _021095ec: add r1, r6, r1 ldr r0, [r0] asr r1, r1, #4 - blx func_ov00_02083bac + blx _ZN10MapManager18func_ov00_02083bacEv str r0, [sp, #0x10] lsr r2, r6, #0x1f lsl r1, r6, #0x1c @@ -17984,7 +17984,7 @@ _021095ec: ldr r0, [r0] add r2, r1, r2 asr r1, r2, #4 - blx func_ov00_02083b84 + blx _ZN10MapManager18func_ov00_02083b84Ev add r7, r0, #0 ldr r0, [sp, #8] ldr r1, [sp, #8] @@ -24828,7 +24828,7 @@ func_ov04_0210cb38: ; 0x0210cb38 ldr r0, _0210cc0c ; =data_027e0e60 add r1, sp, #0x74 ldr r0, [r0] - blx func_ov00_0208344c + blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p mov r0, #0 str r0, [sp] ldr r0, _0210cc10 ; =data_027e0fe8 @@ -24860,7 +24860,7 @@ _0210cb7a: ldr r0, _0210cc0c ; =data_027e0e60 add r1, sp, #0x3c ldr r0, [r0] - blx func_ov00_0208344c + blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p mov r0, #0 str r0, [sp] ldr r0, _0210cc10 ; =data_027e0fe8 @@ -24889,7 +24889,7 @@ _0210cbc2: ldr r0, _0210cc0c ; =data_027e0e60 add r1, sp, #4 ldr r0, [r0] - blx func_ov00_0208344c + blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p mov r0, #0 str r0, [sp] ldr r0, _0210cc10 ; =data_027e0fe8 diff --git a/asm/ov05.inc b/asm/ov05.inc index ec94b899..cb564927 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -335,29 +335,29 @@ .extern func_ov00_0207dea0 .extern func_ov00_02080de8 .extern func_ov00_02081f4c -.extern func_ov00_02082424 -.extern func_ov00_020828e0 -.extern func_ov00_02082d08 -.extern func_ov00_0208344c -.extern func_ov00_02083664 -.extern func_ov00_020839d4 -.extern func_ov00_020839f8 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083c7c -.extern func_ov00_02083e34 -.extern func_ov00_02083ee0 -.extern func_ov00_02083f44 -.extern func_ov00_02083fb0 -.extern func_ov00_020840a0 -.extern func_ov00_020840c4 -.extern func_ov00_0208430c -.extern func_ov00_02084318 -.extern func_ov00_02084740 -.extern func_ov00_020848b8 -.extern func_ov00_0208527c -.extern func_ov00_0208583c +.extern _ZN10MapManager18func_ov00_02082424Ev +.extern _ZN10MapManager16MapData_vfunc_84Ev +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18func_ov00_02083664EP5Vec3pi +.extern _ZN10MapManager18func_ov00_020839d4Ev +.extern _ZN10MapManager18func_ov00_020839f8Ev +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_020840a0Ecci +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager17GetMapData_Unk_0aEv +.extern _ZN10MapManager17GetMapData_Unk_0bEv +.extern _ZN10MapManager18func_ov00_02084740Ev +.extern _ZN10MapManager18func_ov00_020848b8Ev +.extern _ZN10MapManager18func_ov00_0208527cEv +.extern _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi .extern func_ov00_0208726c .extern func_ov00_020872e8 .extern func_ov00_0208766c diff --git a/asm/ov05.s b/asm/ov05.s index 9223e162..41a25650 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -606,7 +606,7 @@ _02101280: bne _02101338 ldr r0, _02101420 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020828e0 + bl _ZN10MapManager16MapData_vfunc_84Ev ldr r3, [r8] ldr r1, [r10, #0x18] ldrb r7, [r3, #0x14] @@ -1342,12 +1342,12 @@ _02101c04: bne _02101c90 ldr r0, _021021dc ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #2 beq _02101c44 ldr r0, _021021dc ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #3 bne _02101c90 _02101c44: @@ -1563,7 +1563,7 @@ _02101f18: ldmneia sp!, {r4, r5, r6, pc} ldr r0, _021021dc ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084740 + bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 ldr r2, [r6, #4] ldr r0, _021021ec ; =data_ov00_020eec68 @@ -2399,7 +2399,7 @@ func_ov05_02102b0c: ; 0x02102b0c mov r2, r7 mov r6, r3 str r5, [r4] - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci cmp r0, #0x30 bgt _02102b9c cmp r0, #0x28 @@ -2588,11 +2588,11 @@ _02102d6c: cmp r0, #0 bne _02102dd8 ldr r0, [sp, #0x44] - bl func_ov00_0208430c + bl _ZN10MapManager17GetMapData_Unk_0aEv cmp r0, #0 bne _02102dd8 ldr r0, [sp, #0x44] - bl func_ov00_02084318 + bl _ZN10MapManager17GetMapData_Unk_0bEv cmp r0, #0 beq _02102de0 _02102dd8: @@ -2608,7 +2608,7 @@ _02102de0: streq r0, [sp, #0x30] beq _02102e0c ldr r0, [sp, #0x44] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev str r0, [sp, #0x30] _02102e0c: ldr r0, [sp, #0x28] @@ -2641,7 +2641,7 @@ _02102e24: ldr r1, [sp, #0x44] add r0, sp, #0x74 add r2, sp, #0x78 - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i add r0, sp, #0x74 bl func_ov05_02103b2c cmp r0, #2 @@ -2659,7 +2659,7 @@ _02102e24: ldr r0, [sp, #0x44] add r1, sp, #0x84 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r6, #0x14] add r0, sp, #0x84 bl func_0202bac0 @@ -2697,11 +2697,11 @@ _02102ee8: bne _0210314c ldr r1, [r7] ldr r0, [sp, #0x44] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev mov r9, r0 ldr r0, [sp, #0x44] ldr r1, [r7, #8] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev str r0, [sp, #0x34] ldr r1, [sp, #0x34] mov r0, r9 @@ -3331,7 +3331,7 @@ func_ov05_0210373c: ; 0x0210373c mov r1, r6 mov r8, r2 mov r11, r3 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev ldr r1, [sp, #0x38] str r0, [sp] cmp r1, r0 @@ -3375,7 +3375,7 @@ func_ov05_0210373c: ; 0x0210373c str r3, [sp, #4] str r7, [sp, #8] str r6, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r8, r0 str r0, [r5, #0x14] mov r2, #1 @@ -3394,7 +3394,7 @@ _02103838: ldr r3, [r7, #8] ldr r2, [sp] str r3, [r5, #0x18] - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r5, #0x14] mov r2, #1 _02103878: @@ -3439,7 +3439,7 @@ func_ov05_021038c8: ; 0x021038c8 mov r1, r6 mov r8, r2 mov r5, r3 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev mov r11, r0 cmp r5, r11 beq _02103a90 @@ -3482,7 +3482,7 @@ func_ov05_021038c8: ; 0x021038c8 str r6, [sp, #0xc] str r3, [sp, #0x10] str r4, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r8, r0 str r0, [r5, #0x14] mov r2, #1 @@ -3503,7 +3503,7 @@ _021039c0: str r6, [sp] str r3, [sp, #4] str r4, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev sub r0, r0, r8 str r0, [r5, #0x14] mov r2, #1 @@ -3523,7 +3523,7 @@ _02103a10: ldr r3, [r7, #8] mov r1, r11 str r3, [r5, #0x18] - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r5, #0x14] mov r2, #1 _02103a54: @@ -6074,7 +6074,7 @@ _021059f0: mov r1, r3 ldr r0, [r0] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, _02105c08 ; =data_ov05_021124f0 str r0, [r6, #0x3c] ldr r1, [r2, #0x20] @@ -7378,7 +7378,7 @@ func_ov05_02106bbc: ; 0x02106bbc strb r2, [r1, #1] ldr r2, [r1] mov r1, r4 - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _02106c64: @@ -7713,7 +7713,7 @@ _0210707c: str r4, [sp, #0x1c] str r6, [sp, #0x24] str r5, [sp, #0x20] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p mov r8, r0 mov r0, r7 bl _ZN13LinkStateBase12GetPlayerPosEv @@ -7728,7 +7728,7 @@ _0210707c: str r4, [sp, #0x10] str r5, [sp, #0x14] str r6, [sp, #0x18] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r8, r0 _02107148: mov r0, r7 @@ -8389,7 +8389,7 @@ _02107a18: mov r2, r0 add r0, sp, #2 mov r1, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r2, #0 ldrb r1, [sp, #2] ldrb r0, [sp, #3] @@ -10030,7 +10030,7 @@ _02109018: _02109060: ldr r0, _02109294 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084740 + bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 ldr r0, _0210928c ; =data_ov00_020eec68 mov r2, #0 @@ -10970,7 +10970,7 @@ _02109d0c: add r1, r7, #0x40 ldr r0, [r0] mov r2, #1 - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p str r0, [r7, #0x44] mov r0, #0xd str r0, [r7, #4] @@ -11805,12 +11805,12 @@ _0210a830: add r0, sp, #0x14 ldr r1, [r1] add r2, sp, #0x2c - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _0210aad8 ; =data_027e0e60 add r1, sp, #0x14 ldr r0, [r0] mov r5, #0 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _0210a904 ldrsb r0, [r0, #0x12] @@ -11836,7 +11836,7 @@ _0210a830: ldr r2, [r0] add r1, sp, #0x2c mov r0, r7 - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi cmp r0, #0 blt _0210a904 mov r0, r4 @@ -11871,7 +11871,7 @@ _0210a904: add r1, sp, #0x2c ldr r0, [r0] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x30] cmp r1, r0 movlt r5, #0 @@ -12408,7 +12408,7 @@ _0210ae98: str r7, [sp, #0x10] str r6, [sp, #0x14] str r3, [sp, #0x18] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #0xc] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -12823,10 +12823,10 @@ _0210b684: ldr r4, [r1] add r2, r5, #0x24 mov r1, r4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0x12 mov r0, r4 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 beq _0210b6d0 ldr r1, [r0] @@ -12871,10 +12871,10 @@ _0210b73c: add r0, sp, #0x10 mov r1, r4 add r2, r5, #0x24 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0x10 mov r0, r4 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _0210b788 ldr r1, [r0] @@ -12917,7 +12917,7 @@ _0210b7dc: mov r4, r0 ldrb r1, [r5, #0x20] mov r0, r6 - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [r4] ldr r1, _0210b968 ; =data_027e0e60 mov r0, r5 @@ -12926,7 +12926,7 @@ _0210b7dc: mov r4, r0 ldrb r1, [r5, #0x21] mov r0, r6 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei str r0, [r4, #8] mov r0, r5 bl _ZN13LinkStateBase12GetPlayerVelEv @@ -13072,7 +13072,7 @@ func_ov05_0210b9c4: ; 0x0210b9c4 add r1, sp, #0 mov r2, #3 str r3, [sp, #8] - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi mov r1, r0 mov r0, r5 bl _ZN12ActorManager13FindActorByIdEj @@ -13144,7 +13144,7 @@ func_ov05_0210babc: ; 0x0210babc add r1, sp, #0 mov r2, #5 str r3, [sp, #8] - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi add sp, sp, #0xc ldmia sp!, {r3, r4, pc} _0210bb10: @@ -13204,10 +13204,10 @@ func_ov05_0210bb98: ; 0x0210bb98 ldr r4, [r1] add r2, r5, #0x24 mov r1, r4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r4 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 beq _0210bc04 ldr r0, _0210bd5c ; =gAdventureFlags @@ -13339,10 +13339,10 @@ func_ov05_0210bd70: ; 0x0210bd70 ldr r4, [r1] add r2, r5, #0x24 mov r1, r4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r4 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 beq _0210bdd8 ldr r1, [r0] @@ -13671,7 +13671,7 @@ func_ov05_0210c20c: ; 0x0210c20c strb r1, [r3, #1] ldr r2, [r3] add r1, sp, #0x6c - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r0, r7 bl _ZN13LinkStateBase12GetPlayerPosEv mov r1, r0 @@ -13756,7 +13756,7 @@ _0210c398: add r1, r5, #0x18 ldr r0, [r0] add r2, r7, #0x24 - bl func_ov00_0208527c + bl _ZN10MapManager18func_ov00_0208527cEv mov r6, r0 add r1, sp, #0x54 mov r0, r7 @@ -13850,7 +13850,7 @@ _0210c4d8: add r1, sp, #0x3c mov r2, #0xe str r3, [sp, #0x44] - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi add sp, sp, #0x78 mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -13872,7 +13872,7 @@ _0210c540: add r1, sp, #0x30 mov r2, #4 str r3, [sp, #0x38] - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi mov r4, r0 bl func_ov05_0210c980 mov r1, r4 @@ -13962,13 +13962,13 @@ _0210c680: add r1, sp, #0x24 mov r2, #7 str r3, [sp, #0x2c] - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi str r0, [r7, #0x10] ldr r1, _0210c950 ; =data_027e0e60 add r0, sp, #6 ldr r1, [r1] add r2, r7, #0x24 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r3, [sp, #6] ldrb r2, [sp, #7] ldr r0, _0210c968 ; =0x00020007 @@ -14058,7 +14058,7 @@ _0210c7cc: add r1, sp, #0x18 mov r2, #0xb str r3, [sp, #0x20] - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi _0210c818: add sp, sp, #0x78 mov r0, #1 @@ -14079,7 +14079,7 @@ _0210c824: ldr r0, [r1] add r1, sp, #0xc mov r2, #0xc - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi mov r1, r0 mov r0, r4 ldr r4, [r0] @@ -14200,10 +14200,10 @@ _0210c9e8: ldr r6, [r1] add r2, r4, #0x24 mov r1, r6 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r6 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r6, r0 addeq sp, sp, #0x10 ldmeqia sp!, {r4, r5, r6, pc} @@ -16376,7 +16376,7 @@ _0210e6d8: ldr r2, [r0] ldr r0, [r1] add r1, r2, #0xc4 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev mov r4, r0 _0210e72c: ldr r1, _0210e884 ; =data_027e0fd4 @@ -16508,7 +16508,7 @@ func_ov05_0210e8b4: ; 0x0210e8b4 ldrh r2, [r5, #0xe] ldr r0, [r0] add r1, sp, #4 - bl func_ov00_02083664 + bl _ZN10MapManager18func_ov00_02083664EP5Vec3pi ldr r2, [sp, #0xc] ldr r1, [sp, #8] ldr r0, [sp, #4] @@ -18865,7 +18865,7 @@ func_ov05_021109c0: ; 0x021109c0 ldr r0, [r2] add r1, r1, #0x1c mov r4, #0x13 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev mov r5, r0 mov r0, r6 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev @@ -19406,7 +19406,7 @@ _02111100: add r1, sp, #0xc mov r0, r5 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #4] mov r5, #0x4000 sub r4, r1, r0 @@ -20209,7 +20209,7 @@ func_ov05_02111c00: ; 0x02111c00 ldr r0, _02111c68 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r0, [r5, #0x140] add r1, sp, #0 ldr r2, [r0] @@ -20448,7 +20448,7 @@ func_ov05_02111f40: ; 0x02111f40 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _02111fb0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020848b8 + bl _ZN10MapManager18func_ov00_020848b8Ev cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} bl func_ov15_0215b780 diff --git a/asm/ov09.inc b/asm/ov09.inc index 94a81008..a19e48af 100644 --- a/asm/ov09.inc +++ b/asm/ov09.inc @@ -230,14 +230,14 @@ .extern func_ov00_0207c1f8 .extern func_ov00_0207c358 .extern func_ov00_0207c444 -.extern func_ov00_020820ec -.extern func_ov00_020820fc -.extern func_ov00_0208210c -.extern func_ov00_02082614 -.extern func_ov00_02082908 -.extern func_ov00_02082adc -.extern func_ov00_02083ee0 -.extern func_ov00_020848b8 +.extern _ZN10MapManager18func_ov00_020820ecEPi +.extern _ZN10MapManager18func_ov00_020820fcEiii +.extern _ZN10MapManager18func_ov00_0208210cEii +.extern _ZN10MapManager18func_ov00_02082614Eii +.extern _ZN10MapManager20GetCourseData_Unk_b0Ev +.extern _ZN10MapManager18func_ov00_02082adcEv +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_020848b8Ev .extern func_ov00_02087d34 .extern func_ov00_020a5e9c .extern func_ov00_020a61ac diff --git a/asm/ov09.s b/asm/ov09.s index 5bbd7f6a..b9675189 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -3218,7 +3218,7 @@ func_ov09_02114554: ; 0x02114554 blx func_020078f4 add r0, r7, #0 add r1, sp, #0x14 - blx func_ov00_020820ec + blx _ZN10MapManager18func_ov00_020820ecEPi ldr r0, _021146b0 ; =data_027e0d38 ldr r0, [r0] add r0, #0xc @@ -3242,7 +3242,7 @@ func_ov09_02114554: ; 0x02114554 str r0, [sp, #8] _021145b6: add r0, r7, #0 - blx func_ov00_02082908 + blx _ZN10MapManager20GetCourseData_Unk_b0Ev add r4, sp, #0x1c str r0, [sp, #0xc] mov r0, #0 @@ -3271,7 +3271,7 @@ _021145f2: add r1, r4, #0 add r2, sp, #0x10 add r3, sp, #0x1c - blx func_ov00_020820fc + blx _ZN10MapManager18func_ov00_020820fcEiii add r0, sp, #0x10 ldrh r1, [r0] cmp r1, #0xcf @@ -3323,7 +3323,7 @@ _02114634: ldr r1, [sp, #4] add r0, r7, #0 add r2, r4, #0 - blx func_ov00_0208210c + blx _ZN10MapManager18func_ov00_0208210cEii mov r0, #0x71 lsl r0, r0, #2 str r0, [sp] @@ -3347,7 +3347,7 @@ _02114688: bl func_ov09_02114520 ldr r0, _021146ac ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02082adc + blx _ZN10MapManager18func_ov00_02082adcEv add sp, #0x1ec pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -16512,7 +16512,7 @@ func_ov09_0211c3d8: ; 0x0211c3d8 add r4, r0, #0 ldr r0, _0211c418 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_020848b8 + blx _ZN10MapManager18func_ov00_020848b8Ev strb r0, [r4, #0xa] ldr r5, [r4, #4] cmp r5, #0 @@ -18385,7 +18385,7 @@ func_ov09_0211d180: ; 0x0211d180 mov r2, r6 str r3, [sp, #0x94] str r9, [sp, #0x98] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x94] cmp r1, r0 movle r6, #1 @@ -18858,7 +18858,7 @@ _0211d86e: add r0, r4, #0 add r1, r7, #0 add r2, r5, #0 - blx func_ov00_02082614 + blx _ZN10MapManager18func_ov00_02082614Eii add r0, r7, #0 add r1, r6, #0 blx strcmp diff --git a/asm/ov12.inc b/asm/ov12.inc index f96d3554..4131efbf 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -1,6 +1,24 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager17GetMapData_Unk_48Ev +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager17Get_MapData_Unk2aEv +.extern _ZN10MapManager18Get_MapData_Unk_d0Ev +.extern _ZN10MapManager18Get_MapData_Unk_d8Ev +.extern _ZN10MapManager18func_ov00_02083664EP5Vec3pi +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_020839b4Ei +.extern _ZN10MapManager18func_ov00_020839c4Ei +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_020840a0Ecci .extern _ZN10PlayerBase18func_ov00_020a7c00Ei .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN10PlayerBase9AddHealthEs @@ -357,24 +375,6 @@ .extern func_ov00_0207f588 .extern func_ov00_020807d4 .extern func_ov00_02081f4c -.extern func_ov00_0208335c -.extern func_ov00_02083368 -.extern func_ov00_020833f4 -.extern func_ov00_02083400 -.extern func_ov00_02083664 -.extern func_ov00_02083770 -.extern func_ov00_020838e8 -.extern func_ov00_020839b4 -.extern func_ov00_020839c4 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083e34 -.extern func_ov00_02083ee0 -.extern func_ov00_02083ef8 -.extern func_ov00_02083fb0 -.extern func_ov00_020840a0 -.extern func_ov00_02084114 .extern func_ov00_020872e8 .extern func_ov00_02087d84 .extern func_ov00_0208819c diff --git a/asm/ov12.s b/asm/ov12.s index b564b7f2..36039620 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -935,7 +935,7 @@ func_ov12_02113720: ; 0x02113720 mov r4, r0 ldr r0, [r2] mov r5, r1 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldrb r1, [r4, #1] sub r0, r5, r0 mov r3, r0, asr #0x6 @@ -969,7 +969,7 @@ func_ov12_02113790: ; 0x02113790 mov r4, r0 ldr r0, [r2] mov r5, r1 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldrb r1, [r4, #3] sub r0, r5, r0 mov r2, r0, asr #0x6 @@ -1008,7 +1008,7 @@ func_ov12_021137e8: ; 0x021137e8 orrne r4, r4, #0x3fc0000 ldr r0, [r0] orrne r4, r4, #0xfc000000 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev add r0, r4, r0 ldmia sp!, {r4, pc} .align 2, 0 @@ -1031,7 +1031,7 @@ func_ov12_02113838: ; 0x02113838 orrne r4, r4, #0x3fc0000 ldr r0, [r0] orrne r4, r4, #0xfc000000 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev add r0, r4, r0 ldmia sp!, {r4, pc} .align 2, 0 @@ -6740,13 +6740,13 @@ func_ov12_02118428: ; 0x02118428 add r1, sp, #0xbc ldr r0, [r0] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _02118808 ; =data_027e0e60 str r0, [sp, #0x9c] ldr r0, [r1] add r1, sp, #0xbc mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0xa8] add r0, sp, #0x8c bl func_01ff9cec @@ -6884,7 +6884,7 @@ _02118740: ldr r0, [r11] mov r1, r7 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x68] str r0, [sp, #0x6c] str r0, [sp, #0xa8] @@ -8230,12 +8230,12 @@ func_ov12_021196d4: ; 0x021196d4 add r0, sp, #0 ldr r1, [r1] mov r2, r4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _0211977c ; =data_027e0e60 ldrb r1, [sp] ldrb r2, [sp, #1] ldr r0, [r0] - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci cmp r0, #0x18 bgt _0211973c bge _02119754 @@ -8365,7 +8365,7 @@ func_ov12_0211986c: ; 0x0211986c mov r5, r0 ldr r0, [r2] mov r4, r1 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r2, [r4] ldrb r1, [r5, #0x118] sub r0, r2, r0 @@ -8397,7 +8397,7 @@ func_ov12_0211986c: ; 0x0211986c orr r1, r2, r1, asr #3 strb r1, [r5, #0x11a] ldr r0, [r0] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldr r2, [r4, #8] ldrb r1, [r5, #0x11a] sub r0, r2, r0 @@ -8442,7 +8442,7 @@ func_ov12_02119968: ; 0x02119968 orrne r6, r6, #0x3fc0000 ldr r0, [r0] orrne r6, r6, #0xfc000000 - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev add r0, r6, r0 str r0, [r4] ldrb r1, [r5, #0x119] @@ -8472,7 +8472,7 @@ func_ov12_02119968: ; 0x02119968 orrne r5, r5, #0x3fc0000 ldr r0, [r0] orrne r5, r5, #0xfc000000 - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev add r0, r5, r0 str r0, [r4, #8] ldmia sp!, {r4, r5, r6, pc} @@ -9492,7 +9492,7 @@ _0211a834: add r1, sp, #8 ldr r0, [r0] mov r2, r4 - bl func_ov00_02083664 + bl _ZN10MapManager18func_ov00_02083664EP5Vec3pi cmp r0, #0 beq _0211a884 mov r0, #1 @@ -10865,7 +10865,7 @@ func_ov12_0211b9c4: ; 0x0211b9c4 str r2, [sp, #8] add r1, sp, #0 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r6, r8] add r2, r0, #0x148 cmp r1, r2 @@ -27793,11 +27793,11 @@ func_ov12_021296a4: ; 0x021296a4 bl func_ov12_0212a258 ldr r0, _0212975c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r1, _0212975c ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldrb r1, [r5, #0x11b] cmp r1, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -28547,7 +28547,7 @@ func_ov12_0212a104: ; 0x0212a104 bge _0212a15c ldr r0, _0212a164 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084114 + bl _ZN10MapManager17GetMapData_Unk_48Ev ldr r1, [r5, #0x4c] cmp r1, r0 ble _0212a15c @@ -28573,12 +28573,12 @@ func_ov12_0212a168: ; 0x0212a168 ldr r1, [r2] add r0, sp, #0 add r2, r5, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _0212a230 ; =data_027e0e60 ldrb r1, [sp] ldrb r2, [sp, #1] ldr r0, [r0] - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci cmp r0, #0x18 bgt _0212a1e0 cmp r0, #0x17 @@ -28872,11 +28872,11 @@ _0212a520: bl func_ov12_0212a234 ldr r0, _0212a618 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r1, _0212a618 ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldrb r1, [r5, #0x24c] ldr ip, [sp] bic r3, r1, #0xe0 @@ -29016,7 +29016,7 @@ _0212a740: add r1, sp, #0x14 str r2, [sp, #0x1c] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r6, #0x22c] mvn r4, #0 bl func_ov00_02079e3c @@ -29029,12 +29029,12 @@ _0212a740: add r0, sp, #0 ldr r1, [r1] add r2, r6, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _0212a9ec ; =data_027e0e60 ldrb r1, [sp] ldrb r2, [sp, #1] ldr r0, [r0] - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci mov r1, r4 str r1, [r6, #0x238] mov r1, #0 @@ -29082,7 +29082,7 @@ _0212a830: add r0, sp, #4 add r2, sp, #8 str r3, [sp, #0x10] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #4] mov r0, r0, lsr #0x9 and r0, r0, #3 @@ -29259,13 +29259,13 @@ func_ov12_0212aa8c: ; 0x0212aa8c ldr r0, [r1] mov r1, #0 str r1, [sp, #8] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev mov r1, #3 mov r7, r0 bl func_01ff9b4c ldr r0, _0212ad00 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp] mov r0, #0 ldr r4, _0212ad04 ; =data_027e0764 @@ -29324,7 +29324,7 @@ _0212ab90: mov r1, r8 ldr r0, [r0] mov r2, r9 - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci mov r5, r0 ldr r0, _0212ad00 ; =data_027e0e60 ldr r2, _0212ad08 ; =func_ov00_020b1940 @@ -29337,7 +29337,7 @@ _0212ab90: mov r0, r6 mov r1, r8 mov r2, r9 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci ldr r1, [r10, #0x18] cmp r0, r1 bne _0212acec @@ -29348,13 +29348,13 @@ _0212ab90: beq _0212acec mov r1, r8 mov r0, r6 - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [sp, #0x24] ldr r2, [r10, #0x4c] mov r1, r9 mov r0, r6 str r2, [sp, #0x28] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei str r0, [sp, #0x2c] mov r0, r10 add r1, sp, #0x24 @@ -29370,7 +29370,7 @@ _0212ab90: mov r0, r6 add r1, sp, #0x18 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r0, [sp, #0x28] ldr r1, [sp, #0x24] str r0, [sp, #0x10] @@ -29381,7 +29381,7 @@ _0212ab90: str r1, [sp, #0x14] mov r1, #0xe add r2, sp, #0xc - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -29717,12 +29717,12 @@ _0212b0bc: add r0, sp, #0 ldr r1, [r1] add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _0212b13c ; =data_027e0e60 ldrb r1, [sp] ldrb r2, [sp, #1] ldr r0, [r0] - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci cmp r0, #0x18 cmpne r0, #0x2c cmpne r0, #0x2d @@ -30531,7 +30531,7 @@ func_ov12_0212ba84: ; 0x0212ba84 ldrb r1, [r6, #1] ldr r0, [r2] mov r5, r3 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r4, r0 mov r0, r8 ldr r2, [r0] @@ -30542,7 +30542,7 @@ func_ov12_0212ba84: ; 0x0212ba84 mov r9, r0 ldr r0, [r1] ldrb r1, [r6] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [sp, #0x10] str r9, [sp, #0x14] str r4, [sp, #0x18] @@ -33924,11 +33924,11 @@ func_ov12_0212e3e8: ; 0x0212e3e8 _0212e42c: ldr r0, _0212e4cc ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r1, _0212e4cc ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldrb r2, [r5, #0x218] ldrb r1, [r5, #0x219] ldrb ip, [r5, #0x21a] @@ -34460,11 +34460,11 @@ _0212eb6c: orr r1, r2, r1, lsr #26 strb r1, [r5, #0x218] ldr r0, [r0] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r1, _0212eca8 ; =data_027e0e60 mov r6, r0 ldr r0, [r1] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldr r2, [r5, #0x48] ldrb r1, [r5, #0x218] sub r2, r2, r6 @@ -34542,7 +34542,7 @@ func_ov12_0212ecb0: ; 0x0212ecb0 ldr r1, [r1] add r0, sp, #0 add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r1, [r4, #0x48] ldr r0, _0212ed4c ; =data_027e0e60 str r1, [sp, #8] @@ -34553,7 +34553,7 @@ func_ov12_0212ecb0: ; 0x0212ecb0 add r0, sp, #4 add r2, sp, #8 str r3, [sp, #0x10] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldrb r1, [sp] ldrb r0, [sp, #1] sub r2, sp, #4 @@ -35602,7 +35602,7 @@ _0212fa9c: ldr r0, _0212fb04 ; =data_027e0e60 add r1, r6, #0x74 ldr r0, [r0] - bl func_ov00_020839c4 + bl _ZN10MapManager18func_ov00_020839c4Ei mov r0, r6 bl func_ov12_021306ec add r0, r6, #0xd8 @@ -35651,7 +35651,7 @@ _0212fb40: ldr r0, _0212fba0 ; =data_027e0e60 add r1, r6, #0x74 ldr r0, [r0] - bl func_ov00_020839c4 + bl _ZN10MapManager18func_ov00_020839c4Ei mov r0, r6 bl func_ov12_021306ec add r0, r6, #0xd8 @@ -35829,7 +35829,7 @@ _0212fc68: str r3, [r4, #0x84] strb r2, [r4, #0x78] ldr r0, [r0] - bl func_ov00_020839b4 + bl _ZN10MapManager18func_ov00_020839b4Ei mov r0, r4 bl func_ov12_021306b0 ldr r0, _0212fea0 ; =0x0000026e @@ -36741,11 +36741,11 @@ func_ov12_02130994: ; 0x02130994 ldr r1, _02130a90 ; =data_027e0e60 mov r5, r0 ldr r0, [r1] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r1, _02130a90 ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldrb r1, [r5, #0x73a] ldrb r2, [r5, #0x739] mov r1, r1, lsl #0x1c @@ -37609,7 +37609,7 @@ func_ov12_021314e8: ; 0x021314e8 str ip, [sp, #4] ldr ip, [r4, #0x5c] str ip, [sp, #8] - bl func_ov00_02083ef8 + bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ ldr r1, _021315b8 ; =data_ov12_02137680 str r0, [r4, #0x4c] ldr r2, [r1, #0x28] @@ -38134,11 +38134,11 @@ _02131c90: beq _02131d64 ldr r0, _02131d78 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r1, _02131d78 ; =data_027e0e60 mov r5, r0 ldr r0, [r1] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldr r2, [r4, #0x73c] ldrb r1, [r4, #0x739] sub r2, r2, r5 @@ -38700,7 +38700,7 @@ func_ov12_0213234c: ; 0x0213234c add r2, sp, #0 str r1, [sp, #8] ldr r1, [r3, #4] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji add sp, sp, #0xc ldmia sp!, {pc} _021323b8: @@ -41102,7 +41102,7 @@ func_ov12_02134300: ; 0x02134300 ldr r0, [r1] ldr r1, [r4, #0x5c] add r2, sp, #0 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} diff --git a/asm/ov14/Actor/ActorRupee.inc b/asm/ov14/Actor/ActorRupee.inc index 4e78a6c5..e9efdb15 100644 --- a/asm/ov14/Actor/ActorRupee.inc +++ b/asm/ov14/Actor/ActorRupee.inc @@ -1,4 +1,5 @@ #pragma once +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i .extern _ZN11ItemManager10GiveRupeesEjj .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p @@ -49,8 +50,11 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev +.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj +.extern __register_global_object .extern data_027e0764 .extern data_027e0e60 .extern data_027e0fc8 @@ -60,12 +64,8 @@ .extern func_01ff9bc4 .extern func_01fffd04 .extern func_0202bc38 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv -.extern _ZN9ActorTypeD1Ev -.extern __register_global_object .extern func_ov00_0207a13c .extern func_ov00_0207a1c8 -.extern func_ov00_02083fb0 .extern func_ov00_020bce48 .extern func_ov00_020c5a24 .extern func_ov00_020d7ad4 diff --git a/asm/ov14/Actor/ActorRupee.s b/asm/ov14/Actor/ActorRupee.s index 0b8d0e2b..c5d567e4 100644 --- a/asm/ov14/Actor/ActorRupee.s +++ b/asm/ov14/Actor/ActorRupee.s @@ -440,7 +440,7 @@ _0213b3cc: add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index 4b5c9749..e2e3a669 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -1,6 +1,44 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager16MapData_vfunc_58Ev +.extern _ZN10MapManager16MapData_vfunc_60Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_6cEv +.extern _ZN10MapManager16MapData_vfunc_70Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager16MapData_vfunc_7cEv +.extern _ZN10MapManager16MapData_vfunc_b4Ev +.extern _ZN10MapManager17GetMapData_Unk_09Ev +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager17Get_MapData_Unk2aEv +.extern _ZN10MapManager18func_ov00_020823d4Ei +.extern _ZN10MapManager18func_ov00_020823e4Ei +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager18func_ov00_02083780Ei +.extern _ZN10MapManager18func_ov00_02083978EiP5Vec3p +.extern _ZN10MapManager18func_ov00_020839b4Ei +.extern _ZN10MapManager18func_ov00_020839c4Ei +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_020840a0Ecci +.extern _ZN10MapManager18func_ov00_020840dcEv +.extern _ZN10MapManager18func_ov00_020843ecEPi +.extern _ZN10MapManager18func_ov00_02084ac4Ej +.extern _ZN10MapManager18func_ov00_02084c7cEi +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei +.extern _ZN10MapManager18func_ov00_02084ce4Ei +.extern _ZN10MapManager18func_ov00_02084cfcEi +.extern _ZN10MapManager18func_ov00_02084ebcEi +.extern _ZN10MapManager8SpawnNPCEP5Vec3pii .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN11ItemManager12GetEquipItemEi .extern _ZN11ItemManager12GetItemModelEj @@ -257,44 +295,6 @@ .extern func_ov00_02081f4c .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_020823d4 -.extern func_ov00_020823e4 -.extern func_ov00_020823f4 -.extern func_ov00_02082680 -.extern func_ov00_020826a0 -.extern func_ov00_020828c0 -.extern func_ov00_02082d08 -.extern func_ov00_0208335c -.extern func_ov00_02083368 -.extern func_ov00_02083780 -.extern func_ov00_02083978 -.extern func_ov00_020839b4 -.extern func_ov00_020839c4 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083c7c -.extern func_ov00_02083e34 -.extern func_ov00_02083e58 -.extern func_ov00_02083ee0 -.extern func_ov00_02083f80 -.extern func_ov00_02083f98 -.extern func_ov00_02083fb0 -.extern func_ov00_02084088 -.extern func_ov00_020840a0 -.extern func_ov00_020840c4 -.extern func_ov00_020840dc -.extern func_ov00_0208414c -.extern func_ov00_020843ec -.extern func_ov00_02084a5c -.extern func_ov00_02084ac4 -.extern func_ov00_02084c7c -.extern func_ov00_02084cb0 -.extern func_ov00_02084cc8 -.extern func_ov00_02084ce4 -.extern func_ov00_02084cfc -.extern func_ov00_02084d18 -.extern func_ov00_02084ebc .extern func_ov00_020875f8 .extern func_ov00_02087d34 .extern func_ov00_02088000 diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 1584d43e..639e0deb 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -345,11 +345,11 @@ _0211f9f8: ldrb r6, [r0] ldrb r1, [r0, #1] mov r0, r9 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r1, r6 mov r6, r0 mov r0, r9 - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [sp, #0x14] mov r0, #0 str r0, [sp, #0x18] @@ -3276,7 +3276,7 @@ _02122124: add r1, sp, #0x2c add r2, sp, #0x98 str r3, [sp, #0x34] - bl func_ov00_02083978 + bl _ZN10MapManager18func_ov00_02083978EiP5Vec3p cmp r0, #0 beq _02122170 ldr r0, [sp, #0x9c] @@ -3337,10 +3337,10 @@ _02122174: strb r7, [sp, #0x100] strb r7, [sp, #0x101] str r3, [sp, #0x94] - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #4 mov r0, r6 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r6, r0 beq _02122358 ldr r1, [r0] @@ -3744,7 +3744,7 @@ _02122820: add r1, sp, #0x14 add r2, sp, #0x5c str r3, [sp, #0x1c] - bl func_ov00_02083978 + bl _ZN10MapManager18func_ov00_02083978EiP5Vec3p cmp r0, #0 movne r6, #1 _02122864: @@ -5970,7 +5970,7 @@ _0212448c: add r1, sp, #0x74 str r2, [sp, #0x7c] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x4c] cmp r0, r1 ble _02124510 @@ -6026,7 +6026,7 @@ _02124580: add r0, sp, #0xc add r2, r5, #0x48 strb r3, [sp, #0xf] - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r3, [sp, #0xc] ldrb r1, [sp, #0xe] ldrb r2, [sp, #0xd] @@ -6054,7 +6054,7 @@ _02124608: add r1, sp, #0x98 strb r2, [r3, #1] ldr r2, [r3] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi add r0, sp, #0x98 add r2, sp, #0x8c add r1, r5, #0x48 @@ -6080,7 +6080,7 @@ _02124668: add r0, sp, #0x1c add r2, sp, #0x68 str r3, [sp, #0x70] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r1, [r5, #0x48] ldr r0, _02124c54 ; =data_027e0e60 str r1, [sp, #0x5c] @@ -6099,12 +6099,12 @@ _02124668: ldr r3, [r5, #0x50] mov r2, r6 str r3, [sp, #0x58] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r8, r0 add r1, sp, #0x50 mov r0, r7 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev cmp r8, r0 bne _02124710 ldr r0, [sp, #0x1c] @@ -6192,7 +6192,7 @@ _021247d8: mov r2, #1 add r3, r7, r3 str r3, [sp, #0x84] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r5, #0x90] add r1, r6, #0xcc add r2, r2, r0 @@ -6241,7 +6241,7 @@ _021248a8: str r3, [sp, #0x48] ldr r3, [r5, #0x50] str r3, [sp, #0x4c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #0x4c] ldrb r0, [r5, #0x112] cmp r0, #0 @@ -6299,7 +6299,7 @@ _021249a4: add r1, sp, #0x38 str r2, [sp, #0x40] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x90] ldr r2, [r5, #0x4c] add r0, r1, r0 @@ -6318,7 +6318,7 @@ _021249a4: add r0, sp, #0x10 add r2, sp, #0x2c str r3, [sp, #0x34] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #0x10] mov r1, r0 mov r0, r0, lsr #0x5 @@ -6391,7 +6391,7 @@ _02124af0: add r1, sp, #0x20 str r2, [sp, #0x28] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x4c] cmp r1, r0 mov r0, r5 @@ -6869,7 +6869,7 @@ func_ov14_02125100: ; 0x02125100 ldr r2, _02125124 ; =data_027e0e60 ldrsh r1, [r0, #0x34] ldr r0, [r2] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 movne r0, #8 moveq r0, #3 @@ -7052,7 +7052,7 @@ func_ov14_021252b8: ; 0x021252b8 strb r2, [sp, #0xc] mov r2, #1 strb r3, [sp, #0xd] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r2, [sp, #0xc] ldr r0, _02125598 ; =data_027e0e60 add r1, sp, #0xc @@ -7060,7 +7060,7 @@ func_ov14_021252b8: ; 0x021252b8 ldr r0, [r0] mov r2, #1 strb r3, [sp, #0xc] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii _02125340: mov r0, r5 bl func_ov00_0208c214 @@ -7096,7 +7096,7 @@ _02125340: add r1, sp, #4 strb r2, [sp, #4] strb r3, [sp, #5] - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev mov r4, r0 ldrh r0, [r5, #0x2a] ldrb r1, [r5, #0x14] @@ -7109,7 +7109,7 @@ _02125340: add r1, sp, #0xa strb r3, [sp, #0xb] strb r2, [sp, #0xa] - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev cmp r0, r4 ldrgt r0, [sp, #0x50] ldrb r2, [sp, #0xa] @@ -7120,7 +7120,7 @@ _02125340: ldr r0, [r0] add r1, sp, #0xa strb r2, [sp, #0xa] - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev cmp r0, r4 ble _021254a0 ldr r0, [sp, #0x44] @@ -7135,7 +7135,7 @@ _02125444: add r1, sp, #8 strb r3, [sp, #9] strb r2, [sp, #8] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x50] ldrb r2, [sp, #8] @@ -7146,7 +7146,7 @@ _02125444: ldr r0, [r0] add r1, sp, #8 strb r2, [sp, #8] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x44] addeq r0, r0, #0x800 @@ -7160,13 +7160,13 @@ _021254a0: add r1, sp, #6 strb r3, [sp, #6] strb r2, [sp, #7] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 bne _021254ec ldr r0, _02125598 ; =data_027e0e60 add r1, sp, #6 ldr r0, [r0] - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev cmp r4, r0 ldreq r0, [sp, #0x58] subeq r0, r0, #0x800 @@ -7424,14 +7424,14 @@ _02125864: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084ce4 + bl _ZN10MapManager18func_ov00_02084ce4Ei ldmia sp!, {r4, pc} _02125890: ldr r0, _021258b0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0212559c @@ -7571,7 +7571,7 @@ _021259c4: add r1, r4, #0x18 mov r2, #1 mov r3, #0 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r4, #0x64] add r0, sp, #0xb0 bl func_ov00_0209a508 @@ -7656,7 +7656,7 @@ _02125b40: ldr r0, _02125c18 ; =data_027e0e60 ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej mvn r0, #0 str r0, [r4, #0x64] _02125b88: @@ -7689,7 +7689,7 @@ _02125bd8: ldr r0, _02125c18 ; =data_027e0e60 ldr r1, [r4, #0x64] ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej mvn r0, #0 str r0, [r4, #0x64] _02125bfc: @@ -7766,7 +7766,7 @@ _02125cd8: ldr r0, _02125d48 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cfc + bl _ZN10MapManager18func_ov00_02084cfcEi cmp r0, #0 movne r0, #8 ldmneia sp!, {r4, pc} @@ -7781,7 +7781,7 @@ _02125d10: ldr r0, _02125d48 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 movne r0, #8 ldmneia sp!, {r4, pc} @@ -8159,7 +8159,7 @@ func_ov14_02126114: ; 0x02126114 ldr r2, _02126138 ; =data_027e0e60 ldrsh r1, [r0, #0x34] ldr r0, [r2] - bl func_ov00_02084cfc + bl _ZN10MapManager18func_ov00_02084cfcEi cmp r0, #0 movne r0, #8 moveq r0, #3 @@ -8885,7 +8885,7 @@ _02126898: add r1, sp, #6 strb r3, [sp, #6] strb ip, [sp, #7] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii b _02126a20 _02126958: ldr r0, [r5, #0x18] @@ -8937,7 +8937,7 @@ _02126958: mov r2, #1 strb r3, [sp, #4] strb ip, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii _02126a20: ldr r1, [r5, #4] mov r0, r5 @@ -9401,7 +9401,7 @@ _02127064: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldmia sp!, {r4, pc} _021270b0: ldrb r1, [r4, #0x7c] @@ -9421,7 +9421,7 @@ _021270b0: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldmia sp!, {r4, pc} _021270fc: ldr r1, [r0] @@ -9438,7 +9438,7 @@ _021270fc: add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldmia sp!, {r4, pc} _0212713c: ldrb r0, [r4, #0x7c] @@ -9456,7 +9456,7 @@ _0212713c: ldr r0, [r0] add r1, r4, #0x38 mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02127034 @@ -9586,7 +9586,7 @@ _02127338: ldrsh r1, [r5, #0x34] ldr r0, [r0] mov r2, #0 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei b _021276a0 _02127358: ldrb r0, [r5, #0x8a] @@ -9614,7 +9614,7 @@ _0212739c: ldr r0, [r0] add r1, r5, #0x38 mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi mov r0, #1 strb r0, [r5, #0x3c] b _021276a0 @@ -9752,7 +9752,7 @@ _02127548: ldr r0, [r0] add r1, r5, #0x18 mov r3, #2 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _021276a0 _021275cc: ldr r0, _021276b0 ; =data_027e0e60 @@ -9760,7 +9760,7 @@ _021275cc: ldr r0, [r0] add r1, r5, #0x18 mov r3, #1 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _021276a0 _021275e8: ldrb r1, [r5, #0x7f] @@ -9800,7 +9800,7 @@ _02127644: ldrsh r1, [r5, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei _02127674: mov r1, #0 ldr r0, _021276b0 ; =data_027e0e60 @@ -9808,7 +9808,7 @@ _02127674: ldr r0, [r0] add r1, r5, #0x38 mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi mov r0, #0 strh r0, [r5, #0x7a] mov r0, #0x1000 @@ -9835,14 +9835,14 @@ func_ov14_021276c0: ; 0x021276c0 arm_func_start func_ov14_021276c4 func_ov14_021276c4: ; 0x021276c4 ldr r2, _021276d8 ; =data_027e0e60 - ldr ip, _021276dc ; =func_ov00_02084cc8 + ldr ip, _021276dc ; =_ZN10MapManager18func_ov00_02084cc8Ei ldrsh r1, [r0, #0x34] ldr r0, [r2] bx ip .align 2, 0 arm_func_end func_ov14_021276c4 _021276d8: .word data_027e0e60 -_021276dc: .word func_ov00_02084cc8 +_021276dc: .word _ZN10MapManager18func_ov00_02084cc8Ei .global func_ov14_021276e0 arm_func_start func_ov14_021276e0 @@ -10061,7 +10061,7 @@ func_ov14_02127984: ; 0x02127984 ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldrb r0, [r4, #0x81] cmp r0, #0 ldrneb r0, [r4, #0x7c] @@ -10258,7 +10258,7 @@ _02127c10: mov r2, r9 strb r6, [sp, #4] strb r7, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrb r0, [r10, #0x15] add r7, r7, #1 add r0, r0, r8 @@ -10524,7 +10524,7 @@ _02127edc: ldr r2, _02127ef4 ; =data_027e0e60 ldrsh r1, [r0, #0x34] ldr r0, [r2] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_02127eb8 @@ -13626,7 +13626,7 @@ func_ov14_0212a758: ; 0x0212a758 ldr r0, _0212a91c ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 ldr r3, [r0] @@ -13758,7 +13758,7 @@ _0212aa30: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldr r0, [r4, #4] orr r0, r0, #4 str r0, [r4, #4] @@ -14040,14 +14040,14 @@ func_ov14_0212acdc: ; 0x0212acdc add r1, sp, #4 strb r3, [sp, #5] mov r2, #1 - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrh r0, [r4, #0x26] cmp r0, #1 bne _0212ae78 ldr r0, _0212ae9c ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 ldr r3, [r0] @@ -14166,7 +14166,7 @@ _0212af98: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldr r0, [r4, #4] orr r0, r0, #4 str r0, [r4, #4] @@ -14247,22 +14247,22 @@ func_ov14_0212b0c0: ; 0x0212b0c0 ldrh r5, [r6, #0x2a] ldr r0, [r0] mov r1, r4 - bl func_ov00_020823d4 + bl _ZN10MapManager18func_ov00_020823d4Ei ldr r1, _0212b124 ; =data_027e0e60 str r0, [r6, #0xcc] ldr r0, [r1] mov r1, r4 - bl func_ov00_020823e4 + bl _ZN10MapManager18func_ov00_020823e4Ei ldr r1, _0212b124 ; =data_027e0e60 str r0, [r6, #0xd0] ldr r0, [r1] mov r1, r5 - bl func_ov00_020823d4 + bl _ZN10MapManager18func_ov00_020823d4Ei ldr r1, _0212b124 ; =data_027e0e60 str r0, [r6, #0xd4] ldr r0, [r1] mov r1, r5 - bl func_ov00_020823e4 + bl _ZN10MapManager18func_ov00_020823e4Ei str r0, [r6, #0xd8] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 @@ -14292,7 +14292,7 @@ func_ov14_0212b128: ; 0x0212b128 bl func_0201933c ldr r0, _0212b1f8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020823f4 + bl _ZN10MapManager16MapData_vfunc_b4Ev mov r4, r0 mov r0, r5 mov r1, r4 @@ -14513,11 +14513,11 @@ func_ov14_0212b31c: ; 0x0212b31c add r1, sp, #4 mov r2, #1 strb r3, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, _0212b4c0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 ldr r3, [r0] @@ -14632,7 +14632,7 @@ _0212b5d8: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldr r0, _0212b654 ; =data_027e0f68 mov r1, #0x19 ldr r0, [r0] @@ -14910,7 +14910,7 @@ _0212b97c: mov r2, r9 strb r3, [sp, #4] strb ip, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii add r6, r6, #1 cmp r6, #2 blt _0212b97c @@ -16234,7 +16234,7 @@ _0212ca00: str r2, [r3, #0x68] ldr r0, [r0] add r1, r3, #0x38 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _0212ca68 _0212ca20: mov r0, #0 @@ -16257,7 +16257,7 @@ _0212ca48: ldr r0, [r0] add r1, r3, #0x38 mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi _0212ca68: mov r0, #1 ldmia sp!, {r3, pc} @@ -16652,7 +16652,7 @@ _0212cf34: ldr r0, [r0] add r1, r4, #0x38 mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _0212cfac _0212cf58: ldr r0, _0212cfb8 ; =data_027e0ffc @@ -16673,7 +16673,7 @@ _0212cf8c: add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r0, [r4, #4] bic r0, r0, #1 str r0, [r4, #4] @@ -18991,7 +18991,7 @@ func_ov14_0212eca8: ; 0x0212eca8 add r2, sp, #0 add r3, sp, #4 add r1, r4, #0x18 - bl func_ov00_02083f80 + bl _ZN10MapManager16MapData_vfunc_6cEv ldr r1, [sp] mov r0, r4 str r1, [r4, #0x1c] @@ -19130,7 +19130,7 @@ func_ov14_0212ee58: ; 0x0212ee58 ldrb r2, [r5, #0x15] ldr r0, [r0] mov r4, #0 - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci mov r1, #0 cmp r0, #0x30 cmpne r0, #0x40 @@ -19489,7 +19489,7 @@ _0212f374: _0212f380: ldr r0, _0212f554 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084d18 + bl _ZN10MapManager17GetMapData_Unk_09Ev cmp r0, #0 addeq sp, sp, #0x58 ldmeqia sp!, {r4, r5, r6, pc} @@ -19501,7 +19501,7 @@ _0212f380: mov r2, #6 strb r3, [sp, #4] strb r4, [sp, #5] - bl func_ov00_0208414c + bl _ZN10MapManager16MapData_vfunc_58Ev cmp r0, #0 addne sp, sp, #0x58 ldmneia sp!, {r4, r5, r6, pc} @@ -19985,7 +19985,7 @@ _0212fa20: mov r0, r10 mov r2, r6 ldrsh r3, [r4, #0xc] - bl func_ov00_020828c0 + bl _ZN10MapManager16MapData_vfunc_7cEv cmp r0, #0 beq _0212faa0 ldrh r0, [r4, #0x24] @@ -19995,7 +19995,7 @@ _0212fa20: bne _0212faa0 ldr r0, [r5] mov r1, r6 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 strneb r11, [r0, #0xa9] _0212faa0: @@ -20123,7 +20123,7 @@ _0212fb88: ldr r0, [r2] strb r3, [sp, #0xe] strb r6, [sp, #0xf] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r6, r0 beq _0212fd7c ldr r1, [r0] @@ -20188,7 +20188,7 @@ _0212fc6c: ldr r0, [r2] strb r3, [sp, #0xc] strb r6, [sp, #0xd] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r6, r0 beq _0212fd7c ldr r1, [r0] @@ -20542,7 +20542,7 @@ _02130198: ldr r0, _021304bc ; =data_027e0e60 ldr r1, [r6, #0x6c] ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej mvn r2, #0 add r1, sp, #0x1c mov r0, r6 @@ -20590,7 +20590,7 @@ _02130268: ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r6, #0x6c] _02130290: add r0, sp, #0xd8 @@ -20643,7 +20643,7 @@ _02130318: ldr r0, _021304bc ; =data_027e0e60 ldr r1, [r6, #0x6c] ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej mvn r2, #0 add r1, sp, #0x10 mov r0, r6 @@ -20684,7 +20684,7 @@ _021303c0: ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r6, #0x6c] _021303e8: add r0, sp, #0x28 @@ -21177,11 +21177,11 @@ func_ov14_021309bc: ; 0x021309bc bne _02130a70 ldr r0, _02130be0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r1, _02130be0 ; =data_027e0e60 str r0, [sp] ldr r0, [r1] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r8, r0 ldr r0, [sp] mov r11, #0 @@ -21199,7 +21199,7 @@ _02130a1c: mov r1, r6 strb r7, [sp, #6] strb r9, [sp, #7] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _02130a54 ldr r1, [r0] @@ -21263,7 +21263,7 @@ _02130b08: mov r1, r5 strb r6, [sp, #4] strb r8, [sp, #5] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 cmpne r4, r10 beq _02130b64 @@ -21712,11 +21712,11 @@ _02131100: ldr r0, _02131410 ; =data_027e0e60 strb r1, [r4, #0x78] ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r1, _02131410 ; =data_027e0e60 str r0, [sp, #0xc] ldr r0, [r1] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r10, r0 ldr r0, [sp, #0xc] mov r8, #0 @@ -21739,7 +21739,7 @@ _021311d0: mov r1, r6 strb r7, [sp, #0x12] strb r9, [sp, #0x13] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _02131224 ldr r1, [r0] @@ -21767,7 +21767,7 @@ _02131240: beq _0213125c ldr r0, _02131410 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej _0213125c: ldr r0, _02131410 ; =data_027e0e60 ldr r5, [r4, #0x88] @@ -21780,7 +21780,7 @@ _0213125c: str r5, [sp, #0x24] mov r2, #1 mov r3, #0 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r4, #0x74] add r0, sp, #0x34 bl func_ov00_0209a508 @@ -21815,7 +21815,7 @@ _021312f4: ldr r0, [r0] strb r8, [sp, #0x10] strb r10, [sp, #0x11] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r6, r0 beq _02131330 ldr r1, [r0] @@ -21979,23 +21979,23 @@ func_ov14_021314b8: ; 0x021314b8 str r1, [sp, #8] ldr r1, [sp] add r7, r1, #0xa - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r1, [sp, #8] cmp r1, r0 blt _02131520 ldr r0, _021316c0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #8] _02131520: ldr r0, _021316c0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv cmp r7, r0 blt _02131544 ldr r0, _021316c0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r7, r0 _02131544: ldr r8, [sp] @@ -22011,7 +22011,7 @@ _02131560: mov r1, r6 strb r2, [sp, #0xe] strb r8, [sp, #0xf] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev mov r5, r0 cmp r5, r10 beq _021315c0 @@ -22063,7 +22063,7 @@ _02131620: ldr r0, [r0] strb r6, [sp, #0xc] strb r9, [sp, #0xd] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev mov r5, r0 cmp r5, r10 beq _02131678 @@ -24731,7 +24731,7 @@ _021338b4: ldr r0, _02133924 ; =data_027e0e60 add r1, r7, #0x6c ldr r0, [r0] - bl func_ov00_020839c4 + bl _ZN10MapManager18func_ov00_020839c4Ei ldr r3, _02133928 ; =func_ov14_02121cd8 add r0, r7, #0xac mov r1, #2 @@ -24776,7 +24776,7 @@ _0213394c: ldr r0, _021339b4 ; =data_027e0e60 add r1, r7, #0x6c ldr r0, [r0] - bl func_ov00_020839c4 + bl _ZN10MapManager18func_ov00_020839c4Ei ldr r3, _021339b8 ; =func_ov14_02121cd8 add r0, r7, #0xac mov r1, #2 @@ -24891,7 +24891,7 @@ func_ov14_021339bc: ; 0x021339bc ldr r2, [sp, #0x28] str r2, [r4, #0x7c] ldr r0, [r0] - bl func_ov00_020839b4 + bl _ZN10MapManager18func_ov00_020839b4Ei mov r0, #0x270 str r0, [r4, #0xb0] mov r1, #4 @@ -24902,7 +24902,7 @@ func_ov14_021339bc: ; 0x021339bc ldr r0, _02133c58 ; =data_027e0e60 add r1, r4, #0x18 ldr r0, [r0] - bl func_ov00_02084ebc + bl _ZN10MapManager18func_ov00_02084ebcEi cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -24911,7 +24911,7 @@ func_ov14_021339bc: ; 0x021339bc add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldrh r0, [r4, #0x28] cmp r0, #1 bne _02133bbc @@ -25726,7 +25726,7 @@ func_ov14_02134554: ; 0x02134554 ldr r0, _02134670 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 ldr r3, [r0] @@ -25771,7 +25771,7 @@ _0213469c: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _021347c0 _021346b4: cmp r2, #0 @@ -25830,7 +25830,7 @@ _02134770: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldr r1, [r4, #4] ldr r0, _021347cc ; =data_027e0e60 bic r1, r1, #0x10 @@ -25838,7 +25838,7 @@ _02134770: ldr r0, [r0] add r1, r4, #0x38 mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r0, [r4, #4] bic r0, r0, #1 str r0, [r4, #4] @@ -26014,7 +26014,7 @@ func_ov14_0213497c: ; 0x0213497c add r1, sp, #8 strb r2, [sp, #8] strb r3, [sp, #9] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x14 bgt _021349d0 bge _021349d8 @@ -26048,7 +26048,7 @@ _021349e0: ldrb r2, [r10, #0x15] ldr r0, [r0] sub r1, r1, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci b _02134a48 _02134a28: mov r0, #0x4000 @@ -26058,7 +26058,7 @@ _02134a28: ldrb r1, [r10, #0x14] ldr r0, [r0] sub r2, r2, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci _02134a48: str r0, [r10, #0x1c] ldrh r5, [r10, #0x26] @@ -26122,13 +26122,13 @@ _02134b1c: mov r2, r6 strb r8, [sp, #6] strb r9, [sp, #7] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r5 strb r8, [sp, #4] strb r9, [sp, #5] mov r2, r11 - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r1, [r10, #0x15] ldrb r0, [r10, #0x3a] add r9, r9, #1 @@ -27771,10 +27771,10 @@ func_ov14_02135f50: ; 0x02135f50 add r0, sp, #0 mov r1, r4 add r2, r2, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r4 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} @@ -27819,7 +27819,7 @@ func_ov14_02135ff0: ; 0x02135ff0 ldr r1, [r1] add r0, sp, #0 add r2, r2, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r0, [sp, #1] ldr r5, _02136074 ; =data_027e0e60 mov r4, #0 @@ -27833,7 +27833,7 @@ _0213602c: mov r1, r8 sub r2, r2, r4 strb r2, [sp] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r7, r0 beq _02136060 ldr r1, [r0] @@ -27999,7 +27999,7 @@ _0213625c: add r0, sp, #0 ldr r1, [r1] add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _02136350 ; =data_027e0e60 ldrb r2, [sp] ldrb r1, [sp, #1] @@ -28009,7 +28009,7 @@ _0213625c: strb r1, [r3, #1] ldr r2, [r3] add r1, r4, #0x48 - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi ldr r1, [r4, #0x48] mov r0, r4 str r1, [r4, #0x198] @@ -28364,7 +28364,7 @@ func_ov14_021366e4: ; 0x021366e4 add r0, sp, #8 ldr r1, [r1] add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r1, [sp, #8] ldr r0, _021368c4 ; =data_027e0e60 ldrb r2, [sp, #9] @@ -28373,7 +28373,7 @@ func_ov14_021366e4: ; 0x021366e4 add r1, sp, #6 strb r3, [sp, #6] strb r2, [sp, #7] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x54] ldrb r1, [sp, #8] @@ -28386,7 +28386,7 @@ func_ov14_021366e4: ; 0x021366e4 add r1, sp, #4 strb r3, [sp, #4] strb r2, [sp, #5] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x48] ldrb r1, [sp, #9] @@ -28399,7 +28399,7 @@ func_ov14_021366e4: ; 0x021366e4 add r1, sp, #2 strb r3, [sp, #2] strb r2, [sp, #3] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x5c] ldrb r1, [sp, #9] @@ -28412,7 +28412,7 @@ func_ov14_021366e4: ; 0x021366e4 add r1, sp, #0 strb r3, [sp] strb r2, [sp, #1] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x50] add lr, sp, #0x30 @@ -28746,7 +28746,7 @@ _02136c04: ldr r2, [sp, #0xc] str r2, [r4, #0x1e0] ldr r0, [r0] - bl func_ov00_020839b4 + bl _ZN10MapManager18func_ov00_020839b4Ei ldr r0, _02136d10 ; =0x0000026e mov r1, #2 str r0, [r4, #0x214] @@ -30829,7 +30829,7 @@ _021386e8: ldr r0, _021389d0 ; =data_027e0e60 add r1, sp, #0xa0 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 bne _021387f0 add r0, sp, #0x24 @@ -30893,7 +30893,7 @@ _02138890: ldr r0, _021389d0 ; =data_027e0e60 add r1, sp, #0x9e ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 bne _021388d8 add r0, sp, #0x24 @@ -31114,7 +31114,7 @@ func_ov14_02138b18: ; 0x02138b18 add r0, sp, #0xc add r2, sp, #0x1c str r3, [sp, #0x24] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #0xc] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -31133,7 +31133,7 @@ func_ov14_02138b18: ; 0x02138b18 ldr r2, [r6, #0x50] add r1, sp, #0x10 str r2, [sp, #0x18] - bl func_ov00_02083f98 + bl _ZN10MapManager16MapData_vfunc_70Ev ldr r1, _02138d54 ; =0x0000ffff mov r2, r0 cmp r2, r1 @@ -31176,14 +31176,14 @@ _02138c20: ldr r5, [r1] add r2, r6, #0x48 mov r1, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r4, sp, #0x54 add r2, sp, #4 mov r0, r5 mov r1, #0x1e mov r3, #0 str r4, [sp] - bl func_ov00_020828c0 + bl _ZN10MapManager16MapData_vfunc_7cEv add sp, sp, #0x68 ldmia sp!, {r4, r5, r6, pc} _02138c74: @@ -31232,7 +31232,7 @@ _02138d08: bl _ZN5Actor18func_ov00_020c1788Ev mov r4, r0 mov r0, r5 - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r4, r0 addne sp, sp, #0x68 ldmneia sp!, {r4, r5, r6, pc} @@ -31241,7 +31241,7 @@ _02138d08: ldrsh r1, [r0, #0x70] ldr r0, [r2] mov r2, #1 - bl func_ov00_02084c7c + bl _ZN10MapManager18func_ov00_02084c7cEi add sp, sp, #0x68 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 @@ -31292,7 +31292,7 @@ func_ov14_02138dc0: ; 0x02138dc0 bl _ZN5Actor18func_ov00_020c1788Ev mov r4, r0 mov r0, r5 - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r4, r0 ldmneia sp!, {r4, r5, r6, pc} add r0, r6, #0x100 @@ -31300,7 +31300,7 @@ func_ov14_02138dc0: ; 0x02138dc0 ldrsh r1, [r0, #0x70] ldr r0, [r2] mov r2, #1 - bl func_ov00_02084c7c + bl _ZN10MapManager18func_ov00_02084c7cEi ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_02138dc0 @@ -32377,7 +32377,7 @@ _02139b24: ldr r2, [r4, #0x50] add r1, sp, #0 str r2, [sp, #8] - bl func_ov00_02083780 + bl _ZN10MapManager18func_ov00_02083780Ei ldr r2, _02139b80 ; =data_027e0fe4 mov r1, r0 ldr r0, [r2] @@ -33299,7 +33299,7 @@ _0213a68c: add r0, sp, #0 add r2, sp, #0x38 str r3, [sp, #0x40] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -33681,7 +33681,7 @@ _0213ab94: add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index 0c4d8178..d32a69a9 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -315,42 +315,42 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern func_ov00_020823c4 -.extern func_ov00_020823d4 -.extern func_ov00_020823e4 -.extern func_ov00_020823f4 -.extern func_ov00_02082680 -.extern func_ov00_020826a0 -.extern func_ov00_02082d08 -.extern func_ov00_02083344 -.extern func_ov00_02083350 -.extern func_ov00_0208335c -.extern func_ov00_02083368 -.extern func_ov00_0208344c -.extern func_ov00_020836dc -.extern func_ov00_02083770 -.extern func_ov00_02083790 -.extern func_ov00_02083840 -.extern func_ov00_020838e8 -.extern func_ov00_020839b4 -.extern func_ov00_020839c4 -.extern func_ov00_02083a1c -.extern func_ov00_02083e34 -.extern func_ov00_02083ee0 -.extern func_ov00_02084088 -.extern func_ov00_020840c4 -.extern func_ov00_020840dc -.extern func_ov00_020843ec -.extern func_ov00_02084984 -.extern func_ov00_02084990 -.extern func_ov00_020849c0 -.extern func_ov00_020849dc -.extern func_ov00_02084a5c -.extern func_ov00_02084ac4 -.extern func_ov00_02084c7c -.extern func_ov00_02084c94 -.extern func_ov00_02084cb0 -.extern func_ov00_02084cc8 +.extern _ZN10MapManager18func_ov00_020823c4EPii +.extern _ZN10MapManager18func_ov00_020823d4Ei +.extern _ZN10MapManager18func_ov00_020823e4Ei +.extern _ZN10MapManager16MapData_vfunc_b4Ev +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager20GetCourseData_Unk_86Ev +.extern _ZN10MapManager20GetCourseData_Unk_87Ev +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager17Get_MapData_Unk2aEv +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_02083790Ei +.extern _ZN10MapManager18func_ov00_02083840Ei +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_020839b4Ei +.extern _ZN10MapManager18func_ov00_020839c4Ei +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager18func_ov00_020840dcEv +.extern _ZN10MapManager18func_ov00_020843ecEPi +.extern _ZN10MapManager17GetMapData_Unk_06Ev +.extern _ZN10MapManager17GetMapData_Unk_07Ev +.extern _ZN10MapManager18func_ov00_020849c0Ev +.extern _ZN10MapManager18func_ov00_020849dcEv +.extern _ZN10MapManager8SpawnNPCEP5Vec3pii +.extern _ZN10MapManager18func_ov00_02084ac4Ej +.extern _ZN10MapManager18func_ov00_02084c7cEi +.extern _ZN10MapManager18func_ov00_02084c94Ei +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei .extern func_ov00_0208726c .extern func_ov00_020876bc .extern func_ov00_0208819c diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 1edeb224..51bc0854 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -2767,7 +2767,7 @@ func_ov14_0213d684: ; 0x0213d684 ldr r2, _0213d6dc ; =data_027e0e60 add r1, r0, #0x2c ldr r0, [r2] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _0213d6cc ldr r1, [r0] @@ -2975,7 +2975,7 @@ _0213d944: add r1, r6, #0x2c ldr r0, [r0] add r1, r1, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r7, r0 beq _0213d990 ldr r1, [r0] @@ -3029,7 +3029,7 @@ _0213d9fc: ldr r0, _0213dad4 ; =data_027e0e60 mov r1, r8 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _0213daa4 mov r0, r10 @@ -3634,7 +3634,7 @@ func_ov14_0213e20c: ; 0x0213e20c add r1, r1, r6 mov r7, r2 mov r4, #0 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _0213e318 ldr r1, [r0] @@ -3739,7 +3739,7 @@ _0213e394: ldr r0, _0213e53c ; =data_027e0e60 mov r1, r7 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev _0213e3b4: cmp r9, #0 ldrne r0, [r9, #0x88] @@ -5127,7 +5127,7 @@ func_ov14_0213f37c: ; 0x0213f37c ldr r1, _0213f44c ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_02084984 + bl _ZN10MapManager17GetMapData_Unk_06Ev cmp r0, #0 ldreq r0, _0213f450 ; =data_027e077c ldreq r0, [r0] @@ -7035,7 +7035,7 @@ _021408e0: cmp r1, #0 beq _02140c4c mov r0, r11 - bl func_ov00_020849dc + bl _ZN10MapManager18func_ov00_020849dcEv cmp r0, #0 beq _021409d0 add r1, sp, #0x14 @@ -7091,7 +7091,7 @@ _02140960: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} _021409d0: mov r0, r11 - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 beq _02140bdc add r1, sp, #0x14 @@ -7261,7 +7261,7 @@ _02140c4c: cmp r0, #0 mov r0, r11 beq _02140db0 - bl func_ov00_020849dc + bl _ZN10MapManager18func_ov00_020849dcEv cmp r0, #0 beq _02140d2c cmp r8, #0 @@ -7316,7 +7316,7 @@ _02140cc8: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} _02140d2c: mov r0, r11 - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 addne sp, sp, #0x38 ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} @@ -7349,7 +7349,7 @@ _02140d2c: add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} _02140db0: - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 beq _02140fb0 cmp r8, #0 @@ -7542,7 +7542,7 @@ _0214107c: addeq sp, sp, #0x38 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} mov r0, r11 - bl func_ov00_02084990 + bl _ZN10MapManager17GetMapData_Unk_07Ev cmp r0, #0 add r3, sp, #0x10 mov r1, #0 @@ -8092,7 +8092,7 @@ func_ov14_0214178c: ; 0x0214178c str r2, [sp, #8] add r1, sp, #0 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r7, r8] add r3, r0, #0xf6 add r0, r1, #0x800 @@ -8188,7 +8188,7 @@ func_ov14_021418ec: ; 0x021418ec str r2, [sp, #8] add r1, sp, #0 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, r6] add r3, r0, #0xf6 add r0, r2, #0x800 @@ -8473,7 +8473,7 @@ _02141cdc: ldrb r1, [r9, #0x14] ldr r0, [r0] add r2, r2, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r9, #0x1c] mov r4, #1 b _02141d88 @@ -8485,7 +8485,7 @@ _02141d0c: ldrb r1, [r9, #0x14] ldr r0, [r0] sub r2, r2, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r9, #0x1c] b _02141d88 _02141d34: @@ -8497,7 +8497,7 @@ _02141d34: ldrb r2, [r9, #0x15] ldr r0, [r0] add r1, r1, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r9, #0x1c] mov r4, #1 b _02141d88 @@ -8509,7 +8509,7 @@ _02141d64: ldrb r2, [r9, #0x15] ldr r0, [r0] sub r1, r1, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r9, #0x1c] _02141d88: ldr r1, [r9, #4] @@ -8545,13 +8545,13 @@ _02141df0: mov r2, r5 strb r7, [sp, #0xe] strb r8, [sp, #0xf] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r10 strb r7, [sp, #0xc] strb r8, [sp, #0xd] mov r2, r11 - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r1, [r9, #0x15] ldrb r0, [r9, #0x39] sub r8, r8, #1 @@ -8594,13 +8594,13 @@ _02141ea4: mov r2, r5 strb r7, [sp, #0xa] strb r8, [sp, #0xb] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r10 strb r7, [sp, #8] strb r8, [sp, #9] mov r2, r11 - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r1, [r9, #0x15] ldrb r0, [r9, #0x39] add r8, r8, #1 @@ -9135,14 +9135,14 @@ _02142634: beq _02142664 ldr r0, _02142778 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej _02142664: ldr r0, _02142778 ; =data_027e0e60 mov r2, #0 ldr r0, [r0] mov r3, r2 add r1, r5, #0x58 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r5, #0x48] mov r0, #0 strb r0, [r5, #0x3b] @@ -9194,14 +9194,14 @@ _02142714: beq _02142744 ldr r0, _02142778 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej _02142744: ldr r0, _02142778 ; =data_027e0e60 mov r2, #0 ldr r0, [r0] mov r3, r2 add r1, r5, #0x58 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r5, #0x48] mov r0, #0 strb r0, [r5, #0x3b] @@ -9257,12 +9257,12 @@ func_ov14_0214278c: ; 0x0214278c bne _02142818 ldr r0, _02142908 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083344 + bl _ZN10MapManager20GetCourseData_Unk_86Ev cmp r0, #1 bgt _02142814 ldr r0, _02142908 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083350 + bl _ZN10MapManager20GetCourseData_Unk_87Ev cmp r0, #1 ble _02142818 _02142814: @@ -15152,7 +15152,7 @@ _02146dd8: ldr r0, _02146e20 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084c94 + bl _ZN10MapManager18func_ov00_02084c94Ei cmp r0, #0 ldrne r0, [r4, #4] bicne r0, r0, #1 @@ -15248,7 +15248,7 @@ _02146f08: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _02147084 _02146f2c: cmp r2, #0 @@ -15269,7 +15269,7 @@ _02146f54: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _02147084 _02146f78: bl func_ov14_02147548 @@ -15315,20 +15315,20 @@ _02146ff0: ldr r0, _02147094 ; =data_027e0e60 ldrb r5, [r4, #0x13] ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, r5 bne _02147040 ldr r0, _02147094 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084c7c + bl _ZN10MapManager18func_ov00_02084c7cEi _02147040: ldr r0, _02147094 ; =data_027e0e60 add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r0, [r4, #4] bic r0, r0, #1 str r0, [r4, #4] @@ -15338,7 +15338,7 @@ _02147064: add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r0, [r4, #4] bic r0, r0, #1 str r0, [r4, #4] @@ -16563,7 +16563,7 @@ func_ov14_02147ee4: ; 0x02147ee4 ldrh r1, [r4, #0x24] ldr r0, [r0] add r2, sp, #0 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02147fb8 ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -16924,7 +16924,7 @@ func_ov14_02148364: ; 0x02148364 ldr r0, [r2] mov r2, #0 mov r9, r1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r10, #0x4c] cmp r1, r0 addlt sp, sp, #0x128 @@ -16934,11 +16934,11 @@ func_ov14_02148364: ; 0x02148364 add r0, sp, #0x14 ldr r1, [r1] mov r2, r9 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _02148644 ; =data_027e0e60 add r1, sp, #0x14 ldr r0, [r0] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x5b bgt _021483e4 bge _021483ec @@ -17498,7 +17498,7 @@ _02148b50: ldr r0, _021497e8 ; =data_027e0e60 add r1, sp, #0x60 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r0, [sp, #0x60] str r0, [r4, #0x48] ldr r0, [sp, #0x64] @@ -17529,7 +17529,7 @@ _02148bb4: ldr r0, _021497e8 ; =data_027e0e60 add r1, sp, #0x54 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r0, [sp, #0x54] str r0, [r4, #0x48] ldr r0, [sp, #0x58] @@ -17543,7 +17543,7 @@ _02148bec: ldr r0, _021497e8 ; =data_027e0e60 add r1, sp, #0x48 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r0, [sp, #0x48] str r0, [r4, #0x48] ldr r0, [sp, #0x4c] @@ -18859,7 +18859,7 @@ _02149cec: str r1, [r5, #0x20] ldrsh r1, [r5, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r5 mov r2, #1 @@ -19117,7 +19117,7 @@ _0214a194: str r1, [r6, #4] ldr r0, [r0] add r1, r6, #0x38 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _0214a3ac _0214a1bc: ldr r0, [r6, #0x74] @@ -19211,7 +19211,7 @@ _0214a2e4: streqb r0, [r6, #0x3c] ldr r0, _0214a3b8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r1, [r6, #0x74] ldr r0, _0214a3cc ; =data_ov14_02153f04 add r4, r6, #0xd8 @@ -19251,7 +19251,7 @@ _0214a398: ldrsh r1, [r6, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei _0214a3ac: mov r0, #1 add sp, sp, #0xc0 @@ -20087,7 +20087,7 @@ func_ov14_0214adfc: ; 0x0214adfc ldr r0, [r0] mov r2, #0 ldrh r4, [r5, #0x24] - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0214ae7c ldrb r0, [r5, #0x2a] @@ -21488,7 +21488,7 @@ func_ov14_0214c018: ; 0x0214c018 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0214c09c ldrb r0, [r4, #0x2a] @@ -21696,7 +21696,7 @@ func_ov14_0214c274: ; 0x0214c274 mov r2, #1 strb r3, [sp] strb ip, [sp, #1] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -21727,22 +21727,22 @@ func_ov14_0214c30c: ; 0x0214c30c ldrh r5, [r6, #0x2a] ldr r0, [r0] mov r1, r4 - bl func_ov00_020823d4 + bl _ZN10MapManager18func_ov00_020823d4Ei ldr r1, _0214c370 ; =data_027e0e60 str r0, [r6, #0x94] ldr r0, [r1] mov r1, r4 - bl func_ov00_020823e4 + bl _ZN10MapManager18func_ov00_020823e4Ei ldr r1, _0214c370 ; =data_027e0e60 str r0, [r6, #0x98] ldr r0, [r1] mov r1, r5 - bl func_ov00_020823d4 + bl _ZN10MapManager18func_ov00_020823d4Ei ldr r1, _0214c370 ; =data_027e0e60 str r0, [r6, #0x9c] ldr r0, [r1] mov r1, r5 - bl func_ov00_020823e4 + bl _ZN10MapManager18func_ov00_020823e4Ei str r0, [r6, #0xa0] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 @@ -21772,7 +21772,7 @@ func_ov14_0214c374: ; 0x0214c374 bl func_0201933c ldr r0, _0214c444 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020823f4 + bl _ZN10MapManager16MapData_vfunc_b4Ev mov r4, r0 mov r0, r5 mov r1, r4 @@ -22152,7 +22152,7 @@ _0214c7ec: ldrb r1, [r10, #0x11] ldr r0, [r4] mov r2, r11 - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 bne _0214c92c _0214c910: @@ -22431,7 +22431,7 @@ _0214cc34: .word gAdventureFlags arm_func_start func_ov14_0214cc38 func_ov14_0214cc38: ; 0x0214cc38 ldr r2, _0214cc50 ; =data_027e0e60 - ldr ip, _0214cc54 ; =func_ov00_020836dc + ldr ip, _0214cc54 ; =_ZN10MapManager18func_ov00_020836dcEii ldrb r1, [r0, #0x160] ldr r0, [r2] mov r2, #0 @@ -22439,7 +22439,7 @@ func_ov14_0214cc38: ; 0x0214cc38 .align 2, 0 arm_func_end func_ov14_0214cc38 _0214cc50: .word data_027e0e60 -_0214cc54: .word func_ov00_020836dc +_0214cc54: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov14_0214cc58 arm_func_start func_ov14_0214cc58 @@ -22868,7 +22868,7 @@ _0214d134: ldr r0, _0214d1b4 ; =data_027e0e60 add r1, r7, #0x74 ldr r0, [r0] - bl func_ov00_020839c4 + bl _ZN10MapManager18func_ov00_020839c4Ei add r0, r7, #0xd8 bl func_020350ac ldr r3, _0214d1b8 ; =func_ov14_02121cd8 @@ -22917,7 +22917,7 @@ _0214d1dc: ldr r0, _0214d254 ; =data_027e0e60 add r1, r7, #0x74 ldr r0, [r0] - bl func_ov00_020839c4 + bl _ZN10MapManager18func_ov00_020839c4Ei add r0, r7, #0xd8 bl func_020350ac ldr r3, _0214d258 ; =func_ov14_02121cd8 @@ -23181,7 +23181,7 @@ _0214d46c: ldr r2, [sp, #0x14] str r2, [r4, #0x84] ldr r0, [r0] - bl func_ov00_020839b4 + bl _ZN10MapManager18func_ov00_020839b4Ei mov r0, r4 mov r1, #1 bl func_ov14_0214e134 @@ -23999,11 +23999,11 @@ func_ov14_0214e134: ; 0x0214e134 mov r5, r0 ldr r0, [r2] mov r4, r1 - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r1, _0214e268 ; =data_027e0e60 mov r6, r0 ldr r0, [r1] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r7, r0 ldrb r0, [r5, #0x15] ldrb r9, [r5, #0x14] @@ -24059,7 +24059,7 @@ _0214e210: ldr r0, [r6] mov r1, r9 mov r2, r10 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci ldr r1, [r5, #0x1c] cmp r1, r0 bne _0214e244 @@ -24068,7 +24068,7 @@ _0214e210: mov r2, r4 strb r7, [sp, #8] strb r10, [sp, #9] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii _0214e244: add r10, r10, #1 cmp r10, r8 @@ -24250,7 +24250,7 @@ func_ov14_0214e38c: ; 0x0214e38c ldr r0, _0214e51c ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 ldr r3, [r0] @@ -24332,7 +24332,7 @@ _0214e574: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _0214e6b0 _0214e58c: cmp r2, #0 @@ -24397,7 +24397,7 @@ _0214e654: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei _0214e684: ldr r1, [r4, #4] ldr r0, _0214e6bc ; =data_027e0e60 @@ -24406,7 +24406,7 @@ _0214e684: ldr r0, [r0] add r1, r4, #0x38 mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r0, [r4, #4] bic r0, r0, #1 str r0, [r4, #4] @@ -24670,7 +24670,7 @@ func_ov14_0214e8f0: ; 0x0214e8f0 ldrh r2, [r4, #0x28] ldr r0, [r0] add r1, r4, #0x88 - bl func_ov00_020823c4 + bl _ZN10MapManager18func_ov00_020823c4EPii cmp r0, #0 addeq sp, sp, #0x50 ldmeqia sp!, {r3, r4, r5, pc} @@ -24678,14 +24678,14 @@ func_ov14_0214e8f0: ; 0x0214e8f0 ldrh r2, [r4, #0x2a] ldr r0, [r0] add r1, r4, #0x80 - bl func_ov00_020823c4 + bl _ZN10MapManager18func_ov00_020823c4EPii cmp r0, #0 addeq sp, sp, #0x50 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _0214ea70 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 ldr r3, [r0] @@ -24730,7 +24730,7 @@ _0214ea9c: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi mov r0, r4 mov r1, #1 bl func_ov14_0214ec40 @@ -24785,7 +24785,7 @@ _0214eb70: add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi mov r0, r4 mov r1, #0 mov r2, #1 @@ -24794,7 +24794,7 @@ _0214eb70: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei mov r0, r4 mov r1, #0 bl func_ov14_0214ec40 @@ -25425,7 +25425,7 @@ _0214f3c0: ldr r0, [r0] mov r3, r2 add r1, r5, #0x18 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _0214f4e8 _0214f41c: ldrsh r0, [r5, #0xc] @@ -25438,14 +25438,14 @@ _0214f41c: add r1, r5, #0x18 ldr r0, [r0] mov r3, #2 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _0214f4e8 _0214f44c: ldr r0, _0214f500 ; =data_027e0e60 add r1, r5, #0x18 ldr r0, [r0] mov r3, #1 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _0214f4e8 _0214f464: bl func_ov14_02127188 @@ -25478,7 +25478,7 @@ _0214f4b4: ldr r0, _0214f500 ; =data_027e0e60 ldrh r1, [r5, #0x24] ldr r0, [r0] - bl func_ov00_02083840 + bl _ZN10MapManager18func_ov00_02083840Ei b _0214f4e8 _0214f4dc: mov r0, r5 @@ -25511,7 +25511,7 @@ func_ov14_0214f504: ; 0x0214f504 ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r4, pc} @@ -25566,7 +25566,7 @@ _0214f5e4: ldr r0, _0214f660 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} @@ -25584,7 +25584,7 @@ _0214f600: ldr r0, _0214f660 ; =data_027e0e60 ldrh r1, [r4, #0x24] ldr r0, [r0] - bl func_ov00_02083840 + bl _ZN10MapManager18func_ov00_02083840Ei mov r0, #1 ldmia sp!, {r4, pc} _0214f640: @@ -25631,7 +25631,7 @@ _0214f6c4: ldr r0, _0214f76c ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -25660,14 +25660,14 @@ _0214f728: ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _0214f76c ; =data_027e0e60 ldrh r1, [r4, #0x24] ldr r0, [r0] - bl func_ov00_02083790 + bl _ZN10MapManager18func_ov00_02083790Ei mov r0, #1 ldmia sp!, {r4, pc} _0214f760: @@ -26155,7 +26155,7 @@ _0214fd64: .word data_ov00_020eec9c arm_func_start func_ov14_0214fd68 func_ov14_0214fd68: ; 0x0214fd68 ldr r2, _0214fd80 ; =data_027e0e60 - ldr ip, _0214fd84 ; =func_ov00_020836dc + ldr ip, _0214fd84 ; =_ZN10MapManager18func_ov00_020836dcEii ldrb r1, [r0, #0x15c] ldr r0, [r2] mov r2, #0 @@ -26163,7 +26163,7 @@ func_ov14_0214fd68: ; 0x0214fd68 .align 2, 0 arm_func_end func_ov14_0214fd68 _0214fd80: .word data_027e0e60 -_0214fd84: .word func_ov00_020836dc +_0214fd84: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov14_0214fd88 arm_func_start func_ov14_0214fd88 @@ -26291,7 +26291,7 @@ _0214fee0: ldrb r1, [r4, #0x14] ldr r0, [r0] sub r2, r2, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r4, #0x1c] mov r0, #0 b _0214ff34 @@ -26303,7 +26303,7 @@ _0214ff0c: ldrb r2, [r4, #0x15] ldr r0, [r0] sub r1, r1, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r4, #0x1c] mov r0, #1 _0214ff34: @@ -26369,13 +26369,13 @@ _02150008: mov r2, r7 strb r9, [sp, #6] strb r10, [sp, #7] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r5] mov r1, r6 strb r9, [sp, #4] strb r10, [sp, #5] mov r2, r11 - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r1, [r4, #0x15] ldrb r0, [r4, #0x39] add r10, r10, #1 @@ -27621,7 +27621,7 @@ _02150d88: add r1, sp, #4 strb r2, [sp, #4] strb r3, [sp, #5] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x14 ldreqsh r0, [r4, #0xc] cmpeq r0, #0 @@ -28201,7 +28201,7 @@ func_ov14_0215141c: ; 0x0215141c ldr r2, [r4, #0x88] str r2, [r4, #0x98] ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r0, [sp, #0xc] str r0, [r4, #0x48] ldr r0, [sp, #0x10] diff --git a/asm/ov15.inc b/asm/ov15.inc index 352eeb8b..0b7b720d 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -446,41 +446,41 @@ .extern func_ov00_02081f50 .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_020823a4 -.extern func_ov00_020823b4 -.extern func_ov00_02082424 -.extern func_ov00_02082454 -.extern func_ov00_02082494 -.extern func_ov00_020824cc -.extern func_ov00_02082504 -.extern func_ov00_02082594 -.extern func_ov00_020825ac -.extern func_ov00_02082650 -.extern func_ov00_02082660 -.extern func_ov00_02082d08 -.extern func_ov00_02082d40 -.extern func_ov00_02083374 -.extern func_ov00_02083384 -.extern func_ov00_0208340c -.extern func_ov00_0208342c -.extern func_ov00_0208346c -.extern func_ov00_020836bc -.extern func_ov00_020836dc -.extern func_ov00_02083770 -.extern func_ov00_020838c8 -.extern func_ov00_020838d8 -.extern func_ov00_020838e8 -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083ee0 -.extern func_ov00_020846a4 -.extern func_ov00_020848b8 -.extern func_ov00_02084a5c -.extern func_ov00_02084b38 -.extern func_ov00_02084cb0 -.extern func_ov00_02084cc8 -.extern func_ov00_02084d4c -.extern func_ov00_02085c60 +.extern _ZN10MapManager18func_ov00_020823a4Ei +.extern _ZN10MapManager18func_ov00_020823b4Ev +.extern _ZN10MapManager18func_ov00_02082424Ev +.extern _ZN10MapManager18func_ov00_02082454Eii +.extern _ZN10MapManager18func_ov00_02082494Ei +.extern _ZN10MapManager18func_ov00_020824ccEi +.extern _ZN10MapManager18func_ov00_02082504Ev +.extern _ZN10MapManager18func_ov00_02082594Ev +.extern _ZN10MapManager18func_ov00_020825acEv +.extern _ZN10MapManager18func_ov00_02082650Eiii +.extern _ZN10MapManager18func_ov00_02082660Eii +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager18func_ov00_02082d40Ev +.extern _ZN10MapManager18func_ov00_02083374Ev +.extern _ZN10MapManager18func_ov00_02083384Ev +.extern _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p +.extern _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p +.extern _ZN10MapManager18func_ov00_0208346cEP4AABB +.extern _ZN10MapManager18func_ov00_020836bcEjPi +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_020838c8Ei +.extern _ZN10MapManager18func_ov00_020838d8Ei +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_020846a4Ev +.extern _ZN10MapManager18func_ov00_020848b8Ev +.extern _ZN10MapManager8SpawnNPCEP5Vec3pii +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei +.extern _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p +.extern _ZN10MapManager18func_ov00_02085c60Eiiii .extern func_ov00_020872e8 .extern func_ov00_02087584 .extern func_ov00_020875f8 diff --git a/asm/ov15.s b/asm/ov15.s index 4a4e1dc8..048841fc 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -86,7 +86,7 @@ func_ov15_0211f69c: ; 0x0211f69c strb r3, [sp, #0x37] strb r3, [sp, #0x38] strb r3, [sp, #0x39] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 addeq sp, sp, #0x3c moveq r0, #1 @@ -261,7 +261,7 @@ func_ov15_0211f954: ; 0x0211f954 bl func_ov15_0213d3d4 ldr r0, _0211f9a4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082594 + bl _ZN10MapManager18func_ov00_02082594Ev ldr r0, _0211f9a8 ; =data_027e0fe4 ldr r0, [r0] bl func_ov15_02184838 @@ -407,7 +407,7 @@ _0211fab4: ldr r0, [r0] add r1, sp, #0x18 mov r3, r2 - bl func_ov00_02085c60 + bl _ZN10MapManager18func_ov00_02085c60Eiiii ldr r0, [r5, #0x2c] bl func_ov15_02121998 cmp r0, #0 @@ -429,7 +429,7 @@ _0211fbac: bl func_ov15_02121988 ldr r0, _0211fc4c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020825ac + bl _ZN10MapManager18func_ov00_020825acEv ldr r0, _0211fc54 ; =data_027e0fe4 ldr r0, [r0] bl func_ov15_021848dc @@ -727,7 +727,7 @@ _0211ff18: add r1, sp, #0x134 add r2, sp, #0x44 add r3, sp, #0x3c - bl func_ov00_02085c60 + bl _ZN10MapManager18func_ov00_02085c60Eiiii cmp r0, #0 beq _02120018 ldr r1, [sp, #0x194] @@ -886,7 +886,7 @@ _02120184: add r1, sp, #0xcc add r2, sp, #0x34 add r3, sp, #0x2c - bl func_ov00_02085c60 + bl _ZN10MapManager18func_ov00_02085c60Eiiii cmp r0, #0 beq _0212023c ldr r0, [sp, #0x12c] @@ -1049,7 +1049,7 @@ _02120354: add r1, sp, #0x64 add r2, sp, #0x24 add r3, sp, #0x1c - bl func_ov00_02085c60 + bl _ZN10MapManager18func_ov00_02085c60Eiiii cmp r0, #0 beq _021204ac ldr r0, [sp, #0xc4] @@ -2319,7 +2319,7 @@ _02121550: mov r6, r5 mov r7, r5 mov r8, r5 - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #3 addls pc, pc, r0, lsl #2 b _02121638 @@ -2505,7 +2505,7 @@ func_ov15_021217e4: ; 0x021217e4 add r1, r7, #0xa6 ldr r0, [r0] add r9, r1, #0x50000 - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #3 addls pc, pc, r0, lsl #2 b _02121940 @@ -3604,7 +3604,7 @@ func_ov15_02122674: ; 0x02122674 ldrh r1, [r4, #0x22] ldr r0, [r0] add r2, sp, #0x4c - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -4163,7 +4163,7 @@ _02122edc: ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r3, r4, r5, pc} @@ -4264,7 +4264,7 @@ _0212307c: ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r3, r4, r5, pc} @@ -6185,7 +6185,7 @@ func_ov15_02124a40: ; 0x02124a40 str r3, [sp, #8] ldr r3, [r10, #0x50] str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r10, #0x2a8] ldrb r0, [r10, #0x118] cmp r0, #0 @@ -6590,7 +6590,7 @@ func_ov15_0212504c: ; 0x0212504c str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] add r0, sp, #0x14 mov r1, #0xa00 @@ -6647,7 +6647,7 @@ func_ov15_02125118: ; 0x02125118 str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] ldr r1, _021251d8 ; =0x00000333 add r0, sp, #0x14 @@ -7359,7 +7359,7 @@ _02125aa8: add r1, sp, #0x14 mov r2, #0 str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #4] ldrb r1, [r4, #0x2a4] cmp r1, #0 @@ -7505,7 +7505,7 @@ _02125cd0: add r1, sp, #8 mov r2, #0 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp] ldrb r1, [r4, #0x2a4] cmp r1, #1 @@ -7860,7 +7860,7 @@ func_ov15_0212619c: ; 0x0212619c str r1, [r4] ldr r0, [r0] add r1, r4, #0xac - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei add r0, r4, #0xac bl func_ov00_02095764 add r0, r4, #0x38 @@ -7884,7 +7884,7 @@ func_ov15_021261e4: ; 0x021261e4 str r1, [r4] ldr r0, [r0] add r1, r4, #0xac - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei add r0, r4, #0xac bl func_ov00_02095764 add r0, r4, #0x38 @@ -7910,7 +7910,7 @@ func_ov15_02126234: ; 0x02126234 str r1, [r4] ldr r0, [r0] add r1, r4, #0xac - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei add r0, r4, #0xac bl func_ov00_02095764 add r0, r4, #0x38 @@ -7944,7 +7944,7 @@ func_ov15_0212627c: ; 0x0212627c str r1, [ip, #0xd0] ldr r0, [r0] add r1, ip, #0xac - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei add sp, sp, #0x14 ldmia sp!, {pc} .align 2, 0 @@ -10315,7 +10315,7 @@ func_ov15_02127d9c: ; 0x02127d9c str r1, [r4, #0x7c] ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 beq _02127e38 mov r0, r4 @@ -10564,7 +10564,7 @@ _02128198: ldrsh r1, [r5, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldr r0, [r5, #4] bic r0, r0, #1 bic r0, r0, #8 @@ -10964,7 +10964,7 @@ func_ov15_02128670: ; 0x02128670 ldr r0, [r0] ldr r7, [r6, #0x1c] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r1, r0 subs r4, r1, r7 rsbmi r4, r4, #0 @@ -11244,7 +11244,7 @@ _02128ad8: add r1, r4, #0x18 ldr r0, [r0] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x1c] ldr r0, [r4, #0x80] cmp r0, #0x3000 @@ -11832,18 +11832,18 @@ func_ov15_0212925c: ; 0x0212925c ldr r0, [r2] mov r8, r1 add r1, sp, #0x68 - bl func_ov00_0208340c + bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p ldr r0, _021296c0 ; =data_027e0e60 add r1, sp, #0x5c ldr r0, [r0] - bl func_ov00_0208342c + bl _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p ldr r0, _021296c0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083374 + bl _ZN10MapManager18func_ov00_02083374Ev ldr r1, _021296c0 ; =data_027e0e60 mov r11, r0 ldr r0, [r1] - bl func_ov00_02083384 + bl _ZN10MapManager18func_ov00_02083384Ev ldr r3, [sp, #0x70] ldr r2, [sp, #0x5c] add r3, r3, #0xe800 @@ -12483,7 +12483,7 @@ func_ov15_02129a6c: ; 0x02129a6c ldrb r1, [r7, #1] ldr r0, [r2] mov r6, r3 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r5, r0 mov r0, r9 ldr r2, [r0] @@ -12494,7 +12494,7 @@ func_ov15_02129a6c: ; 0x02129a6c mov r4, r0 ldr r0, [r1] ldrb r1, [r7] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [sp, #0x10] mvn r0, #0 str r4, [sp, #0x14] @@ -16458,7 +16458,7 @@ _0212cf4c: add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldr r1, _0212cfbc ; =data_ov15_0218a464 ldr r2, _0212cfc0 ; =data_ov15_0218a470 @@ -16757,7 +16757,7 @@ _0212d358: add r1, sp, #0x20 str r2, [sp, #0x28] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x184] sub r0, r0, r1 str r0, [r4, #0x4c] @@ -16812,7 +16812,7 @@ _0212d430: add r1, sp, #0x14 str r2, [sp, #0x1c] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x184] sub r0, r0, r1 str r0, [r4, #0x4c] @@ -17588,7 +17588,7 @@ _0212df28: ldrh r1, [r4, #0x22] ldr r0, [r0] add r2, sp, #0x2c - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _0212e03c mov r0, #2 @@ -18878,7 +18878,7 @@ _0212f13c: str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _0212f260 ; =data_027e0e58 str r0, [sp, #0x10] ldr r0, [r1] @@ -18968,7 +18968,7 @@ func_ov15_0212f2c8: ; 0x0212f2c8 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, #0x184] ldr r1, _0212f344 ; =data_ov15_0218a46c sub r0, r0, r2 @@ -19237,7 +19237,7 @@ func_ov15_0212f5f0: ; 0x0212f5f0 ldr r0, _0212f6b8 ; =data_027e0e60 add r1, r4, #0x334 ldr r0, [r0] - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldr r0, [r4, #0x130] sub r0, r0, #4 cmp r0, #1 @@ -19297,7 +19297,7 @@ func_ov15_0212f6c4: ; 0x0212f6c4 ldr r0, _0212f794 ; =data_027e0e60 add r1, r4, #0x334 ldr r0, [r0] - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldr r0, [r4, #0x130] sub r0, r0, #4 cmp r0, #1 @@ -19511,7 +19511,7 @@ _0212f824: ldr r0, _0212fc24 ; =data_027e0e60 add r1, r4, #0x334 ldr r0, [r0] - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei mov ip, #5 strb ip, [r4, #0x490] mov r1, #0x5d @@ -19704,7 +19704,7 @@ _0212fcb0: add r1, sp, #0x10 mov r2, #0 str r3, [sp, #0x18] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldr r1, _0212fd1c ; =data_ov15_0218a5a0 ldr r2, _0212fd20 ; =data_ov15_0218a5ac @@ -19980,7 +19980,7 @@ _0212fe8c: str r0, [r5, #0x488] ldr r0, [r1] add r1, r5, #0x334 - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei add r0, sp, #0x1c4 bl func_ov00_0209a508 b _02130510 @@ -20014,7 +20014,7 @@ _0213010c: ldr r0, _02130540 ; =data_027e0e60 add r1, r5, #0x334 ldr r0, [r0] - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei b _02130510 _02130188: add r6, sp, #0x30 @@ -20086,7 +20086,7 @@ _02130220: add r1, sp, #0x24 ldr r0, [r0] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x28] ldr r1, [sp, #0x24] add r0, sp, #0x24 @@ -20126,7 +20126,7 @@ _02130220: add r1, sp, #0x18 ldr r0, [r0] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x18] str r0, [sp, #0x1c] str r1, [r5, #0x4a0] @@ -20369,7 +20369,7 @@ _02130694: ldrh r1, [r4, #0x26] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _02130724 mov r0, r4 @@ -21606,7 +21606,7 @@ _02131840: ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _021318fc ldr r0, _0213190c ; =data_027e0f94 @@ -21906,7 +21906,7 @@ _02131c70: ldr r0, _02131f08 ; =data_027e0e60 add r1, r4, #0x334 ldr r0, [r0] - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldr r0, [r4, #0x32c] bl func_ov15_0215bacc mov r0, #0 @@ -22388,7 +22388,7 @@ _021322e8: str r4, [sp, #0x8c] str r6, [sp, #0x40] str r4, [sp, #0x48] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0xa0] ldr r4, [sp, #0x84] orr r2, r1, #1 @@ -22461,7 +22461,7 @@ _0213246c: str r5, [sp, #0x28] str r4, [sp, #0x2c] str r3, [sp, #0x30] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x80] ldr r4, [sp, #0x64] orr r2, r1, #1 @@ -22499,7 +22499,7 @@ _02132504: ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0x4c - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 addeq sp, sp, #0xa4 ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc} @@ -22675,7 +22675,7 @@ func_ov15_0213278c: ; 0x0213278c bhi _021327d0 ldr r0, _021327d8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 movne r0, #0 ldmneia sp!, {r4, pc} @@ -23506,7 +23506,7 @@ _021332ac: ldrh r1, [r7, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldrne r0, [r7, #0x360] subne r0, r0, #1 @@ -25507,7 +25507,7 @@ _02134e14: add r1, sp, #0x14 str r2, [sp, #0x1c] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x4c] cmp r1, r0 movlt r0, #1 @@ -25537,7 +25537,7 @@ _02134e6c: str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x24] ldrb r0, [r4, #0x217] cmp r0, #1 @@ -26926,7 +26926,7 @@ _02136168: ldr r0, [r0] ldr r2, [r2, #0x28] add r3, sp, #0xb4 - bl func_ov00_02084d4c + bl _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p cmp r0, #1 movls r4, #2 _0213618c: @@ -28137,7 +28137,7 @@ _02137164: str r2, [sp, #0x10] add r1, sp, #8 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldrb r1, [r4, #0x27c] mov ip, r0 cmp r1, #1 @@ -29260,7 +29260,7 @@ _02138150: add r1, sp, #0x1c mov r2, #0 ldr r5, [r3, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _021382e8 ; =data_027e0f94 str r5, [sp, #0x30] ldr r2, [r1] @@ -29452,7 +29452,7 @@ func_ov15_02138408: ; 0x02138408 ldr r0, _0213846c ; =data_027e0e60 mov r2, #0 ldr r0, [r0] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r3, [r4, #4] ldr r1, _02138470 ; =0xfffffccd add r2, r3, r1 @@ -29606,7 +29606,7 @@ func_ov15_02138478: ; 0x02138478 add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _02138bb8 ; =data_027e0f94 ldr r1, [r1, #4] cmp r1, r0 @@ -30324,7 +30324,7 @@ _02139100: ldr r0, [r0] and r1, r1, #0x3f add r2, sp, #8 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _02139144 ldr r0, _02139158 ; =data_027e0d38 @@ -32192,7 +32192,7 @@ _0213aa30: add r1, sp, #8 mov r2, #0 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x24] add r0, sp, #0x20 mov r1, #0x800 @@ -32307,7 +32307,7 @@ func_ov15_0213abc4: ; 0x0213abc4 add r1, sp, #0x9c str r2, [sp, #0xa4] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x130] cmp r1, #2 strgt r0, [r5, #0x4c] @@ -32627,7 +32627,7 @@ _0213b05c: add r1, sp, #0x10 mov r2, #0 str r3, [sp, #0x18] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r2, #0 str r0, [sp, #0xac] ldr r1, _0213b148 ; =0x0000051f @@ -36696,7 +36696,7 @@ func_ov15_0213e754: ; 0x0213e754 str r1, [r4] ldr r0, [r0] add r1, r4, #0x31c - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldr r0, _0213e7dc ; =data_027e103c mov r1, #0 ldr r0, [r0] @@ -36738,7 +36738,7 @@ func_ov15_0213e7e4: ; 0x0213e7e4 str r1, [r4] ldr r0, [r0] add r1, r4, #0x31c - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldr r0, _0213e874 ; =data_027e103c mov r1, #0 ldr r0, [r0] @@ -37302,7 +37302,7 @@ _0213f03c: str r6, [sp, #0x6c] str r5, [sp, #0x70] str r3, [sp, #0x74] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x88] add r1, sp, #0x84 str r1, [sp] @@ -37335,7 +37335,7 @@ _0213f03c: ldr r0, _0213f4b8 ; =data_027e0e60 add r1, r4, #0x31c ldr r0, [r0] - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei add r0, sp, #0x118 bl func_ov00_0209a508 b _0213f47c @@ -37364,7 +37364,7 @@ _0213f154: strh r2, [r1, #0xc] ldr r0, [r0] add r1, r4, #0x31c - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldr r0, _0213f4c4 ; =data_ov00_020eec68 mov r1, #0x1e bl func_ov00_020d716c @@ -37623,7 +37623,7 @@ func_ov15_0213f4d4: ; 0x0213f4d4 add r1, sp, #4 mov r2, #0 str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x14] mov ip, #0 add r1, sp, #0x10 @@ -37772,7 +37772,7 @@ _0213f684: str ip, [sp, #0xc] str r4, [sp, #0x10] str r3, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x3c] mov r0, #0 str r0, [sp] @@ -37870,7 +37870,7 @@ func_ov15_0213f80c: ; 0x0213f80c ldr r0, [r0] add r1, sp, #0x88 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [sp, #0x94] str r0, [sp, #0x98] str r0, [sp, #0xa4] @@ -37920,7 +37920,7 @@ _0213f91c: str ip, [sp, #0x64] str r4, [sp, #0x68] str r3, [sp, #0x6c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0xb8] ldr r1, _0213fb88 ; =0x00000d9a add r0, sp, #0xb4 @@ -38704,7 +38704,7 @@ func_ov15_02140424: ; 0x02140424 ldr r0, _02140588 ; =data_027e0e60 add r1, r4, #0x31c ldr r0, [r0] - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei mov r0, r4 mov r1, #0x3c bl func_ov15_02140cb8 @@ -41785,7 +41785,7 @@ func_ov15_02142ba0: ; 0x02142ba0 strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02142c60 ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -42459,7 +42459,7 @@ _0214352c: add r2, sp, #0 ldr r0, [r0] add r1, r5, #0x294 - bl func_ov00_02082454 + bl _ZN10MapManager18func_ov00_02082454Eii cmp r0, #0 beq _02143578 ldr r1, [r5, #0x2b8] @@ -43560,7 +43560,7 @@ _0214449c: strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02144544 ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -43726,7 +43726,7 @@ _021446d8: strb ip, [sp, #0x13] strb ip, [sp, #0x14] strb ip, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02144770 ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -44112,7 +44112,7 @@ _02144a40: mov r2, #0 str r3, [r9, #0x4c0] ldr r0, [r0] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _021457e4 ; =0xfffffe66 mov r2, #0 add r0, r0, r1 @@ -44139,7 +44139,7 @@ _02144d14: str r5, [sp, #0x24] str r4, [sp, #0x28] str r3, [sp, #0x2c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0xdc] ldr r0, [r9, #0x298] cmp r0, #0x2b8 @@ -45936,7 +45936,7 @@ func_ov15_0214655c: ; 0x0214655c stmdb sp!, {r3, lr} ldr r0, _02146574 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev rsb r0, r0, #0 ldmia sp!, {r3, pc} .align 2, 0 @@ -46281,7 +46281,7 @@ _02146958: _02146960: ldr r0, _021469ec ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev ldr r1, [r4, #0x4c] sub r0, r1, r0 cmp r0, #0x2000 @@ -46289,7 +46289,7 @@ _02146960: ldmgtia sp!, {r4, pc} ldr r0, _021469ec ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev ldr r1, [r4, #0x4c] sub r0, r1, r0 mov r1, r0, lsl #0x5 @@ -48440,7 +48440,7 @@ func_ov15_021486a0: ; 0x021486a0 str r2, [sp, #0x38] str r3, [sp, #0x3c] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #0x3f8] ldrb r0, [r5, #0x438] cmp r0, #4 @@ -55887,7 +55887,7 @@ func_ov15_0214eabc: ; 0x0214eabc ldr r0, [r2] mov r4, r1 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #4] ldr ip, [r5, #0x15c] sub r3, r1, ip @@ -57647,7 +57647,7 @@ _02150234: ldr r0, _02150858 ; =data_027e0e60 ldrb r6, [r1, #0x28] ldr r0, [r0] - bl func_ov00_02082d40 + bl _ZN10MapManager18func_ov00_02082d40Ev strb r0, [sp, #8] and r0, r0, #0xff strb r0, [r10, #0x29c] @@ -57734,7 +57734,7 @@ _02150460: ldr r0, _02150858 ; =data_027e0e60 add r1, sp, #0x30 ldr r0, [r0] - bl func_ov00_0208346c + bl _ZN10MapManager18func_ov00_0208346cEP4AABB ldr r1, [sp, #0x30] ldr r0, [sp, #0x38] add r1, r1, #0xc000 @@ -58031,7 +58031,7 @@ func_ov15_02150874: ; 0x02150874 add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldr r1, _021508f8 ; =data_ov15_0218bef4 ldr r2, _021508fc ; =data_ov15_0218bef8 @@ -58616,7 +58616,7 @@ func_ov15_021510c0: ; 0x021510c0 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x184] sub r0, r0, r1 str r0, [r4, #0x4c] @@ -59027,7 +59027,7 @@ func_ov15_02151680: ; 0x02151680 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, #0x184] ldr r1, _021516fc ; =data_ov15_0218bf00 sub r0, r0, r2 @@ -59523,7 +59523,7 @@ func_ov15_02151cfc: ; 0x02151cfc ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 bne _02151d68 ldr r0, _02151d80 ; =data_027e10a4 @@ -59535,7 +59535,7 @@ func_ov15_02151cfc: ; 0x02151cfc bne _02151d68 ldr r0, _02151d7c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 beq _02151d68 ldr r0, [r4, #0x184] @@ -59677,7 +59677,7 @@ func_ov15_02151ef8: ; 0x02151ef8 ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 bne _02151f4c ldr r0, _02151f64 ; =data_027e10a4 @@ -59689,7 +59689,7 @@ func_ov15_02151ef8: ; 0x02151ef8 bne _02151f4c ldr r0, _02151f60 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 ldmneia sp!, {r4, pc} _02151f4c: @@ -60259,7 +60259,7 @@ _021525f4: strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _0215268c ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -60855,7 +60855,7 @@ _02152e6c: ldr r0, [r0] add r1, r5, #0x39c mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x3a0] cmp r1, r0 bge _02152f6c @@ -60874,7 +60874,7 @@ _02152e6c: str r7, [sp, #0x78] str r6, [sp, #0x7c] str r3, [sp, #0x80] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0xdc] ldr r1, _0215348c ; =0x00000266 add r0, sp, #0xd8 @@ -60999,7 +60999,7 @@ _021530c4: add r1, r5, #0x39c ldr r0, [r0] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x3a0] cmp r1, r0 strlt r0, [r5, #0x3a0] @@ -61865,7 +61865,7 @@ _02153d0c: strb r7, [sp, #0xa3] strb r7, [sp, #0xa4] strb r7, [sp, #0xa5] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02153f7c ; =data_027e0d38 add r1, sp, #0x90 ldr r0, [r0] @@ -62039,7 +62039,7 @@ func_ov15_02153f94: ; 0x02153f94 add r1, sp, #0xc mov r2, #0 str r3, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _0215417c ; =data_027e0f94 ldr r2, [r1, #4] cmp r2, r0 @@ -62240,7 +62240,7 @@ _02154280: strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02154324 ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -62349,7 +62349,7 @@ _02154404: strb ip, [sp, #0x5f] strb ip, [sp, #0x60] strb ip, [sp, #0x61] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02154628 ; =data_027e0d38 add r1, sp, #0x4c ldr r0, [r0] @@ -62440,7 +62440,7 @@ _02154490: ldr r0, [r3] add r1, sp, #4 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x2c] mvn r0, #0x80000000 str r0, [sp] @@ -62497,7 +62497,7 @@ _02154654: strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _021546fc ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -64348,7 +64348,7 @@ _02156084: str ip, [sp] str r4, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x10] sub r4, r1, r0 mov r0, r6 @@ -65051,7 +65051,7 @@ func_ov15_02156970: ; 0x02156970 str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] ldr r1, _02156a30 ; =0x00000333 add r0, sp, #0x14 @@ -65109,7 +65109,7 @@ func_ov15_02156a44: ; 0x02156a44 str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] add r0, sp, #0x14 mov r1, #0xa00 @@ -66232,7 +66232,7 @@ func_ov15_021578e0: ; 0x021578e0 add r1, sp, #8 mov r2, r7 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x3c] ldr r7, _02157c34 ; =0x000004cd sub r5, r1, r0 @@ -66581,7 +66581,7 @@ _02157ed8: ldrh r1, [r10, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 addeq sp, sp, #0x5c ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} @@ -66976,7 +66976,7 @@ func_ov15_0215846c: ; 0x0215846c ldr r0, _0215856c ; =data_027e0e60 mov r2, r4 ldr r0, [r0] - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _021584f8 ldr r6, _02158570 ; =data_027e0fe4 @@ -67008,7 +67008,7 @@ _021584f8: ldr r0, _0215856c ; =data_027e0e60 mov r2, #0 ldr r0, [r0] - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} mov r9, #0 @@ -67473,7 +67473,7 @@ _02158b38: add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r5, #0x4c] ldr r1, _02158ccc ; =data_ov15_0218c384 sub r0, r0, r2 @@ -67872,7 +67872,7 @@ _021590c4: ldr r3, [r4, #0x50] mov r2, #0 str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x1f8] mov r5, r0 cmp r1, #4 @@ -68209,7 +68209,7 @@ func_ov15_0215957c: ; 0x0215957c add r1, sp, #0x14 mov r2, #0 str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r4, r0 cmp r6, #0x2a000 bne _021595fc @@ -68280,7 +68280,7 @@ _0215969c: add r1, sp, #8 str r2, [sp, #0x10] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x4c] mov r4, r0 cmp r1, r4 @@ -68630,7 +68630,7 @@ func_ov15_02159b70: ; 0x02159b70 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, #0x4c] sub r1, r0, #0x800 cmp r2, r1 @@ -68800,7 +68800,7 @@ func_ov15_02159db8: ; 0x02159db8 add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _02159e38 ; =0xfffff4cd ldr r2, [r4, #0x4c] add r0, r0, r1 @@ -68921,7 +68921,7 @@ _02159ea0: add r1, sp, #0x24 str r2, [sp, #0x2c] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x34] mov r0, #0 ldr r7, [sp] @@ -69369,7 +69369,7 @@ _0215a500: ldrh r1, [r10, #0x20] ldr r0, [r0] add r2, sp, #0x18 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi str r0, [r10, #0x1ec] ldr r2, [sp, #0x24] ldr r1, [sp, #0x18] @@ -69518,7 +69518,7 @@ func_ov15_0215a768: ; 0x0215a768 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 mov r1, #0x37 beq _0215a820 @@ -69576,7 +69576,7 @@ _0215a858: _0215a860: ldr r0, _0215a8bc ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d40 + bl _ZN10MapManager18func_ov00_02082d40Ev cmp r0, #0 addne sp, sp, #8 ldmneia sp!, {r4, pc} @@ -69685,7 +69685,7 @@ _0215a9c0: ldr r0, _0215b26c ; =data_027e0e60 mov r6, #0 ldr r0, [r0] - bl func_ov00_02082d40 + bl _ZN10MapManager18func_ov00_02082d40Ev cmp r0, #0 beq _0215a9e4 cmp r0, #1 @@ -69783,7 +69783,7 @@ _0215ab28: ldr r0, _0215b26c ; =data_027e0e60 mov r2, r5 ldr r0, [r0] - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii mov r5, r0 _0215ab4c: ldrb r0, [r4, #0x236] @@ -69793,7 +69793,7 @@ _0215ab4c: ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 bne _0215ab84 ldrb r0, [r4, #0x236] @@ -70226,7 +70226,7 @@ _0215b164: bne _0215b240 ldr r0, _0215b26c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d40 + bl _ZN10MapManager18func_ov00_02082d40Ev cmp r0, #0 bne _0215b238 add r0, r4, #0x200 @@ -70516,11 +70516,11 @@ _0215b54c: ldr r0, _0215b62c ; =data_027e0e60 mov r1, #0 ldr r0, [r0] - bl func_ov00_020823b4 + bl _ZN10MapManager18func_ov00_020823b4Ev ldr r0, _0215b62c ; =data_027e0e60 mov r1, #0 ldr r0, [r0] - bl func_ov00_020823a4 + bl _ZN10MapManager18func_ov00_020823a4Ei ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov15_0215b358 @@ -70711,7 +70711,7 @@ func_ov15_0215b84c: ; 0x0215b84c mov r4, r0 ldr r0, [r1] mov r1, #1 - bl func_ov00_020823b4 + bl _ZN10MapManager18func_ov00_020823b4Ev ldr r1, [r4, #0x1c4] ldr r0, _0215bac4 ; =data_ov00_020ee0a0 mov r1, r1, asr #0xc @@ -71098,7 +71098,7 @@ _0215bd70: ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 mov r0, r4 beq _0215bd98 @@ -71269,7 +71269,7 @@ _0215bf70: ldrh r1, [r4, #0x22] ldr r0, [r0] add r2, sp, #0x3c - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _0215c058 ldr r0, _0215c334 ; =data_027e10a4 @@ -71374,7 +71374,7 @@ _0215c154: ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0x18 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi ldr r2, [sp, #0x2c] ldr r1, [sp, #0x38] sub r0, r2, #0x7000 @@ -71587,7 +71587,7 @@ _0215c474: ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi ldr r2, [sp, #0x14] ldr r1, [sp, #0x20] sub r0, r2, #0x7000 @@ -71661,7 +71661,7 @@ func_ov15_0215c584: ; 0x0215c584 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0215c660 ldrb r0, [r4, #0x1bc] @@ -72472,7 +72472,7 @@ func_ov15_0215d078: ; 0x0215d078 ldrh r1, [r0] ldr r0, [r2] add r2, sp, #0x54 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 addeq sp, sp, #0x6c moveq r0, r5 @@ -73798,7 +73798,7 @@ _0215e0f4: ldr r0, _0215e570 ; =data_027e0e60 mov r2, #0 ldr r0, [r0] - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 bne _0215e558 ldr r0, _0215e574 ; =data_027e0dbc @@ -74335,7 +74335,7 @@ func_ov15_0215e890: ; 0x0215e890 str r3, [sp, #0x50] ldr r3, [r9, #0x50] str r3, [sp, #0x54] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r9, #0x130] mov r6, r0 cmp r1, #7 @@ -74353,7 +74353,7 @@ _0215e8f8: ; jump table _0215e918: ldr r0, _0215f7b8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 ldr r0, [r9, #0x3b8] subeq r0, r0, #1 @@ -74549,7 +74549,7 @@ _0215ebbc: beq _0215ec14 ldr r0, _0215f7b8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 bne _0215ec24 _0215ec14: @@ -74813,7 +74813,7 @@ _0215ef7c: add r1, sp, #0x40 str r2, [sp, #0x48] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldrb r1, [r9, #0x3ec] cmp r1, #1 bne _0215f048 @@ -74885,7 +74885,7 @@ _0215f048: ldr r3, [r9, #0x50] add r1, sp, #0x34 str r3, [sp, #0x3c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _0215f7f8 ; =0xfffffccd ldr r2, [r9, #0x4c] add r0, r0, r1 @@ -74927,7 +74927,7 @@ _0215f158: add r1, sp, #0x28 mov r2, #0 str r3, [sp, #0x30] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r4, r0 ldr r0, _0215f7f8 ; =0xfffffccd ldr r2, _0215f7e0 ; =0x00000266 @@ -74981,7 +74981,7 @@ _0215f250: str r2, [sp, #0x24] mov r2, #0 ldr r4, [r9, #0x50] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r9, #0x48] mov r3, #0 str r0, [sp, #0x80] @@ -75052,7 +75052,7 @@ _0215f35c: add r1, sp, #0x10 mov r2, #0 str r3, [sp, #0x18] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r1, #0x2000 mov r4, r0 ldr r2, _0215f808 ; =0x0000019a @@ -75422,7 +75422,7 @@ func_ov15_0215f8b0: ; 0x0215f8b0 add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r4, r0 mov r0, r6 bl _ZN5Actor12ApplyGravityEv @@ -75618,7 +75618,7 @@ func_ov15_0215fb6c: ; 0x0215fb6c ldr r0, _0215fc94 ; =data_027e0e60 mov r2, #0 ldr r0, [r0] - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 movne r0, #0 addne sp, sp, #0x18 @@ -75639,7 +75639,7 @@ _0215fba8: mov r1, r5 ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 moveq r0, #0 addeq sp, sp, #0x18 @@ -75890,7 +75890,7 @@ func_ov15_0215fefc: ; 0x0215fefc ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 movne r0, #1 strneb r0, [r4, #0x3ef] @@ -76912,7 +76912,7 @@ func_ov15_02160c24: ; 0x02160c24 add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldr r1, _02160ca8 ; =data_ov15_0218caec ldr r2, _02160cac ; =data_ov15_0218caf8 @@ -77444,7 +77444,7 @@ func_ov15_021613a4: ; 0x021613a4 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x184] sub r0, r0, r1 str r0, [r4, #0x4c] @@ -77798,7 +77798,7 @@ func_ov15_02161880: ; 0x02161880 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, #0x184] ldr r1, _021618fc ; =data_ov15_0218caf4 sub r0, r0, r2 @@ -78223,7 +78223,7 @@ _02161cd0: ldr r0, _02162430 ; =data_027e0e60 str r1, [r10, #0x284] ldr r0, [r0] - bl func_ov00_02082d40 + bl _ZN10MapManager18func_ov00_02082d40Ev ldr r1, _02162434 ; =data_027e0d38 ldr r2, _02162438 ; =data_027e0fe4 ldr r1, [r1] @@ -78390,7 +78390,7 @@ _021620bc: ldr r0, _02162430 ; =data_027e0e60 add r1, sp, #0x2c ldr r0, [r0] - bl func_ov00_0208346c + bl _ZN10MapManager18func_ov00_0208346cEP4AABB ldr r1, [sp, #0x34] ldr r0, [sp, #0x38] ldr r2, [sp, #0x2c] @@ -78677,7 +78677,7 @@ _021624c8: add r1, sp, #4 mov r2, #0 str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldr r1, _02162530 ; =data_ov15_0218cc00 ldr r2, _02162534 ; =data_ov15_0218cc0c @@ -78750,7 +78750,7 @@ _021625a0: add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x184] sub r0, r0, r1 str r0, [r5, #0x4c] @@ -79507,7 +79507,7 @@ _021630ec: ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 bne _02163160 mov r0, r4 @@ -79834,7 +79834,7 @@ _0216346c: str r7, [sp, #0x50] str r3, [sp, #0x94] str r3, [sp, #0x58] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x90] add r0, r4, #0x288 str r0, [sp] @@ -80004,7 +80004,7 @@ _02163854: ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0x5c - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _0216391c ldr r0, _02163c44 ; =data_027e10a4 @@ -80219,7 +80219,7 @@ _02163b90: add r1, sp, #8 str r2, [sp, #0x10] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x184] sub r0, r0, r1 str r0, [r4, #0x4c] @@ -80616,7 +80616,7 @@ _021640c4: add r3, ip, r3, asr #12 str r3, [sp, #0x34] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x30] add r0, r6, #0x288 str r0, [sp] @@ -81672,7 +81672,7 @@ _021650ac: add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r4, #0x184] ldr r1, _02165120 ; =data_ov15_0218cc08 sub r0, r0, r2 @@ -82592,7 +82592,7 @@ _02165d70: ldr r0, [r0] mov r2, r3 add r1, r4, #0x18 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii mov r0, r4 mov r1, #1 bl func_ov15_02165e94 @@ -83168,7 +83168,7 @@ func_ov15_0216648c: ; 0x0216648c add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldrb r0, [r4, #0xa4] cmp r0, #0 @@ -83241,7 +83241,7 @@ func_ov15_02166584: ; 0x02166584 add r1, sp, #8 mov r2, #0 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] mov r1, #0 str r1, [sp] @@ -83914,7 +83914,7 @@ _02166d48: add r1, sp, #0x10 str r2, [sp, #0x18] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #0x4c] ldr r0, _02166ef0 ; =data_027e0ffc mov r1, #0x1dc @@ -84141,14 +84141,14 @@ func_ov15_021670dc: ; 0x021670dc _02167114: ldr r0, _0216728c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 ldmeqia sp!, {r4, r5, r6, pc} ldr r0, _0216728c ; =data_027e0e60 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldreq r0, [r4, #0x284] addeq r0, r0, #1 @@ -85284,7 +85284,7 @@ _02168098: str r5, [sp, #4] str r3, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x98] ldr r2, [r4, #0x18c] add r1, r1, r0 @@ -85977,7 +85977,7 @@ _02168a9c: str ip, [sp, #0xc] str r3, [sp, #0x10] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x98] ldr r2, [r5, #0x18c] add r1, r1, r0 @@ -86844,7 +86844,7 @@ _02169594: add r1, sp, #8 mov r2, #0 add r8, r8, r3 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r10, #0x48] ldr r1, [r5, r9, lsl #2] str r0, [sp, #0x18] @@ -88056,7 +88056,7 @@ _0216a6a8: bne _0216a6c4 ldr r0, _0216a750 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020848b8 + bl _ZN10MapManager18func_ov00_020848b8Ev cmp r0, #0 moveq r11, #0 _0216a6c4: @@ -90474,7 +90474,7 @@ func_ov15_0216c664: ; 0x0216c664 mov r4, r0 ldr r0, [r1] mov r5, #0 - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev ldr r1, [r4, #0x4c] sub r0, r1, r0 cmp r0, #0x2000 @@ -91832,7 +91832,7 @@ func_ov15_0216d8c8: ; 0x0216d8c8 strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _0216d960 ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -91897,7 +91897,7 @@ _0216d9b0: strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _0216da9c ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -94351,7 +94351,7 @@ func_ov15_0216fa98: ; 0x0216fa98 add r1, r4, #0x74 ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei add r0, r4, #0xf8 add r0, r0, #0x400 blx func_0202ab64 @@ -94403,7 +94403,7 @@ func_ov15_0216fb50: ; 0x0216fb50 add r1, r4, #0x74 ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei add r0, r4, #0xf8 add r0, r0, #0x400 blx func_0202ab64 @@ -94630,7 +94630,7 @@ _0216fe54: ldr r0, _0217062c ; =data_027e0e60 str r2, [r5, #0x498] ldr r0, [r0] - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei add r0, sp, #0x288 bl func_ov00_0209a4f4 ldr r2, _02170630 ; =data_027e0f94 @@ -95003,7 +95003,7 @@ _021703e8: add r1, sp, #0 mov r2, r6 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _02170634 ; =data_027e0f64 ldr r3, [sp, #0x2c] ldr r2, [sp, #0x34] @@ -95256,7 +95256,7 @@ func_ov15_021707e8: ; 0x021707e8 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -96014,7 +96014,7 @@ _021712c8: ldr r3, [r4, #0x50] mov r2, #0 str r3, [sp, #0x40] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x4c] mov lr, r0 cmp r1, lr @@ -96097,7 +96097,7 @@ _0217140c: ldr r3, [r4, #0x50] mov r2, #0 str r3, [sp, #0x34] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov ip, r0 ldr r1, [r4, #0x4c] sub r0, ip, #0x1800 @@ -96156,7 +96156,7 @@ _021714f8: ldr r3, [r4, #0x50] mov r2, #0 str r3, [sp, #0x28] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x4c] add r0, r0, #0x29 cmp r1, r0 @@ -96225,7 +96225,7 @@ _0217161c: add r1, r4, #0x74 ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei add sp, sp, #0x1e8 ldmia sp!, {r4, pc} _02171640: @@ -97841,7 +97841,7 @@ func_ov15_02172d18: ; 0x02172d18 str r3, [sp, #4] ldr r3, [r4, #0x50] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _02172d8c ; =data_027e0e58 str r0, [sp, #0x10] ldr r0, [r1] @@ -97877,7 +97877,7 @@ func_ov15_02172d90: ; 0x02172d90 str r3, [sp, #8] ldr r3, [r4, #0x50] str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x14] ldr r1, [r4, #0x4c] sub r0, r1, r0 @@ -98215,7 +98215,7 @@ func_ov15_0217317c: ; 0x0217317c ldr r0, [r3] add r1, sp, #0x14 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x9a add r1, r0, #0x900 ldr r0, [sp, #0x24] @@ -98358,7 +98358,7 @@ func_ov15_021733b0: ; 0x021733b0 str r3, [sp, #0x24] ldr r3, [r4, #0x530] str r3, [sp, #0x28] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x52c] cmp r1, r0 blt _02173474 @@ -98504,7 +98504,7 @@ func_ov15_021735a8: ; 0x021735a8 str r7, [sp] str lr, [sp, #4] str ip, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xa4 add r3, r0, #0x800 ldr r0, [r5, #4] @@ -99309,7 +99309,7 @@ func_ov15_02174100: ; 0x02174100 ldr r0, _02174174 ; =data_027e0e60 ldrsh r5, [r4, #0x78] ldr r0, [r0] - bl func_ov00_02082504 + bl _ZN10MapManager18func_ov00_02082504Ev sub r0, r5, r0 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -99362,13 +99362,13 @@ _021741a4: ldr r2, _021741d0 ; =data_027e0e60 add r1, r0, #0x160 ldr r0, [r2] - bl func_ov00_02082494 + bl _ZN10MapManager18func_ov00_02082494Ei b _021741c8 _021741b8: ldr r2, _021741d0 ; =data_027e0e60 add r1, r0, #0x160 ldr r0, [r2] - bl func_ov00_020824cc + bl _ZN10MapManager18func_ov00_020824ccEi _021741c8: mov r0, #1 ldmia sp!, {r3, pc} @@ -99424,7 +99424,7 @@ _02174268: _02174270: ldr r0, _021742a8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082504 + bl _ZN10MapManager18func_ov00_02082504Ev mov r1, r0 add r0, sp, #0 bl func_ov00_020a61ac @@ -99751,7 +99751,7 @@ _02174660: str r0, [r4, #0x28] ldr r0, _02174694 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082424 + bl _ZN10MapManager18func_ov00_02082424Ev mov r0, #0 str r0, [r4, #0x30] mov r0, #1 @@ -99898,7 +99898,7 @@ _0217481c: ldrb r2, [r4, #0x34] ldr r0, [r0] mov r3, #1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -103304,7 +103304,7 @@ func_ov15_021776c4: ; 0x021776c4 str r1, [r4] ldr r0, [r0] add r1, r4, #0x374 - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldr r0, _021777f0 ; =data_027e0f6c add r1, r4, #0x78 ldr r0, [r0] @@ -103393,7 +103393,7 @@ func_ov15_02177808: ; 0x02177808 str r1, [r4] ldr r0, [r0] add r1, r4, #0x374 - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldr r0, _0217793c ; =data_027e0f6c add r1, r4, #0x78 ldr r0, [r0] @@ -103502,7 +103502,7 @@ func_ov15_02177964: ; 0x02177964 add r1, sp, #0x38 mov r2, #0 str r3, [sp, #0x40] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, _02177efc ; =data_027e0764 str r0, [r4, #0x4c] ldr r1, [r2] @@ -103678,7 +103678,7 @@ _02177c20: str r1, [r4, #0x398] ldr r0, [r0] add r1, r4, #0x374 - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei b _02177c84 _02177c5c: mov r1, #0x69 @@ -104463,7 +104463,7 @@ _021784d0: mov r2, #0 str r3, [sp, #0x50] str r4, [sp, #0x58] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r2, #0 str r0, [sp, #0x54] ldr r1, _021789a4 ; =0x00001ccd @@ -104512,7 +104512,7 @@ _02178810: mov r2, #0 str r3, [sp, #0x10] mov r4, r4, lsl #0xc - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _021789b8 ; =0xffffc4cd cmp r4, #0x1000 add r2, r0, r1 @@ -104770,7 +104770,7 @@ func_ov15_02178b7c: ; 0x02178b7c ldrh r1, [r4, #0x22] ldr r0, [r0] add r2, sp, #0x18 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _02178c58 ldr r0, _02178c6c ; =data_027e10a4 @@ -104824,7 +104824,7 @@ func_ov15_02178c70: ; 0x02178c70 add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev sub r0, r0, #0x1000 mov r1, #0x1500 str r0, [r4, #0x4c] @@ -106308,12 +106308,12 @@ _0217a208: mov r1, #0x11 ldr r0, [r0] sub r2, r1, #0x12 - bl func_ov00_02082650 + bl _ZN10MapManager18func_ov00_02082650Eiii ldr r0, _0217a550 ; =data_027e0e60 mov r1, #0x27 ldr r0, [r0] sub r2, r1, #0x28 - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii mov r0, #1 strb r0, [r7, #0x474] _0217a270: @@ -106763,7 +106763,7 @@ func_ov15_0217a850: ; 0x0217a850 str r6, [sp] str r5, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r5, #2 ldr r2, [sp, #0xc] ldr r1, _0217aa24 ; =data_027e0f64 @@ -109023,7 +109023,7 @@ func_ov15_0217c67c: ; 0x0217c67c add r1, sp, #4 mov r2, #0 str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp] ldrh r0, [r5, #0x20] ldr r2, _0217c7f0 ; =data_ov15_02187018 @@ -109430,7 +109430,7 @@ _0217cc78: add r1, sp, #8 mov r2, #0 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x30] ldr r0, _0217cecc ; =data_027e0ffc add r2, sp, #0x2c @@ -109597,7 +109597,7 @@ func_ov15_0217cedc: ; 0x0217cedc add r1, sp, #8 mov r2, #0 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] mov r1, #0 str r1, [sp] @@ -110240,7 +110240,7 @@ _0217d79c: _0217d7b0: ldr r0, _0217d860 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082504 + bl _ZN10MapManager18func_ov00_02082504Ev mov r1, r0 add r0, sp, #0 bl func_ov00_020a61ac @@ -110636,7 +110636,7 @@ func_ov15_0217dc4c: ; 0x0217dc4c str r2, [sp] str r2, [sp, #4] str r1, [sp, #8] - bl func_ov00_02082504 + bl _ZN10MapManager18func_ov00_02082504Ev mov r1, r0 add r0, sp, #0 bl func_ov00_020a61ac @@ -113047,7 +113047,7 @@ func_ov15_0217fc40: ; 0x0217fc40 add r1, r4, #0x4c ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldrb r0, [r4, #0x3a1] cmp r0, #0 beq _0217fc94 @@ -113127,7 +113127,7 @@ func_ov15_0217fd64: ; 0x0217fd64 add r1, r4, #0x4c ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei ldrb r0, [r4, #0x3a1] cmp r0, #0 beq _0217fdb8 @@ -113479,7 +113479,7 @@ _02180200: add r1, r4, #0x4c ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei mov r0, #1 strb r0, [r4, #0x474] b _021802e8 @@ -113499,7 +113499,7 @@ _021802c4: add r1, r4, #0x4c ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei mov r0, #1 strb r0, [r4, #0x474] _021802e8: @@ -114105,7 +114105,7 @@ _02180b9c: add r1, r5, #0x4c ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838d8 + bl _ZN10MapManager18func_ov00_020838d8Ei mov r0, #0 strb r0, [r5, #0x474] b _02180bf8 @@ -114116,7 +114116,7 @@ _02180bd4: add r1, r5, #0x4c ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020838c8 + bl _ZN10MapManager18func_ov00_020838c8Ei mov r0, #1 strb r0, [r5, #0x474] _02180bf8: @@ -114837,7 +114837,7 @@ func_ov15_021815b0: ; 0x021815b0 ldr r0, [r2] ldrh r1, [r5, #0x26] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 cmpne r4, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -115638,7 +115638,7 @@ _02182140: ldrh r1, [r4, #0x26] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _02182548 mov r0, r4 @@ -116051,7 +116051,7 @@ func_ov15_021826ac: ; 0x021826ac str r6, [sp] str lr, [sp, #4] str ip, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xa4 add r3, r0, #0x800 ldr r0, [r5, #4] @@ -116133,7 +116133,7 @@ func_ov15_02182810: ; 0x02182810 str r3, [sp, #0x24] ldr r3, [r4, #0x338] str r3, [sp, #0x28] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x334] cmp r1, r0 blt _021828c0 @@ -116765,7 +116765,7 @@ _02182ff0: str r1, [sp, #0x20] add r1, sp, #0x18 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x9a add r1, r0, #0x900 ldr r0, [sp, #0x28] @@ -118302,7 +118302,7 @@ func_ov15_02184540: ; 0x02184540 ldmneia sp!, {r4, pc} ldr r0, _021845e4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev ldrb r1, [r4, #0x54] cmp r1, r0 bne _021845b4 @@ -118331,7 +118331,7 @@ _021845b4: ldr r0, _021845e4 ; =data_027e0e60 str r1, [r4, #0x3c] ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev strb r0, [r4, #0x54] ldmia sp!, {r4, pc} .align 2, 0 @@ -118352,7 +118352,7 @@ func_ov15_021845e8: ; 0x021845e8 ldmneia sp!, {r4, pc} ldr r0, _02184640 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev ldrb r1, [r4, #0x64] cmp r0, r1 ldmeqia sp!, {r4, pc} @@ -118381,7 +118381,7 @@ func_ov15_02184644: ; 0x02184644 ldmneia sp!, {r4, pc} ldr r0, _021846f4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev ldrb r1, [r4, #0xc3] cmp r0, r1 ldmeqia sp!, {r4, pc} diff --git a/asm/ov17.inc b/asm/ov17.inc index 50b401ef..5506da16 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -229,39 +229,39 @@ .extern func_ov00_020807d4 .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_020823c4 -.extern func_ov00_020823d4 -.extern func_ov00_020823e4 -.extern func_ov00_020823f4 -.extern func_ov00_02082680 -.extern func_ov00_020826a0 -.extern func_ov00_020828c0 -.extern func_ov00_0208335c -.extern func_ov00_02083368 -.extern func_ov00_02083604 -.extern func_ov00_02083614 -.extern func_ov00_020836dc -.extern func_ov00_02083790 -.extern func_ov00_02083840 -.extern func_ov00_020839d4 -.extern func_ov00_020839f8 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083ee0 -.extern func_ov00_02083f44 -.extern func_ov00_02083fb0 -.extern func_ov00_020840a0 -.extern func_ov00_020840c4 -.extern func_ov00_020843ec -.extern func_ov00_02084a5c -.extern func_ov00_02084ac4 -.extern func_ov00_02084b20 -.extern func_ov00_02084b2c -.extern func_ov00_02084cb0 -.extern func_ov00_02084cc8 -.extern func_ov00_02084d24 -.extern func_ov00_0208583c +.extern _ZN10MapManager18func_ov00_020823c4EPii +.extern _ZN10MapManager18func_ov00_020823d4Ei +.extern _ZN10MapManager18func_ov00_020823e4Ei +.extern _ZN10MapManager16MapData_vfunc_b4Ev +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager16MapData_vfunc_7cEv +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager17Get_MapData_Unk2aEv +.extern _ZN10MapManager18func_ov00_02083604Ei +.extern _ZN10MapManager18func_ov00_02083614Ei +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083790Ei +.extern _ZN10MapManager18func_ov00_02083840Ei +.extern _ZN10MapManager18func_ov00_020839d4Ev +.extern _ZN10MapManager18func_ov00_020839f8Ev +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_020840a0Ecci +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager18func_ov00_020843ecEPi +.extern _ZN10MapManager8SpawnNPCEP5Vec3pii +.extern _ZN10MapManager18func_ov00_02084ac4Ej +.extern _ZN10MapManager21SetCourseData_Unk_25cEc +.extern _ZN10MapManager21GetCourseData_Unk_25dEv +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei +.extern _ZN10MapManager18func_ov00_02084d24Ecci +.extern _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi .extern func_ov00_02088130 .extern func_ov00_02088144 .extern func_ov00_02088158 diff --git a/asm/ov17.s b/asm/ov17.s index bc796bdc..0a7e68c5 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -773,7 +773,7 @@ func_ov17_0215bbd4: ; 0x0215bbd4 ldrb r1, [r6, #1] ldr r0, [r2] mov r5, r3 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r4, r0 mov r0, r8 ldr r2, [r0] @@ -784,7 +784,7 @@ func_ov17_0215bbd4: ; 0x0215bbd4 mov r9, r0 ldr r0, [r1] ldrb r1, [r6] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r9, [sp, #0x14] str r4, [sp, #0x18] str r0, [sp, #0x10] @@ -1144,7 +1144,7 @@ func_ov17_0215bf8c: ; 0x0215bf8c str r1, [r4, #0x20] ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 mov r2, #1 @@ -1329,7 +1329,7 @@ _0215c2f4: str r1, [r5, #4] ldr r0, [r0] add r1, r5, #0x38 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _0215c648 _0215c32c: ldr r1, [r5, #4] @@ -1504,7 +1504,7 @@ _0215c598: add r1, r5, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r1, _0215c670 ; =0xffffed1f mov r0, #0 str r1, [r5, #0x70] @@ -1539,7 +1539,7 @@ _0215c634: ldrsh r1, [r5, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei _0215c648: mov r0, #1 add sp, sp, #0x108 @@ -1832,7 +1832,7 @@ func_ov17_0215c940: ; 0x0215c940 strb r2, [sp, #4] mov r2, #1 strb r3, [sp, #5] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r2, [sp, #4] ldr r0, _0215ca64 ; =data_027e0e60 add r1, sp, #4 @@ -1840,7 +1840,7 @@ func_ov17_0215c940: ; 0x0215c940 ldr r0, [r0] mov r2, #1 strb r3, [sp, #4] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii _0215c9c4: ldrh r0, [r4, #0x26] mov r1, #0x24 @@ -1900,7 +1900,7 @@ func_ov17_0215ca70: ; 0x0215ca70 ldr r0, _0215cba0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 bne _0215cabc mov r0, r4 @@ -1969,7 +1969,7 @@ _0215cb84: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -2221,7 +2221,7 @@ func_ov17_0215ce24: ; 0x0215ce24 ldr r1, [r0] add r0, sp, #0 add r2, r2, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r1, [sp] ldrb r0, [r5, #0x14] cmp r1, r0 @@ -2498,7 +2498,7 @@ _0215d1ec: ldr r3, [r3, #8] str r3, [r4, #0x210] ldr r1, [r1] - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, [r4, #0x68] ldr r1, [r4, #0x60] cmp r0, #0 @@ -3507,7 +3507,7 @@ func_ov17_0215dff0: ; 0x0215dff0 mov r10, r0 add r0, sp, #6 mov r2, r11 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r7, #0 ldr r4, _0215e1b4 ; =data_027e0e60 str r7, [r10, #0x1ec] @@ -3526,7 +3526,7 @@ _0215e038: mov r1, r6 strb r8, [sp, #4] strb r2, [sp, #5] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _0215e078 ldr r1, [r0] @@ -3750,7 +3750,7 @@ func_ov17_0215e338: ; 0x0215e338 mov r10, r0 add r0, sp, #2 mov r2, r11 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r7, #0 ldr r4, _0215e460 ; =data_027e0e60 str r7, [r10, #0x250] @@ -3769,7 +3769,7 @@ _0215e37c: mov r1, r6 strb r8, [sp] strb r2, [sp, #1] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _0215e3bc ldr r1, [r0] @@ -4852,11 +4852,11 @@ _0215f25c: add r0, sp, #0 ldr r1, [r1] add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _0215f2e0 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _0215f2ac ldr r1, [r0] @@ -5306,11 +5306,11 @@ func_ov17_0215f874: ; 0x0215f874 add r0, sp, #0 ldr r1, [r1] mov r2, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _0215f904 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 ldmeqia sp!, {r3, r4, r5, pc} ldr r1, [r0] @@ -5406,7 +5406,7 @@ func_ov17_0215f9a0: ; 0x0215f9a0 add r1, sp, #0 str r2, [sp, #8] ldr r2, [r4, #8] - bl func_ov00_0208583c + bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi cmp r0, #0 movlt r0, #1 movge r0, #0 @@ -5588,7 +5588,7 @@ _0215fb5e: blx func_ov03_020f8068 add r1, r0, #0 add r0, r7, #0 - blx func_ov00_02083614 + blx _ZN10MapManager18func_ov00_02083614Ei cmp r0, #0 beq _0215fb80 cmp r4, r5 @@ -5674,7 +5674,7 @@ _0215fc14: bl func_ov03_020f8068 mov r1, r0 mov r0, r10 - bl func_ov00_02083614 + bl _ZN10MapManager18func_ov00_02083614Ei cmp r0, #0 beq _0215fcb4 ldr r10, [r11] @@ -5682,7 +5682,7 @@ _0215fc14: bl func_ov03_020f8068 mov r1, r0 mov r0, r10 - bl func_ov00_02083604 + bl _ZN10MapManager18func_ov00_02083604Ei cmp r0, #0 beq _0215fcb4 _0215fc78: @@ -5751,7 +5751,7 @@ _0215fd3c: bl func_ov03_020f8068 mov r1, r0 mov r0, r8 - bl func_ov00_02083614 + bl _ZN10MapManager18func_ov00_02083614Ei cmp r0, #0 beq _0215fd70 cmp r5, r7 @@ -5936,7 +5936,7 @@ _0215ffcc: bl func_ov03_020f8068 mov r1, r0 mov r0, r6 - bl func_ov00_02083614 + bl _ZN10MapManager18func_ov00_02083614Ei cmp r0, #0 beq _02160088 mov r0, r7 @@ -6733,7 +6733,7 @@ _021608d4: add r1, sp, #0 str r2, [sp, #8] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x1bc] ldr r0, [r4, #0x144] cmp r0, #0 @@ -6940,7 +6940,7 @@ _02160b10: add r0, sp, #4 add r2, sp, #0x14 str r3, [sp, #0x1c] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #4] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -7012,7 +7012,7 @@ _02160c28: add r0, sp, #0 add r2, sp, #8 str r3, [sp, #0x10] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -7611,14 +7611,14 @@ _02161404: add r1, r5, #0x18 ldr r0, [r0] mov r3, #2 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _021614dc _02161468: ldr r0, _021614f0 ; =data_027e0e60 add r1, r5, #0x18 ldr r0, [r0] mov r3, #1 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _021614dc _02161480: bl func_ov14_02127188 @@ -7641,7 +7641,7 @@ _021614a8: ldr r0, _021614f0 ; =data_027e0e60 ldrh r1, [r5, #0x24] ldr r0, [r0] - bl func_ov00_02083840 + bl _ZN10MapManager18func_ov00_02083840Ei b _021614dc _021614d0: mov r0, r5 @@ -7750,7 +7750,7 @@ func_ov17_0216161c: ; 0x0216161c ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _02161670 ldr r0, _0216167c ; =data_027e0fe4 @@ -7777,7 +7777,7 @@ func_ov17_02161680: ; 0x02161680 ldr r0, _021616e8 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -7795,7 +7795,7 @@ func_ov17_02161680: ; 0x02161680 ldr r0, _021616e8 ; =data_027e0e60 ldrh r1, [r4, #0x24] ldr r0, [r0] - bl func_ov00_02083840 + bl _ZN10MapManager18func_ov00_02083840Ei mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 @@ -7810,7 +7810,7 @@ func_ov17_021616ec: ; 0x021616ec ldr r0, _0216179c ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -7839,14 +7839,14 @@ func_ov17_021616ec: ; 0x021616ec ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _0216179c ; =data_027e0e60 ldrh r1, [r4, #0x24] ldr r0, [r0] - bl func_ov00_02083790 + bl _ZN10MapManager18func_ov00_02083790Ei mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 @@ -10928,11 +10928,11 @@ func_ov17_02163e24: ; 0x02163e24 ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} ldr r0, _02163ecc ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r1, _02163ecc ; =data_027e0e60 mov r11, r0 ldr r0, [r1] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r8, r0 mov r9, #0 cmp r11, #0 @@ -10949,7 +10949,7 @@ _02163e78: mov r1, r6 strb r7, [sp] strb r10, [sp, #1] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _02163eb0 ldr r1, [r0] @@ -11054,7 +11054,7 @@ _02163fbc: str r2, [r4, #0x6c] ldr r0, [r0] add r1, r4, #0x38 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _0216407c _02163fe4: mov r0, #0 @@ -11066,7 +11066,7 @@ _02163fe4: ldr r0, [r0] add r1, r4, #0x38 mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _0216407c _02164010: mov r0, #1 @@ -11076,7 +11076,7 @@ _02164010: str r2, [r4, #0x68] ldr r0, [r0] add r1, r4, #0x38 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi cmp r5, #0 bne _0216407c mov r0, r4 @@ -11091,7 +11091,7 @@ _02164048: ldr r0, [r0] add r1, r4, #0x38 mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi cmp r5, #0 bne _0216407c mov r0, r4 @@ -11278,23 +11278,23 @@ func_ov17_02164284: ; 0x02164284 str r1, [sp, #8] ldr r1, [sp] add r7, r1, #0xa - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r1, [sp, #8] cmp r1, r0 blt _021642ec ldr r0, _02164474 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #8] _021642ec: ldr r0, _02164474 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv cmp r7, r0 blt _02164310 ldr r0, _02164474 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r7, r0 _02164310: ldr r8, [sp] @@ -11310,7 +11310,7 @@ _0216432c: mov r1, r6 strb r2, [sp, #0xe] strb r8, [sp, #0xf] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev mov r5, r0 cmp r5, r10 beq _02164380 @@ -11359,7 +11359,7 @@ _021643e0: ldr r0, [r0] strb r6, [sp, #0xc] strb r9, [sp, #0xd] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev mov r5, r0 cmp r5, r10 beq _0216442c @@ -12427,11 +12427,11 @@ _021651b0: _021651c0: ldr r0, _02165280 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldr r1, _02165280 ; =data_027e0e60 and r11, r0, #0xff ldr r0, [r1] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv mov r8, #0 strb r8, [sp] strb r8, [sp, #1] @@ -12449,7 +12449,7 @@ _02165208: mov r1, r6 strb r8, [sp] strb r9, [sp, #1] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r5, r0 beq _02165258 ldr r1, [r0] @@ -13053,7 +13053,7 @@ _02165770: _0216577e: ldr r0, _021657b8 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02084b2c + blx _ZN10MapManager21GetCourseData_Unk_25dEv cmp r0, #0 beq _02165798 add r0, r4, #0 @@ -13511,7 +13511,7 @@ _02165d80: ldr r0, _02165e44 ; =data_027e0e60 mov r1, #1 ldr r0, [r0] - bl func_ov00_02084b20 + bl _ZN10MapManager21SetCourseData_Unk_25cEc mov r0, r4 mov r1, #1 bl _ZN5Actor18CollidesWithPlayerEj @@ -13730,12 +13730,12 @@ _02166080: ; jump table _02166090: ldr r0, _021661e0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084b2c + bl _ZN10MapManager21GetCourseData_Unk_25dEv ldmia sp!, {r4, pc} _021660a0: ldr r0, _021661e0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084b2c + bl _ZN10MapManager21GetCourseData_Unk_25dEv cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} @@ -14372,15 +14372,15 @@ func_ov17_02166878: ; 0x02166878 ldr r5, [r0] ldr r1, [r9, #0x18] mov r0, r5 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev mov r4, r0 ldr r1, [r9, #0x20] mov r0, r5 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r2, r0 mov r0, r5 mov r1, r4 - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci str r0, [r9, #0x70] ldrb r1, [r9, #0x7a] ldr r2, [r9, #0x18] @@ -14465,7 +14465,7 @@ _021669f8: mov r2, r4 strb r6, [sp, #4] strb r8, [sp, #5] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r0, [r9, #0x15] add r8, r8, #1 add r0, r0, #2 @@ -14482,7 +14482,7 @@ _02166a38: ldrh r2, [r9, #0x2a] ldr r0, [r0] add r1, r9, #0x64 - bl func_ov00_020823c4 + bl _ZN10MapManager18func_ov00_020823c4EPii add sp, sp, #0x54 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 @@ -14679,7 +14679,7 @@ _02166cc4: ldr r0, _02166df4 ; =data_027e0e60 ldr r1, [r4, #0x74] ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej mvn r0, #0 str r0, [r4, #0x74] _02166cec: @@ -14696,7 +14696,7 @@ _02166cec: ldr r0, [r0] add r1, r4, #0x38 mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _02166de8 _02166d28: mov r1, #1 @@ -14710,7 +14710,7 @@ _02166d28: ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r4, #0x74] _02166d5c: mov r0, r4 @@ -14742,14 +14742,14 @@ _02166d8c: ldr r0, [r0] add r1, r4, #0x38 mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi b _02166de8 _02166dd4: ldr r0, _02166df4 ; =data_027e0e60 add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi _02166de8: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} @@ -15323,12 +15323,12 @@ _021675cc: sub r2, r2, #1 sub r2, r3, r2, lsl #11 str r2, [sp, #0x10] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev ldr r1, _021676a8 ; =data_027e0e60 mov r5, r0 ldr r0, [r1] ldr r1, [sp, #0x10] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev ldrb r1, [r10, #0x7a] mov r6, r0 mov r7, #0 @@ -15348,13 +15348,13 @@ _02167650: mov r3, r11 add r1, r5, r7 add r2, r6, r8 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci b _02167680 _02167670: ldr r3, [r10, #0x70] add r1, r5, r7 add r2, r6, r8 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci _02167680: ldrb r1, [r10, #0x7a] add r8, r8, #1 @@ -16338,13 +16338,13 @@ _021683b0: mov r2, r5 strb r7, [sp, #6] strb r9, [sp, #7] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldr r0, [r4] strb r7, [sp, #4] strb r9, [sp, #5] mov r1, r11 mov r2, #1 - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r10, #0x68] cmp r0, #1 ldr r0, [r4] @@ -16352,13 +16352,13 @@ _021683b0: mov r1, r8 mov r2, r9 mov r3, #0x17 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci b _02168414 _02168404: mov r1, r8 mov r2, r9 mov r3, #9 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci _02168414: ldrb r0, [r10, #0x15] add r9, r9, #1 @@ -16490,12 +16490,12 @@ func_ov17_0216857c: ; 0x0216857c ldr r0, _021685b4 ; =data_027e0e60 ldr r0, [r0] mov r1, r4 - bl func_ov00_020823d4 + bl _ZN10MapManager18func_ov00_020823d4Ei ldr r1, _021685b4 ; =data_027e0e60 str r0, [r5, #0x6c] ldr r0, [r1] mov r1, r4 - bl func_ov00_020823e4 + bl _ZN10MapManager18func_ov00_020823e4Ei str r0, [r5, #0x70] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -16524,7 +16524,7 @@ func_ov17_021685b8: ; 0x021685b8 bl func_0201933c ldr r0, _02168654 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020823f4 + bl _ZN10MapManager16MapData_vfunc_b4Ev mov r4, r0 mov r0, r5 mov r1, r4 @@ -17305,7 +17305,7 @@ _02168ef8: ; jump table _02168f08: ldr r0, _02169180 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev sub r0, r0, #2 cmp r4, r0 addlt r0, r4, #2 @@ -17345,7 +17345,7 @@ _02168f70: _02168f9c: ldr r0, _02169180 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv sub r0, r0, #2 cmp r5, r0 addlt r0, r5, #2 @@ -17557,7 +17557,7 @@ _0216929c: ldr r0, _02169340 ; =data_027e0e60 add r1, r4, #0x64 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev ldr r1, [r0] mov r5, r0 ldr r1, [r1, #0x1c] @@ -17578,7 +17578,7 @@ _021692e8: ldr r0, _02169340 ; =data_027e0e60 add r1, r4, #0x64 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev ldr r1, [r0] mov r5, r0 ldr r1, [r1, #0x1c] @@ -17897,7 +17897,7 @@ _021696b8: add r1, sp, #0x12 strb r3, [sp, #0x13] mov r2, #1 - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrh r0, [r4, #0x26] cmp r0, #1 bne _02169874 @@ -17911,7 +17911,7 @@ _021696b8: mov r2, #1 strb r3, [sp, #0x10] strb ip, [sp, #0x11] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii b _02169874 _02169728: ldr r1, [sp, #0x48] @@ -17926,7 +17926,7 @@ _02169728: add r1, sp, #0xe strb r3, [sp, #0xf] mov r2, #1 - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrh r0, [r4, #0x26] cmp r0, #1 bne _02169874 @@ -17940,7 +17940,7 @@ _02169728: mov r2, #1 strb r3, [sp, #0xc] strb ip, [sp, #0xd] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii b _02169874 _02169798: ldr r1, [sp, #0x50] @@ -17955,7 +17955,7 @@ _02169798: add r1, sp, #0xa strb r3, [sp, #0xb] mov r2, #1 - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrh r0, [r4, #0x26] cmp r0, #1 bne _02169874 @@ -17969,7 +17969,7 @@ _02169798: mov r2, #1 strb r3, [sp, #8] strb ip, [sp, #9] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii b _02169874 _02169808: ldr r1, [sp, #0x5c] @@ -17984,7 +17984,7 @@ _02169808: add r1, sp, #6 strb r3, [sp, #7] mov r2, #1 - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrh r0, [r4, #0x26] cmp r0, #1 bne _02169874 @@ -17998,7 +17998,7 @@ _02169808: mov r2, #1 strb r3, [sp, #4] strb ip, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii _02169874: mov r1, #0 bic r1, r1, #0x6000 @@ -18072,7 +18072,7 @@ _02169960: ldr r0, _02169a54 ; =data_027e0e60 strh r1, [r4, #0xc] ldr r0, [r0] - bl func_ov00_0208335c + bl _ZN10MapManager17Get_MapData_Unk28Ev ldrb r1, [sp, #4] sub r0, r0, #2 cmp r1, r0 @@ -18084,7 +18084,7 @@ _0216998c: ldr r0, _02169a54 ; =data_027e0e60 strh r1, [r4, #0xc] ldr r0, [r0] - bl func_ov00_02083368 + bl _ZN10MapManager17Get_MapData_Unk2aEv ldrb r1, [sp, #5] sub r0, r0, #2 cmp r1, r0 @@ -18131,7 +18131,7 @@ _02169a0c: ldr r0, [r0] add r2, sp, #4 mov r1, #0x7e - bl func_ov00_020828c0 + bl _ZN10MapManager16MapData_vfunc_7cEv add sp, sp, #0x1c ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -18798,14 +18798,14 @@ _0216a250: add r1, r5, #0x18 ldr r0, [r0] mov r3, #2 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _0216a330 _0216a2b4: ldr r0, _0216a344 ; =data_027e0e60 add r1, r5, #0x18 ldr r0, [r0] mov r3, #1 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _0216a330 _0216a2cc: bl func_ov14_02127188 @@ -18830,7 +18830,7 @@ _0216a2fc: ldr r0, _0216a344 ; =data_027e0e60 ldrh r1, [r5, #0x24] ldr r0, [r0] - bl func_ov00_02083840 + bl _ZN10MapManager18func_ov00_02083840Ei b _0216a330 _0216a324: mov r0, r5 @@ -18862,7 +18862,7 @@ func_ov17_0216a348: ; 0x0216a348 ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r4, pc} @@ -18917,7 +18917,7 @@ _0216a428: ldr r0, _0216a4a4 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} @@ -18935,7 +18935,7 @@ _0216a444: ldr r0, _0216a4a4 ; =data_027e0e60 ldrh r1, [r4, #0x24] ldr r0, [r0] - bl func_ov00_02083840 + bl _ZN10MapManager18func_ov00_02083840Ei mov r0, #1 ldmia sp!, {r4, pc} _0216a484: @@ -18982,7 +18982,7 @@ _0216a508: ldr r0, _0216a5b0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} @@ -19011,14 +19011,14 @@ _0216a56c: ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _0216a5b0 ; =data_027e0e60 ldrh r1, [r4, #0x24] ldr r0, [r0] - bl func_ov00_02083790 + bl _ZN10MapManager18func_ov00_02083790Ei mov r0, #1 ldmia sp!, {r4, pc} _0216a5a4: @@ -19397,7 +19397,7 @@ func_ov17_0216a9fc: ; 0x0216a9fc str r0, [r4, #0x20] ldr r0, [r2] mov r2, #1 - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p add r6, r4, #0x18 str r0, [r4, #0x1c] ldmia r6, {r0, r1, r2} @@ -19450,7 +19450,7 @@ func_ov17_0216a9fc: ; 0x0216a9fc ldr r0, _0216abf8 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 beq _0216ab90 mov r0, r4 @@ -19711,7 +19711,7 @@ _0216aedc: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldr r1, [r4, #4] mov r0, #0 bic r1, r1, #8 diff --git a/asm/ov18.inc b/asm/ov18.inc index cdf26420..c223374b 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -254,34 +254,34 @@ .extern func_ov00_0207f4a4 .extern func_ov00_02080140 .extern func_ov00_020807d4 -.extern func_ov00_02082680 -.extern func_ov00_020828c0 -.extern func_ov00_02082d08 -.extern func_ov00_02082d84 -.extern func_ov00_0208330c -.extern func_ov00_02083318 -.extern func_ov00_02083344 -.extern func_ov00_02083350 -.extern func_ov00_02083374 -.extern func_ov00_02083384 -.extern func_ov00_0208340c -.extern func_ov00_0208342c -.extern func_ov00_0208344c -.extern func_ov00_02083560 -.extern func_ov00_020838e8 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083ce8 -.extern func_ov00_02083f80 -.extern func_ov00_02084088 -.extern func_ov00_020843ec -.extern func_ov00_020849c0 -.extern func_ov00_02084be0 -.extern func_ov00_02084c7c -.extern func_ov00_02084c94 -.extern func_ov00_02084cb0 -.extern func_ov00_02084cc8 +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager16MapData_vfunc_7cEv +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager18func_ov00_02082d84Ev +.extern _ZN10MapManager21GetCourseData_Unk_25cEv +.extern _ZN10MapManager18func_ov00_02083318Ei +.extern _ZN10MapManager20GetCourseData_Unk_86Ev +.extern _ZN10MapManager20GetCourseData_Unk_87Ev +.extern _ZN10MapManager18func_ov00_02083374Ev +.extern _ZN10MapManager18func_ov00_02083384Ev +.extern _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p +.extern _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18func_ov00_02083560EiPS_j +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083ce8Ecccci +.extern _ZN10MapManager16MapData_vfunc_6cEv +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager18func_ov00_020843ecEPi +.extern _ZN10MapManager18func_ov00_020849c0Ev +.extern _ZN10MapManager18func_ov00_02084be0Eii +.extern _ZN10MapManager18func_ov00_02084c7cEi +.extern _ZN10MapManager18func_ov00_02084c94Ei +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei .extern func_ov00_0208726c .extern func_ov00_020872e8 .extern func_ov00_02087d34 diff --git a/asm/ov18.s b/asm/ov18.s index 0fd5534b..a029a7a4 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -304,7 +304,7 @@ func_ov18_0215b86c: ; 0x0215b86c ldr r0, _0215bd68 ; =data_027e0e60 add r1, r9, #0x1b0 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldrb r2, [r9, #0x12] ldr r0, _0215bd6c ; =0x00001333 mov r1, #0 @@ -322,18 +322,18 @@ func_ov18_0215b86c: ; 0x0215b86c ldr r0, _0215bd68 ; =data_027e0e60 add r1, sp, #0x64 ldr r0, [r0] - bl func_ov00_0208340c + bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p ldr r0, _0215bd68 ; =data_027e0e60 add r1, sp, #0x58 ldr r0, [r0] - bl func_ov00_0208342c + bl _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p ldr r0, _0215bd68 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083374 + bl _ZN10MapManager18func_ov00_02083374Ev ldr r1, _0215bd68 ; =data_027e0e60 mov r5, r0 ldr r0, [r1] - bl func_ov00_02083384 + bl _ZN10MapManager18func_ov00_02083384Ev mov r10, #0x4000 rsb r10, r10, #0 mov r6, r0 @@ -693,7 +693,7 @@ _0215be0c: bne _0215be5c ldr r0, _0215beb0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 movne r0, #1 strneb r0, [r9, #0x1cc] @@ -824,7 +824,7 @@ func_ov18_0215bfc8: ; 0x0215bfc8 add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r0, r5 ldr r2, [r0] add r1, sp, #0 @@ -1219,12 +1219,12 @@ func_ov18_0215c460: ; 0x0215c460 ldrb r1, [r5, #1] ldr r0, [r2] mov r4, r3 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei ldr r2, _0215c5bc ; =data_027e0e60 mov r8, r0 ldrb r1, [r5] ldr r0, [r2] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei mov r1, #0x5000 str r1, [sp, #0x14] str r0, [sp, #0x10] @@ -3214,7 +3214,7 @@ func_ov18_0215dee4: ; 0x0215dee4 ldrb r1, [r4, #0x15c] ldr r0, [r0] add r2, r4, #0x1cc - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -3538,7 +3538,7 @@ _0215e324: add r0, sp, #4 ldr r1, [r1] add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r2, [sp, #4] ldr r0, _0215e49c ; =data_027e0e60 ldrb r1, [sp, #5] @@ -3548,7 +3548,7 @@ _0215e324: add r1, sp, #4 strb r3, [sp, #4] strb r2, [sp, #5] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #6 cmpne r0, #0x37 add r0, sp, #0x54 @@ -4315,7 +4315,7 @@ _0215ede4: mov r2, r6 strb r8, [sp, #0xc] strb r9, [sp, #0xd] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii add r9, r9, #1 cmp r9, r10 blt _0215ede4 @@ -5272,7 +5272,7 @@ _0215f9b0: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi mov r0, #7 strb r0, [r4, #0x12] b _0215fa1c @@ -5287,7 +5287,7 @@ _0215f9e8: add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi mov r0, #1 strb r0, [r4, #0x12] _0215fa1c: @@ -6426,7 +6426,7 @@ _021607b8: mov r2, r5 strb r7, [sp, #0xc] strb r9, [sp, #0xd] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii add r9, r9, #1 cmp r9, r10 ble _021607b8 @@ -6613,7 +6613,7 @@ _021609c0: add r2, sp, #4 ldr r0, [r0] mov r1, #0x30 - bl func_ov00_020828c0 + bl _ZN10MapManager16MapData_vfunc_7cEv add sp, sp, #0x1c ldmia sp!, {pc} .align 2, 0 @@ -6843,7 +6843,7 @@ _02160c80: mov r2, r11 strb r6, [sp, #0x14] strb r8, [sp, #0x15] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii _02160c9c: add r8, r8, #1 cmp r8, r10 @@ -6918,7 +6918,7 @@ _02160d90: mov r2, r11 strb r6, [sp, #0x12] strb r8, [sp, #0x13] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii _02160dac: add r8, r8, #1 cmp r8, r10 @@ -6993,7 +6993,7 @@ _02160ea0: mov r2, r11 strb r6, [sp, #0x10] strb r8, [sp, #0x11] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii _02160ebc: add r8, r8, #1 cmp r8, r10 @@ -9042,7 +9042,7 @@ _0216285c: ldr r0, _02162ca0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084c94 + bl _ZN10MapManager18func_ov00_02084c94Ei cmp r0, #0 bne _02162950 add r0, sp, #0x118 @@ -9105,13 +9105,13 @@ _02162950: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084c7c + bl _ZN10MapManager18func_ov00_02084c7cEi b _02162c90 _02162968: ldr r0, _02162ca0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084c94 + bl _ZN10MapManager18func_ov00_02084c94Ei cmp r0, #0 bne _02162a48 add r0, sp, #0xec @@ -9171,13 +9171,13 @@ _02162a48: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084c7c + bl _ZN10MapManager18func_ov00_02084c7cEi b _02162c90 _02162a60: ldr r0, _02162ca0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084c94 + bl _ZN10MapManager18func_ov00_02084c94Ei cmp r0, #0 bne _02162ab4 add r0, sp, #0xb4 @@ -9200,13 +9200,13 @@ _02162ab4: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084c7c + bl _ZN10MapManager18func_ov00_02084c7cEi b _02162c90 _02162acc: ldr r0, _02162ca0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084c94 + bl _ZN10MapManager18func_ov00_02084c94Ei cmp r0, #0 bne _02162b20 add r0, sp, #0x88 @@ -9229,13 +9229,13 @@ _02162b20: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084c7c + bl _ZN10MapManager18func_ov00_02084c7cEi b _02162c90 _02162b38: ldr r0, _02162ca0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 bne _02162b94 add r0, sp, #0x5c @@ -9260,13 +9260,13 @@ _02162b94: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei b _02162c90 _02162bac: ldr r0, _02162ca0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 bne _02162c08 add r0, sp, #0x30 @@ -9291,13 +9291,13 @@ _02162c08: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei b _02162c90 _02162c20: ldr r0, _02162ca0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 bne _02162c7c add r0, sp, #4 @@ -9322,7 +9322,7 @@ _02162c7c: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei _02162c90: mov r0, #0 str r0, [r4, #0x6c] @@ -17123,11 +17123,11 @@ func_ov18_021693b0: ; 0x021693b0 mov r6, r0 ldr r5, [r2] mov r0, r5 - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei mov r4, r0 mov r0, r5 mov r1, r6 - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [sp, #4] mov r0, #0 str r0, [sp, #8] @@ -17136,7 +17136,7 @@ func_ov18_021693b0: ; 0x021693b0 add r3, sp, #0x10 mov r0, r5 str r4, [sp, #0xc] - bl func_ov00_02083f80 + bl _ZN10MapManager16MapData_vfunc_6cEv ldr r0, [sp, #0x14] cmp r0, #0xf80 movlt r0, #1 @@ -18338,7 +18338,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8 strh r2, [r4, #0x10] ldrb r2, [r4, #0x15] ldr r1, [r1] - bl func_ov00_02083560 + bl _ZN10MapManager18func_ov00_02083560EiPS_j ldrb lr, [r4, #0x16] ldrb ip, [r4, #0x17] ldrb r1, [sp, #0x15] @@ -18353,10 +18353,10 @@ func_ov18_0216a3c8: ; 0x0216a3c8 ldrb r3, [sp, #0x14] add r1, sp, #0x18 strb ip, [sp, #0x13] - bl func_ov00_02083ce8 + bl _ZN10MapManager18func_ov00_02083ce8Ecccci ldr r0, _0216a5b4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208330c + bl _ZN10MapManager21GetCourseData_Unk_25cEv cmp r0, #0 beq _0216a47c add r0, r4, #8 @@ -18381,16 +18381,16 @@ _0216a47c: add r3, r4, #0xc strb ip, [sp, #0x10] strb lr, [sp, #0x11] - bl func_ov00_02082d84 + bl _ZN10MapManager18func_ov00_02082d84Ev _0216a4a4: ldr r0, _0216a5b4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083344 + bl _ZN10MapManager20GetCourseData_Unk_86Ev cmp r0, #2 bge _0216a4cc ldr r0, _0216a5b4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02083350 + bl _ZN10MapManager20GetCourseData_Unk_87Ev cmp r0, #2 blt _0216a504 _0216a4cc: @@ -18509,7 +18509,7 @@ _0216a63c: ldr r0, _0216a6b0 ; =data_027e0e60 ldrb r1, [r4, #0x19] ldr r0, [r0] - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x14] @@ -18524,7 +18524,7 @@ _0216a674: ldr r0, _0216a6b0 ; =data_027e0e60 ldrb r1, [r4, #0x19] ldr r0, [r0] - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 movne r0, #1 strneb r0, [r4, #0x14] @@ -18548,7 +18548,7 @@ func_ov18_0216a6b4: ; 0x0216a6b4 ldr r0, _0216a77c ; =data_027e0e60 ldrb r5, [r4, #0x15] ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, r5 ldmeqia sp!, {r4, r5, r6, pc} ldrh r0, [r6] @@ -19096,13 +19096,13 @@ func_ov18_0216adcc: ; 0x0216adcc ldmhiia sp!, {r3, r4, r5, pc} ldr r0, _0216aed4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208330c + bl _ZN10MapManager21GetCourseData_Unk_25cEv cmp r0, #0 beq _0216ae24 ldr r0, _0216aed4 ; =data_027e0e60 ldrb r1, [r5, #4] ldr r0, [r0] - bl func_ov00_02083318 + bl _ZN10MapManager18func_ov00_02083318Ei cmp r0, #0 addeq sp, sp, #8 moveq r0, #1 @@ -19110,7 +19110,7 @@ func_ov18_0216adcc: ; 0x0216adcc _0216ae24: ldr r0, _0216aed4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020849c0 + bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 addne sp, sp, #8 movne r0, #1 diff --git a/asm/ov19.inc b/asm/ov19.inc index 88307a71..9ff48dc4 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -1,6 +1,14 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_02083780Ei +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02084d24Ecci .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN11ItemManager7AddItemEi @@ -182,14 +190,6 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern func_ov00_02082680 -.extern func_ov00_020836dc -.extern func_ov00_02083770 -.extern func_ov00_02083780 -.extern func_ov00_02083a1c -.extern func_ov00_02083ee0 -.extern func_ov00_02083fb0 -.extern func_ov00_02084d24 .extern func_ov00_020875f8 .extern func_ov00_02087d34 .extern func_ov00_02087df8 diff --git a/asm/ov19.s b/asm/ov19.s index 0cc7f427..ed10a3fb 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -3473,7 +3473,7 @@ _021703a4: ldr r0, [r3] add r1, sp, #0x18 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x34] ldr r1, [sp, #0x30] ldr r0, _02170568 ; =data_027e0f64 @@ -5462,7 +5462,7 @@ func_ov19_02171e64: ; 0x02171e64 add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -6438,7 +6438,7 @@ func_ov19_02172ae0: ; 0x02172ae0 ldrb r1, [r4, #0x15a] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 moveq r0, #0 streqb r0, [r4, #0x158] @@ -7849,24 +7849,24 @@ _02173d94: mov r2, r11 strb r6, [sp, #2] strb r8, [sp, #3] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r7 mov r2, r8 mov r3, #9 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci b _02173df4 _02173dcc: add r1, sp, #0 mov r2, #0 strb r6, [sp] strb r8, [sp, #1] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r7 mov r2, r8 mov r3, #0x15 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci _02173df4: ldrb r0, [r10, #0x15] add r8, r8, #1 @@ -8418,7 +8418,7 @@ _021744b8: ldr r2, [r4, #0x50] add r1, sp, #0 str r2, [sp, #8] - bl func_ov00_02083780 + bl _ZN10MapManager18func_ov00_02083780Ei str r0, [r4, #0x354] ldr r1, _02174550 ; =data_ov19_02176b88 mov r0, r4 @@ -8592,7 +8592,7 @@ _02174710: ldrh r1, [r7, #0x20] ldr r0, [r0] add r2, sp, #8 - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 movne r5, #1 _02174754: @@ -9147,7 +9147,7 @@ _02174eb4: add r2, sp, #0x14 str r1, [sp, #0x1c] ldr r1, [r4, #0x354] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -9901,7 +9901,7 @@ func_ov19_021758c8: ; 0x021758c8 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #0x4c] add r0, r5, #0x158 bl func_ov00_020c5e20 @@ -10078,7 +10078,7 @@ _02175af8: mov r2, r0 add r0, sp, #2 mov r1, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r2, #0 ldrb r1, [sp, #2] ldrb r0, [sp, #3] diff --git a/asm/ov20.inc b/asm/ov20.inc index 158fde90..26c18122 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -167,14 +167,14 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern func_ov00_020833f4 -.extern func_ov00_02083400 -.extern func_ov00_020836bc -.extern func_ov00_02083770 -.extern func_ov00_02083a1c -.extern func_ov00_02083c7c -.extern func_ov00_02083ee0 -.extern func_ov00_02083f44 +.extern _ZN10MapManager18Get_MapData_Unk_d0Ev +.extern _ZN10MapManager18Get_MapData_Unk_d8Ev +.extern _ZN10MapManager18func_ov00_020836bcEjPi +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p .extern func_ov00_02087d34 .extern func_ov00_02087d84 .extern func_ov00_02088000 diff --git a/asm/ov20.s b/asm/ov20.s index b3a2e680..5bed0c78 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -839,7 +839,7 @@ _0216e120: mov r1, #2 add r2, sp, #0x20 str r3, [sp, #0x28] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -850,7 +850,7 @@ _0216e120: add r2, sp, #0x44 ldr r0, [r0] mov r1, #2 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi ldr r1, [sp, #0x44] ldr r0, [r7, #0xa8c] cmp r0, r1 @@ -5055,7 +5055,7 @@ _02171ac0: str lr, [sp, #4] str ip, [sp, #8] str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x14] ldr r0, [r5, #0x15c] cmp r0, #0 @@ -5371,7 +5371,7 @@ _02171e20: str r1, [sp, #0x18] add r1, sp, #0x10 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x20] ldr r0, _021720a0 ; =data_027e0ffc ldr r1, _021720a4 ; =0x00000243 @@ -8665,7 +8665,7 @@ _02174a20: add r1, sp, #4 mov r2, #1 str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r2, r4, r0 ldr r1, [sp, #0x50] ldr r0, [sp, #0x58] @@ -9881,7 +9881,7 @@ _021759e8: ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0x3c - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 addeq sp, sp, #0x19c ldmeqia sp!, {r4, r5, pc} @@ -10024,7 +10024,7 @@ _02175c00: str ip, [sp, #0x30] str r3, [sp, #0x34] str r5, [sp, #0x38] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0xa0] mov r1, #0 str r1, [sp] @@ -10051,7 +10051,7 @@ _02175c64: str r5, [sp, #0x24] str r3, [sp, #0x28] str lr, [sp, #0x2c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x94] mov r1, #0 str r1, [sp] @@ -10077,7 +10077,7 @@ _02175ccc: str lr, [sp, #0x18] str r3, [sp, #0x1c] str ip, [sp, #0x20] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x88] mov r1, #0 str r1, [sp] @@ -10103,7 +10103,7 @@ _02175d30: str lr, [sp, #0xc] str r3, [sp, #0x10] str ip, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x7c] mov r1, #0 str r1, [sp] @@ -11640,13 +11640,13 @@ func_ov20_02176fe8: ; 0x02176fe8 ldr r1, [r4, #0x88] str r1, [r4, #0x98] ldr r0, [r0] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r1, _02177060 ; =0xffffd99a str r0, [r4, #0x48] ldr r0, _0217705c ; =data_027e0e60 str r1, [r4, #0x4c] ldr r0, [r0] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev str r0, [r4, #0x50] mov r0, #1 add sp, sp, #0xc @@ -11908,7 +11908,7 @@ func_ov20_02177300: ; 0x02177300 mov r2, r0 mov r1, r5 add r0, sp, #0xc - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r2, [sp, #0xc] ldrb r1, [sp, #0xd] sub r3, sp, #4 @@ -11962,7 +11962,7 @@ func_ov20_021773f4: ; 0x021773f4 add r0, sp, #0 ldr r1, [r1] add r2, r2, #0x20 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r2, [sp] ldrb r1, [sp, #1] sub r3, sp, #4 @@ -12033,7 +12033,7 @@ func_ov20_021774e8: ; 0x021774e8 add r1, sp, #0x18 strb r2, [r3, #1] ldr r2, [r3] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r8, #0 ldr r4, _021775cc ; =data_027e0e60 mov r9, r8 @@ -12064,11 +12064,11 @@ _02177538: mov r2, #0 mov r1, r5 bne _0217759c - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p mov r10, r0 b _021775a8 _0217759c: - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p cmp r10, r0 movge r10, r0 _021775a8: diff --git a/asm/ov21.inc b/asm/ov21.inc index 82760e5e..1794998b 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -1,4 +1,9 @@ #pragma once +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager16MapData_vfunc_60Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase12GetPlayerVelEv .extern _ZN13LinkStateBase15ChangeLinkStateEi @@ -123,11 +128,6 @@ .extern func_ov00_0207a1c8 .extern func_ov00_0207c1f8 .extern func_ov00_02081f4c -.extern func_ov00_020836dc -.extern func_ov00_02083a1c -.extern func_ov00_02083e58 -.extern func_ov00_02083ee0 -.extern func_ov00_02084088 .extern func_ov00_0208b5a4 .extern func_ov00_0208b5bc .extern func_ov00_0208b694 diff --git a/asm/ov21.s b/asm/ov21.s index 14110fc8..2f150d18 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -515,7 +515,7 @@ _0216dcb0: .word data_027e0f94 arm_func_start func_ov21_0216dcb4 func_ov21_0216dcb4: ; 0x0216dcb4 ldr r2, _0216dccc ; =data_027e0e60 - ldr ip, _0216dcd0 ; =func_ov00_020836dc + ldr ip, _0216dcd0 ; =_ZN10MapManager18func_ov00_020836dcEii ldrh r1, [r0, #0x22] ldr r0, [r2] mov r2, #0 @@ -523,7 +523,7 @@ func_ov21_0216dcb4: ; 0x0216dcb4 .align 2, 0 arm_func_end func_ov21_0216dcb4 _0216dccc: .word data_027e0e60 -_0216dcd0: .word func_ov00_020836dc +_0216dcd0: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov21_0216dcd4 arm_func_start func_ov21_0216dcd4 @@ -926,7 +926,7 @@ func_ov21_0216e208: ; 0x0216e208 ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -2896,7 +2896,7 @@ _0216fa3c: ldr r1, [r4] add r0, sp, #0x14 mov r2, r7 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r0, [sp, #0x14] ldrb r1, [sp, #0x15] ldr r2, _0216fbb4 ; =func_ov00_020b1940 @@ -3337,7 +3337,7 @@ func_ov21_02170050: ; 0x02170050 add r1, sp, #0x10 mov r2, #0 str r3, [sp, #0x18] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r6, #0xc _021700b8: rsb r4, r6, #0 @@ -3438,7 +3438,7 @@ func_ov21_021701b0: ; 0x021701b0 add r1, sp, #0x10 mov r2, #0 str r3, [sp, #0x18] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r6, #0xf _02170218: rsb r4, r6, #0 @@ -3568,11 +3568,11 @@ func_ov21_02170388: ; 0x02170388 add r0, sp, #0 ldr r1, [r1] add r2, sp, #4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _021703fc ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev cmp r0, #0 addgt sp, sp, #0x10 movgt r0, #0 @@ -3580,7 +3580,7 @@ func_ov21_02170388: ; 0x02170388 ldr r0, _021703fc ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x14 movne r0, #0 moveq r0, #1 diff --git a/asm/ov22.inc b/asm/ov22.inc index 4169cdbe..4f01808f 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -1,6 +1,25 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager16MapData_vfunc_60Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager16MapData_vfunc_7cEv +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager18func_ov00_020836bcEjPi +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager18func_ov00_0208413cEi +.extern _ZN10MapManager18func_ov00_02084ac4Ej +.extern _ZN10MapManager18func_ov00_02084d24Ecci +.extern _ZN10MapManager8SpawnNPCEP5Vec3pii .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j @@ -174,25 +193,6 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c518 .extern func_ov00_02081f4c -.extern func_ov00_02082680 -.extern func_ov00_020826a0 -.extern func_ov00_020828c0 -.extern func_ov00_0208344c -.extern func_ov00_020836bc -.extern func_ov00_020836dc -.extern func_ov00_02083770 -.extern func_ov00_020838e8 -.extern func_ov00_02083a1c -.extern func_ov00_02083c7c -.extern func_ov00_02083e34 -.extern func_ov00_02083e58 -.extern func_ov00_02083ee0 -.extern func_ov00_02084088 -.extern func_ov00_020840c4 -.extern func_ov00_0208413c -.extern func_ov00_02084a5c -.extern func_ov00_02084ac4 -.extern func_ov00_02084d24 .extern func_ov00_02087df8 .extern func_ov00_02088000 .extern func_ov00_02088130 diff --git a/asm/ov22.s b/asm/ov22.s index 45adc59a..d6d92658 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -485,7 +485,7 @@ func_ov22_0216dc9c: ; 0x0216dc9c ldrb r1, [r4, #0x15a] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 moveq r0, #0 streqb r0, [r4, #0x158] @@ -1077,10 +1077,10 @@ _0216e4a8: mov r0, r8 mov r2, r5 ldrsh r3, [r10, #0xc] - bl func_ov00_020828c0 + bl _ZN10MapManager16MapData_vfunc_7cEv ldr r0, [r4] mov r1, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _0216e51c strb r9, [r0, #0x65] @@ -1371,7 +1371,7 @@ _0216e8bc: ldr r0, [r0] add r2, r10, r2 strb r2, [sp, #0xb] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r7, r0 beq _0216e938 ldr r1, [r0] @@ -1425,14 +1425,14 @@ _0216e958: beq _0216e9bc ldr r0, _0216ec8c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej _0216e9bc: ldr r0, _0216ec8c ; =data_027e0e60 add r1, sp, #0x1c ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r4, #0x74] _0216e9d8: mov r0, #0x3c @@ -1536,7 +1536,7 @@ _0216eb28: ldr r0, [r0] add r2, r10, r2 strb r2, [sp, #9] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r7, r0 beq _0216eba4 ldr r1, [r0] @@ -1590,14 +1590,14 @@ _0216ebc4: beq _0216ec28 ldr r0, _0216ec8c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084ac4 + bl _ZN10MapManager18func_ov00_02084ac4Ej _0216ec28: ldr r0, _0216ec8c ; =data_027e0e60 add r1, sp, #0x10 ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii str r0, [r4, #0x74] _0216ec44: mov r1, #0 @@ -1827,7 +1827,7 @@ _0216eed0: ldrb r1, [r4, #0x14] ldr r0, [r0] sub r2, r2, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci b _0216ef14 _0216eef4: mov r0, #0 @@ -1837,7 +1837,7 @@ _0216eef4: ldrb r2, [r4, #0x15] ldr r0, [r0] sub r1, r1, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci _0216ef14: str r0, [r4, #0x1c] ldrh r6, [r4, #0x24] @@ -1901,13 +1901,13 @@ _0216efe8: mov r2, r7 strb r9, [sp, #6] strb r10, [sp, #7] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r5] mov r1, r6 strb r9, [sp, #4] strb r10, [sp, #5] mov r2, r11 - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r1, [r4, #0x15] ldrb r0, [r4, #0x39] add r10, r10, #1 @@ -3102,7 +3102,7 @@ _0216ff6c: strb r8, [sp, #0x37] strb r8, [sp, #0x38] strb r8, [sp, #0x39] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _021701e8 ; =data_027e0d38 add r1, sp, #0x24 ldr r0, [r0] @@ -4924,7 +4924,7 @@ func_ov22_02171770: ; 0x02171770 str r1, [sp, #8] ldrh r1, [r4, #0x22] and r1, r1, #0xff - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 beq _021717d8 ldr r0, [r4, #0x48] @@ -5897,7 +5897,7 @@ func_ov22_02172438: ; 0x02172438 str r1, [sp, #0xc] ldrh r1, [r4, #0x22] and r1, r1, #0xff - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -6099,7 +6099,7 @@ func_ov22_021726e8: ; 0x021726e8 str r1, [sp, #8] ldrh r1, [r4, #0x22] and r1, r1, #0xff - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -6197,7 +6197,7 @@ func_ov22_0217283c: ; 0x0217283c str r1, [sp, #8] ldrh r1, [r4, #0x22] and r1, r1, #0xff - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 ldreqb r0, [r4, #0x752] cmpeq r0, #0 @@ -8056,7 +8056,7 @@ _021740a4: ldrh r1, [r5, #0x20] ldr r0, [r0] ldr r2, [r5, #8] - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _02174120 ldr r1, _02174610 ; =data_027e0764 @@ -8817,7 +8817,7 @@ func_ov22_02174a80: ; 0x02174a80 str r3, [sp, #4] ldr r3, [r4, #0x50] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x9a add r0, r0, #0x900 str r0, [r4, #0x4c] @@ -9015,7 +9015,7 @@ func_ov22_02174cb0: ; 0x02174cb0 str r3, [sp, #0x18] str r5, [sp, #0x1c] str r6, [sp, #0x20] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x28] ldr r3, _02174db4 ; =0x0000059a mov r0, #0x1f @@ -9199,7 +9199,7 @@ _02174f9c: ldr r0, [r7] add r1, sp, #8 strb r4, [sp, #9] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x38 bne _02175028 ldr r1, [r6] @@ -9225,7 +9225,7 @@ _02174f9c: strb r3, [r8] strb r2, [r8, #1] ldr r2, [r8] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi ldr r0, _02175064 ; =data_027e0e58 add r1, r5, #0x158 ldr r0, [r0] @@ -9883,10 +9883,10 @@ func_ov22_021757c0: ; 0x021757c0 ldr r5, [r1] add r2, sp, #0x1c mov r1, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r5 - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev ldr r1, [sp, #4] mov r2, #0x19000 ldr ip, [sp, #0xc] @@ -10228,7 +10228,7 @@ func_ov22_02175c44: ; 0x02175c44 ldr r0, _02175cfc ; =data_027e0e60 add r1, r9, #0x18 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldrb r7, [r9, #0x14] add r0, r7, #2 cmp r7, r0 @@ -10249,7 +10249,7 @@ _02175cb4: mov r2, r4 strb r6, [sp] strb r8, [sp, #1] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrb r0, [r9, #0x15] add r8, r8, #1 add r0, r0, #0x10 @@ -10596,7 +10596,7 @@ _0217612c: mov r1, r6 mov r2, r7 mov r3, r5 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci ldrb r0, [r4, #0x15] add r7, r7, #1 add r0, r0, #0x10 @@ -11547,7 +11547,7 @@ func_ov22_02176d6c: ; 0x02176d6c ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0x30 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi mov ip, #0 ldr r1, _02176f7c ; =0x00000ccd bic r0, ip, #0x6000 @@ -11589,7 +11589,7 @@ func_ov22_02176d6c: ; 0x02176d6c strb r2, [r4, #0x125] ldr r0, [r0] add r1, sp, #0x18 - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r1, [sp, #0x18] ldr r0, _02176f78 ; =data_027e0e60 str r1, [r4, #0x48] @@ -11600,7 +11600,7 @@ func_ov22_02176d6c: ; 0x02176d6c mov r1, #0x5000 ldr r0, [r0] rsb r1, r1, #0 - bl func_ov00_0208413c + bl _ZN10MapManager18func_ov00_0208413cEi add r0, r4, #0x170 ldr r1, [r0] ldr r1, [r1, #8] diff --git a/asm/ov23.inc b/asm/ov23.inc index 6c85c482..9f4779f2 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -1,6 +1,28 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi +.extern _ZN10MapManager16MapData_vfunc_60Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18Set_MapData_Unk_16Eci +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_02083790Ei +.extern _ZN10MapManager18func_ov00_02083840Ei +.extern _ZN10MapManager18func_ov00_02083918EiPi +.extern _ZN10MapManager18func_ov00_02083958Ei +.extern _ZN10MapManager18func_ov00_020839d4Ev +.extern _ZN10MapManager18func_ov00_020839f8Ev +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_020840a0Ecci +.extern _ZN10MapManager18func_ov00_02084740Ev +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084d24Ecci .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN11ItemManager12GetItemModelEj .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList @@ -222,28 +244,6 @@ .extern func_ov00_0207c444 .extern func_ov00_02081f4c .extern func_ov00_02081f50 -.extern func_ov00_02082680 -.extern func_ov00_0208344c -.extern func_ov00_02083624 -.extern func_ov00_02083790 -.extern func_ov00_02083840 -.extern func_ov00_02083918 -.extern func_ov00_02083948 -.extern func_ov00_02083958 -.extern func_ov00_020839d4 -.extern func_ov00_020839f8 -.extern func_ov00_02083a1c -.extern func_ov00_02083c24 -.extern func_ov00_02083c50 -.extern func_ov00_02083c7c -.extern func_ov00_02083e58 -.extern func_ov00_02083ee0 -.extern func_ov00_02083fb0 -.extern func_ov00_020840a0 -.extern func_ov00_020840c4 -.extern func_ov00_02084740 -.extern func_ov00_02084b38 -.extern func_ov00_02084d24 .extern func_ov00_0208726c .extern func_ov00_0208b5a4 .extern func_ov00_0208b5bc diff --git a/asm/ov23.s b/asm/ov23.s index 3a64ecfd..6357275b 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -707,10 +707,10 @@ _0216df74: ldr r5, [r1] add r2, r4, #0x48 mov r1, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 ldmeqia sp!, {r3, r4, r5, pc} ldr r1, [r0] @@ -2286,7 +2286,7 @@ func_ov23_0216f2a4: ; 0x0216f2a4 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldr r1, [r4, #0x48] ldr r3, _0216f3f0 ; =data_ov23_0217ac20 @@ -2388,7 +2388,7 @@ func_ov23_0216f428: ; 0x0216f428 add r1, sp, #0x74 mov r2, #0 str r3, [sp, #0x7c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r4, r0 ldr r0, [sp, #0xd0] ldr r1, [sp, #0xc8] @@ -2400,7 +2400,7 @@ func_ov23_0216f428: ; 0x0216f428 str r1, [sp, #0x6c] add r1, sp, #0x68 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev cmp r4, r0 addne sp, sp, #0x1fc mov r0, #0 @@ -2538,7 +2538,7 @@ _0216f6bc: ldr r0, _0216f878 ; =data_027e0e60 mov r1, r6 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _0216f6f4 ldr r1, [r0] @@ -2843,7 +2843,7 @@ _0216fac8: add r1, sp, #4 str r2, [sp, #0xc] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r7, #0x3a0] mov r1, r7 add r0, r7, #0x398 @@ -2986,7 +2986,7 @@ func_ov23_0216fc10: ; 0x0216fc10 str lr, [sp, #0x14] str ip, [sp, #0x18] str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcd add r0, r0, #0x400 str r0, [sp, #0x24] @@ -3021,7 +3021,7 @@ func_ov23_0216fc10: ; 0x0216fc10 add r1, sp, #8 mov r2, #0 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] mov r0, r4 bl func_ov23_0216fddc @@ -3073,7 +3073,7 @@ func_ov23_0216fddc: ; 0x0216fddc ldr r1, [r1] add r0, sp, #2 add r2, r2, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mvn r4, #0 _0216fe00: ldr r6, _0216fea4 ; =data_027e0e60 @@ -3088,7 +3088,7 @@ _0216fe0c: mov r1, r7 strb r3, [sp] strb r2, [sp, #1] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r8, r0 beq _0216fe84 ldr r1, [r0] @@ -3463,7 +3463,7 @@ _021702d0: add r1, sp, #0x20 str r2, [sp, #0x28] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #0x4c] ldr r1, [r5, #0x48] mov r0, r5 @@ -3630,7 +3630,7 @@ _02170524: add r1, sp, #0x14 mov r2, #0 str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #0x3a0] _021705a8: mov r0, r5 @@ -5846,16 +5846,16 @@ func_ov23_021722d0: ; 0x021722d0 add r0, sp, #0 ldr r1, [r1] add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _021723c0 ; =data_027e0e60 ldrb r1, [sp] ldr r0, [r0] - bl func_ov00_02083c24 + bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [r4, #0x48] ldr r0, _021723c0 ; =data_027e0e60 ldrb r1, [sp, #1] ldr r0, [r0] - bl func_ov00_02083c50 + bl _ZN10MapManager18func_ov00_02083c50Ei str r0, [r4, #0x50] ldr r1, [r4, #0x48] ldr r0, _021723c0 ; =data_027e0e60 @@ -5867,7 +5867,7 @@ func_ov23_021722d0: ; 0x021722d0 add r1, sp, #4 str r2, [sp, #0xc] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] add r0, r4, #0x1b4 bl func_ov23_0216f0f4 @@ -6194,7 +6194,7 @@ _021727a0: ldr r0, [r0] mov r3, r1 mov r2, #2 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii mov r0, r4 mov r1, #1 bl _ZN5Actor18func_Ov00_020c1bfcEi @@ -6468,7 +6468,7 @@ _02172a78: mov r1, r5 strb r3, [sp] strb r2, [sp, #1] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r4, r0 beq _02172ae4 ldr r1, [r0] @@ -7126,7 +7126,7 @@ _02173388: ldr r0, [r0] add r1, sp, #0x10 strb r2, [sp, #0x10] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r10, r0 beq _021734a8 ldr r1, [r0] @@ -7663,13 +7663,13 @@ _02173b48: ldr r0, _021741ac ; =data_027e0e60 mov r1, #1 ldr r0, [r0] - bl func_ov00_02083790 + bl _ZN10MapManager18func_ov00_02083790Ei ldr r0, _021741ac ; =data_027e0e60 mov r1, #1 ldr r0, [r0] mov r2, #2 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii _02173b88: ldr r0, [r4, #0x138] cmp r0, #0x1e @@ -8079,7 +8079,7 @@ _02174120: bl _ZN5Actor18func_ov00_020c1c20Eiii ldr r0, _021741ac ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084740 + bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 ldr r0, _021741a8 ; =data_ov00_020eec68 mov r2, #0 @@ -8088,13 +8088,13 @@ _02174120: ldr r0, _021741ac ; =data_027e0e60 mov r1, #1 ldr r0, [r0] - bl func_ov00_02083840 + bl _ZN10MapManager18func_ov00_02083840Ei ldr r0, _021741ac ; =data_027e0e60 mov r1, #1 ldr r0, [r0] mov r2, #2 mov r3, r1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii _0217419c: mov r0, #1 add sp, sp, #0xc4 @@ -10309,7 +10309,7 @@ func_ov23_02175d3c: ; 0x02175d3c mov r2, #1 strb r3, [sp, #4] strb r4, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii add sp, sp, #0x6c ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 @@ -11656,7 +11656,7 @@ func_ov23_02177020: ; 0x02177020 add r2, r2, #0x1800 str r2, [r9, #0x40] ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldrb r7, [r9, #0x14] add r0, r7, #2 cmp r7, r0 @@ -11677,7 +11677,7 @@ _021770a0: mov r2, r4 strb r6, [sp] strb r8, [sp, #1] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrb r0, [r9, #0x15] add r8, r8, #1 add r0, r0, #4 @@ -12266,7 +12266,7 @@ _02177890: mov r1, r6 mov r2, r7 mov r3, r5 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci ldrb r0, [r4, #0x15] add r7, r7, #1 add r0, r0, #4 @@ -12584,7 +12584,7 @@ func_ov23_02177ba0: ; 0x02177ba0 strb r1, [r3, #1] ldr r2, [r3] add r1, sp, #0x78 - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi add r0, sp, #0x6c add r1, sp, #0x78 bl func_ov00_020b1a4c @@ -12688,7 +12688,7 @@ _02177d24: add r1, sp, #0x38 strb r3, [sp, #0x46] str r2, [sp, #0x48] - bl func_ov00_02083624 + bl _ZN10MapManager14GetEntrancePosEP5Vec3pi ldr r0, [sp, #0x40] ldr r2, [sp, #0x38] ldr r1, [sp, #0x3c] @@ -12709,7 +12709,7 @@ _02177da8: mov r2, #2 strb r4, [sp, #0x32] str r3, [sp, #0x34] - bl func_ov00_02083624 + bl _ZN10MapManager14GetEntrancePosEP5Vec3pi ldr r2, [sp, #0x24] ldr r1, [sp, #0x28] ldr r0, [sp, #0x2c] @@ -12804,16 +12804,16 @@ func_ov23_02177e90: ; 0x02177e90 ldr r1, [r1] mov r0, r8 mov r7, #1 - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev ldr r1, _02178044 ; =data_027e0f94 mov r4, r0 ldr r1, [r1, #8] mov r0, r8 - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev mov r2, r0 mov r1, r4 mov r0, r8 - bl func_ov00_020840a0 + bl _ZN10MapManager18func_ov00_020840a0Ecci sub r0, r0, #0x49 cmp r0, #3 addls pc, pc, r0, lsl #2 @@ -13056,14 +13056,14 @@ _02178218: add r2, sp, #0xc ldr r0, [r0] mov r1, #0x5b - bl func_ov00_02083918 + bl _ZN10MapManager18func_ov00_02083918EiPi cmp r0, #0 beq _02178298 ldr r0, _02178318 ; =data_027e0e60 ldrb r1, [sp, #0x10] ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _0217831c ; =data_027e0f64 mov r1, #0 ldr r0, [r0] @@ -13074,7 +13074,7 @@ _02178274: ldr r0, _02178318 ; =data_027e0e60 mov r1, #0 ldr r0, [r0] - bl func_ov00_02083958 + bl _ZN10MapManager18func_ov00_02083958Ei ldr r0, _0217831c ; =data_027e0f64 mov r1, #0 ldr r0, [r0] @@ -13543,7 +13543,7 @@ _021788b8: add r1, sp, #0xc mov r0, r6 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #4] ldr r6, [r4, #0xb0] sub r5, r1, r0 @@ -13641,10 +13641,10 @@ func_ov23_021789fc: ; 0x021789fc mov r2, r0 add r0, sp, #4 mov r1, r4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r0, r4 add r1, sp, #4 - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev str r0, [sp, #0xc] mov r0, #1 str r0, [sp] @@ -13680,10 +13680,10 @@ func_ov23_02178ab0: ; 0x02178ab0 ldr r4, [r1] add r2, r2, #0x20 mov r1, r4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #8 mov r0, r4 - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev mov r7, #0 ldr r11, _02179018 ; =data_02050f54 str r0, [sp] @@ -13747,16 +13747,16 @@ _02178b10: ldr r9, [r0] add r0, sp, #6 mov r1, r9 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r0, r9 add r1, sp, #6 - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev ldr r1, _02179014 ; =data_027e0e60 str r0, [sp, #0x30] ldr r1, [r1] add r0, sp, #0x10 mov r2, r4 - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #0x10] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -13893,16 +13893,16 @@ _02178de8: ldr r4, [r1] add r2, sp, #0x20 mov r1, r4 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #4 mov r0, r4 - bl func_ov00_02083e58 + bl _ZN10MapManager16MapData_vfunc_60Ev ldr r1, _02179014 ; =data_027e0e60 str r0, [sp, #0x24] ldr r1, [r1] add r0, sp, #0xc add r2, sp, #0x20 - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #0xc] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov24.inc b/asm/ov24.inc index 653183a9..4ebd7900 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -163,18 +163,18 @@ .extern func_ov00_0207c1b0 .extern func_ov00_0207c2e8 .extern func_ov00_02081f4c -.extern func_ov00_02082680 -.extern func_ov00_020826a0 -.extern func_ov00_020833f4 -.extern func_ov00_02083400 -.extern func_ov00_0208344c -.extern func_ov00_02083908 -.extern func_ov00_02083ee0 -.extern func_ov00_0208412c -.extern func_ov00_0208413c -.extern func_ov00_02084b38 -.extern func_ov00_02084be0 -.extern func_ov00_02084d24 +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager18Get_MapData_Unk_d0Ev +.extern _ZN10MapManager18Get_MapData_Unk_d8Ev +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18func_ov00_02083908EcPi +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_0208412cEv +.extern _ZN10MapManager18func_ov00_0208413cEi +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084be0Eii +.extern _ZN10MapManager18func_ov00_02084d24Ecci .extern func_ov00_020876bc .extern func_ov00_02088158 .extern func_ov00_0208b180 diff --git a/asm/ov24.s b/asm/ov24.s index ee2347ce..cbd37605 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -180,7 +180,7 @@ _0216d8cc: mov r2, r7 strb r4, [sp, #4] strb r10, [sp, #5] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r1, [r5, #0x15] ldrb r0, [r5, #0x65] add r10, r10, #1 @@ -495,7 +495,7 @@ func_ov24_0216dcbc: ; 0x0216dcbc ldr r1, _0216dd58 ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_0208412c + bl _ZN10MapManager18func_ov00_0208412cEv ldr r1, _0216dd5c ; =0xfffff667 ldr r2, [r4, #0x6c] add r0, r0, r1 @@ -519,7 +519,7 @@ _0216dd0c: blx r2 ldr r0, _0216dd58 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208412c + bl _ZN10MapManager18func_ov00_0208412cEv sub r1, r0, #0x800 str r0, [sp, #0x10] str r1, [sp, #4] @@ -712,13 +712,13 @@ _0216df44: ldr r1, [r4, #0x88] str r1, [r4, #0x98] ldr r0, [r0] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev str r0, [r4, #0x228] mov r1, #0 ldr r0, _0216dffc ; =data_027e0e60 str r1, [r4, #0x22c] ldr r0, [r0] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev str r0, [r4, #0x230] mov r0, #1 add sp, sp, #0xc @@ -920,7 +920,7 @@ _0216e258: ldr r0, _0216e4b0 ; =data_027e0e60 ldr r1, [r4, #0x16c] ldr r0, [r0] - bl func_ov00_0208413c + bl _ZN10MapManager18func_ov00_0208413cEi _0216e280: ldr r1, [r4, #0x174] ldr r0, _0216e4b4 ; =data_ov24_021791ec @@ -998,7 +998,7 @@ _0216e378: ldr r0, _0216e4b0 ; =data_027e0e60 ldr r1, [r4, #0x16c] ldr r0, [r0] - bl func_ov00_0208413c + bl _ZN10MapManager18func_ov00_0208413cEi _0216e3a0: ldr r1, [r4, #0x174] ldr r0, _0216e4c0 ; =data_ov24_021791f4 @@ -1106,7 +1106,7 @@ _0216e4f4: ldr r0, _0216e6f0 ; =data_027e0e60 ldr r1, [r4, #0x16c] ldr r0, [r0] - bl func_ov00_0208413c + bl _ZN10MapManager18func_ov00_0208413cEi mov r2, #0 _0216e520: add r0, r4, r2, lsl #1 @@ -1133,7 +1133,7 @@ _0216e558: ldr r0, _0216e6f0 ; =data_027e0e60 ldr r1, [r4, #0x16c] ldr r0, [r0] - bl func_ov00_0208413c + bl _ZN10MapManager18func_ov00_0208413cEi mov r2, #0 mov r1, r2 _0216e588: @@ -1336,7 +1336,7 @@ _0216e810: ldrb r1, [r5, #0x159] ldr r0, [r0] add r2, sp, #0x18 - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi cmp r0, #0 beq _0216e860 ldr r0, [sp, #0x20] @@ -1705,7 +1705,7 @@ _0216ec38: add r0, r0, #0xe00 str r0, [r4, #0x47c] ldr r0, [r3] - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 bne _0216ecf4 mov r0, r4 @@ -1879,7 +1879,7 @@ _0216eee4: ldr r0, [r0] mov r2, #3 mov r3, #1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii _0216ef1c: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} @@ -5265,7 +5265,7 @@ _02171994: str r6, [sp, #8] str r3, [sp, #0xc] str r5, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] add r1, sp, #0x14 mov r0, r4 @@ -8633,7 +8633,7 @@ _02174630: str r6, [sp, #8] str r3, [sp, #0xc] str r5, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] add r1, sp, #0x14 mov r0, r4 @@ -9506,7 +9506,7 @@ _021752ac: ; jump table _021752c4: ldr r0, _02175eb8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208412c + bl _ZN10MapManager18func_ov00_0208412cEv ldr r1, [r4, #0x4c] cmp r1, r0 bge _0217537c @@ -9516,7 +9516,7 @@ _021752c4: _021752e8: ldr r0, _02175eb8 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_0208412c + bl _ZN10MapManager18func_ov00_0208412cEv ldr r1, [r4, #0x4c] cmp r1, r0 bge _0217537c @@ -13360,12 +13360,12 @@ _02178504: ldr r0, _0217869c ; =data_027e0e60 add r1, sp, #0x5c ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r0, _0217869c ; =data_027e0e60 add r1, sp, #0x5c ldr r0, [r0] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x60] _0217852c: ldr r0, _02178694 ; =data_027e0f64 @@ -14079,24 +14079,24 @@ _02178e60: mov r2, r11 strb r6, [sp, #2] strb r8, [sp, #3] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r7 mov r2, r8 mov r3, #9 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci b _02178ec0 _02178e98: add r1, sp, #0 mov r2, #0 strb r6, [sp] strb r8, [sp, #1] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r7 mov r2, r8 mov r3, #0x35 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci _02178ec0: ldrb r0, [r10, #0x15] add r8, r8, #1 diff --git a/asm/ov25.inc b/asm/ov25.inc index 958be3e3..763cbcbc 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -1,5 +1,16 @@ #pragma once .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18func_ov00_020836bcEjPi +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p +.extern _ZN10MapManager18func_ov00_02084164Ev +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084be0Eii .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj @@ -173,17 +184,6 @@ .extern func_ov00_0207c444 .extern func_ov00_02081f4c .extern func_ov00_02081f50 -.extern func_ov00_0208344c -.extern func_ov00_020836bc -.extern func_ov00_02083770 -.extern func_ov00_020838e8 -.extern func_ov00_02083a1c -.extern func_ov00_02083ee0 -.extern func_ov00_02083f44 -.extern func_ov00_020840c4 -.extern func_ov00_02084164 -.extern func_ov00_02084b38 -.extern func_ov00_02084be0 .extern func_ov00_020875f8 .extern func_ov00_02087d34 .extern func_ov00_020888e8 diff --git a/asm/ov25.s b/asm/ov25.s index 91cc9863..2284a809 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -437,7 +437,7 @@ _0216db80: str r3, [sp, #0x18] ldr r3, [r4, #0x1c] str r3, [sp, #0x1c] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p str r0, [r4, #0x18] ldr r0, _0216dcd4 ; =data_027e0fac add r2, r4, #0x14 @@ -615,7 +615,7 @@ _0216de80: add r2, sp, #0 ldr r0, [r0] mov r1, #1 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi ldr r1, [sp] add r0, r4, #0x3a4 str r1, [r4, #0x620] @@ -4564,7 +4564,7 @@ func_ov25_02171508: ; 0x02171508 mov r4, r1 mov r1, #1 mov r2, #3 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 addne sp, sp, #0x38 movne r0, #0 @@ -7980,7 +7980,7 @@ _021741f4: add r2, sp, #0xe8 mov r1, #0xd str r3, [sp, #0xf0] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 beq _02174248 mov r0, r4 @@ -8060,7 +8060,7 @@ _02174328: ldr r0, _0217507c ; =data_027e0e60 add r1, sp, #0x10 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 mov r0, r4 bne _02174368 @@ -8081,7 +8081,7 @@ _02174374: ldr r0, _0217507c ; =data_027e0e60 add r1, sp, #0xe ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _021743d4 ldr r5, [r4, #0x138] @@ -8875,7 +8875,7 @@ _02174ee8: strb r6, [sp, #0x137] strb r6, [sp, #0x138] strb r6, [sp, #0x139] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _021750b4 ; =data_027e0d38 mov r3, #0x17 ldr r0, [r0] @@ -9110,7 +9110,7 @@ _02175278: ldr r0, _0217507c ; =data_027e0e60 add r1, sp, #0xc ldr r0, [r0] - bl func_ov00_02084164 + bl _ZN10MapManager18func_ov00_02084164Ev cmp r0, #0 addeq sp, sp, #0x340 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} @@ -9870,7 +9870,7 @@ func_ov25_02175c54: ; 0x02175c54 add r2, sp, #0 ldr r0, [r0] mov r1, #1 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi add r4, r11, #0x100 ldrsh r0, [r4, #0x78] ldr r7, [sp] @@ -10449,7 +10449,7 @@ _021763e4: ldr r0, [r0] mov r3, r2 mov r1, #5 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii _0217641c: ldr r0, [r4, #0x130] cmp r0, #0xd @@ -11628,7 +11628,7 @@ func_ov25_021772ec: ; 0x021772ec add r0, sp, #4 ldr r1, [r1] add r2, r2, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r3, [sp, #4] ldrb r1, [r4, #8] ldrb r2, [sp, #5] @@ -11940,7 +11940,7 @@ _021775e8: str r3, [sp, #4] ldr r3, [r4, #0x50] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x800 str r0, [r4, #0x4c] _021776c0: @@ -12869,7 +12869,7 @@ _0217831c: str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x10] ldr r0, [r5, #0x178] cmp r0, #0 @@ -13323,7 +13323,7 @@ func_ov25_021788a4: ; 0x021788a4 ldr r2, [r4, #0x88] str r2, [r4, #0x98] ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r2, [sp, #0x14] ldr r1, [sp, #0x10] ldr r0, [sp, #0xc] diff --git a/asm/ov26.inc b/asm/ov26.inc index 4e19a922..3499120c 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -218,22 +218,22 @@ .extern func_ov00_0207c1f8 .extern func_ov00_0207c444 .extern func_ov00_02081f4c -.extern func_ov00_020823d4 -.extern func_ov00_020823e4 -.extern func_ov00_020823f4 -.extern func_ov00_02082614 -.extern func_ov00_02082680 -.extern func_ov00_020826a0 -.extern func_ov00_020836dc -.extern func_ov00_02083a1c -.extern func_ov00_02083e34 -.extern func_ov00_02083ee0 -.extern func_ov00_02084088 -.extern func_ov00_02084164 -.extern func_ov00_02084740 -.extern func_ov00_02084a50 -.extern func_ov00_02084cb0 -.extern func_ov00_02084cc8 +.extern _ZN10MapManager18func_ov00_020823d4Ei +.extern _ZN10MapManager18func_ov00_020823e4Ei +.extern _ZN10MapManager16MapData_vfunc_b4Ev +.extern _ZN10MapManager18func_ov00_02082614Eii +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager18func_ov00_02084164Ev +.extern _ZN10MapManager18func_ov00_02084740Ev +.extern _ZN10MapManager18func_ov00_02084a50Ev +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei .extern func_ov00_020875f8 .extern func_ov00_02087d34 .extern func_ov00_02087e8c diff --git a/asm/ov26.s b/asm/ov26.s index 49368125..9adcc77e 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -1039,7 +1039,7 @@ func_ov26_0216e11c: ; 0x0216e11c ldr r0, _0216e320 ; =data_027e0e60 moveq r1, #5 ldr r0, [r0] - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r9, #0x1c] ldrb r7, [r9, #0x14] add r0, r7, #5 @@ -1060,7 +1060,7 @@ _0216e1a4: mov r2, r4 strb r6, [sp, #4] strb r8, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrb r0, [r9, #0x15] add r8, r8, #1 add r0, r0, #2 @@ -1939,7 +1939,7 @@ _0216ebec: bne _0216ec8c ldr r0, _0216ec9c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084a50 + bl _ZN10MapManager18func_ov00_02084a50Ev cmp r0, #0 ldreq r0, _0216eca0 ; =data_027e0c68 ldreqb r1, [r0, #4] @@ -2280,7 +2280,7 @@ _0216f024: beq _0216f0d4 ldr r0, _0216f200 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084a50 + bl _ZN10MapManager18func_ov00_02084a50Ev cmp r0, #0 bne _0216f0d4 ldr r0, [r10, #0xb8] @@ -2493,7 +2493,7 @@ _0216f368: ble _0216f38c ldr r0, _0216f39c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084a50 + bl _ZN10MapManager18func_ov00_02084a50Ev cmp r0, #0 beq _0216f394 _0216f38c: @@ -2845,7 +2845,7 @@ func_ov26_0216f7c4: ; 0x0216f7c4 str r3, [sp, #4] ldr r3, [r4, #0x50] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] add sp, sp, #0xc ldmia sp!, {r3, r4, pc} @@ -2875,7 +2875,7 @@ func_ov26_0216f828: ; 0x0216f828 add r1, sp, #0 str r2, [sp, #8] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcd ldr r1, [r4, #0x4c] add r0, r0, #0x400 @@ -2918,7 +2918,7 @@ func_ov26_0216f8b8: ; 0x0216f8b8 add r1, sp, #0 str r2, [sp, #8] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcd ldr r1, [r4, #0x4c] add r0, r0, #0x400 @@ -2958,7 +2958,7 @@ func_ov26_0216f920: ; 0x0216f920 str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcd add r3, r0, #0x400 add r0, sp, #0x18 @@ -3062,7 +3062,7 @@ _0216fa94: ldr r0, _0216fb18 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02084164 + bl _ZN10MapManager18func_ov00_02084164Ev cmp r0, #0 addeq sp, sp, #0x1c ldmeqia sp!, {r3, r4, pc} @@ -3237,7 +3237,7 @@ _0216fc2c: ldr r0, _0216fd94 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02084164 + bl _ZN10MapManager18func_ov00_02084164Ev cmp r0, #0 addeq sp, sp, #0x34 ldmeqia sp!, {r3, r4, r5, r6, pc} @@ -3310,7 +3310,7 @@ func_ov26_0216fdb0: ; 0x0216fdb0 ldr r0, [r0] str ip, [sp] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x9a add r1, r0, #0x1100 str r1, [sp, #0x1c] @@ -3414,7 +3414,7 @@ func_ov26_0216ff14: ; 0x0216ff14 add r1, sp, #0 mov r2, #1 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcd add r0, r0, #0x400 str r0, [r4, #0x4cc] @@ -3465,7 +3465,7 @@ func_ov26_0216ffb8: ; 0x0216ffb8 add r1, sp, #0 str r2, [sp, #8] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcd ldr r1, [r4, #0x4c] add r0, r0, #0x400 @@ -3552,7 +3552,7 @@ func_ov26_02170088: ; 0x02170088 add r1, sp, #0 str r2, [sp, #8] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcd ldr r1, [r4, #0x4c] add r0, r0, #0x400 @@ -3656,7 +3656,7 @@ func_ov26_02170194: ; 0x02170194 ldr r0, _02170260 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02084164 + bl _ZN10MapManager18func_ov00_02084164Ev cmp r0, #0 addeq sp, sp, #0x10 ldmeqia sp!, {r4, pc} @@ -3872,7 +3872,7 @@ func_ov26_02170320: ; 0x02170320 ldr r0, _0217058c ; =data_027e0e60 add r1, sp, #4 ldr r0, [r0] - bl func_ov00_02084164 + bl _ZN10MapManager18func_ov00_02084164Ev cmp r0, #0 addeq sp, sp, #0x14 ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} @@ -4030,7 +4030,7 @@ func_ov26_02170704: ; 0x02170704 str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x10] ldr r1, _02170790 ; =data_027e0f94 add r0, r4, #0x14 @@ -5725,7 +5725,7 @@ func_ov26_02171e4c: ; 0x02171e4c ldr r0, _02171e94 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02171e4c @@ -6157,7 +6157,7 @@ func_ov26_021723d4: ; 0x021723d4 strb r2, [sp, #4] mov r2, #1 strb r3, [sp, #5] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r2, [sp, #4] ldr r0, _021725a0 ; =data_027e0e60 add r1, sp, #4 @@ -6165,7 +6165,7 @@ func_ov26_021723d4: ; 0x021723d4 ldr r0, [r0] mov r2, #1 strb r3, [sp, #4] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii _02172454: add ip, r4, #0x18 ldmia ip, {r0, r1, r2} @@ -6234,7 +6234,7 @@ _02172454: ldr r0, _021725a0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 mov r2, #1 @@ -6400,7 +6400,7 @@ _02172788: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei _0217279c: mov r0, #1 add sp, sp, #0xb0 @@ -7922,7 +7922,7 @@ _02173b64: ldr r0, _02173b78 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02173b3c @@ -12278,7 +12278,7 @@ func_ov26_02176b44: ; 0x02176b44 ldr r0, _02176cb0 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 ldr r3, [r0] @@ -12347,7 +12347,7 @@ _02176d0c: ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 - bl func_ov00_02084cb0 + bl _ZN10MapManager18func_ov00_02084cb0Ei ldr r1, [r4, #4] mov r0, #1 orr r1, r1, #4 @@ -12545,22 +12545,22 @@ func_ov26_02176fc8: ; 0x02176fc8 ldrh r5, [r6, #0x2a] ldr r0, [r0] mov r1, r4 - bl func_ov00_020823d4 + bl _ZN10MapManager18func_ov00_020823d4Ei ldr r1, _0217702c ; =data_027e0e60 str r0, [r6, #0xd4] ldr r0, [r1] mov r1, r4 - bl func_ov00_020823e4 + bl _ZN10MapManager18func_ov00_020823e4Ei ldr r1, _0217702c ; =data_027e0e60 str r0, [r6, #0xd8] ldr r0, [r1] mov r1, r5 - bl func_ov00_020823d4 + bl _ZN10MapManager18func_ov00_020823d4Ei ldr r1, _0217702c ; =data_027e0e60 str r0, [r6, #0xdc] ldr r0, [r1] mov r1, r5 - bl func_ov00_020823e4 + bl _ZN10MapManager18func_ov00_020823e4Ei str r0, [r6, #0xe0] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 @@ -12590,7 +12590,7 @@ func_ov26_02177030: ; 0x02177030 bl func_0201933c ldr r0, _02177100 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020823f4 + bl _ZN10MapManager16MapData_vfunc_b4Ev mov r4, r0 mov r0, r5 mov r1, r4 @@ -13246,7 +13246,7 @@ _0217789c: ldr r0, [r5] mov r1, r6 and r2, r8, #0xff - bl func_ov00_02082614 + bl _ZN10MapManager18func_ov00_02082614Eii ldr r1, [r4] mov r0, r6 add r1, r1, #4 @@ -13697,7 +13697,7 @@ func_ov26_02177e14: ; 0x02177e14 str r2, [r7, #0xb4] ldr r1, [r1] add r2, r7, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r4, _02177f64 ; =data_ov26_0217af64 ldr r6, _02177f60 ; =data_027e0e60 add r9, sp, #2 @@ -13715,7 +13715,7 @@ _02177e90: mov r2, r8 strb r10, [sp, #2] strb r3, [sp, #3] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii add r5, r5, #1 cmp r5, #0x12 blo _02177e90 @@ -13739,7 +13739,7 @@ _02177ef4: mov r2, r9 strb ip, [sp] strb r3, [sp, #1] - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii add r5, r5, #1 cmp r5, #0x18 blt _02177ef4 @@ -14008,13 +14008,13 @@ func_ov26_02178228: ; 0x02178228 mov r2, r0 ldr r0, [r1] ldr r1, [r2, #0x15c] - ldr ip, _02178248 ; =func_ov00_020836dc + ldr ip, _02178248 ; =_ZN10MapManager18func_ov00_020836dcEii mov r2, #0 bx ip .align 2, 0 arm_func_end func_ov26_02178228 _02178244: .word data_027e0e60 -_02178248: .word func_ov00_020836dc +_02178248: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov26_0217824c thumb_func_start func_ov26_0217824c @@ -14132,7 +14132,7 @@ _02178354: bne _02178384 ldr r0, _021783b4 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084740 + bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 ldr r0, _021783b0 ; =data_ov00_020eec68 mov r2, #0x3c @@ -14311,7 +14311,7 @@ func_ov26_0217855c: ; 0x0217855c ldrb r1, [r10, #0x14] ldr r0, [r0] sub r2, r2, #1 - bl func_ov00_02083e34 + bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r10, #0x1c] ldr r1, [r10, #0x18] ldr r0, _021786d4 ; =data_027e0e60 @@ -14334,7 +14334,7 @@ func_ov26_0217855c: ; 0x0217855c ldr r0, [r0] strb r2, [sp, #6] strb r3, [sp, #7] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x37 bgt _02178604 bge _0217860c @@ -14377,7 +14377,7 @@ _02178658: mov r2, r5 strb r7, [sp, #4] strb r8, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii add r8, r8, #1 cmp r8, r9 blt _02178658 diff --git a/asm/ov27.inc b/asm/ov27.inc index 024fa41f..191418e7 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -1,5 +1,10 @@ #pragma once .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18func_ov00_020836bcEjPi +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_020838e8EjPi .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef @@ -175,11 +180,6 @@ .extern func_ov00_02081f50 .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_0208344c -.extern func_ov00_020836bc -.extern func_ov00_020836dc -.extern func_ov00_020838e8 -.extern func_ov00_02083ee0 .extern func_ov00_020872e8 .extern func_ov00_020875f8 .extern func_ov00_02087d34 diff --git a/asm/ov27.s b/asm/ov27.s index d464d6db..e593923c 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -372,7 +372,7 @@ _0216db58: str r3, [sp, #0x18] ldr r3, [r5, #0x50] str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #0x4c] mov r0, r5 mov r1, #4 @@ -1417,7 +1417,7 @@ _0216eadc: ldr r0, _0216ed44 ; =data_027e0e60 add r1, sp, #0xc ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r0, _0216ed48 ; =data_027e0f64 ldr r1, [sp, #0xc] ldr r2, [r0] @@ -1469,7 +1469,7 @@ _0216eb54: add r1, sp, #0 str r3, [sp, #0x30] str r2, [sp, #0x38] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p add r0, sp, #0 add r1, r4, #0x48 mov r2, r0 @@ -2098,7 +2098,7 @@ _0216f43c: ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0216f4b0 mov r0, r4 @@ -2197,7 +2197,7 @@ func_ov27_0216f5c0: ; 0x0216f5c0 ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -2260,7 +2260,7 @@ func_ov27_0216f608: ; 0x0216f608 ldr r3, [r4, #0x50] add r1, sp, #4 str r3, [sp, #0xc] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] mov r0, r4 bl func_ov14_02145258 @@ -3164,7 +3164,7 @@ _021702d0: add r1, sp, #8 mov r2, #0 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] mov r1, #0 str r1, [sp] @@ -4009,7 +4009,7 @@ func_ov27_02170e24: ; 0x02170e24 add r1, sp, #0xc mov r2, r5 str r3, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev cmp r0, #0x2000 addlt sp, sp, #0x18 str r0, [r4, #0x4c] @@ -5430,7 +5430,7 @@ _02172284: add r1, sp, #0x18 str r2, [sp, #0x20] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r6, #0x4c] add r0, r0, #0x800 cmp r1, r0 @@ -5468,7 +5468,7 @@ _021722d0: str r3, [sp, #0x10] ldr r3, [r6, #0x50] str r3, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r5, r0, #0x800 mov r3, #0x3800 str r5, [r6, #0x4c] @@ -5781,7 +5781,7 @@ func_ov27_02172598: ; 0x02172598 str r1, [sp, #0x20] add r1, sp, #0x18 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr ip, _0217283c ; =0x00000a8f str r0, [sp, #0x28] mov r1, #0 @@ -6644,7 +6644,7 @@ func_ov27_02173330: ; 0x02173330 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -7034,7 +7034,7 @@ func_ov27_02173830: ; 0x02173830 strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _021738dc ; =data_027e0d38 add r1, sp, #0 ldr r0, [r0] @@ -7451,7 +7451,7 @@ func_ov27_02173d78: ; 0x02173d78 ldr r0, [r0] add r1, sp, #0x18 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x28] ldr r3, _02173e34 ; =0x0000099a mov r0, #0 @@ -7969,7 +7969,7 @@ func_ov27_0217440c: ; 0x0217440c ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmeqia sp!, {r4, pc} add r0, r4, #0x470 @@ -8042,7 +8042,7 @@ func_ov27_02174454: ; 0x02174454 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r1, r4, #0x100 ldrsh r2, [r1, #0x1e] mov r1, #0 @@ -8209,7 +8209,7 @@ func_ov27_02174748: ; 0x02174748 add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldrsb r1, [r4, #0x2c] mov r0, r4 @@ -8237,7 +8237,7 @@ func_ov27_021747d4: ; 0x021747d4 add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r4, r0 mov r0, r5 bl func_ov14_02145508 @@ -9153,7 +9153,7 @@ func_ov27_021752a8: ; 0x021752a8 str r1, [sp, #0x1c] ldrh r1, [r4, #0x20] add r2, sp, #8 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi add r0, r4, #0xb8 add r0, r0, #0x400 str r0, [sp] @@ -9240,7 +9240,7 @@ _021754a4: ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _021754cc add r0, r4, #0x470 @@ -9381,7 +9381,7 @@ func_ov27_02175660: ; 0x02175660 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldreqb r0, [r4, #0x4e7] cmpeq r0, #1 diff --git a/asm/ov28.inc b/asm/ov28.inc index 0a742d5b..f465f63a 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -1,5 +1,15 @@ #pragma once .extern Approach_thunk +.extern _ZN10MapManager17GetMapData_Unk_4cEv +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_02082b3cEi +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p +.extern _ZN10MapManager18func_ov00_020843ecEPi +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084be0Eii +.extern _ZN10MapManager8SpawnNPCEP5Vec3pii .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN14AdventureFlags18func_Ov00_02097810Ei @@ -171,16 +181,6 @@ .extern func_ov00_0207c31c .extern func_ov00_0207c444 .extern func_ov00_0207c474 -.extern func_ov00_02082680 -.extern func_ov00_02082b3c -.extern func_ov00_020836dc -.extern func_ov00_020838e8 -.extern func_ov00_02083f44 -.extern func_ov00_02084120 -.extern func_ov00_020843ec -.extern func_ov00_02084a5c -.extern func_ov00_02084b38 -.extern func_ov00_02084be0 .extern func_ov00_0208726c .extern func_ov00_020876bc .extern func_ov00_02087ab0 diff --git a/asm/ov28.s b/asm/ov28.s index 1526b066..05f4f70e 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -3517,7 +3517,7 @@ func_ov28_021704b0: ; 0x021704b0 ldr r0, [r0] mov r2, r1 mov r3, r1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii b _02170604 _02170524: ldr r0, _02170624 ; =gAdventureFlags @@ -3537,7 +3537,7 @@ _02170524: ldr r0, [r0] mov r3, r2 mov r1, #2 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii b _02170604 _02170570: ldr r0, _02170624 ; =gAdventureFlags @@ -3557,7 +3557,7 @@ _02170570: ldr r0, [r0] mov r3, r2 mov r1, #3 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii b _02170604 _021705bc: ldr r0, _02170624 ; =gAdventureFlags @@ -3577,7 +3577,7 @@ _021705bc: ldr r0, [r0] mov r3, r2 mov r1, #4 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii _02170604: add r0, r4, #0x74 add r0, r0, #0x400 @@ -3950,10 +3950,10 @@ _021709a4: mov r0, r6 add r1, sp, #0 str r3, [sp, #8] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p mov r5, r0 mov r0, r6 - bl func_ov00_02084120 + bl _ZN10MapManager17GetMapData_Unk_4cEv add r0, r5, r0 str r0, [r4, #0x4c] ldrsb r0, [r4, #0x2c] @@ -5560,7 +5560,7 @@ _02171ee8: mov r2, r4 strb r6, [sp, #4] strb r8, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrb r0, [r9, #0x15] add r8, r8, #1 add r0, r0, #1 @@ -5664,7 +5664,7 @@ _02172008: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi mov r0, #0xc strb r0, [r4, #0x12] b _021720c4 @@ -5689,7 +5689,7 @@ _02172068: add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi mov r0, #1 strb r0, [r4, #0x12] _021720c4: @@ -5942,7 +5942,7 @@ _021723c4: mov r2, r4 strb r6, [sp, #4] strb r8, [sp, #5] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldrb r0, [r9, #0x15] add r8, r8, #1 add r0, r0, #1 @@ -6065,7 +6065,7 @@ _02172528: add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r0, [r4, #4] orr r0, r0, #0x14 str r0, [r4, #4] @@ -6088,7 +6088,7 @@ _02172580: add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 - bl func_ov00_020843ec + bl _ZN10MapManager18func_ov00_020843ecEPi ldr r0, [r4, #4] bic r0, r0, #4 bic r0, r0, #0x10 @@ -6540,7 +6540,7 @@ func_ov28_02172af8: ; 0x02172af8 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -6615,7 +6615,7 @@ func_ov28_02172bc8: ; 0x02172bc8 ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 @@ -8457,7 +8457,7 @@ func_ov28_021742b0: ; 0x021742b0 add r1, r4, #0x48 mov r2, #1 mov r3, #0 - bl func_ov00_02084a5c + bl _ZN10MapManager8SpawnNPCEP5Vec3pii add r0, sp, #0 bl func_ov00_0209a508 add sp, sp, #0xb0 @@ -8965,7 +8965,7 @@ func_ov28_0217496c: ; 0x0217496c strb lr, [sp, #0x13] strb lr, [sp, #0x14] strb lr, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02174a10 ; =gOverlayManager ldr r2, _02174a14 ; =0x00000004 mov r1, #2 @@ -8975,7 +8975,7 @@ func_ov28_0217496c: ; 0x0217496c ldr r0, [r0] add r1, sp, #0 strb r2, [sp, #0x15] - bl func_ov00_02082b3c + bl _ZN10MapManager18func_ov00_02082b3cEi ldr r0, _02174a10 ; =gOverlayManager ldr r2, _02174a18 ; =0x00000005 mov r1, #2 @@ -9507,7 +9507,7 @@ _0217504c: add r1, ip, r3 and r1, r1, #0xff mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii mov r1, #0 str r1, [r4, #0x130] ldr r0, _021750a0 ; =data_ov28_02179684 @@ -9623,7 +9623,7 @@ _02175184: ldr r0, [r0] and r1, r1, #0xff mov r3, #1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _02175260 ; =data_ov28_02179684 mov r5, #0 ldr r1, [r0, #0x18] @@ -9731,7 +9731,7 @@ _02175308: ldr r0, _021753dc ; =data_027e0e60 ldrb r2, [r4, #0x29] ldr r0, [r0] - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, [r4, #0x1bc] @@ -9749,7 +9749,7 @@ _02175364: add r1, ip, r3 and r1, r1, #0xff mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii mov r0, r4 bl func_ov28_02175028 bl func_ov28_02174948 @@ -9796,7 +9796,7 @@ func_ov28_021753f0: ; 0x021753f0 add r1, ip, r3 and r1, r1, #0xff mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r1, _02175468 ; =data_ov28_02178348 add r0, r4, #0x1c0 ldr r1, [r1] @@ -12084,7 +12084,7 @@ _021772b0: ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _02177408 mov r0, r4 diff --git a/asm/ov29.inc b/asm/ov29.inc index fd7cee09..cbfe9681 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -1,6 +1,15 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_6cEv +.extern _ZN10MapManager18Set_MapData_Unk_16Eci +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083908EcPi +.extern _ZN10MapManager18func_ov00_02083928EPci +.extern _ZN10MapManager18func_ov00_02083938Ei +.extern _ZN10MapManager18func_ov00_020846a4Ev +.extern _ZN10MapManager18func_ov00_02084d24Ecci .extern _ZN11ItemManager18func_ov00_020ae4dcEj .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j @@ -185,15 +194,6 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern func_ov00_02082680 -.extern func_ov00_020836dc -.extern func_ov00_02083908 -.extern func_ov00_02083928 -.extern func_ov00_02083938 -.extern func_ov00_02083948 -.extern func_ov00_02083f80 -.extern func_ov00_020846a4 -.extern func_ov00_02084d24 .extern func_ov00_02087400 .extern func_ov00_0208b5a4 .extern func_ov00_0208b5bc diff --git a/asm/ov29.s b/asm/ov29.s index 935b7723..4f8aad75 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -1504,7 +1504,7 @@ func_ov29_0216ea08: ; 0x0216ea08 ldmneia sp!, {r4, pc} ldr r0, _0216ea68 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #0xd beq _0216ea48 cmp r0, #0xe @@ -2286,7 +2286,7 @@ _0216f4bc: add r1, sp, #4 ldr r0, [r0] mov r2, #0 - bl func_ov00_02083928 + bl _ZN10MapManager18func_ov00_02083928EPci ldrb r1, [sp, #8] ldr r0, _0216f6a4 ; =data_027e0e60 add r2, r4, #0x1f0 @@ -2297,17 +2297,17 @@ _0216f4bc: and r1, r1, #0xff and r5, r3, #0xff mov r6, #1 - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi ldr r0, _0216f6a4 ; =data_027e0e60 mov r1, r5 ldr r0, [r0] add r2, r4, #0x20c - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi ldr r0, _0216f6a4 ; =data_027e0e60 mov r1, r6 ldr r0, [r0] add r2, r4, #0x228 - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi ldr r1, _0216f6a8 ; =data_02052f54 add r0, r4, #0x1c8 ldrsh r2, [r1, #2] @@ -2649,14 +2649,14 @@ _0216f9b0: ldrb r5, [r4, #0x22c] ldr r0, [r0] mov r1, #0 - bl func_ov00_02083938 + bl _ZN10MapManager18func_ov00_02083938Ei cmp r0, r5 beq _0216fbe8 ldr r0, _0216fbf8 ; =data_027e0e60 ldrb r1, [r4, #0x22c] ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci b _0216fbe8 _0216f9e4: ldr r0, _0216fbf4 ; =data_027e0f64 @@ -2683,14 +2683,14 @@ _0216fa2c: ldrb r5, [r4, #0x1f4] ldr r0, [r0] mov r1, #0 - bl func_ov00_02083938 + bl _ZN10MapManager18func_ov00_02083938Ei cmp r0, r5 beq _0216fbe8 ldr r0, _0216fbf8 ; =data_027e0e60 ldrb r1, [r4, #0x1f4] ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci b _0216fbe8 _0216fa60: ldr r0, _0216fbf4 ; =data_027e0f64 @@ -2717,14 +2717,14 @@ _0216faa8: ldrb r5, [r4, #0x210] ldr r0, [r0] mov r1, #0 - bl func_ov00_02083938 + bl _ZN10MapManager18func_ov00_02083938Ei cmp r0, r5 beq _0216fbe8 ldr r0, _0216fbf8 ; =data_027e0e60 ldrb r1, [r4, #0x210] ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci b _0216fbe8 _0216fadc: add r0, r4, #0x250 @@ -2891,7 +2891,7 @@ func_ov29_0216fcd4: ; 0x0216fcd4 ldrb r1, [r0, #0x1c6] ldr r0, [r2] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0216fd6c ldr r1, _0216fd7c ; =data_027e0f94 @@ -2906,7 +2906,7 @@ func_ov29_0216fcd4: ; 0x0216fcd4 add r2, sp, #0 add r3, sp, #4 str ip, [sp, #0x18] - bl func_ov00_02083f80 + bl _ZN10MapManager16MapData_vfunc_6cEv ldr r0, [sp, #4] cmp r0, #0 ldreq r0, [sp, #8] @@ -10615,24 +10615,24 @@ _02176630: mov r2, r11 strb r6, [sp, #2] strb r8, [sp, #3] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r7 mov r2, r8 mov r3, #9 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci b _02176690 _02176668: add r1, sp, #0 mov r2, #0 strb r6, [sp] strb r8, [sp, #1] - bl func_ov00_02082680 + bl _ZN10MapManager18func_ov00_02082680Eii ldr r0, [r4] mov r1, r7 mov r2, r8 mov r3, #0x35 - bl func_ov00_02084d24 + bl _ZN10MapManager18func_ov00_02084d24Ecci _02176690: ldrb r0, [r10, #0x15] add r8, r8, #1 diff --git a/asm/ov30.inc b/asm/ov30.inc index 5370e24f..213798db 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -140,14 +140,14 @@ .extern func_ov00_0207c1f8 .extern func_ov00_02081f4c .extern func_ov00_02081f50 -.extern func_ov00_02082d08 -.extern func_ov00_02083770 -.extern func_ov00_02083ee0 -.extern func_ov00_02084324 -.extern func_ov00_0208433c -.extern func_ov00_0208439c -.extern func_ov00_02084740 -.extern func_ov00_02084924 +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_a4Ev +.extern _ZN10MapManager18func_ov00_0208433cEP5Vec3pi +.extern _ZN10MapManager18func_ov00_0208439cEv +.extern _ZN10MapManager18func_ov00_02084740Ev +.extern _ZN10MapManager18func_ov00_02084924Ej .extern func_ov00_02087d34 .extern func_ov00_020884b4 .extern func_ov00_02093a1c diff --git a/asm/ov30.s b/asm/ov30.s index 26a4350a..ed90ab1e 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -1568,7 +1568,7 @@ func_ov30_0217d09c: ; 0x0217d09c str lr, [sp, #0x28] str ip, [sp, #0x2c] str r3, [sp, #0x30] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 addne sp, sp, #0x58 movne r0, #0 @@ -1787,7 +1787,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8 str lr, [sp, #4] str ip, [sp, #8] str r3, [sp, #0xc] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 addne sp, sp, #0x20 movne r0, #0 @@ -1866,7 +1866,7 @@ func_ov30_0217d4e8: ; 0x0217d4e8 add r2, sp, #0 mov r1, #0xff str r3, [sp, #8] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 addne sp, sp, #0x18 movne r0, #0 @@ -1983,7 +1983,7 @@ func_ov30_0217d690: ; 0x0217d690 str ip, [sp, #0x24] str r6, [sp, #0x28] str r3, [sp, #0x2c] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 addne sp, sp, #0x48 movne r0, #0 @@ -2069,7 +2069,7 @@ func_ov30_0217d7d8: ; 0x0217d7d8 add r1, sp, #0x18 add r2, sp, #0x14 str r3, [sp, #0x20] - bl func_ov00_0208433c + bl _ZN10MapManager18func_ov00_0208433cEP5Vec3pi mov r0, r11 ldrsh r2, [sp, #0x16] ldrsh r1, [sp, #0x14] @@ -2097,7 +2097,7 @@ _0217d874: strh r0, [sp, #0xe] ldr r0, [r5] mov r1, r6 - bl func_ov00_02084324 + bl _ZN10MapManager16MapData_vfunc_a4Ev cmp r0, #0 beq _0217d934 ldrsh r1, [sp, #0x16] @@ -2114,7 +2114,7 @@ _0217d874: ldr r0, [r5] mov r1, r6 add r2, sp, #0x24 - bl func_ov00_0208439c + bl _ZN10MapManager18func_ov00_0208439cEv ldr r1, [r10, #8] ldr r0, [sp, #0x2c] ldr r3, [r10] @@ -2158,7 +2158,7 @@ _0217d934: ldr r2, [sp] ldr r0, [r0] add r1, sp, #0x10 - bl func_ov00_0208439c + bl _ZN10MapManager18func_ov00_0208439cEv _0217d97c: mov r0, r11 add sp, sp, #0x30 @@ -4040,7 +4040,7 @@ _0217f250: mov r2, #1 str r4, [sp, #0x18] str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x60] add r0, sp, #0x5c bl func_ov30_0217f088 @@ -4102,7 +4102,7 @@ _0217f2f4: str r6, [sp, #8] str r4, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x54] _0217f3b8: ldr r0, _0217f55c ; =data_027e10b4 @@ -4306,7 +4306,7 @@ _0217f5f8: str r5, [sp, #0x18] str r3, [sp, #0x1c] str r7, [sp, #0x20] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r6, r0 _0217f69c: str r5, [r4, #0x48] @@ -4477,7 +4477,7 @@ _0217f880: mov r2, #1 str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x10] add r0, sp, #0xc bl func_ov30_0217f088 @@ -4711,7 +4711,7 @@ _0217fbb4: mov r2, #1 str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x10] add r0, sp, #0xc bl func_ov30_0217f088 @@ -5412,7 +5412,7 @@ func_ov30_02180548: ; 0x02180548 bne _02180594 ldr r0, _021805a0 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #7 bne _02180594 ldr r0, _021805a4 ; =gAdventureFlags @@ -5444,7 +5444,7 @@ func_ov30_021805ac: ; 0x021805ac bne _021805f8 ldr r0, _02180604 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02082d08 + bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #7 bne _021805f8 ldr r0, _02180608 ; =gAdventureFlags @@ -10049,7 +10049,7 @@ func_ov30_02183ca8: ; 0x02183ca8 ldr r0, [r2] str r3, [sp, #0x38] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r7] ldr r1, _02183d7c ; =data_027e0e60 str r2, [sp, #0x24] @@ -10061,7 +10061,7 @@ func_ov30_02183ca8: ; 0x02183ca8 str r2, [sp, #0x2c] add r1, sp, #0x24 mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _02183d78 ; =data_ov30_021894a0 add r0, r4, r0 str r0, [sp, #0x10] @@ -10518,7 +10518,7 @@ _021841ec: bl func_ov00_020d716c ldr r0, _02184308 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084740 + bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 ldr r0, _02184304 ; =data_ov00_020eec68 mov r2, #0 @@ -10527,7 +10527,7 @@ _021841ec: ldr r0, _02184308 ; =data_027e0e60 mov r1, #0 ldr r0, [r0] - bl func_ov00_02084924 + bl _ZN10MapManager18func_ov00_02084924Ej b _02184298 _0218424c: ldr r0, [r10, #0x88] @@ -10548,7 +10548,7 @@ _0218424c: ldr r0, _02184308 ; =data_027e0e60 mov r1, #1 ldr r0, [r0] - bl func_ov00_02084924 + bl _ZN10MapManager18func_ov00_02084924Ej _02184298: ldr r0, [r10, #0x94] cmp r0, #0 @@ -11362,7 +11362,7 @@ _02184940: ldr r3, [r7, #0x50] add r2, sp, #0x74 str r3, [sp, #0x7c] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 movne r8, #1 _02184998: @@ -11450,7 +11450,7 @@ _02184a84: ldr r3, [r7, #0x50] add r2, sp, #0x68 str r3, [sp, #0x70] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 movne r8, #1 _02184adc: @@ -11550,7 +11550,7 @@ _02184bf8: ldr r3, [r7, #0x50] add r2, sp, #0x5c str r3, [sp, #0x64] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 movne r8, #1 _02184c50: @@ -11648,7 +11648,7 @@ _02184d64: ldr r3, [r7, #0x50] add r2, sp, #0x50 str r3, [sp, #0x58] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 movne r8, #1 _02184dbc: @@ -11747,7 +11747,7 @@ _02184ed4: ldr r3, [r0, #0x50] ldr r0, [r5] str r3, [sp, #0x4c] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 movne r8, #1 _02184f2c: @@ -11842,7 +11842,7 @@ _02185034: ldr r3, [r0, #0x50] ldr r0, [r5] str r3, [sp, #0x40] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 movne r8, #1 _0218508c: @@ -11937,7 +11937,7 @@ _02185194: ldr r3, [r0, #0x50] ldr r0, [r5] str r3, [sp, #0x34] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 movne r8, #1 _021851ec: @@ -14289,7 +14289,7 @@ func_ov30_021872c4: ; 0x021872c4 ldr r0, [r3] add r1, sp, #0 str ip, [sp, #8] - bl func_ov00_0208433c + bl _ZN10MapManager18func_ov00_0208433cEP5Vec3pi add sp, sp, #0xc ldmia sp!, {pc} .align 2, 0 @@ -14303,13 +14303,13 @@ func_ov30_02187304: ; 0x02187304 mov r3, r0 ldr r0, [r2] mov r2, r1 - ldr ip, _02187324 ; =func_ov00_0208439c + ldr ip, _02187324 ; =_ZN10MapManager18func_ov00_0208439cEv mov r1, r3 bx ip .align 2, 0 arm_func_end func_ov30_02187304 _02187320: .word data_027e0e60 -_02187324: .word func_ov00_0208439c +_02187324: .word _ZN10MapManager18func_ov00_0208439cEv .global func_ov30_02187328 arm_func_start func_ov30_02187328 @@ -14377,7 +14377,7 @@ func_ov30_021873bc: ; 0x021873bc mov r5, r0 ldr r0, [r2] mov r4, r1 - bl func_ov00_02084324 + bl _ZN10MapManager16MapData_vfunc_a4Ev cmp r0, #0 addeq sp, sp, #8 moveq r0, #0 @@ -14468,13 +14468,13 @@ _02187524: ldr r0, _02187568 ; =data_027e0e60 add r1, sp, #4 ldr r0, [r0] - bl func_ov00_02084324 + bl _ZN10MapManager16MapData_vfunc_a4Ev cmp r0, #0 beq _0218755c ldr r0, _02187568 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02084324 + bl _ZN10MapManager16MapData_vfunc_a4Ev cmp r0, #0 addne sp, sp, #8 movne r0, #1 @@ -14523,14 +14523,14 @@ _021875d0: .word 0x000016a1 arm_func_start func_ov30_021875d4 func_ov30_021875d4: ; 0x021875d4 ldr r2, _021875e8 ; =data_027e0e60 - ldr ip, _021875ec ; =func_ov00_02084324 + ldr ip, _021875ec ; =_ZN10MapManager16MapData_vfunc_a4Ev mov r1, r0 ldr r0, [r2] bx ip .align 2, 0 arm_func_end func_ov30_021875d4 _021875e8: .word data_027e0e60 -_021875ec: .word func_ov00_02084324 +_021875ec: .word _ZN10MapManager16MapData_vfunc_a4Ev .global func_ov30_021875f0 arm_func_start func_ov30_021875f0 diff --git a/asm/ov31.inc b/asm/ov31.inc index 8e1593c2..5fbd45ca 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -153,7 +153,7 @@ .extern func_ov00_0207b89c .extern func_ov00_0207ba90 .extern func_ov00_0207bc48 -.extern func_ov00_02083918 +.extern _ZN10MapManager18func_ov00_02083918EiPi .extern func_ov00_0208726c .extern func_ov00_02087338 .extern func_ov00_02087400 diff --git a/asm/ov31.s b/asm/ov31.s index d3af2dc4..02be17e1 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -273,7 +273,7 @@ _0217c040: mov r1, #0x45 ldr r0, [r0] add r2, sp, #0x50 - bl func_ov00_02083918 + bl _ZN10MapManager18func_ov00_02083918EiPi cmp r0, #0 beq _0217c0f0 ldr r0, _0217c214 ; =data_027e0f64 diff --git a/asm/ov32.inc b/asm/ov32.inc index a11b7585..054d383a 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -1,6 +1,11 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083780Ei +.extern _ZN10MapManager18func_ov00_02084be0Eii +.extern _ZN10MapManager18func_ov00_02084cc8Ei .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList @@ -159,11 +164,6 @@ .extern func_ov00_02081f4c .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_020836dc -.extern func_ov00_02083780 -.extern func_ov00_02083ee0 -.extern func_ov00_02084be0 -.extern func_ov00_02084cc8 .extern func_ov00_020875f8 .extern func_ov00_02087d34 .extern func_ov00_020888e8 diff --git a/asm/ov32.s b/asm/ov32.s index 7d8f21a8..c826e628 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -1370,7 +1370,7 @@ func_ov32_0217cdd8: ; 0x0217cdd8 ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, [r4, #0x184] @@ -1529,7 +1529,7 @@ _0217cfc4: ldrh r1, [r5, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0217d030 mov r0, r5 @@ -1938,7 +1938,7 @@ _0217d500: add r1, sp, #0x10 str r2, [sp, #0x18] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r5, #0x4c] ldr r0, [r5, #0x184] mov r1, #2 @@ -3069,7 +3069,7 @@ _0217e3e4: ldrh r1, [r5, #0x24] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0217e448 mov r0, r5 @@ -5206,11 +5206,11 @@ func_ov32_0217feac: ; 0x0217feac str r2, [sp, #0x18] ldr r2, [r6, #0x50] str r2, [sp, #0x1c] - bl func_ov00_02083780 + bl _ZN10MapManager18func_ov00_02083780Ei mov r7, r0 add r1, sp, #8 mov r0, r5 - bl func_ov00_02083780 + bl _ZN10MapManager18func_ov00_02083780Ei cmp r7, r0 moveq r4, #1 _0217ff6c: @@ -6830,7 +6830,7 @@ _021815b8: ldr r0, _02181624 ; =data_027e0e60 ldrsh r1, [r4, #0x34] ldr r0, [r0] - bl func_ov00_02084cc8 + bl _ZN10MapManager18func_ov00_02084cc8Ei cmp r0, #0 mov r0, r4 beq _021815ec @@ -8066,7 +8066,7 @@ func_ov32_021826c4: ; 0x021826c4 ldr r0, _021826ec ; =data_027e0e60 mov r2, #3 ldr r0, [r0] - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov32_021826c4 @@ -9021,7 +9021,7 @@ func_ov32_0218318c: ; 0x0218318c mla r6, r5, r3, r6 mov r2, #1 add r5, r6, #0x800 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, r5 str r0, [r4, #0x234] mov r0, #0 @@ -9122,7 +9122,7 @@ _02183414: mov r2, #1 str r6, [lr, #4] sub r5, r5, #0x400 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x800 add r0, r0, r5 str r0, [r4, #0x234] @@ -9156,7 +9156,7 @@ _02183498: mov r2, #1 str r6, [lr, #4] sub r5, r5, #0x400 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x800 add r0, r0, r5 str r0, [r4, #0x234] @@ -9394,7 +9394,7 @@ func_ov32_02183818: ; 0x02183818 str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x1c] cmp r1, r0 strlt r0, [sp, #0x1c] @@ -10648,7 +10648,7 @@ func_ov32_02184890: ; 0x02184890 str r3, [sp, #4] ldr r3, [r4, #0x50] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x9a add r0, r0, #0x900 str r0, [r4, #0x4c] @@ -10836,7 +10836,7 @@ func_ov32_02184a9c: ; 0x02184a9c str r3, [sp, #0x18] str r5, [sp, #0x1c] str r6, [sp, #0x20] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x28] ldr r3, _02184ba0 ; =0x0000059a mov r0, #0x1f diff --git a/asm/ov33.inc b/asm/ov33.inc index af65f5a6..65302e14 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -115,8 +115,8 @@ .extern func_ov00_0207a1c8 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern func_ov00_020836dc -.extern func_ov00_02083ee0 +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager16MapData_vfunc_68Ev .extern func_ov00_0208726c .extern func_ov00_02087338 .extern func_ov00_020876bc diff --git a/asm/ov33.s b/asm/ov33.s index c866e95e..3da5cb2e 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -855,7 +855,7 @@ func_ov33_0217c808: ; 0x0217c808 add r1, sp, #0 mov r2, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r1, r0, #0x800 mov r0, r4 str r1, [r4, #0x4c] @@ -1130,7 +1130,7 @@ _0217cba8: ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0217cf08 mov r0, r5 @@ -1171,7 +1171,7 @@ _0217cc24: add r1, sp, #0x1c str r2, [sp, #0x24] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x4c] add r0, r0, #0x800 cmp r1, r0 @@ -1280,7 +1280,7 @@ _0217cdd0: ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0217cf08 mov r0, r5 @@ -1321,7 +1321,7 @@ _0217ce4c: add r1, sp, #0x10 str r2, [sp, #0x18] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x4c] add r0, r0, #0x800 cmp r1, r0 diff --git a/asm/ov34.inc b/asm/ov34.inc index 451d7192..a46e2160 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -129,11 +129,11 @@ .extern func_ov00_0207c31c .extern func_ov00_0207c444 .extern func_ov00_02081f4c -.extern func_ov00_02083908 -.extern func_ov00_02083948 -.extern func_ov00_02083a1c -.extern func_ov00_02083ee0 -.extern func_ov00_02084088 +.extern _ZN10MapManager18func_ov00_02083908EcPi +.extern _ZN10MapManager18Set_MapData_Unk_16Eci +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_54Ev .extern func_ov00_02087400 .extern func_ov00_02087d34 .extern func_ov00_02087d84 diff --git a/asm/ov34.s b/asm/ov34.s index 5fbf04f8..b6428dd7 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -1340,14 +1340,14 @@ _0217cfa4: add r2, sp, #0 mov r0, r4 mov r1, #1 - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi cmp r0, #0 addeq sp, sp, #0x1c ldmeqia sp!, {r3, r4, pc} mov r0, r4 mov r1, #1 mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _0217d00c ; =data_027e0f64 add r1, sp, #0 ldr r0, [r0] @@ -1386,14 +1386,14 @@ _0217d040: add r2, sp, #0 mov r0, r4 mov r1, #4 - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi cmp r0, #0 addeq sp, sp, #0x1c ldmeqia sp!, {r3, r4, pc} mov r0, r4 mov r1, #4 mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _0217d0a8 ; =data_027e0f64 add r1, sp, #0 ldr r0, [r0] @@ -1432,14 +1432,14 @@ _0217d0dc: add r2, sp, #0 mov r0, r4 mov r1, #3 - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi cmp r0, #0 addeq sp, sp, #0x1c ldmeqia sp!, {r3, r4, pc} mov r0, r4 mov r1, #3 mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _0217d144 ; =data_027e0f64 add r1, sp, #0 ldr r0, [r0] @@ -2227,7 +2227,7 @@ _0217db48: mov r1, #1 ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _0217de98 ; =data_ov34_021861a0 mov r1, #0 ldr r2, [r0, #0x8c] @@ -6628,7 +6628,7 @@ _02181b50: add r1, sp, #0xc mov r2, #0 str r3, [sp, #0x14] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev mov r1, r4, asr #0x4 mov r5, r1, lsl #0x1 add r0, r0, #0xcd @@ -10717,11 +10717,11 @@ func_ov34_021853dc: ; 0x021853dc ldr r1, [r1] add r0, sp, #8 add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, _02185580 ; =data_027e0e60 add r1, sp, #8 ldr r0, [r0] - bl func_ov00_02084088 + bl _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #5 cmpne r0, #6 cmpne r0, #0x14 diff --git a/asm/ov35.inc b/asm/ov35.inc index 65396aad..cd99a8fb 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -1,6 +1,8 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_020836bcEjPi .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN11ItemManager12GetItemModelEj .extern _ZN11ItemManager7AddItemEi @@ -164,8 +166,6 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern func_ov00_020836bc -.extern func_ov00_02083ee0 .extern func_ov00_02087584 .extern func_ov00_020875f8 .extern func_ov00_02087d34 diff --git a/asm/ov35.s b/asm/ov35.s index 4253f687..94f2f5b6 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -2807,7 +2807,7 @@ func_ov35_0217e320: ; 0x0217e320 ldr r0, [r0] add r1, sp, #0x18 mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x28] mov r3, #0x800 str r3, [sp] @@ -8086,7 +8086,7 @@ _02182d84: add r2, sp, #0x94 ldr r0, [r0] mov r1, #1 - bl func_ov00_020836bc + bl _ZN10MapManager18func_ov00_020836bcEjPi ldr r5, [sp, #0xac] ldr r3, [sp, #0xb0] ldr r2, [sp, #0xb4] @@ -9259,7 +9259,7 @@ _02183d8c: str ip, [sp, #0x18] str r3, [sp, #0x1c] str r8, [sp, #0x20] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x28] str r5, [sp] ldrsh r1, [r7, #0x78] diff --git a/asm/ov36.inc b/asm/ov36.inc index daedd1b4..0721fdc4 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -157,17 +157,17 @@ .extern func_ov00_0207c5d4 .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_020833f4 -.extern func_ov00_02083400 -.extern func_ov00_020836dc -.extern func_ov00_02083770 -.extern func_ov00_02083918 -.extern func_ov00_02083948 -.extern func_ov00_02083958 -.extern func_ov00_020839d4 -.extern func_ov00_020839f8 -.extern func_ov00_02084b38 -.extern func_ov00_02084be0 +.extern _ZN10MapManager18Get_MapData_Unk_d0Ev +.extern _ZN10MapManager18Get_MapData_Unk_d8Ev +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_02083918EiPi +.extern _ZN10MapManager18Set_MapData_Unk_16Eci +.extern _ZN10MapManager18func_ov00_02083958Ei +.extern _ZN10MapManager18func_ov00_020839d4Ev +.extern _ZN10MapManager18func_ov00_020839f8Ev +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084be0Eii .extern func_ov00_0208726c .extern func_ov00_02087d34 .extern func_ov00_02088000 diff --git a/asm/ov36.s b/asm/ov36.s index a62b2ce8..f9c3ec74 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -1829,13 +1829,13 @@ _0217d56c: ldr r0, [r0] mov r2, r1 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _0217d6b0 ; =data_027e0e60 mov r1, #4 ldr r0, [r0] mov r2, #3 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xeb ldr r0, [r0] @@ -2375,7 +2375,7 @@ func_ov36_0217dd98: ; 0x0217dd98 ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0217ddf0 ldr r0, [r4, #0x138] @@ -3213,7 +3213,7 @@ _0217e978: str r1, [sp, #0x14] ldrh r1, [r6, #0x22] ldr r4, _0217eb34 ; =0x00000337 - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji ldrh r2, [r6, #0x78] ldr r5, _0217eb50 ; =data_02050f54 mov r1, #0x3800 @@ -3519,7 +3519,7 @@ _0217ede8: add r2, sp, #0 str r1, [sp, #8] ldrh r1, [r4, #0x22] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -3528,22 +3528,22 @@ _0217ede8: ldr r0, _0217ef0c ; =data_027e0e60 ldr r1, [r4, #0x54] ldr r0, [r0] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev ldr r1, _0217ef0c ; =data_027e0e60 mov r6, r0 ldr r0, [r1] ldr r1, [r4, #0x5c] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev ldr r1, _0217ef0c ; =data_027e0e60 mov r7, r0 ldr r0, [r1] ldr r1, [r4, #0x48] - bl func_ov00_020839d4 + bl _ZN10MapManager18func_ov00_020839d4Ev ldr r1, _0217ef0c ; =data_027e0e60 mov r5, r0 ldr r0, [r1] ldr r1, [r4, #0x50] - bl func_ov00_020839f8 + bl _ZN10MapManager18func_ov00_020839f8Ev cmp r6, r5 mov r2, #0 beq _0217ee8c @@ -6918,7 +6918,7 @@ _02181dc8: mov r1, #2 ldr r0, [r0] mov r2, #1 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 addeq sp, sp, #0x14 ldmeqia sp!, {r3, r4, pc} @@ -6973,7 +6973,7 @@ _02181e34: mov r1, #3 ldr r0, [r0] mov r2, r1 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 addne sp, sp, #0x14 ldmneia sp!, {r3, r4, pc} @@ -6982,13 +6982,13 @@ _02181e34: ldr r0, [r0] mov r2, r1 mov r3, #1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _02181f30 ; =data_027e0e60 mov r1, #4 ldr r0, [r0] mov r2, #3 mov r3, #1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii add sp, sp, #0x14 ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -7020,13 +7020,13 @@ func_ov36_02181f3c: ; 0x02181f3c mov r2, r1 ldr r0, [r0] mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _02181fc8 ; =data_027e0e60 mov r1, #4 ldr r0, [r0] mov r2, #3 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii mov r2, #0 ldr r1, _02181fcc ; =data_027e0f64 strb r2, [r4, #0x8aa] @@ -7662,14 +7662,14 @@ _021828dc: add r2, sp, #0x2c ldr r0, [r0] mov r1, #0x5b - bl func_ov00_02083918 + bl _ZN10MapManager18func_ov00_02083918EiPi cmp r0, #0 beq _02182934 ldr r0, _0218298c ; =data_027e0e60 ldrb r1, [sp, #0x30] ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _02182954 ; =data_027e0f64 mov r1, #0 ldr r0, [r0] @@ -7712,7 +7712,7 @@ func_ov36_02182990: ; 0x02182990 mov r4, r0 ldr r0, [r1] mov r1, #0 - bl func_ov00_02083958 + bl _ZN10MapManager18func_ov00_02083958Ei ldr r0, _02182c68 ; =data_027e0f64 mov r1, #0 ldr r0, [r0] @@ -10049,11 +10049,11 @@ _02184a9c: ldr r0, [r0] str r1, [sp, #0x20] str r1, [sp, #0x24] - bl func_ov00_02083400 + bl _ZN10MapManager18Get_MapData_Unk_d8Ev ldr r1, _02184de0 ; =data_027e0e60 mov r4, r0 ldr r0, [r1] - bl func_ov00_020833f4 + bl _ZN10MapManager18Get_MapData_Unk_d0Ev mov r2, #0 mov r1, r2 cmp r6, #0 @@ -10375,7 +10375,7 @@ _02184f6c: add r2, sp, #0 str r1, [sp, #8] ldrh r1, [r6, #0x22] - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji strb r0, [r5] cmp r4, #0 beq _02185040 diff --git a/asm/ov37.inc b/asm/ov37.inc index b704e649..d5dd88aa 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -1,6 +1,9 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18Set_MapData_Unk_16Eci +.extern _ZN10MapManager18func_ov00_02083908EcPi .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN11ItemManager12GetItemModelEj @@ -145,9 +148,6 @@ .extern func_ov00_02081f4c .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_02083908 -.extern func_ov00_02083948 -.extern func_ov00_02083ee0 .extern func_ov00_02087400 .extern func_ov00_02087d34 .extern func_ov00_02088000 diff --git a/asm/ov37.s b/asm/ov37.s index 13e46b59..d8afdba0 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -3062,14 +3062,14 @@ _0217e78c: add r2, sp, #0x7c ldr r0, [r0] mov r1, #3 - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi cmp r0, #0 beq _0217e7ec ldr r0, _0217f0f4 ; =data_027e0e60 mov r1, #3 ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _0217e334 ; =data_027e0f64 mov r2, #0 ldr r0, [r0] @@ -3175,14 +3175,14 @@ _0217e93c: add r2, sp, #0x54 ldr r0, [r0] mov r1, #1 - bl func_ov00_02083908 + bl _ZN10MapManager18func_ov00_02083908EcPi cmp r0, #0 beq _0217e99c ldr r0, _0217f0f4 ; =data_027e0e60 mov r1, #1 ldr r0, [r0] mov r2, #0 - bl func_ov00_02083948 + bl _ZN10MapManager18Set_MapData_Unk_16Eci ldr r0, _0217e334 ; =data_027e0f64 mov r2, #0 ldr r0, [r0] @@ -3939,7 +3939,7 @@ func_ov37_0217f468: ; 0x0217f468 str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x10] add r1, sp, #0xc mov r0, r4 @@ -3972,7 +3972,7 @@ func_ov37_0217f4d4: ; 0x0217f4d4 str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x10] add r1, sp, #0xc mov r0, r4 @@ -4003,7 +4003,7 @@ func_ov37_0217f540: ; 0x0217f540 str lr, [sp, #0x14] str ip, [sp, #0x18] str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x24] ldr r1, [sp, #0x20] add r0, r5, #0x2000 @@ -6751,7 +6751,7 @@ _02181b64: str r6, [sp, #0x44] str r4, [sp, #0x48] str r3, [sp, #0x4c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x228] mov r1, #0 str r1, [sp] @@ -6805,7 +6805,7 @@ _02181c30: str r6, [sp, #0x38] str r4, [sp, #0x3c] str r3, [sp, #0x40] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x21c] mov r1, #0 str r1, [sp] @@ -6938,7 +6938,7 @@ _02181e2c: mov r2, #1 str r6, [sp, #0x30] str r3, [sp, #0x34] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x1f8] mov r0, #0 str r0, [sp] @@ -7167,7 +7167,7 @@ _0218219c: mov r2, #1 str r6, [sp, #0x24] str r3, [sp, #0x28] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x1bc] mov r0, #0 str r0, [sp] @@ -7286,7 +7286,7 @@ _02182368: str r6, [sp, #0x14] str r4, [sp, #0x18] str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x198] mov r1, #0 str r1, [sp] @@ -7341,7 +7341,7 @@ _02182438: str r6, [sp, #8] str r4, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18c] mov r1, #0 str r1, [sp] @@ -12123,7 +12123,7 @@ func_ov37_02186458: ; 0x02186458 add r1, sp, #8 mov r2, #1 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x4c] ldr r1, [r4, #0x48] add r0, r4, #0x21c @@ -12603,7 +12603,7 @@ func_ov37_02186b68: ; 0x02186b68 str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0xcd add r0, r0, #0x400 str r0, [sp, #0x18] @@ -13264,7 +13264,7 @@ _021874d8: str ip, [sp, #0x14] str r4, [sp, #0x18] str r3, [sp, #0x1c] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x24] mov r1, #0 str r1, [sp] diff --git a/asm/ov38.inc b/asm/ov38.inc index e834cb13..3d36c5ae 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -162,8 +162,8 @@ .extern func_ov00_0207c358 .extern func_ov00_0207c444 .extern func_ov00_0207c7e8 -.extern func_ov00_02084b38 -.extern func_ov00_02084be0 +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084be0Eii .extern func_ov00_02087d34 .extern func_ov00_02087d84 .extern func_ov00_02088000 diff --git a/asm/ov38.s b/asm/ov38.s index 05366951..d3dbb24a 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -10966,7 +10966,7 @@ _02185790: mov r1, #3 ldr r0, [r0] mov r2, #1 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 @@ -11049,7 +11049,7 @@ _021858ac: mov r1, #3 ldr r0, [r0] mov r2, #1 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, [r4, #0xff8] @@ -11064,7 +11064,7 @@ _021858f0: mov r1, #6 ldr r0, [r0] mov r2, #1 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, _02185a64 ; =data_027e0e60 @@ -11072,7 +11072,7 @@ _021858f0: ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _02185a68 ; =data_ov29_0217a4ac mov r1, #0 strb r1, [r0, #0x56] @@ -11104,7 +11104,7 @@ _02185984: mov r1, #5 ldr r0, [r0] mov r2, #1 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, [r4, #0xff8] @@ -11118,7 +11118,7 @@ _02185984: ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii add r0, r4, #0x1000 ldrsh r1, [r0, #0x9c] sub r1, r1, #1 @@ -11148,7 +11148,7 @@ _021859e4: ldr r0, [r0] mov r3, r2 mov r1, #5 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii add r0, r4, #0x1000 ldrsh r1, [r0, #0x9c] sub r1, r1, #1 @@ -11498,7 +11498,7 @@ _02185ef8: ldr r0, [r0] mov r2, r1 mov r3, r1 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _02186a10 ; =data_ov38_021891e0 mov r1, #0 ldr r2, [r0, #0x20c] @@ -11742,7 +11742,7 @@ _021862c8: mov r1, #2 ldr r0, [r0] mov r2, #1 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 beq _02186304 ldr r0, _02186a20 ; =data_027e0fc8 diff --git a/asm/ov39.inc b/asm/ov39.inc index 73a4568b..f4ad32fc 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -1,6 +1,9 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084be0Eii .extern _ZN10PlayerBase18EquipItem_vfunc_2cEv .extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi .extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i @@ -149,9 +152,6 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c474 .extern func_ov00_0207c5d4 -.extern func_ov00_02083ee0 -.extern func_ov00_02084b38 -.extern func_ov00_02084be0 .extern func_ov00_02087584 .extern func_ov00_020875f8 .extern func_ov00_02087d34 diff --git a/asm/ov39.s b/asm/ov39.s index 10f07dd1..448fce53 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -1779,7 +1779,7 @@ func_ov39_0217d534: ; 0x0217d534 ldr r3, [r4, #0x50] mov r2, #0 str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, _0217d5c8 ; =data_027e0f94 mov r3, r0 str r0, [r4, #0x4c] @@ -3458,7 +3458,7 @@ func_ov39_0217ec34: ; 0x0217ec34 ldr r0, [r0] mov r2, #1 mov r3, r2 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov39_0217ec34 @@ -3993,7 +3993,7 @@ _0217f3c4: mov r1, #3 ldr r0, [r0] mov r2, #1 - bl func_ov00_02084be0 + bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 beq _0217f40c ldr r0, _0217f480 ; =data_ov29_0217bd28 @@ -4005,7 +4005,7 @@ _0217f3c4: ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldmia sp!, {r4, pc} _0217f40c: ldr r0, _0217f480 ; =data_ov29_0217bd28 @@ -7587,13 +7587,13 @@ func_ov39_021825e8: ; 0x021825e8 ldr r0, [r0] mov r2, r1 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _02182670 ; =data_027e0e60 mov r1, #2 ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii mov r0, r4 mov r1, #8 mov r2, #7 diff --git a/asm/ov40.inc b/asm/ov40.inc index ad82a2af..506138a7 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -260,12 +260,12 @@ .extern func_ov00_0207c074 .extern func_ov00_0207c1f8 .extern func_ov00_0207c444 -.extern func_ov00_02082650 -.extern func_ov00_02082660 -.extern func_ov00_02082670 -.extern func_ov00_0208344c -.extern func_ov00_020838e8 -.extern func_ov00_020846a4 +.extern _ZN10MapManager18func_ov00_02082650Eiii +.extern _ZN10MapManager18func_ov00_02082660Eii +.extern _ZN10MapManager18func_ov00_02082670Eii +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_020846a4Ev .extern func_ov00_02089b08 .extern func_ov00_02089b50 .extern func_ov00_02089b88 diff --git a/asm/ov40.s b/asm/ov40.s index 9f9050fc..f27ddffc 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -4792,7 +4792,7 @@ func_ov40_0217fa44: ; 0x0217fa44 ldr r0, _0217fbb4 ; =data_027e0e60 add r1, sp, #0x70 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p add r0, sp, #0x44 bl func_ov00_020c1500 mvn r1, #0 @@ -4852,7 +4852,7 @@ _0217fb0c: ldr r0, _0217fbb4 ; =data_027e0e60 add r1, sp, #0x38 ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p add r0, sp, #0xc bl func_ov00_020c1500 mvn r1, #0 @@ -8498,7 +8498,7 @@ func_ov40_02182694: ; 0x02182694 ldrb r1, [r5, #0xf] ldr r0, [r0] add r2, sp, #0 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi cmp r0, #0 beq _02182798 ldr r0, [sp, #4] @@ -11728,7 +11728,7 @@ func_ov40_02184fb4: ; 0x02184fb4 ldr r2, [r4, #0x88] str r2, [r4, #0x98] ldr r0, [r0] - bl func_ov00_0208344c + bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r1, [sp, #0xc] mov r0, #1 str r1, [r4, #0x48] @@ -12507,7 +12507,7 @@ func_ov40_02185878: ; 0x02185878 _021858c8: ldr r0, _02185b40 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev sub r0, r0, #0xd cmp r0, #3 addls pc, pc, r0, lsl #2 @@ -12522,7 +12522,7 @@ _021858f4: mov r2, r5 ldr r0, [r0] mov r1, #0xd - bl func_ov00_02082650 + bl _ZN10MapManager18func_ov00_02082650Eiii ldr r0, _02185b44 ; =gAdventureFlags ldr r0, [r0] bl _ZN14AdventureFlags18func_ov00_02097c08Ev @@ -12546,50 +12546,50 @@ _0218594c: mov r2, r5 ldr r0, [r0] mov r1, #0x2b - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185964: ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #0x2c - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _0218597c: ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #0x1d - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185994: ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #0xf - bl func_ov00_02082650 + bl _ZN10MapManager18func_ov00_02082650Eiii ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #4 - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _021859c0: ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #6 - bl func_ov00_02082650 + bl _ZN10MapManager18func_ov00_02082650Eiii ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #4 - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _021859ec: ldr r0, _02185b40 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev sub r0, r0, #0xd cmp r0, #3 addls pc, pc, r0, lsl #2 @@ -12604,7 +12604,7 @@ _02185a18: mov r2, r5 ldr r0, [r0] mov r1, #0xe - bl func_ov00_02082650 + bl _ZN10MapManager18func_ov00_02082650Eiii ldr r0, _02185b44 ; =gAdventureFlags ldr r0, [r0] bl _ZN14AdventureFlags18func_ov00_02097c08Ev @@ -12628,57 +12628,57 @@ _02185a70: mov r2, r5 ldr r0, [r0] mov r1, #0x25 - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185a88: ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #0x2d - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185aa0: ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #0x25 - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185ab8: ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #0x10 - bl func_ov00_02082650 + bl _ZN10MapManager18func_ov00_02082650Eiii ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #2 - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185ae4: ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #2 - bl func_ov00_02082650 + bl _ZN10MapManager18func_ov00_02082650Eiii ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #2 - bl func_ov00_02082660 + bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185b10: ldr r0, _02185b40 ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_020846a4 + bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #0xe bne _02185b38 ldr r0, _02185b40 ; =data_027e0e60 mov r2, r5 ldr r0, [r0] mov r1, #0xe - bl func_ov00_02082670 + bl _ZN10MapManager18func_ov00_02082670Eii _02185b38: str r4, [r6, #0x158] ldmia sp!, {r4, r5, r6, pc} diff --git a/asm/ov41.inc b/asm/ov41.inc index 1cd11506..ac3991a3 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -1,4 +1,9 @@ #pragma once +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_7cEv +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef @@ -132,11 +137,6 @@ .extern func_ov00_0207c31c .extern func_ov00_0207c7e8 .extern func_ov00_02081f4c -.extern func_ov00_020828c0 -.extern func_ov00_020836dc -.extern func_ov00_02083770 -.extern func_ov00_02083a1c -.extern func_ov00_02083ee0 .extern func_ov00_0208cd48 .extern func_ov00_02093a5c .extern func_ov00_02094824 diff --git a/asm/ov41.s b/asm/ov41.s index 62ff46e4..afa97125 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -3837,7 +3837,7 @@ _0218c680: add r0, sp, #4 ldr r1, [r1] add r2, sp, #0x1c - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r2, #0 sub r1, r2, #1 mov r0, #1 @@ -3866,7 +3866,7 @@ _0218c6cc: add r2, sp, #4 ldr r0, [r0] mov r1, #2 - bl func_ov00_020828c0 + bl _ZN10MapManager16MapData_vfunc_7cEv add r4, r4, #1 cmp r4, #4 blt _0218c608 @@ -4015,7 +4015,7 @@ func_ov41_0218c834: ; 0x0218c834 ldr r0, [r1] mov r1, r5 mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 bne _0218ca3c mov r0, r6 @@ -4749,7 +4749,7 @@ func_ov41_0218d210: ; 0x0218d210 ldr r0, [r0] ldr r1, [r6, #0x514] add r2, sp, #0 - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r5, #1 _0218d2b8: @@ -4936,7 +4936,7 @@ _0218d438: str r3, [sp, #4] ldr r3, [r4, #0x50] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add sp, sp, #0x3c str r0, [r4, #0x4c] ldmia sp!, {r3, r4, pc} @@ -5143,7 +5143,7 @@ _0218d7c0: add r1, sp, #4 str r2, [sp, #0xc] mov r2, #1 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r4, #0x4c] cmp r1, r0 movge r0, #1 diff --git a/asm/ov42.inc b/asm/ov42.inc index 6ff28d52..73871b88 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -1,4 +1,5 @@ #pragma once +.extern _ZN10MapManager18func_ov00_02083918EiPi .extern _ZN11ItemManager13ForceEquipItemEi .extern _ZN11ItemManager20ClearForcedEquipItemEv .extern _ZN12ActorManager8GetActorEP8ActorRef @@ -112,7 +113,6 @@ .extern func_ov00_0207a1c8 .extern func_ov00_0207bb1c .extern func_ov00_0207c1b0 -.extern func_ov00_02083918 .extern func_ov00_0208726c .extern func_ov00_02087400 .extern func_ov00_020a61ac diff --git a/asm/ov42.s b/asm/ov42.s index d1ba68d7..f7fa334e 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -297,7 +297,7 @@ _02189894: add r2, sp, #0x48 ldr r0, [r0] mov r1, #0x42 - bl func_ov00_02083918 + bl _ZN10MapManager18func_ov00_02083918EiPi cmp r0, #0 beq _021898e0 ldr r0, _02189af8 ; =data_027e0f64 @@ -312,7 +312,7 @@ _021898e0: add r2, sp, #0x64 ldr r0, [r0] mov r1, #0x43 - bl func_ov00_02083918 + bl _ZN10MapManager18func_ov00_02083918EiPi cmp r0, #0 beq _02189918 ldr r0, _02189af8 ; =data_027e0f64 diff --git a/asm/ov43.inc b/asm/ov43.inc index d42e675d..2cada26d 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -97,8 +97,8 @@ .extern func_ov00_0207c474 .extern func_ov00_02081f4c .extern func_ov00_02081f50 -.extern func_ov00_020836dc -.extern func_ov00_02083770 +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji .extern func_ov00_02087d34 .extern func_ov00_02093a1c .extern _ZN14AdventureFlags18func_Ov00_02097810Ei diff --git a/asm/ov43.s b/asm/ov43.s index 41992889..b3380421 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -2999,7 +2999,7 @@ _0218bd3c: ldrh r1, [r4, #0x26] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _0218c970 ldr r0, [r4, #0x3d4] @@ -3815,7 +3815,7 @@ _0218c920: ldrh r1, [r4, #0x26] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 addeq sp, sp, #0x150 moveq r0, #1 @@ -4220,7 +4220,7 @@ _0218ceac: ldrh r1, [r10, #0x26] ldr r0, [r0] add r2, sp, #0xc - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -4237,7 +4237,7 @@ _0218cf04: str r1, [sp, #4] ldrh r1, [r10, #0x26] add r2, sp, #0 - bl func_ov00_02083770 + bl _ZN10MapManager18func_ov00_02083770Eji cmp r0, #0 moveq r0, #1 movne r0, #0 diff --git a/asm/ov44.inc b/asm/ov44.inc index b48c4015..1f952648 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -109,8 +109,8 @@ .extern func_ov00_0207c1b0 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern func_ov00_02083a1c -.extern func_ov00_020840c4 +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager16MapData_vfunc_78Ev .extern func_ov00_020a95a4 .extern func_ov00_020a9b6c .extern func_ov00_020a9b78 diff --git a/asm/ov44.s b/asm/ov44.s index b19298c1..9bcdc00f 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -6543,10 +6543,10 @@ func_ov44_0218e4a0: ; 0x0218e4a0 add r0, sp, #0 mov r1, r5 add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _0218e4ec ldr r0, [r0, #4] diff --git a/asm/ov46.inc b/asm/ov46.inc index 27a26d9c..f37cdc73 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -123,9 +123,9 @@ .extern func_ov00_0207ba90 .extern func_ov00_0207c1b0 .extern func_ov00_0207c1f8 -.extern func_ov00_02083a1c -.extern func_ov00_02083fb0 -.extern func_ov00_020840c4 +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager16MapData_vfunc_78Ev .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 diff --git a/asm/ov46.s b/asm/ov46.s index 98e030f1..98ddf8c9 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -33,10 +33,10 @@ func_ov46_02190074: ; 0x02190074 add r0, sp, #0 mov r1, r5 mov r2, r6 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r7, r0 ldr r4, _021901d0 ; =0x0000036d beq _021900d8 @@ -60,7 +60,7 @@ _021900d8: ldr r3, [r6, #8] mov r1, r5 str r3, [sp, #0x10] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #4] and r0, r0, #0x1f cmp r0, #0xe @@ -756,10 +756,10 @@ func_ov46_021909ac: ; 0x021909ac add r0, sp, #0 mov r1, r5 mov r2, r6 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0 mov r0, r5 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r7, r0 ldr r4, _02190b08 ; =0x0000036d beq _02190a10 @@ -783,7 +783,7 @@ _02190a10: ldr r3, [r6, #8] mov r1, r5 str r3, [sp, #0x10] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #4] and r0, r0, #0x1f cmp r0, #0xe diff --git a/asm/ov47.inc b/asm/ov47.inc index ddc643d0..66cd2b79 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -51,12 +51,12 @@ .extern func_ov00_0207c444 .extern func_ov00_02081f4c .extern func_ov00_02081f50 -.extern func_ov00_020836dc -.extern func_ov00_02083ee0 -.extern func_ov00_02083f44 -.extern func_ov00_020840c4 -.extern func_ov00_02084120 -.extern func_ov00_02084740 +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager17GetMapData_Unk_4cEv +.extern _ZN10MapManager18func_ov00_02084740Ev .extern func_ov00_02093a1c .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 diff --git a/asm/ov47.s b/asm/ov47.s index 32a6ebd1..c2aa8c03 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -1184,7 +1184,7 @@ _02190fdc: ldr r0, _021910ec ; =data_027e0e60 add r1, r5, #0x108 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev ldr r1, [r0] ldr r1, [r1, #0x54] blx r1 @@ -1619,7 +1619,7 @@ _02191578: str r3, [sp, #4] ldr r3, [r4, #0x340] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x33c] ldrh r0, [r4, #0x20] cmp r0, #4 @@ -2892,7 +2892,7 @@ _0219260c: ldrh r1, [r6, #0x22] ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _02192ecc ldrh r0, [r6, #0x20] @@ -3489,7 +3489,7 @@ _02192e70: beq _02192eb4 ldr r0, _02192f7c ; =data_027e0e60 ldr r0, [r0] - bl func_ov00_02084740 + bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 ldr r0, _02192f80 ; =data_ov00_020eec68 mov r2, #0 @@ -3519,10 +3519,10 @@ _02192ecc: str r4, [sp, #0x14] str r3, [sp, #0x18] str r5, [sp, #0x1c] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p mov r7, r0 mov r0, r8 - bl func_ov00_02084120 + bl _ZN10MapManager17GetMapData_Unk_4cEv ldr r1, [r6, #0x344] add r2, r7, r0 cmp r1, #0 @@ -4711,7 +4711,7 @@ func_ov47_02193e80: ; 0x02193e80 str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x18] ldr r1, _02193f44 ; =func_ov47_02193e68 str r4, [sp] diff --git a/asm/ov49.inc b/asm/ov49.inc index 2e2b5486..25cf5249 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -118,11 +118,11 @@ .extern func_ov00_0207c1b0 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern func_ov00_020836dc -.extern func_ov00_020839b4 -.extern func_ov00_020839c4 -.extern func_ov00_02083ee0 -.extern func_ov00_02083fb0 +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_020839b4Ei +.extern _ZN10MapManager18func_ov00_020839c4Ei +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i .extern func_ov00_02088000 .extern func_ov00_02094824 .extern func_ov00_0209a4f4 diff --git a/asm/ov49.s b/asm/ov49.s index f0673b70..60b0c659 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -462,7 +462,7 @@ func_ov49_02195930: ; 0x02195930 strb r2, [r4, #0x56c] ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020839b4 + bl _ZN10MapManager18func_ov00_020839b4Ei mov r0, r4 add r1, r4, #0x254 bl func_ov00_020cb140 @@ -500,7 +500,7 @@ func_ov49_02195b94: ; 0x02195b94 add r1, r4, #0x168 ldr r0, [r2] add r1, r1, #0x400 - bl func_ov00_020839c4 + bl _ZN10MapManager18func_ov00_020839c4Ei ldrb r0, [r4, #0x5c8] cmp r0, #0 bne _02195c24 @@ -2543,7 +2543,7 @@ _02197764: str r3, [sp, #4] ldr r3, [r4, #0x164] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [r4, #0x160] mov r0, r4 mov r1, #0 @@ -2661,7 +2661,7 @@ _021978a8: add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -3317,7 +3317,7 @@ _02198160: .word 0x0000048e arm_func_start func_ov49_02198164 func_ov49_02198164: ; 0x02198164 ldr r2, _0219817c ; =data_027e0e60 - ldr ip, _02198180 ; =func_ov00_020836dc + ldr ip, _02198180 ; =_ZN10MapManager18func_ov00_020836dcEii ldrb r1, [r0, #0x15c] ldr r0, [r2] mov r2, #0 @@ -3325,7 +3325,7 @@ func_ov49_02198164: ; 0x02198164 .align 2, 0 arm_func_end func_ov49_02198164 _0219817c: .word data_027e0e60 -_02198180: .word func_ov00_020836dc +_02198180: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov49_02198184 arm_func_start func_ov49_02198184 diff --git a/asm/ov50.inc b/asm/ov50.inc index 3f6bd505..f33f91cf 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -1,6 +1,10 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_020840dcEv .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj @@ -119,10 +123,6 @@ .extern func_ov00_02081f50 .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_02083a1c -.extern func_ov00_02083ee0 -.extern func_ov00_020840c4 -.extern func_ov00_020840dc .extern func_ov00_020884b4 .extern func_ov00_02093a1c .extern func_ov00_02093a5c diff --git a/asm/ov50.s b/asm/ov50.s index 56fa69b3..e7a20a55 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -399,7 +399,7 @@ _02195a34: ldr r0, _02195cac ; =data_027e0e60 add r1, r6, #0x108 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev ldr r1, [r0] ldr r1, [r1, #0x54] blx r1 @@ -929,7 +929,7 @@ _02196184: add r1, sp, #0 str r2, [sp, #8] mov r2, #0 - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x4c] sub r1, r1, r0 mov r0, r5 @@ -1345,7 +1345,7 @@ func_ov50_02196698: ; 0x02196698 add r0, sp, #8 ldr r1, [r1] add r2, r4, #0x48 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r1, [sp, #8] ldr r0, _0219683c ; =data_027e0e60 ldrb r2, [sp, #9] @@ -1354,7 +1354,7 @@ func_ov50_02196698: ; 0x02196698 add r1, sp, #6 strb r3, [sp, #6] strb r2, [sp, #7] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x48] ldrb r1, [sp, #8] @@ -1367,7 +1367,7 @@ func_ov50_02196698: ; 0x02196698 add r1, sp, #4 strb r3, [sp, #4] strb r2, [sp, #5] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x3c] ldrb r1, [sp, #9] @@ -1380,7 +1380,7 @@ func_ov50_02196698: ; 0x02196698 add r1, sp, #2 strb r3, [sp, #2] strb r2, [sp, #3] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x50] ldrb r1, [sp, #9] @@ -1393,7 +1393,7 @@ func_ov50_02196698: ; 0x02196698 add r1, sp, #0 strb r3, [sp] strb r2, [sp, #1] - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 ldreq r0, [sp, #0x44] addeq r0, r0, #0x800 @@ -3027,7 +3027,7 @@ func_ov50_02197d04: ; 0x02197d04 ldr r0, _02197dc0 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _02197da0 ldr r1, [r0] diff --git a/asm/ov51.inc b/asm/ov51.inc index 9a208a59..52c2e0b7 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -52,9 +52,9 @@ .extern func_ov00_02081f4c .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern func_ov00_020826a0 -.extern func_ov00_02083a1c -.extern func_ov00_02083ee0 +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager16MapData_vfunc_68Ev .extern func_ov00_0208e6b0 .extern func_ov00_0208e82c .extern func_ov00_02093a5c diff --git a/asm/ov51.s b/asm/ov51.s index 6c613bd4..b6995fb9 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -702,7 +702,7 @@ _02195db4: str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x10] ldr r0, [r5, #0x15c] cmp r0, #0 @@ -2549,11 +2549,11 @@ _02197588: ldr r5, [r2] add r2, r4, #0x48 mov r1, r5 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0xc mov r0, r5 mov r2, #1 - bl func_ov00_020826a0 + bl _ZN10MapManager18func_ov00_020826a0Eiii ldr r0, [r4, #0x154] cmp r0, #0 addgt sp, sp, #0x48 diff --git a/asm/ov52.inc b/asm/ov52.inc index 8dee865c..d0373366 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -1,4 +1,8 @@ #pragma once +.extern _ZN10MapManager18func_ov00_02082b3cEi +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02084b38Eiii .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN14AdventureFlags18func_ov00_02097738Ev @@ -126,10 +130,6 @@ .extern func_ov00_0207a1c8 .extern func_ov00_0207b89c .extern func_ov00_0207c1b0 -.extern func_ov00_02082b3c -.extern func_ov00_020836dc -.extern func_ov00_020838e8 -.extern func_ov00_02084b38 .extern func_ov00_0208d01c .extern func_ov00_020a9588 .extern func_ov00_020a95a4 diff --git a/asm/ov52.s b/asm/ov52.s index c18ed485..96528400 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -401,7 +401,7 @@ func_ov52_02195908: ; 0x02195908 strb r3, [r4, #0xc] ldr r0, [r0] mov r1, #0x1e - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii mov r1, #0 ldr r0, _02195a08 ; =data_027e0e60 str r1, [sp, #4] @@ -419,7 +419,7 @@ func_ov52_02195908: ; 0x02195908 ldr r0, [r0] add r2, sp, #0 mov r1, #2 - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02195a0c ; =gOverlayManager ldr r2, _02195a10 ; =0x00000004 mov r1, #2 @@ -427,7 +427,7 @@ func_ov52_02195908: ; 0x02195908 ldr r0, _02195a08 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02082b3c + bl _ZN10MapManager18func_ov00_02082b3cEi ldr r0, _02195a0c ; =gOverlayManager ldr r2, _02195a14 ; =0x00000005 mov r1, #2 @@ -495,7 +495,7 @@ _02195a60: strb r4, [sp, #0x13] strb r4, [sp, #0x14] strb r4, [sp, #0x15] - bl func_ov00_020838e8 + bl _ZN10MapManager18func_ov00_020838e8EjPi ldr r0, _02195b3c ; =gOverlayManager ldr r2, _02195b40 ; =0x00000004 mov r1, #2 @@ -503,7 +503,7 @@ _02195a60: ldr r0, _02195b38 ; =data_027e0e60 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_02082b3c + bl _ZN10MapManager18func_ov00_02082b3cEi ldr r0, _02195b3c ; =gOverlayManager ldr r2, _02195b44 ; =0x00000005 mov r1, #2 @@ -553,13 +553,13 @@ func_ov52_02195b5c: ; 0x02195b5c mov r1, #0x1f mov r2, #1 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _02195ba8 ; =data_027e0e60 mov r1, #0x1e ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii ldr r0, _02195bac ; =data_ov09_0211f5b4 blx func_ov03_020f4048 mov r0, #2 @@ -599,7 +599,7 @@ _02195be0: ldr r0, [r0] mov r3, r2 mov r1, #0x1f - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii mov r0, #1 strb r0, [r4, #0xc] b _02195ca4 @@ -608,7 +608,7 @@ _02195c20: mov r1, #5 ldr r0, [r0] mov r2, #0 - bl func_ov00_020836dc + bl _ZN10MapManager18func_ov00_020836dcEii cmp r0, #0 beq _02195ca4 ldrb r0, [r4, #0x11] @@ -634,7 +634,7 @@ _02195c5c: ldr r0, [r0] mov r3, r2 mov r1, #0x1e - bl func_ov00_02084b38 + bl _ZN10MapManager18func_ov00_02084b38Eiii mov r0, #3 strb r0, [r4, #0xc] _02195ca0: diff --git a/asm/ov53.inc b/asm/ov53.inc index 4590adba..bdb117c6 100644 --- a/asm/ov53.inc +++ b/asm/ov53.inc @@ -40,8 +40,8 @@ .extern func_0204f614 .extern func_ov00_0207bb1c .extern func_ov00_02081f4c -.extern func_ov00_02083ee0 -.extern func_ov00_020840c4 +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev .extern func_ov00_02087f08 .extern func_ov00_0208967c .extern func_ov00_020b17ec diff --git a/asm/ov53.s b/asm/ov53.s index f40d9598..442f45b0 100644 --- a/asm/ov53.s +++ b/asm/ov53.s @@ -456,7 +456,7 @@ _02199220: mov r1, r7 strb r3, [sp, #4] strb r2, [sp, #5] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _02199270 ldr r3, [r0] @@ -1275,7 +1275,7 @@ _02199d28: ldr r3, [r5, #0x50] add r1, sp, #0 str r3, [sp, #8] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [r5, #0x4c] cmp r1, r0 movlt r6, #1 diff --git a/asm/ov54.inc b/asm/ov54.inc index 80c6bab4..8a7badbb 100644 --- a/asm/ov54.inc +++ b/asm/ov54.inc @@ -1,4 +1,9 @@ #pragma once +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager18func_ov00_02084ebcEi +.extern _ZN10MapManager18func_ov00_02085594Ev +.extern _ZN10MapManager18func_ov00_02085a34Eii .extern _ZN11ItemManager12GetItemModelEj .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p @@ -21,6 +26,7 @@ .extern _ZN13PlayerControl20UpdateUsingEquipItemEv .extern _ZNK11ItemManager16GetEquippedFairyEv .extern _ZNK11ItemManager8GetFairyEi +.extern __register_global_object .extern data_02050f54 .extern data_02054654 .extern data_027e0d38 @@ -38,14 +44,8 @@ .extern func_01ffa9fc .extern func_01fffcec .extern func_0202af4c -.extern __register_global_object .extern func_ov00_0207c1b0 .extern func_ov00_0207c2e8 -.extern func_ov00_02083a1c -.extern func_ov00_02083c7c -.extern func_ov00_02084ebc -.extern func_ov00_02085594 -.extern func_ov00_02085a34 .extern func_ov00_020a5e9c .extern func_ov00_020a9588 .extern func_ov00_020a95a4 diff --git a/asm/ov54.s b/asm/ov54.s index df1afc4a..a162d77e 100644 --- a/asm/ov54.s +++ b/asm/ov54.s @@ -113,14 +113,14 @@ func_ov54_02198e04: ; 0x02198e04 arm_func_start func_ov54_02198e08 func_ov54_02198e08: ; 0x02198e08 ldr r0, _02198e1c ; =data_027e0e60 - ldr ip, _02198e20 ; =func_ov00_02085a34 + ldr ip, _02198e20 ; =_ZN10MapManager18func_ov00_02085a34Eii mov r2, #1 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov54_02198e08 _02198e1c: .word data_027e0e60 -_02198e20: .word func_ov00_02085a34 +_02198e20: .word _ZN10MapManager18func_ov00_02085a34Eii .global func_ov54_02198e24 arm_func_start func_ov54_02198e24 @@ -129,7 +129,7 @@ func_ov54_02198e24: ; 0x02198e24 ldr r0, _02198e48 ; =data_027e0e60 mov r2, #2 ldr r0, [r0] - bl func_ov00_02085a34 + bl _ZN10MapManager18func_ov00_02085a34Eii cmp r0, #0 movgt r0, #1 movle r0, #0 @@ -232,7 +232,7 @@ func_ov54_02198efc: ; 0x02198efc add r0, sp, #0xc ldr r1, [r1] add r2, r7, #0x38 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r2, [sp, #0xc] ldrb r1, [sp, #0xd] mov r0, r7 @@ -318,7 +318,7 @@ _02199050: ldr r0, _02199290 ; =data_027e0e60 add r1, r7, #0x38 ldr r0, [r0] - bl func_ov00_02085594 + bl _ZN10MapManager18func_ov00_02085594Ev mov r4, r0 _021990c4: cmp r4, #1 @@ -842,7 +842,7 @@ func_ov54_021997f0: ; 0x021997f0 strb r1, [r3, #1] ldr r2, [r3] add r1, sp, #0x10 - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi cmp r4, #0 mov r4, #1 beq _02199884 @@ -855,7 +855,7 @@ func_ov54_021997f0: ; 0x021997f0 str ip, [sp, #4] str r3, [sp, #8] str r2, [sp, #0xc] - bl func_ov00_02084ebc + bl _ZN10MapManager18func_ov00_02084ebcEi cmp r0, #0 moveq r4, #0 _02199884: diff --git a/asm/ov55.inc b/asm/ov55.inc index 15e9e682..68653625 100644 --- a/asm/ov55.inc +++ b/asm/ov55.inc @@ -40,7 +40,7 @@ .extern func_01fffcec .extern func_02019570 .extern func_020385b8 -.extern func_ov00_02083f44 +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p .extern func_ov00_02087d34 .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 diff --git a/asm/ov55.s b/asm/ov55.s index ea2867fb..2d2dad34 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -598,7 +598,7 @@ func_ov55_021993b8: ; 0x021993b8 str r10, [sp, #0xc] str r9, [sp, #0x10] str r3, [sp, #0x14] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p cmp r0, r8 bge _021994cc ldr r0, _02199640 ; =data_027e0e60 @@ -610,7 +610,7 @@ func_ov55_021993b8: ; 0x021993b8 str r10, [sp] str r9, [sp, #4] str r3, [sp, #8] - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p cmp r0, r8 movlt r6, r5 _021994cc: diff --git a/asm/ov57.inc b/asm/ov57.inc index 142d8ebb..fe983f15 100644 --- a/asm/ov57.inc +++ b/asm/ov57.inc @@ -57,7 +57,7 @@ .extern func_ov00_0207c1f8 .extern func_ov00_0207c444 .extern func_ov00_02081f4c -.extern func_ov00_020840c4 +.extern _ZN10MapManager16MapData_vfunc_78Ev .extern func_ov00_02087f08 .extern func_ov00_0208967c .extern func_ov00_02093a1c diff --git a/asm/ov57.s b/asm/ov57.s index 5f2ea21c..28163870 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -146,7 +146,7 @@ _02198ea4: ldr r0, _02198fb8 ; =data_027e0e60 add r1, r4, #0x14 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev movs r6, r0 addeq sp, sp, #0x1c moveq r0, #0 @@ -616,7 +616,7 @@ _02199470: ldr r0, _021994b8 ; =data_027e0e60 add r1, r1, #0x14 ldr r0, [r0] - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -1206,7 +1206,7 @@ _02199ca0: _02199cb8: ldr r0, [r11] mov r1, r8 - bl func_ov00_020840c4 + bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 beq _02199d2c ldr r3, [r0] diff --git a/asm/ov58.inc b/asm/ov58.inc index b1be52dd..b1ef0054 100644 --- a/asm/ov58.inc +++ b/asm/ov58.inc @@ -70,17 +70,17 @@ .extern func_ov00_0207c0ac .extern func_ov00_0207c0cc .extern func_ov00_02081f4c -.extern func_ov00_0208346c -.extern func_ov00_02083a1c -.extern func_ov00_02083c7c -.extern func_ov00_02083e58 -.extern func_ov00_02083ee0 -.extern func_ov00_02083f44 -.extern func_ov00_02083f80 -.extern func_ov00_02083fb0 -.extern func_ov00_02084088 -.extern func_ov00_020840dc -.extern func_ov00_0208499c +.extern _ZN10MapManager18func_ov00_0208346cEP4AABB +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi +.extern _ZN10MapManager16MapData_vfunc_60Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p +.extern _ZN10MapManager16MapData_vfunc_6cEv +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager18func_ov00_020840dcEv +.extern _ZN10MapManager18func_ov00_0208499cEv .extern func_ov00_0208e72c .extern func_ov00_020a5e9c .extern func_ov00_020a61ac diff --git a/asm/ov58.s b/asm/ov58.s index 809266de..9b85c9cc 100644 --- a/asm/ov58.s +++ b/asm/ov58.s @@ -91,17 +91,17 @@ func_ov58_02198d00: ; 0x02198d00 ldr r6, [r1] add r2, sp, #0x14 mov r1, r6 - bl func_ov00_02083a1c + bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #4 mov r0, r6 - bl func_ov00_020840dc + bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 bne _02198eb4 ldr r0, _02198ef0 ; =data_027e0e60 add r1, sp, #0x14 ldr r0, [r0] mov r2, #0 - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p ldr r1, [sp, #0x18] add r1, r1, #0xff add r1, r1, #0x1700 @@ -596,7 +596,7 @@ func_ov58_021992c4: ; 0x021992c4 mov r5, r0 ldr r0, [r2] mov r4, r1 - bl func_ov00_0208499c + bl _ZN10MapManager18func_ov00_0208499cEv cmp r0, #0 beq _0219930c ldr r0, _021993ec ; =data_027e0c54 @@ -789,7 +789,7 @@ _021994c2: ldr r0, _021997f4 ; =data_027e0e60 add r1, sp, #0x1bc ldr r0, [r0] - blx func_ov00_0208346c + blx _ZN10MapManager18func_ov00_0208346cEP4AABB ldr r0, [r4] add r1, sp, #0x128 str r0, [sp, #0x128] @@ -825,7 +825,7 @@ _02199502: ldr r1, [r1] add r0, #2 add r2, r4, #0 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r0, [r4] add r3, sp, #0x58 str r0, [sp, #0x1b0] @@ -844,7 +844,7 @@ _02199502: add r1, sp, #0x1b0 strb r3, [r2, #1] ldr r2, [r2] - blx func_ov00_02083c7c + blx _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi ldr r0, [r4, #4] str r0, [sp, #0x1b4] ldr r1, [r5, #0x18] @@ -893,7 +893,7 @@ _02199580: add r1, sp, #0x1a4 strb r3, [r2, #1] ldr r2, [r2] - blx func_ov00_02083c7c + blx _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi ldr r1, [r4] ldr r0, [sp, #0x1a4] sub r1, r1, r0 @@ -948,7 +948,7 @@ _021995e2: str r0, [sp, #0x124] ldr r0, _021997f4 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083ee0 + blx _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x1b4] _02199606: ldr r1, [sp, #0x198] @@ -1034,7 +1034,7 @@ _0219968e: str r0, [sp, #0x1b8] ldr r1, [r1] add r0, sp, #0x58 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r0, sp, #0x58 ldrb r1, [r0] add r7, sp, #0x58 @@ -1052,7 +1052,7 @@ _0219968e: ldrb r2, [r7, #1] strb r2, [r3, #1] ldr r2, [r3] - blx func_ov00_02083c7c + blx _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi ldr r1, [sp, #0x1b4] ldr r0, _021997fc ; =0x00000999 mov r2, #0 @@ -1066,7 +1066,7 @@ _0219968e: ldr r0, _021997f4 ; =data_027e0e60 add r1, sp, #0x104 ldr r0, [r0] - blx func_ov00_02083ee0 + blx _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x198] str r0, [sp, #0x1b4] add r0, r0, r1 @@ -1154,7 +1154,7 @@ _02199796: lsl r2, r2, #1 ldr r0, [r0] add r1, r1, r2 - blx func_ov00_02084088 + blx _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x19 bne _021997ec ldr r1, [r5, #0x18] @@ -1164,7 +1164,7 @@ _02199796: lsl r1, r1, #1 ldr r0, [r0] add r1, r2, r1 - blx func_ov00_02083e58 + blx _ZN10MapManager16MapData_vfunc_60Ev ldr r1, [sp, #0x18] mov r2, #0 str r1, [sp, #0xf8] @@ -1176,7 +1176,7 @@ _02199796: str r0, [sp, #0x100] ldr r0, _021997f4 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083ee0 + blx _ZN10MapManager16MapData_vfunc_68Ev add r6, r0, #0 ldr r0, [sp, #0x1b4] sub r1, r0, r6 @@ -1237,7 +1237,7 @@ _0219983e: add r3, sp, #0x17c ldr r0, [r0] str r6, [sp, #0xf0] - blx func_ov00_02083f80 + blx _ZN10MapManager16MapData_vfunc_6cEv ldr r0, [sp, #0x17c] cmp r0, #0 bne _02199862 @@ -1316,7 +1316,7 @@ _021998c8: add r0, sp, #0x54 ldr r1, [r1] add r0, #2 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0x54 add r1, #2 ldrb r2, [r1] @@ -1371,7 +1371,7 @@ _02199940: add r2, sp, #0x170 str r0, [sp, #0x178] add r0, sp, #0x54 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r0, sp, #0x54 ldrb r1, [r0] add r2, sp, #0x58 @@ -1407,7 +1407,7 @@ _02199986: add r1, sp, #0x170 strb r2, [r3, #1] ldr r2, [r3] - blx func_ov00_02083c7c + blx _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi add r0, r7, #0 ldrb r2, [r0] add r1, sp, #0x24 @@ -1493,7 +1493,7 @@ _02199a38: ldr r1, [r1] add r0, #2 add r2, sp, #0x170 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r0, sp, #0x50 add r0, #2 ldrb r1, [r0] @@ -1558,7 +1558,7 @@ _02199aba: add r0, sp, #0x50 ldr r1, [r1] add r2, sp, #0x170 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0x50 ldrb r2, [r1] add r0, sp, #0x58 @@ -1608,7 +1608,7 @@ _02199b14: add r1, sp, #0x170 strb r2, [r3, #1] ldr r2, [r3] - blx func_ov00_02083c7c + blx _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi b _02199bde _02199b30: add r0, sp, #0x214 @@ -1635,7 +1635,7 @@ _02199b58: str r0, [sp, #0x178] add r0, sp, #0x4c add r0, #2 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0x4c add r1, #2 ldrb r2, [r1] @@ -1686,7 +1686,7 @@ _02199bba: add r1, sp, #0x170 strb r2, [r3, #1] ldr r2, [r3] - blx func_ov00_02083c7c + blx _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi b _02199bde _02199bd6: add sp, #0x1fc @@ -1710,7 +1710,7 @@ _02199bde: str r1, [sp, #0xa8] add r1, sp, #0xa4 mov r2, #0 - blx func_ov00_02083ee0 + blx _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x198] str r0, [sp, #0x1b4] add r0, r0, r1 @@ -1736,7 +1736,7 @@ _02199c18: add r2, sp, #0x158 str r0, [sp, #0x160] add r0, sp, #0x4c - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0x4c ldrb r2, [r1] add r0, sp, #0x58 @@ -1786,7 +1786,7 @@ _02199c80: add r1, sp, #0x158 strb r2, [r3, #1] ldr r2, [r3] - blx func_ov00_02083c7c + blx _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi ldr r0, [sp, #0x158] ldr r2, [sp, #0x160] ldr r3, [sp, #0x15c] @@ -1803,7 +1803,7 @@ _02199c80: str r1, [sp, #0x9c] add r1, sp, #0x98 mov r2, #0 - blx func_ov00_02083ee0 + blx _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x198] str r0, [sp, #0x1b4] add r0, r0, r1 @@ -1821,11 +1821,11 @@ _02199cd0: add r0, sp, #0x48 add r0, #2 add r1, r7, #0 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0x48 add r0, r7, #0 add r1, #2 - blx func_ov00_02084088 + blx _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x19 bne _02199d0c ldr r0, _02199ee4 ; =data_027e0e60 @@ -1833,10 +1833,10 @@ _02199cd0: ldr r7, [r0] add r0, sp, #0x48 add r1, r7, #0 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r0, r7, #0 add r1, sp, #0x48 - blx func_ov00_02083e58 + blx _ZN10MapManager16MapData_vfunc_60Ev ldr r1, _02199eec ; =0x00001333 str r0, [sp, #0x1b4] sub r0, r0, r1 @@ -1852,7 +1852,7 @@ _02199d0c: str r0, [sp, #0x94] ldr r0, _02199ee4 ; =data_027e0e60 ldr r0, [r0] - blx func_ov00_02083ee0 + blx _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x1b4] _02199d26: ldr r0, [sp, #0x18] @@ -1881,7 +1881,7 @@ _02199d50: add r0, sp, #0x60 ldr r1, [r1] add r2, r7, #0 - blx func_ov00_02083fb0 + blx _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r1, [sp, #0x60] ldr r0, [sp, #0x60] lsr r2, r1, #5 @@ -1909,7 +1909,7 @@ _02199d50: mov r2, #0 str r3, [sp, #0x1b0] str r3, [sp, #0x80] - blx func_ov00_02083ee0 + blx _ZN10MapManager16MapData_vfunc_68Ev ldr r1, [sp, #0x198] str r0, [sp, #0x1b4] add r0, r0, r1 @@ -1925,7 +1925,7 @@ _02199d50: add r0, sp, #0x44 ldr r1, [r1] add r0, #2 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r0, sp, #0x44 add r0, #2 ldrb r2, [r0] @@ -1987,7 +1987,7 @@ _02199e0c: add r0, sp, #0x44 ldr r1, [r1] add r2, sp, #0x1b0 - blx func_ov00_02083a1c + blx _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p add r1, sp, #0x44 mov r3, sp ldrb r2, [r1] @@ -2014,7 +2014,7 @@ _02199e54: add r2, sp, #0x74 str r0, [sp, #0x7c] add r0, sp, #0x5c - blx func_ov00_02083fb0 + blx _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r0, [sp, #0x5c] ldr r2, [sp, #0x5c] lsr r1, r0, #5 @@ -2096,7 +2096,7 @@ func_ov58_02199ef0: ; 0x02199ef0 add r1, sp, #0x18 strb r2, [r3, #1] ldr r2, [r3] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r8, #0 ldr r4, _02199fd4 ; =data_027e0e60 mov r9, r8 @@ -2127,11 +2127,11 @@ _02199f40: mov r2, #0 mov r1, r5 bne _02199fa4 - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p mov r10, r0 b _02199fb0 _02199fa4: - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p cmp r10, r0 movle r10, r0 _02199fb0: @@ -2213,7 +2213,7 @@ func_ov58_0219a084: ; 0x0219a084 add r1, sp, #0x30 strb r2, [r3, #1] ldr r2, [r3] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r8, #0 ldr r4, _0219a3a8 ; =data_027e0e60 add r10, sp, #0x3c @@ -2243,7 +2243,7 @@ _0219a0d8: ldr r0, [r4] mov r1, r10 mov r2, r11 - bl func_ov00_02083f44 + bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p str r0, [r10, #4] add r9, r9, #0x4000 add r10, r10, #0xc @@ -2395,7 +2395,7 @@ _0219a368: ldr r0, [r0] add r2, sp, #0x14 add r3, sp, #0x18 - bl func_ov00_02083f80 + bl _ZN10MapManager16MapData_vfunc_6cEv ldr r0, [sp, #0x18] cmp r0, #0 ldreq r0, [sp, #0x20] @@ -2538,7 +2538,7 @@ func_ov58_0219a47c: ; 0x0219a47c ldr r2, [ip] strb r7, [sp] strb r6, [sp, #1] - bl func_ov00_02083c7c + bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi bl func_020385b8 add r1, sp, #4 bl _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p diff --git a/asm/ov59.inc b/asm/ov59.inc index 2a3e99cf..3cb7cf4e 100644 --- a/asm/ov59.inc +++ b/asm/ov59.inc @@ -1,4 +1,7 @@ #pragma once +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_020858b0Ev .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase12GetPlayerPosEv @@ -43,9 +46,6 @@ .extern func_ov00_02078b40 .extern func_ov00_0207c1b0 .extern func_ov00_0207c358 -.extern func_ov00_02083ee0 -.extern func_ov00_02083fb0 -.extern func_ov00_020858b0 .extern func_ov00_020a5e9c .extern func_ov00_020b853c .extern func_ov00_020b8c50 diff --git a/asm/ov59.s b/asm/ov59.s index 79b12542..55851799 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -215,7 +215,7 @@ func_ov59_02198f10: ; 0x02198f10 ldr r0, _02198fa4 ; =data_027e0e60 moveq r2, #1 ldr r0, [r0] - bl func_ov00_020858b0 + bl _ZN10MapManager18func_ov00_020858b0Ev _02198f88: mov r0, #0 strb r0, [r5, #0x1c] @@ -982,7 +982,7 @@ _02199968: str r6, [sp, #0x38] str r5, [sp, #0x64] str r5, [sp, #0x40] - bl func_ov00_02083fb0 + bl _ZN10MapManager18func_ov00_02083fb0EiPS_i bl func_ov59_02198e2c ldrb r1, [r0, #0x27] mov r2, #0 @@ -1099,7 +1099,7 @@ _02199bdc: str r6, [sp, #0x2c] str r5, [sp, #0x30] str r3, [sp, #0x34] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev add r0, r0, #0x99 ldr r1, [sp, #0x60] add r0, r0, #0x900 @@ -1118,7 +1118,7 @@ _02199bdc: str r6, [sp, #0x20] str r5, [sp, #0x24] str r3, [sp, #0x28] - bl func_ov00_02083ee0 + bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x60] ldr r1, [sp, #0x1c] ldr r2, [r4, #0x344] diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 897f28c1..6e89e980 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -3,6 +3,9 @@ #include "global.h" #include "types.h" +#include "lib/math.h" + +#include "Physics/AABB.hpp" #include "System/SysNew.hpp" struct MapManager_Unk1 { @@ -23,10 +26,10 @@ struct MapManager_Unk2 { class MapDataBase : public SysObject { public: - /* 00 */ virtual ~MapData(); + /* 00 */ virtual ~MapDataBase(); - MapData(); - MapData(uint param1, uint param2); + MapDataBase(); + MapDataBase(u32 param1, u32 param2); }; class MapManager : public SysObject { diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index f6074d85..802043ac 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -34,7 +34,7 @@ unk8 MapManager::func_ov00_020826a0(unk32 param_2, unk32 param_3, unk32 param_4) unk8 MapManager::CreateMap(unk32 mapType, unk32 param_3, unk32 param_4) {} unk8 MapManager::DestroyMap() {} unk8 MapManager::MapData_vfunc_44() {} -static unk8 MapManager::func_ov00_02082808() {} +unk8 MapManager::func_ov00_02082808() {} unk8 MapManager::MapData_vfunc_7c() {} unk8 MapManager::MapData_vfunc_84() {} bool MapManager::func_ov00_020828f8(s32 *param_2) {} @@ -49,21 +49,21 @@ unk8 MapManager::GetCourseData_Unk_1c() {} unk8 MapManager::GetCourseData_Unk_1d() {} unk8 MapManager::func_ov00_02082d40() {} u32 MapManager::func_ov00_02082d74(unk32 param_2) {} -static unk8 MapManager::func_ov00_02082d84() {} +unk8 MapManager::func_ov00_02082d84() {} bool MapManager::func_ov00_02082e1c(s32 *param_2, s32 *param_3) {} -static unk8 MapManager::func_ov00_0208306c() {} +unk8 MapManager::func_ov00_0208306c() {} void MapManager::func_ov00_0208315c(s32 *param_2, s32 *param_3) {} void MapManager::func_ov00_02083244(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5) {} void MapManager::func_ov00_02083298(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5) {} unk8 MapManager::GetCourseData_Unk_25c() {} bool MapManager::func_ov00_02083318(unk32 param_2) {} -static unk8 MapManager::func_ov00_02083328() {} +unk8 MapManager::func_ov00_02083328() {} unk8 MapManager::GetCourseData_Unk_86() {} unk8 MapManager::GetCourseData_Unk_87() {} unk8 MapManager::Get_MapData_Unk28() {} unk8 MapManager::Get_MapData_Unk2a() {} -static unk8 MapManager::func_ov00_02083374() {} -static unk8 MapManager::func_ov00_02083384() {} +unk8 MapManager::func_ov00_02083374() {} +unk8 MapManager::func_ov00_02083384() {} unk8 MapManager::GetCourseMinX() {} unk8 MapManager::GetCourseMinZ() {} unk8 MapManager::GetCourseMaxX() {} @@ -80,7 +80,7 @@ unk8 MapManager::GetMapData_Unk_d0(Vec3p *param_2) {} unk8 MapManager::func_ov00_0208346c(AABB *param_2) {} unk8 MapManager::func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 param_4) {} unk8 MapManager::func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4) {} -static void MapManager::func_ov00_02083560(unk32 param_1, MapManager *param_2, u32 param_3) {} +void MapManager::func_ov00_02083560(unk32 param_1, MapManager *param_2, u32 param_3) {} unk8 MapManager::func_ov00_02083570(unk32 param_2, unk32 param_3) {} unk32 MapManager::func_ov00_02083588() {} unk32 MapManager::func_ov00_020835a4() {} @@ -113,61 +113,61 @@ void MapManager::func_ov00_02083968(u32 param_2, unk8 *param_3) {} bool MapManager::func_ov00_02083978(unk32 param_2, Vec3p *param_3) {} bool MapManager::func_ov00_020839b4(s32 param_2) {} bool MapManager::func_ov00_020839c4(s32 param_2) {} -static unk8 MapManager::func_ov00_020839d4() {} -static unk8 MapManager::func_ov00_020839f8() {} -static void MapManager::func_ov00_02083a1c(unk32 param_1, MapManager *param_2, Vec3p *param_3) {} -static unk8 MapManager::func_ov00_02083a54(unk32 param_1, MapManager *param_2, unk32 param_3, unk32 param_4, unk32 param_5) {} -static unk8 MapManager::func_ov00_02083b84() {} -static unk8 MapManager::func_ov00_02083bac() {} -static unk8 MapManager::func_ov00_02083bd4() {} -static unk8 MapManager::func_ov00_02083bfc() {} +unk8 MapManager::func_ov00_020839d4() {} +unk8 MapManager::func_ov00_020839f8() {} +void MapManager::func_ov00_02083a1c(unk32 param_1, MapManager *param_2, Vec3p *param_3) {} +unk8 MapManager::func_ov00_02083a54(unk32 param_1, MapManager *param_2, unk32 param_3, unk32 param_4, unk32 param_5) {} +unk8 MapManager::func_ov00_02083b84() {} +unk8 MapManager::func_ov00_02083bac() {} +unk8 MapManager::func_ov00_02083bd4() {} +unk8 MapManager::func_ov00_02083bfc() {} unk8 MapManager::func_ov00_02083c24(unk32 param_2) {} unk8 MapManager::func_ov00_02083c50(unk32 param_2) {} unk8 MapManager::func_ov00_02083c7c(Vec3p *param_2, unk32 param_3) {} -static unk8 MapManager::func_ov00_02083ce8(unk8 param_1, unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5) {} +unk8 MapManager::func_ov00_02083ce8(unk8 param_1, unk8 param_2, unk8 param_3, unk8 param_4, unk32 param_5) {} unk8 MapManager::func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4) {} unk8 MapManager::MapData_vfunc_60() {} -static unk8 MapManager::func_ov00_02083e70() {} +unk8 MapManager::func_ov00_02083e70() {} unk8 MapManager::MapData_vfunc_68() {} void MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3) {} void MapManager::func_ov00_02083f44(Vec3p *param_2) {} unk8 MapManager::MapData_vfunc_6c() {} unk8 MapManager::MapData_vfunc_70() {} -static unk8 MapManager::func_ov00_02083fb0(unk32 param_1, MapManager *param_2, unk32 param_3) {} +unk8 MapManager::func_ov00_02083fb0(unk32 param_1, MapManager *param_2, unk32 param_3) {} void MapManager::func_ov00_02084024(unk32 param_2, AABB *param_3) {} unk8 MapManager::MapData_vfunc_54() {} unk8 MapManager::func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4) {} unk8 MapManager::MapData_vfunc_78() {} -static unk8 MapManager::func_ov00_020840dc() {} -static unk8 MapManager::func_ov00_02084100(unk32 param_1, MapManager *param_2) {} +unk8 MapManager::func_ov00_020840dc() {} +unk8 MapManager::func_ov00_02084100(unk32 param_1, MapManager *param_2) {} unk8 MapManager::GetMapData_Unk_48() {} unk8 MapManager::GetMapData_Unk_4c() {} unk32 MapManager::func_ov00_0208412c() {} void MapManager::func_ov00_0208413c(unk32 param_2) {} unk8 MapManager::MapData_vfunc_58() {} -static unk8 MapManager::func_ov00_02084164() {} +unk8 MapManager::func_ov00_02084164() {} unk8 MapManager::GetMapData_Unk_0a() {} unk8 MapManager::GetMapData_Unk_0b() {} unk8 MapManager::MapData_vfunc_a4() {} unk8 MapManager::func_ov00_0208433c(Vec3p *param_2, unk32 param_3) {} -static unk8 MapManager::func_ov00_0208439c() {} +unk8 MapManager::func_ov00_0208439c() {} void MapManager::func_ov00_020843ec(s32 *param_2) {} unk8 MapManager::GetMapData_Unk_38() {} unk8 MapManager::func_ov00_020846a4() {} -static unk8 MapManager::func_ov00_02084700() {} +unk8 MapManager::func_ov00_02084700() {} unk8 MapManager::func_ov00_02084740() {} unk8 MapManager::func_ov00_020847e0() {} unk8 MapManager::func_ov00_020847f0() {} bool MapManager::func_ov00_02084838() {} bool MapManager::func_ov00_020848b8() {} void MapManager::func_ov00_02084924(u32 param_2) {} -static unk8 MapManager::func_ov00_02084934() {} +unk8 MapManager::func_ov00_02084934() {} unk8 MapManager::GetMapData_Unk_06() {} unk8 MapManager::GetMapData_Unk_07() {} unk8 MapManager::func_ov00_0208499c() {} unk8 MapManager::func_ov00_020849c0() {} unk8 MapManager::func_ov00_020849dc() {} -static bool MapManager::func_ov00_020849f8(unk32 param_1) {} +bool MapManager::func_ov00_020849f8(unk32 param_1) {} unk8 MapManager::func_ov00_02084a50() {} void MapManager::SpawnNPC(Vec3p *param_2, unk32 param_3, unk32 param_4) {} bool MapManager::func_ov00_02084ac4(u32 actorId) {} @@ -190,11 +190,11 @@ unk8 MapManager::func_ov00_02084d24(unk8 param_2, unk8 param_3, unk32 param_4) { s32 MapManager::func_ov00_02084d4c(unk32 param_2, unk32 param_3, Vec3p *param_4) {} unk8 MapManager::func_ov00_02084ebc(unk32 param_2) {} s32 MapManager::func_ov00_02085108(s32 *param_2) {} -static unk8 MapManager::func_ov00_0208527c() {} -static unk8 MapManager::func_ov00_020853fc() {} -static unk8 MapManager::func_ov00_02085594() {} -static void MapManager::func_ov00_0208583c(unk32 param_1, Vec3p *param_2, unk32 param_3) {} -static unk8 MapManager::func_ov00_020858b0() {} +unk8 MapManager::func_ov00_0208527c() {} +unk8 MapManager::func_ov00_020853fc() {} +unk8 MapManager::func_ov00_02085594() {} +void MapManager::func_ov00_0208583c(unk32 param_1, Vec3p *param_2, unk32 param_3) {} +unk8 MapManager::func_ov00_020858b0() {} s32 MapManager::func_ov00_02085a34(unk32 param_2, unk32 param_3) {} unk8 MapManager::func_ov00_02085c60(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5) {} unk8 MapManager::func_ov00_02086044(unk32 param_2, unk32 param_3, unk32 param_4) {}