diff --git a/asm/dtcm.s b/asm/dtcm.s index b3664d47..d3b1bcb1 100644 --- a/asm/dtcm.s +++ b/asm/dtcm.s @@ -3548,8 +3548,8 @@ data_027e0e58: .global data_027e0e5c data_027e0e5c: .space 0x4 - .global data_027e0e60 -data_027e0e60: + .global gMapManager +gMapManager: .space 0x4 .global data_027e0e64 data_027e0e64: diff --git a/asm/itcm.inc b/asm/itcm.inc index f282df4a..1ab002af 100644 --- a/asm/itcm.inc +++ b/asm/itcm.inc @@ -19,7 +19,7 @@ .extern data_027e080c .extern data_027e081c .extern data_027e08e4 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0e64 .extern data_027e0f6c .extern data_027e0fdc diff --git a/asm/itcm.s b/asm/itcm.s index bc5b45df..34e9c16a 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -9181,7 +9181,7 @@ func_01fffd04: ; 0x01fffd04 ldr r0, [sp, #0x4c] ldr r1, [sp, #0x44] str r0, [sp, #0x34] - ldr r0, _01ffff04 ; =data_027e0e60 + ldr r0, _01ffff04 ; =gMapManager ldr r3, [sp, #0x48] ldr r2, [sp, #0x54] str r1, [sp, #0x2c] @@ -9212,7 +9212,7 @@ _01fffdf4: mov ip, #0 str r0, [sp, #0x24] ldr r1, [r6, #0x50] - ldr r0, _01ffff04 ; =data_027e0e60 + ldr r0, _01ffff04 ; =gMapManager str r1, [sp, #0x28] ldr r1, [r6, #0x54] add r2, sp, #0x20 @@ -9277,7 +9277,7 @@ _01fffef8: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_01fffd04 -_01ffff04: .word data_027e0e60 +_01ffff04: .word gMapManager .global func_01ffff08 arm_func_start func_01ffff08 diff --git a/asm/main/main_02000000.inc b/asm/main/main_02000000.inc index 60b5442b..ff72ea0a 100644 --- a/asm/main/main_02000000.inc +++ b/asm/main/main_02000000.inc @@ -111,7 +111,7 @@ .extern data_027e0dbc .extern data_027e0e28 .extern data_027e0e2c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f7c .extern data_027e0f80 diff --git a/asm/main/main_02000000.s b/asm/main/main_02000000.s index e9f932fc..74757c8c 100644 --- a/asm/main/main_02000000.s +++ b/asm/main/main_02000000.s @@ -58474,7 +58474,7 @@ func_0202bf58: ; 0x0202bf58 mov r0, #0 ldmmiia sp!, {r3, pc} ldr ip, [r2] - ldr r0, _0202bfbc ; =data_027e0e60 + ldr r0, _0202bfbc ; =gMapManager str ip, [sp, #0xc] ldr ip, [r2, #4] ldr r0, [r0] @@ -58494,7 +58494,7 @@ func_0202bf58: ; 0x0202bf58 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_0202bf58 -_0202bfbc: .word data_027e0e60 +_0202bfbc: .word gMapManager .global func_0202bfc0 arm_func_start func_0202bfc0 @@ -76848,7 +76848,7 @@ _020382e8: mov r3, #0 sub r2, r3, #2 mov r5, #0x47 - ldr r0, _0203859c ; =data_027e0e60 + ldr r0, _0203859c ; =gMapManager mov r1, #0xff str r2, [sp, #0xc] str r5, [sp] @@ -76953,7 +76953,7 @@ _02038444: mov r0, #2 ldmia sp!, {r3, r4, r5, pc} _0203846c: - ldr r0, _0203859c ; =data_027e0e60 + ldr r0, _0203859c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 @@ -77039,7 +77039,7 @@ _0203858c: .word data_027e0618 _02038590: .word gItemManager _02038594: .word data_027e0db0 _02038598: .word data_027e0c68 -_0203859c: .word data_027e0e60 +_0203859c: .word gMapManager _020385a0: .word data_027e0d38 _020385a4: .word data_027e0f64 _020385a8: .word data_020569e0 @@ -80336,7 +80336,7 @@ _0203ac8c: b _0203ad24 _0203acc0: ldrh r2, [r5, #6] - ldr r0, _0203ae9c ; =data_027e0e60 + ldr r0, _0203ae9c ; =gMapManager add r1, sp, #8 ldr r0, [r0] and r2, r2, #0xff @@ -80465,7 +80465,7 @@ _0203ae8c: .word 0x00020001 _0203ae90: .word 0xffff0001 _0203ae94: .word data_027e103c _0203ae98: .word data_027e0d3c -_0203ae9c: .word data_027e0e60 +_0203ae9c: .word gMapManager _0203aea0: .word data_02057ed0 _0203aea4: .word data_027e0c68 diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index e490c88b..be979665 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -25,7 +25,7 @@ .extern data_027e0c54 .extern data_027e0d0c .extern data_027e0d3c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 0f7fa178..d255d42d 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -204,7 +204,7 @@ _020c1784: .word func_ov00_02087ef0 .global _ZN5Actor18func_ov00_020c1788Ev arm_func_start _ZN5Actor18func_ov00_020c1788Ev _ZN5Actor18func_ov00_020c1788Ev: ; 0x020c1788 - ldr r3, _020c17a0 ; =data_027e0e60 + ldr r3, _020c17a0 ; =gMapManager ldr ip, _020c17a4 ; =_ZN10MapManager18func_ov00_02083570Eii ldrb r1, [r0, #0x10] ldrb r2, [r0, #0x11] @@ -212,7 +212,7 @@ _ZN5Actor18func_ov00_020c1788Ev: ; 0x020c1788 bx ip .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c1788Ev -_020c17a0: .word data_027e0e60 +_020c17a0: .word gMapManager _020c17a4: .word _ZN10MapManager18func_ov00_02083570Eii .global _ZN5Actor8vfunc_2cEv @@ -680,7 +680,7 @@ _ZN5Actor8vfunc_a8Ev: ; 0x020c1bf8 arm_func_start _ZN5Actor18func_Ov00_020c1bfcEi _ZN5Actor18func_Ov00_020c1bfcEi: ; 0x020c1bfc add r2, r0, r1 - ldr r0, _020c1c18 ; =data_027e0e60 + ldr r0, _020c1c18 ; =gMapManager ldrb r1, [r2, #0x2a] ldr ip, _020c1c1c ; =_ZN10MapManager18func_ov00_02084be0Eii ldrb r2, [r2, #0x28] @@ -688,7 +688,7 @@ _ZN5Actor18func_Ov00_020c1bfcEi: ; 0x020c1bfc bx ip .align 2, 0 arm_func_end _ZN5Actor18func_Ov00_020c1bfcEi -_020c1c18: .word data_027e0e60 +_020c1c18: .word gMapManager _020c1c1c: .word _ZN10MapManager18func_ov00_02084be0Eii .global _ZN5Actor18func_ov00_020c1c20Eiii @@ -696,7 +696,7 @@ _020c1c1c: .word _ZN10MapManager18func_ov00_02084be0Eii _ZN5Actor18func_ov00_020c1c20Eiii: ; 0x020c1c20 stmdb sp!, {r3, lr} add ip, r0, r1 - ldr r0, _020c1c44 ; =data_027e0e60 + ldr r0, _020c1c44 ; =gMapManager mov r3, r2 ldrb r1, [ip, #0x2a] ldrb r2, [ip, #0x28] @@ -705,7 +705,7 @@ _ZN5Actor18func_ov00_020c1c20Eiii: ; 0x020c1c20 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c1c20Eiii -_020c1c44: .word data_027e0e60 +_020c1c44: .word gMapManager .global _ZN5Actor8vfunc_48Ei arm_func_start _ZN5Actor8vfunc_48Ei @@ -2306,7 +2306,7 @@ _ZN5Actor18func_ov00_020c3094Ev: ; 0x020c3094 sub sp, sp, #0x18 mov r5, r0 ldr r1, [r5, #0x48] - ldr r0, _020c3108 ; =data_027e0e60 + ldr r0, _020c3108 ; =gMapManager str r1, [sp, #0xc] ldr r1, [r5, #0x4c] mov r4, #0 @@ -2333,7 +2333,7 @@ _ZN5Actor18func_ov00_020c3094Ev: ; 0x020c3094 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c3094Ev -_020c3108: .word data_027e0e60 +_020c3108: .word gMapManager .global _ZN5Actor6GetPosEv arm_func_start _ZN5Actor6GetPosEv @@ -2382,14 +2382,14 @@ _ZN5Actor18func_ov00_020c3158Ev: ; 0x020c3158 ldr r1, [r0, #0x3c] cmp r1, #0 ldmltia sp!, {r3, pc} - ldr r0, _020c317c ; =data_027e0e60 + ldr r0, _020c317c ; =gMapManager mov r2, #1 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084c5cEii ldmia sp!, {r3, pc} .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c3158Ev -_020c317c: .word data_027e0e60 +_020c317c: .word gMapManager .global _ZN5Actor4KillEv arm_func_start _ZN5Actor4KillEv diff --git a/asm/ov00/Actor/ActorManager.inc b/asm/ov00/Actor/ActorManager.inc index 3feda380..68a7a1cd 100644 --- a/asm/ov00/Actor/ActorManager.inc +++ b/asm/ov00/Actor/ActorManager.inc @@ -6,7 +6,7 @@ .extern _ZN5Actor18func_ov00_020c27a8Ei .extern data_02056be4 .extern data_027e077c -.extern data_027e0e60 +.extern gMapManager .extern data_027e103c .extern func_01ff9ec0 .extern func_ov00_0208e72c diff --git a/asm/ov00/Actor/ActorManager.s b/asm/ov00/Actor/ActorManager.s index cff6edf7..b8de6df0 100644 --- a/asm/ov00/Actor/ActorManager.s +++ b/asm/ov00/Actor/ActorManager.s @@ -616,7 +616,7 @@ _ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0 str r0, [sp] movne r0, #0 strne r0, [r10] - ldr r0, _020c3ce4 ; =data_027e0e60 + ldr r0, _020c3ce4 ; =gMapManager add r2, sp, #0x14 ldr r0, [r0] mov r3, #8 @@ -695,14 +695,14 @@ _020c3cd8: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end _ZN12ActorManager18func_ov00_020c3bb0EiPi -_020c3ce4: .word data_027e0e60 +_020c3ce4: .word gMapManager .global _ZN12ActorManager18func_ov00_020c3ce8Eii arm_func_start _ZN12ActorManager18func_ov00_020c3ce8Eii _ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8 stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0xcc - ldr r3, _020c3dcc ; =data_027e0e60 + ldr r3, _020c3dcc ; =gMapManager mov r11, r0 ldr r0, [r3] mov r10, r2 @@ -763,7 +763,7 @@ _020c3db0: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end _ZN12ActorManager18func_ov00_020c3ce8Eii -_020c3dcc: .word data_027e0e60 +_020c3dcc: .word gMapManager .global _ZN12ActorManager14Actor_vfunc_28Ev arm_func_start _ZN12ActorManager14Actor_vfunc_28Ev diff --git a/asm/ov00/Item/ItemManager.inc b/asm/ov00/Item/ItemManager.inc index 8288875e..89530a89 100644 --- a/asm/ov00/Item/ItemManager.inc +++ b/asm/ov00/Item/ItemManager.inc @@ -6,7 +6,7 @@ .extern _ZN14AdventureFlags3GetEj .extern _ZN14AdventureFlags3SetEjb .extern _ZNK11ItemManager10GetMaxAmmoEi -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f78 .extern data_027e0fbc .extern data_027e103c diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index ba83e597..30d80c1f 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -1113,20 +1113,20 @@ _020ae34c: .word data_027e103c .global _ZNK11ItemManager18func_ov00_020ae350Ev arm_func_start _ZNK11ItemManager18func_ov00_020ae350Ev _ZNK11ItemManager18func_ov00_020ae350Ev: ; 0x020ae350 - ldr r0, _020ae360 ; =data_027e0e60 + ldr r0, _020ae360 ; =gMapManager ldr ip, _020ae364 ; =_ZN10MapManager10GetNumKeysEv ldr r0, [r0] bx ip .align 2, 0 arm_func_end _ZNK11ItemManager18func_ov00_020ae350Ev -_020ae360: .word data_027e0e60 +_020ae360: .word gMapManager _020ae364: .word _ZN10MapManager10GetNumKeysEv .global _ZN11ItemManager8GiveKeysEj thumb_func_start _ZN11ItemManager8GiveKeysEj _ZN11ItemManager8GiveKeysEj: ; 0x020ae368 push {r4, lr} - ldr r0, _020ae38c ; =data_027e0e60 + ldr r0, _020ae38c ; =gMapManager add r4, r1, #0 ldr r0, [r0] blx _ZN10MapManager10GetNumKeysEv @@ -1139,13 +1139,13 @@ _020ae37c: bgt _020ae382 mov r1, #0 _020ae382: - ldr r0, _020ae38c ; =data_027e0e60 + ldr r0, _020ae38c ; =gMapManager ldr r0, [r0] blx _ZN10MapManager10SetNumKeysEi pop {r4, pc} .align 2, 0 thumb_func_end _ZN11ItemManager8GiveKeysEj -_020ae38c: .word data_027e0e60 +_020ae38c: .word gMapManager .global _ZNK11ItemManager15GetEquippedItemEv arm_func_start _ZNK11ItemManager15GetEquippedItemEv diff --git a/asm/ov00/Item/ItemManager_func_ov00_020ad790.inc b/asm/ov00/Item/ItemManager_func_ov00_020ad790.inc index fe397d2b..7381d9e3 100644 --- a/asm/ov00/Item/ItemManager_func_ov00_020ad790.inc +++ b/asm/ov00/Item/ItemManager_func_ov00_020ad790.inc @@ -29,7 +29,7 @@ _020ad7c0: movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} _020ad800: - lda r0, data_027e0e60 + lda r0, gMapManager ldr r4, [r6, #8] ldr r0, [r0] bl _ZN10MapManager18func_ov00_020849f8Ei diff --git a/asm/ov00/Map/MapManager.inc b/asm/ov00/Map/MapManager.inc index d26a3ac5..da0f4814 100644 --- a/asm/ov00/Map/MapManager.inc +++ b/asm/ov00/Map/MapManager.inc @@ -10,7 +10,7 @@ .extern data_027e0ce0 .extern data_027e0d38 .extern data_027e0d3c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov00/Map/MapManager.s b/asm/ov00/Map/MapManager.s index 9a2bd053..e32a3b60 100644 --- a/asm/ov00/Map/MapManager.s +++ b/asm/ov00/Map/MapManager.s @@ -4243,7 +4243,7 @@ _02085188: cmp r0, r7 blt _02085250 ldr r0, [sp, #0xc] - ldr r11, _02085278 ; =data_027e0e60 + ldr r11, _02085278 ; =gMapManager and r5, r0, #0xff _020851a4: ldr r0, [r11] @@ -4304,7 +4304,7 @@ _02085268: .align 2, 0 arm_func_end _ZN10MapManager18func_ov00_02085108EPi _02085274: .word data_027e0f64 -_02085278: .word data_027e0e60 +_02085278: .word gMapManager .global _ZN10MapManager18func_ov00_0208527cEv arm_func_start _ZN10MapManager18func_ov00_0208527cEv @@ -4362,7 +4362,7 @@ _ZN10MapManager18func_ov00_0208527cEv: ; 0x0208527c ldr r0, [sp, #8] cmp r11, r0 bgt _020853e8 - ldr r4, _020853f8 ; =data_027e0e60 + ldr r4, _020853f8 ; =gMapManager add r6, sp, #0x10 _02085358: ldr r8, [sp, #4] @@ -4411,7 +4411,7 @@ _020853e8: .align 2, 0 arm_func_end _ZN10MapManager18func_ov00_0208527cEv _020853f4: .word data_027e0f64 -_020853f8: .word data_027e0e60 +_020853f8: .word gMapManager .global _ZN10MapManager18func_ov00_020853fcEv arm_func_start _ZN10MapManager18func_ov00_020853fcEv @@ -4482,7 +4482,7 @@ _020854e4: ldr r0, [sp, #8] and r6, r0, #0xff _020854fc: - ldr r0, _02085590 ; =data_027e0e60 + ldr r0, _02085590 ; =gMapManager add r1, sp, #0x10 ldr r0, [r0] strb r6, [sp, #0x10] @@ -4524,7 +4524,7 @@ _02085580: .align 2, 0 arm_func_end _ZN10MapManager18func_ov00_020853fcEv _0208558c: .word data_027e0f64 -_02085590: .word data_027e0e60 +_02085590: .word gMapManager .global _ZN10MapManager18func_ov00_02085594Ev arm_func_start _ZN10MapManager18func_ov00_02085594Ev @@ -5362,7 +5362,7 @@ _02086164: ldr r1, [sp, #4] cmp r0, r1 ble _020861ec - ldr r0, _02086280 ; =data_027e0e60 + ldr r0, _02086280 ; =gMapManager add r1, sp, #0x12 ldr r0, [r0] add r2, sp, #0x68 @@ -5432,7 +5432,7 @@ _02086274: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end _ZN10MapManager18func_ov00_02086044Eiii -_02086280: .word data_027e0e60 +_02086280: .word gMapManager .global _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ arm_func_start _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ diff --git a/asm/ov00/Player/LinkStateFollow.inc b/asm/ov00/Player/LinkStateFollow.inc index 7844a71f..c5775e7b 100644 --- a/asm/ov00/Player/LinkStateFollow.inc +++ b/asm/ov00/Player/LinkStateFollow.inc @@ -10,7 +10,7 @@ .extern _ZN13LinkStateBase8vfunc_24Ei .extern _ZN13PlayerControl13StopFollowingEv .extern _ZN13PlayerControl18func_ov00_020af01cEPc -.extern data_027e0e60 +.extern gMapManager .extern data_027e0fb8 .extern func_01ff9bf8 .extern func_01ff9cec diff --git a/asm/ov00/Player/LinkStateFollow.s b/asm/ov00/Player/LinkStateFollow.s index d9a6bf8f..22b8876c 100644 --- a/asm/ov00/Player/LinkStateFollow.s +++ b/asm/ov00/Player/LinkStateFollow.s @@ -30,7 +30,7 @@ _ZN15LinkStateFollow16MoveTowardTargetEv: ; 0x020a8f80 ldmneia sp!, {r4, r5, pc} mov r0, r5 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev - ldr r2, _020a9020 ; =data_027e0e60 + ldr r2, _020a9020 ; =gMapManager add r1, r0, #0xc4 ldr r0, [r2] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -62,7 +62,7 @@ _ZN15LinkStateFollow16MoveTowardTargetEv: ; 0x020a8f80 ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end _ZN15LinkStateFollow16MoveTowardTargetEv -_020a9020: .word data_027e0e60 +_020a9020: .word gMapManager _020a9024: .word 0x00000155 .global _ZN15LinkStateFollow12OnStateLeaveEi @@ -82,7 +82,7 @@ _020a904c: cmp r0, #6 cmpne r0, #7 ldmneia sp!, {r3, r4, r5, pc} - ldr r1, _020a90ac ; =data_027e0e60 + ldr r1, _020a90ac ; =gMapManager add r0, sp, #0 ldr r4, [r1] add r2, r5, #0x24 @@ -104,7 +104,7 @@ _020a904c: .align 2, 0 arm_func_end _ZN15LinkStateFollow12OnStateLeaveEi _020a90a8: .word data_027e0fb8 -_020a90ac: .word data_027e0e60 +_020a90ac: .word gMapManager .global _ZN15LinkStateFollow8vfunc_24Ei arm_func_start _ZN15LinkStateFollow8vfunc_24Ei @@ -204,7 +204,7 @@ _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p: ; 0x020a9180 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _020a920c ; =data_027e0e60 + ldr r0, _020a920c ; =gMapManager ldrb r2, [sp] ldrb r1, [sp, #1] ldr r0, [r0] @@ -226,7 +226,7 @@ _020a91f0: .align 2, 0 arm_func_end _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p _020a9208: .word data_027e0fb8 -_020a920c: .word data_027e0e60 +_020a920c: .word gMapManager .global _ZN15LinkStateFollow18func_ov00_020a9210EP5Vec3pP5Actor arm_func_start _ZN15LinkStateFollow18func_ov00_020a9210EP5Vec3pP5Actor diff --git a/asm/ov00/Player/LinkStateInteract.inc b/asm/ov00/Player/LinkStateInteract.inc index c35564bc..01e57bcd 100644 --- a/asm/ov00/Player/LinkStateInteract.inc +++ b/asm/ov00/Player/LinkStateInteract.inc @@ -43,7 +43,7 @@ .extern _ZNK11ItemManager8GetFairyEi .extern data_02050f54 .extern data_027e0d0c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0fb8 .extern data_027e0fe4 .extern data_ov00_020eec9c diff --git a/asm/ov00/Player/LinkStateInteract.s b/asm/ov00/Player/LinkStateInteract.s index d07a02de..1d94409f 100644 --- a/asm/ov00/Player/LinkStateInteract.s +++ b/asm/ov00/Player/LinkStateInteract.s @@ -940,7 +940,7 @@ _020aae90: add r2, r6, #0x8c str r1, [sp, #0x28] ldr r1, [r6, #0x4c] - ldr r5, _020ab3d8 ; =data_027e0e60 + ldr r5, _020ab3d8 ; =gMapManager str r1, [sp, #0x2c] ldr r3, [r6, #0x50] add r1, sp, #0x68 @@ -1270,7 +1270,7 @@ _020ab3c8: .word 0x000004cd _020ab3cc: .word data_027e0fb8 _020ab3d0: .word data_027e0fe4 _020ab3d4: .word 0x0000ffff -_020ab3d8: .word data_027e0e60 +_020ab3d8: .word gMapManager _020ab3dc: .word 0x00001ccd _020ab3e0: .word 0x00001333 _020ab3e4: .word 0x000018e4 diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index b8790e5c..73867f5f 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -6,7 +6,7 @@ .extern _ZNK11ItemManager8GetFairyEi .extern data_027e0c54 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern gAdventureFlags .extern data_027e0f94 diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index f8977340..e5d45665 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -285,7 +285,7 @@ _020a7de4: _ZN10PlayerBase8TeleportEP5Vec3psibb: ; 0x020a7df4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x1c - ldr r3, _020a7e6c ; =data_027e0e60 + ldr r3, _020a7e6c ; =gMapManager mov r5, r0 mov r4, r1 mov lr, #0xff @@ -315,7 +315,7 @@ _ZN10PlayerBase8TeleportEP5Vec3psibb: ; 0x020a7df4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end _ZN10PlayerBase8TeleportEP5Vec3psibb -_020a7e6c: .word data_027e0e60 +_020a7e6c: .word gMapManager .global _ZN10PlayerBase18TeleportToEntranceEib arm_func_start _ZN10PlayerBase18TeleportToEntranceEib @@ -328,7 +328,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70 mov r4, r2 str r0, [r3] ldr r1, [r5, #4] - ldr r0, _020a7f68 ; =data_027e0e60 + ldr r0, _020a7f68 ; =gMapManager str r1, [r3, #4] ldr r2, [r5, #8] add r1, sp, #0 @@ -366,7 +366,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70 ldrb r0, [sp, #0x18] cmp r0, #0 beq _020a7f40 - ldr r0, _020a7f68 ; =data_027e0e60 + ldr r0, _020a7f68 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082af4Ev ldr r0, _020a7f80 ; =gAdventureFlags @@ -386,7 +386,7 @@ _020a7f58: .align 2, 0 arm_func_end _ZN10PlayerBase18TeleportToEntranceEib _020a7f64: .word data_027e0f94 -_020a7f68: .word data_027e0e60 +_020a7f68: .word gMapManager _020a7f6c: .word data_027e0fac _020a7f70: .word data_027e0fa0 _020a7f74: .word data_027e0fb0 diff --git a/asm/ov00/Player/PlayerControl.inc b/asm/ov00/Player/PlayerControl.inc index 5fdbb0fb..31b1b43a 100644 --- a/asm/ov00/Player/PlayerControl.inc +++ b/asm/ov00/Player/PlayerControl.inc @@ -26,7 +26,7 @@ .extern data_027e0d0c .extern data_027e0d38 .extern data_027e0e2c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov00/Player/PlayerControl.s b/asm/ov00/Player/PlayerControl.s index 1ac075f6..bd4688a2 100644 --- a/asm/ov00/Player/PlayerControl.s +++ b/asm/ov00/Player/PlayerControl.s @@ -643,7 +643,7 @@ _020af5c4: mov r0, r4 bl _ZN13PlayerControl13StopFollowingEv _020af620: - ldr r0, _020af6d8 ; =data_027e0e60 + ldr r0, _020af6d8 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02085108EPi @@ -695,7 +695,7 @@ _020af6c8: .word data_027e0c68 _020af6cc: .word data_027e0fac _020af6d0: .word data_027e0ffc _020af6d4: .word 0x0000010a -_020af6d8: .word data_027e0e60 +_020af6d8: .word gMapManager _020af6dc: .word data_027e103c _020af6e0: .word data_027e05f8 @@ -721,7 +721,7 @@ _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii: ; 0x020af6e4 str r0, [r4, #0x84] str r0, [r4, #0x88] _020af72c: - ldr r1, _020af774 ; =data_027e0e60 + ldr r1, _020af774 ; =gMapManager add r0, sp, #0 ldr r1, [r1] mov r2, r6 @@ -741,7 +741,7 @@ _020af72c: .align 2, 0 arm_func_end _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii _020af770: .word data_027e0f94 -_020af774: .word data_027e0e60 +_020af774: .word gMapManager .global _ZN13PlayerControl18func_ov00_020af778Ev arm_func_start _ZN13PlayerControl18func_ov00_020af778Ev @@ -883,7 +883,7 @@ _020af944: bl _ZN5Actor16XzDistanceToLinkEv mov r4, r0 _020af97c: - ldr r0, _020afad0 ; =data_027e0e60 + ldr r0, _020afad0 ; =gMapManager add r1, sp, #8 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02085108EPi @@ -974,7 +974,7 @@ _020afac0: .word data_027e0f90 _020afac4: .word gItemManager _020afac8: .word data_027e0fc8 _020afacc: .word data_027e0fe4 -_020afad0: .word data_027e0e60 +_020afad0: .word gMapManager _020afad4: .word data_027e0f94 .global _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p @@ -999,7 +999,7 @@ _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p: ; 0x020afad8 blx r1 cmp r0, #3 bne _020afb48 - ldr r0, _020afb68 ; =data_027e0e60 + ldr r0, _020afb68 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02085594Ev @@ -1020,7 +1020,7 @@ _020afb54: arm_func_end _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p _020afb60: .word data_027e0f94 _020afb64: .word data_027e0f90 -_020afb68: .word data_027e0e60 +_020afb68: .word gMapManager .global _ZN13PlayerControl18func_ov00_020afb6cEv arm_func_start _ZN13PlayerControl18func_ov00_020afb6cEv @@ -1136,7 +1136,7 @@ _020afcf4: ldrb r0, [r9, #0x81] cmp r0, #0 beq _020afe24 - ldr r0, _020afe84 ; =data_027e0e60 + ldr r0, _020afe84 ; =gMapManager add r1, r9, #0x9c ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -1173,7 +1173,7 @@ _020afd5c: b _020afdc4 _020afd88: ldr r1, _020afe78 ; =data_027e0f94 - ldr r0, _020afe84 ; =data_027e0e60 + ldr r0, _020afe84 ; =gMapManager ldr r1, [r1, #4] ldr r0, [r0] str r1, [sp, #8] @@ -1242,7 +1242,7 @@ _020afe74: .word gItemManager _020afe78: .word data_027e0f94 _020afe7c: .word data_027e0fc8 _020afe80: .word data_027e0ffc -_020afe84: .word data_027e0e60 +_020afe84: .word gMapManager .global _ZN13PlayerControl18func_ov00_020afe88Eib arm_func_start _ZN13PlayerControl18func_ov00_020afe88Eib @@ -1864,17 +1864,17 @@ _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p: ; 0x020b05e8 str r3, [sp, #4] str r1, [sp, #0xc] _020b06e0: - ldr r1, _020b0774 ; =data_027e0e60 + ldr r1, _020b0774 ; =gMapManager add r0, sp, #0 ldr r1, [r1] add r2, sp, #4 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _020b0774 ; =data_027e0e60 + ldr r0, _020b0774 ; =gMapManager ldrb r1, [sp] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c24Ei ldr r1, [sp, #4] - ldr r2, _020b0774 ; =data_027e0e60 + ldr r2, _020b0774 ; =gMapManager sub r0, r0, r1 add r0, r0, r0, lsr #31 add r3, r1, r0, asr #1 @@ -1904,7 +1904,7 @@ _020b0764: .word 0x00000333 _020b0768: .word data_027e0f94 _020b076c: .word data_027e0fac _020b0770: .word data_02050f54 -_020b0774: .word data_027e0e60 +_020b0774: .word gMapManager .global _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji arm_func_start _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji diff --git a/asm/ov00/Save/AdventureFlags.inc b/asm/ov00/Save/AdventureFlags.inc index 60618808..cd1910ee 100644 --- a/asm/ov00/Save/AdventureFlags.inc +++ b/asm/ov00/Save/AdventureFlags.inc @@ -3,7 +3,7 @@ .extern data_027e0c68 .extern data_027e0db0 .extern data_027e0dbc -.extern data_027e0e60 +.extern gMapManager .extern func_0204f754 .extern func_ov00_0207b2f0 .extern func_ov00_0207b334 diff --git a/asm/ov00/Save/AdventureFlags.s b/asm/ov00/Save/AdventureFlags.s index 9555e442..2880f496 100644 --- a/asm/ov00/Save/AdventureFlags.s +++ b/asm/ov00/Save/AdventureFlags.s @@ -325,7 +325,7 @@ _ZN14AdventureFlags18func_ov00_02097968Ei: ; 0x02097968 strb ip, [sp, #0x14] strb ip, [sp, #0x15] bl _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 - ldr r0, _02097a40 ; =data_027e0e60 + ldr r0, _02097a40 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838f8EPi @@ -342,7 +342,7 @@ _ZN14AdventureFlags18func_ov00_02097968Ei: ; 0x02097968 .align 2, 0 arm_func_end _ZN14AdventureFlags18func_ov00_02097968Ei _02097a3c: .word data_027e0db0 -_02097a40: .word data_027e0e60 +_02097a40: .word gMapManager .global _ZN14AdventureFlags18func_ov00_02097a44Eii arm_func_start _ZN14AdventureFlags18func_ov00_02097a44Eii diff --git a/asm/ov00/ov00_020773c0.inc b/asm/ov00/ov00_020773c0.inc index cc2cf301..41b5124f 100644 --- a/asm/ov00/ov00_020773c0.inc +++ b/asm/ov00/ov00_020773c0.inc @@ -26,7 +26,7 @@ .extern data_027e0d48 .extern data_027e0d54 .extern data_027e0e28 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern gAdventureFlags .extern data_027e0f7c diff --git a/asm/ov00/ov00_020773c0.s b/asm/ov00/ov00_020773c0.s index 4f4c32d4..4fba1472 100644 --- a/asm/ov00/ov00_020773c0.s +++ b/asm/ov00/ov00_020773c0.s @@ -3875,7 +3875,7 @@ _02078f7c: .word data_027e1054 arm_func_start func_ov00_02078f80 func_ov00_02078f80: ; 0x02078f80 stmdb sp!, {r4, lr} - ldr r1, _02078fa8 ; =data_027e0e60 + ldr r1, _02078fa8 ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager18func_ov00_02083588Ev @@ -3886,7 +3886,7 @@ func_ov00_02078f80: ; 0x02078f80 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_02078f80 -_02078fa8: .word data_027e0e60 +_02078fa8: .word gMapManager .global func_ov00_02078fac arm_func_start func_ov00_02078fac @@ -4038,7 +4038,7 @@ _02079148: .word data_027e0c38 func_ov00_0207914c: ; 0x0207914c stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x14 - ldr r4, _020791d8 ; =data_027e0e60 + ldr r4, _020791d8 ; =gMapManager mov r11, r0 ldr r7, [r4] mov r10, r1 @@ -4073,7 +4073,7 @@ func_ov00_0207914c: ; 0x0207914c ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_0207914c -_020791d8: .word data_027e0e60 +_020791d8: .word gMapManager .global func_ov00_020791dc arm_func_start func_ov00_020791dc @@ -4097,7 +4097,7 @@ func_ov00_020791dc: ; 0x020791dc func_ov00_0207920c: ; 0x0207920c stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x14 - ldr r4, _0207929c ; =data_027e0e60 + ldr r4, _0207929c ; =gMapManager mov r11, r0 ldr r7, [r4] mov r10, r1 @@ -4133,7 +4133,7 @@ func_ov00_0207920c: ; 0x0207920c ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_0207920c -_0207929c: .word data_027e0e60 +_0207929c: .word gMapManager .global func_ov00_020792a0 arm_func_start func_ov00_020792a0 @@ -4161,7 +4161,7 @@ _020792d4: ldr r0, [r0, #0x14] add r9, r9, r0 _020792f4: - ldr r0, _020793b4 ; =data_027e0e60 + ldr r0, _020793b4 ; =gMapManager ldr r6, [r0] mov r0, r6 bl _ZN10MapManager13GetCourseMinXEv @@ -4212,7 +4212,7 @@ _02079368: .align 2, 0 arm_func_end func_ov00_020792a0 _020793b0: .word data_027e0c38 -_020793b4: .word data_027e0e60 +_020793b4: .word gMapManager .global func_ov00_020793b8 arm_func_start func_ov00_020793b8 @@ -4340,7 +4340,7 @@ _0207955c: mov r0, #0 b _02079614 _02079564: - ldr r0, _0207967c ; =data_027e0e60 + ldr r0, _0207967c ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, r4 @@ -4348,7 +4348,7 @@ _02079564: cmp r0, #0 movne r0, #0 bne _02079614 - ldr r0, _0207967c ; =data_027e0e60 + ldr r0, _0207967c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 @@ -4357,7 +4357,7 @@ _02079564: cmp r0, #0 moveq r0, #0 beq _02079614 - ldr r0, _0207967c ; =data_027e0e60 + ldr r0, _0207967c ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, r4 @@ -4415,7 +4415,7 @@ _0207966c: .word data_027e0e28 _02079670: .word data_027e0d38 _02079674: .word gOverlayManager _02079678: .word 0x00000003 -_0207967c: .word data_027e0e60 +_0207967c: .word gMapManager .global func_ov00_02079680 arm_func_start func_ov00_02079680 @@ -4510,7 +4510,7 @@ func_ov00_0207977c: ; 0x0207977c bl func_ov00_02078b88 cmp r0, #0 bne _0207984c - ldr r0, _0207986c ; =data_027e0e60 + ldr r0, _0207986c ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, r4 @@ -4555,7 +4555,7 @@ _0207984c: arm_func_end func_ov00_0207977c _02079864: .word data_027e0e28 _02079868: .word data_027e0d38 -_0207986c: .word data_027e0e60 +_0207986c: .word gMapManager _02079870: .word data_027e0c38 _02079874: .word data_027e080c diff --git a/asm/ov00/ov00_0207af9c.inc b/asm/ov00/ov00_0207af9c.inc index 257ecc7e..dbcb92ae 100644 --- a/asm/ov00/ov00_0207af9c.inc +++ b/asm/ov00/ov00_0207af9c.inc @@ -41,7 +41,7 @@ .extern data_027e0e2c .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov00/ov00_0207af9c.s b/asm/ov00/ov00_0207af9c.s index 59f1b892..5993970e 100644 --- a/asm/ov00/ov00_0207af9c.s +++ b/asm/ov00/ov00_0207af9c.s @@ -807,7 +807,7 @@ _0207b62c: ldr r0, [r5] blx func_ov00_020a5e9c str r0, [r5, #0x44] - ldr r0, _0207b808 ; =data_027e0e60 + ldr r0, _0207b808 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02082d08Ev add r1, r5, #0 @@ -954,12 +954,12 @@ _0207b740: ldr r0, [r0, #8] cmp r0, #1 beq _0207b7f0 - ldr r0, _0207b808 ; =data_027e0e60 + ldr r0, _0207b808 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083328Ev cmp r0, #0 beq _0207b7f0 - ldr r0, _0207b808 ; =data_027e0e60 + ldr r0, _0207b808 ; =gMapManager ldrb r1, [r4, #0x12] ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083318Ei @@ -1027,7 +1027,7 @@ _0207b7f0: thumb_func_end func_ov00_0207b5bc _0207b800: .word data_027e0fe4 _0207b804: .word 0x414e4353 -_0207b808: .word data_027e0e60 +_0207b808: .word gMapManager _0207b80c: .word data_027e0f94 _0207b810: .word data_027e0fac _0207b814: .word data_027e0f7c @@ -5073,7 +5073,7 @@ func_ov00_0207e4b0: ; 0x0207e4b0 func_ov00_0207e4b8: ; 0x0207e4b8 stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x7c - ldr r3, _0207e92c ; =data_027e0e60 + ldr r3, _0207e92c ; =gMapManager mov r9, r1 ldr r1, [r3] mov r8, r0 @@ -5376,7 +5376,7 @@ _0207e8f4: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_0207e4b8 -_0207e92c: .word data_027e0e60 +_0207e92c: .word gMapManager _0207e930: .word data_027e0f6c _0207e934: .word data_ov00_020ec824 _0207e938: .word func_ov00_0207e968 @@ -5415,7 +5415,7 @@ func_ov00_0207e96c: ; 0x0207e96c func_ov00_0207e970: ; 0x0207e970 stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0xc4 - ldr r4, _0207ee00 ; =data_027e0e60 + ldr r4, _0207ee00 ; =gMapManager mov r9, r1 ldr r1, [r4] mov r8, r0 @@ -5723,7 +5723,7 @@ _0207edd0: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_0207e970 -_0207ee00: .word data_027e0e60 +_0207ee00: .word gMapManager _0207ee04: .word data_027e0f6c _0207ee08: .word data_ov00_020ec864 _0207ee0c: .word func_ov00_0207e968 @@ -5734,7 +5734,7 @@ _0207ee10: .word func_ov00_0207e96c func_ov00_0207ee14: ; 0x0207ee14 stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x74 - ldr r0, _0207efdc ; =data_027e0e60 + ldr r0, _0207efdc ; =gMapManager mov r9, r1 ldr r1, [r0] add r0, sp, #8 @@ -5851,7 +5851,7 @@ _0207efbc: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_0207ee14 -_0207efdc: .word data_027e0e60 +_0207efdc: .word gMapManager _0207efe0: .word data_027e0f6c _0207efe4: .word data_ov00_020ec8a4 _0207efe8: .word func_ov00_0207e968 @@ -5863,7 +5863,7 @@ _0207eff0: .word 0x0000ffff func_ov00_0207eff4: ; 0x0207eff4 stmdb sp!, {r4, r5, r6, r7, r8, r9, lr} sub sp, sp, #0x24 - ldr r0, _0207f0f4 ; =data_027e0e60 + ldr r0, _0207f0f4 ; =gMapManager mov r8, r1 ldr r1, [r0] add r0, sp, #8 @@ -5930,7 +5930,7 @@ _0207f0e8: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov00_0207eff4 -_0207f0f4: .word data_027e0e60 +_0207f0f4: .word gMapManager _0207f0f8: .word data_027e0f6c _0207f0fc: .word data_ov00_020ec8e4 @@ -5944,7 +5944,7 @@ func_ov00_0207f100: ; 0x0207f100 arm_func_start func_ov00_0207f104 func_ov00_0207f104: ; 0x0207f104 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r3, _0207f1f0 ; =data_027e0e60 + ldr r3, _0207f1f0 ; =gMapManager mov r5, r1 ldr r1, [r3] mov r6, r0 @@ -6005,14 +6005,14 @@ _0207f1cc: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_0207f104 -_0207f1f0: .word data_027e0e60 +_0207f1f0: .word gMapManager .global func_ov00_0207f1f4 arm_func_start func_ov00_0207f1f4 func_ov00_0207f1f4: ; 0x0207f1f4 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr} sub sp, sp, #0x3c - ldr r0, _0207f318 ; =data_027e0e60 + ldr r0, _0207f318 ; =gMapManager mov r9, r1 ldr r1, [r0] mov r8, r2 @@ -6088,7 +6088,7 @@ _0207f30c: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov00_0207f1f4 -_0207f318: .word data_027e0e60 +_0207f318: .word gMapManager _0207f31c: .word data_027e0f6c _0207f320: .word data_ov00_020ec924 diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index e7aea8bc..ffeb319f 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -103,7 +103,7 @@ .extern data_027e0d38 .extern data_027e0d3c .extern data_027e0d44 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index 619704f2..b6547b46 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -253,7 +253,7 @@ _02086fd0: str r0, [sp, #0xc] mov r1, #1 str r1, [sp, #0x10] - ldr r0, _02087088 ; =data_027e0e60 + ldr r0, _02087088 ; =gMapManager add r1, sp, #0x30 ldr r0, [r0] add r2, sp, #0x24 @@ -279,7 +279,7 @@ _02087068: _0208707c: .word data_ov00_020e2fb4 _02087080: .word data_027e0d38 _02087084: .word data_027e071c -_02087088: .word data_027e0e60 +_02087088: .word gMapManager .global func_ov00_0208708c arm_func_start func_ov00_0208708c @@ -445,7 +445,7 @@ _0208729c: strh r1, [r0, #0x18] cmp ip, #2 blo _0208729c - ldr r0, _020872e4 ; =data_027e0e60 + ldr r0, _020872e4 ; =gMapManager ldrb r2, [r5, #0x1b8] ldr r0, [r0] add r1, sp, #0 @@ -460,7 +460,7 @@ _0208729c: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov00_0208726c -_020872e4: .word data_027e0e60 +_020872e4: .word gMapManager .global func_ov00_020872e8 arm_func_start func_ov00_020872e8 @@ -782,7 +782,7 @@ _02087724: strh r1, [r0, #0x18] cmp r3, #2 blo _02087724 - ldr r0, _0208784c ; =data_027e0e60 + ldr r0, _0208784c ; =gMapManager ldrb r2, [r7, #0x1b8] ldr r0, [r0] add r1, sp, #0x6c @@ -855,7 +855,7 @@ _02087830: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov00_020876bc -_0208784c: .word data_027e0e60 +_0208784c: .word gMapManager .global func_ov00_02087850 arm_func_start func_ov00_02087850 @@ -892,7 +892,7 @@ _020878b8: strh r1, [r0, #0x18] cmp r3, #2 blo _020878b8 - ldr r0, _020879e0 ; =data_027e0e60 + ldr r0, _020879e0 ; =gMapManager ldrb r2, [r7, #0x1b8] ldr r0, [r0] add r1, sp, #0x6c @@ -965,7 +965,7 @@ _020879c4: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov00_02087850 -_020879e0: .word data_027e0e60 +_020879e0: .word gMapManager .global func_ov00_020879e4 arm_func_start func_ov00_020879e4 @@ -1329,7 +1329,7 @@ func_ov00_02087e14: ; 0x02087e14 arm_func_start func_ov00_02087e8c func_ov00_02087e8c: ; 0x02087e8c stmdb sp!, {r3, lr} - ldr r0, _02087eec ; =data_027e0e60 + ldr r0, _02087eec ; =gMapManager mov r1, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083938Ei @@ -1357,7 +1357,7 @@ _02087ee4: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_02087e8c -_02087eec: .word data_027e0e60 +_02087eec: .word gMapManager .global func_ov00_02087ef0 arm_func_start func_ov00_02087ef0 @@ -1475,7 +1475,7 @@ _0208800c: .word func_ov00_020a1888 func_ov00_02088010: ; 0x02088010 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc - ldr r2, _02088070 ; =data_027e0e60 + ldr r2, _02088070 ; =gMapManager mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -1499,7 +1499,7 @@ func_ov00_02088010: ; 0x02088010 ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov00_02088010 -_02088070: .word data_027e0e60 +_02088070: .word gMapManager .global func_ov00_02088074 arm_func_start func_ov00_02088074 @@ -2664,7 +2664,7 @@ func_ov00_0208901c: ; 0x0208901c func_ov00_02089068: ; 0x02089068 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x4c - ldr r3, _02089164 ; =data_027e0e60 + ldr r3, _02089164 ; =gMapManager mov r5, r0 ldr r0, [r3] mov r4, r2 @@ -2697,7 +2697,7 @@ _020890b8: str r0, [sp, #0x20] b _0208912c _020890ec: - ldr r0, _02089164 ; =data_027e0e60 + ldr r0, _02089164 ; =gMapManager add r1, sp, #0xc ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -2731,7 +2731,7 @@ _0208912c: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov00_02089068 -_02089164: .word data_027e0e60 +_02089164: .word gMapManager .global func_ov00_02089168 arm_func_start func_ov00_02089168 @@ -3290,7 +3290,7 @@ _02089910: strh r1, [r0, #0x18] cmp r3, #2 blo _02089910 - ldr r0, _02089a28 ; =data_027e0e60 + ldr r0, _02089a28 ; =gMapManager ldrb r2, [r9, #0x1b8] ldr r0, [r0] add r1, sp, #0x20 @@ -3360,7 +3360,7 @@ _020899b4: .align 2, 0 arm_func_end func_ov00_0208967c _02089a24: .word gAdventureFlags -_02089a28: .word data_027e0e60 +_02089a28: .word gMapManager .global func_ov00_02089a2c arm_func_start func_ov00_02089a2c @@ -4133,7 +4133,7 @@ func_ov00_0208a464: ; 0x0208a464 bl func_ov00_0208edd8 b _0208a77c _0208a4d0: - ldr r1, _0208a844 ; =data_027e0e60 + ldr r1, _0208a844 ; =gMapManager add r0, sp, #0x18 ldr r1, [r1] bl _ZN10MapManager18func_ov00_02084100EiPS_ @@ -4305,25 +4305,25 @@ _0208a4d0: add r1, sp, #0x20 bl func_ov00_0208ed74 _0208a77c: - ldr r0, _0208a844 ; =data_027e0e60 + ldr r0, _0208a844 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev - ldr r1, _0208a844 ; =data_027e0e60 + ldr r1, _0208a844 ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager17Get_MapData_Unk2aEv - ldr r1, _0208a844 ; =data_027e0e60 + ldr r1, _0208a844 ; =gMapManager mov r5, r0 ldr r0, [r1] ldr r1, [r6, #0x308] bl _ZN10MapManager18func_ov00_020839d4Ev strb r0, [r6, #0x320] - ldr r0, _0208a844 ; =data_027e0e60 + ldr r0, _0208a844 ; =gMapManager ldr r1, [r6, #0x310] ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839f8Ev strb r0, [r6, #0x321] - ldr r0, _0208a844 ; =data_027e0e60 + ldr r0, _0208a844 ; =gMapManager ldr r1, [r6, #0x314] ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839d4Ev @@ -4338,7 +4338,7 @@ _0208a77c: cmp r0, r4 subge r0, r4, #1 strgeb r0, [r6, #0x322] - ldr r0, _0208a844 ; =data_027e0e60 + ldr r0, _0208a844 ; =gMapManager ldr r1, [r6, #0x31c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839f8Ev @@ -4357,7 +4357,7 @@ _0208a77c: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_0208a464 -_0208a844: .word data_027e0e60 +_0208a844: .word gMapManager _0208a848: .word data_027e0f94 .global func_ov00_0208a84c @@ -4907,7 +4907,7 @@ _0208af04: strh r2, [r0, #0x18] cmp r5, #2 blo _0208af04 - ldr r0, _0208b114 ; =data_027e0e60 + ldr r0, _0208b114 ; =gMapManager add r1, sp, #0x18 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083928EPci @@ -5037,7 +5037,7 @@ _0208b0dc: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov00_0208aed8 -_0208b114: .word data_027e0e60 +_0208b114: .word gMapManager _0208b118: .word data_027e0f64 .global func_ov00_0208b11c @@ -5851,7 +5851,7 @@ _0208b9e0: .word func_ov00_0208ba58 arm_func_start func_ov00_0208b9e4 func_ov00_0208b9e4: ; 0x0208b9e4 add r2, r0, r1 - ldr r0, _0208ba00 ; =data_027e0e60 + ldr r0, _0208ba00 ; =gMapManager ldrb r1, [r2, #0x2e] ldr ip, _0208ba04 ; =_ZN10MapManager18func_ov00_02084be0Eii ldrb r2, [r2, #0x2c] @@ -5859,7 +5859,7 @@ func_ov00_0208b9e4: ; 0x0208b9e4 bx ip .align 2, 0 arm_func_end func_ov00_0208b9e4 -_0208ba00: .word data_027e0e60 +_0208ba00: .word gMapManager _0208ba04: .word _ZN10MapManager18func_ov00_02084be0Eii .global func_ov00_0208ba08 @@ -5867,7 +5867,7 @@ _0208ba04: .word _ZN10MapManager18func_ov00_02084be0Eii func_ov00_0208ba08: ; 0x0208ba08 stmdb sp!, {r3, lr} add ip, r0, r1 - ldr r0, _0208ba2c ; =data_027e0e60 + ldr r0, _0208ba2c ; =gMapManager mov r3, r2 ldrb r1, [ip, #0x2e] ldrb r2, [ip, #0x2c] @@ -5876,7 +5876,7 @@ func_ov00_0208ba08: ; 0x0208ba08 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_0208ba08 -_0208ba2c: .word data_027e0e60 +_0208ba2c: .word gMapManager .global func_ov00_0208ba30 arm_func_start func_ov00_0208ba30 @@ -7394,7 +7394,7 @@ _0208cd78: mov r2, #0x18 str r4, [sp] bl func_0204f614 - ldr r0, _0208ce80 ; =data_027e0e60 + ldr r0, _0208ce80 ; =gMapManager add r2, sp, #0x24 ldr r0, [r0] mov r1, r5 @@ -7459,7 +7459,7 @@ _0208ce54: arm_func_end func_ov00_0208cd48 _0208ce78: .word func_ov00_0207f100 _0208ce7c: .word func_ov00_0208d018 -_0208ce80: .word data_027e0e60 +_0208ce80: .word gMapManager .global func_ov00_0208ce84 arm_func_start func_ov00_0208ce84 @@ -7619,7 +7619,7 @@ _0208d064: mov r2, #0x18 str r4, [sp] bl func_0204f614 - ldr r0, _0208d1f4 ; =data_027e0e60 + ldr r0, _0208d1f4 ; =gMapManager add r2, sp, #0x44 ldr r0, [r0] mov r1, r5 @@ -7719,7 +7719,7 @@ _0208d1c8: arm_func_end func_ov00_0208d01c _0208d1ec: .word func_ov00_0207f100 _0208d1f0: .word func_ov00_0208d018 -_0208d1f4: .word data_027e0e60 +_0208d1f4: .word gMapManager .global func_ov00_0208d1f8 arm_func_start func_ov00_0208d1f8 @@ -10562,7 +10562,7 @@ func_ov00_0208f794: ; 0x0208f794 bl func_020078f4 ldr r6, _0208f9dc ; =data_ov00_020db010 ldr r11, _0208f9e0 ; =data_ov00_020db030 - ldr r4, _0208f9e4 ; =data_027e0e60 + ldr r4, _0208f9e4 ; =gMapManager mov r9, #0 add r5, sp, #4 _0208f7d4: @@ -10710,7 +10710,7 @@ _0208f9ac: arm_func_end func_ov00_0208f794 _0208f9dc: .word data_ov00_020db010 _0208f9e0: .word data_ov00_020db030 -_0208f9e4: .word data_027e0e60 +_0208f9e4: .word gMapManager _0208f9e8: .word data_027e0f68 .global func_ov00_0208f9ec @@ -10980,7 +10980,7 @@ _0208fcd4: cmp r1, r0 cmplt r6, r1 bge _0208fd30 - ldr r4, _0208fef4 ; =data_027e0e60 + ldr r4, _0208fef4 ; =gMapManager _0208fcf8: ldr r0, [r4] ldr r2, [r5, #0x16c] @@ -10998,7 +10998,7 @@ _0208fd20: cmp r6, r1 blt _0208fcf8 _0208fd30: - ldr r0, _0208fef4 ; =data_027e0e60 + ldr r0, _0208fef4 ; =gMapManager ldr r2, [r5, #0x16c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084be0Eii @@ -11009,7 +11009,7 @@ _0208fd30: add r6, r0, #1 cmp r6, r1 bge _0208fd98 - ldr r4, _0208fef4 ; =data_027e0e60 + ldr r4, _0208fef4 ; =gMapManager _0208fd60: ldr r0, [r4] ldr r2, [r5, #0x16c] @@ -11039,7 +11039,7 @@ _0208fda8: movne r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} _0208fdc0: - ldr r0, _0208fef4 ; =data_027e0e60 + ldr r0, _0208fef4 ; =gMapManager ldr r1, [r5, #0x160] ldr r0, [r0] ldr r2, [r5, #0x16c] @@ -11052,7 +11052,7 @@ _0208fdc0: cmp r4, r0 mov r8, #0 bge _0208fe2c - ldr r6, _0208fef4 ; =data_027e0e60 + ldr r6, _0208fef4 ; =gMapManager mov r7, #1 _0208fdfc: ldr r0, [r6] @@ -11078,7 +11078,7 @@ _0208fe3c: mov r6, #1 cmp r7, r0 bge _0208fe80 - ldr r4, _0208fef4 ; =data_027e0e60 + ldr r4, _0208fef4 ; =gMapManager _0208fe54: ldr r0, [r4] ldr r2, [r5, #0x16c] @@ -11108,7 +11108,7 @@ _0208fea8: mov r6, #0 cmp r0, #0 ble _0208feec - ldr r4, _0208fef4 ; =data_027e0e60 + ldr r4, _0208fef4 ; =gMapManager _0208febc: ldr r1, [r5, #0x164] ldr r0, [r4] @@ -11127,7 +11127,7 @@ _0208feec: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov00_0208fcb4 -_0208fef4: .word data_027e0e60 +_0208fef4: .word gMapManager .global func_ov00_0208fef8 arm_func_start func_ov00_0208fef8 @@ -11268,7 +11268,7 @@ _02090004: bl func_01ff9bc4 cmp r5, #0xa bge _020902d4 - ldr r1, _02090320 ; =data_027e0e60 + ldr r1, _02090320 ; =gMapManager add r0, sp, #0x18 ldr r1, [r1] add r2, sp, #0x5c @@ -11278,7 +11278,7 @@ _02090004: bl func_01ff9ec0 cmp r0, #0x2000 blt _02090144 - ldr r0, _02090320 ; =data_027e0e60 + ldr r0, _02090320 ; =gMapManager add r1, sp, #0x18 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083e70Ev @@ -11289,13 +11289,13 @@ _02090144: add r5, r5, #1 b _020902f8 _02090150: - ldr r0, _02090320 ; =data_027e0e60 + ldr r0, _02090320 ; =gMapManager add r1, sp, #0x18 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev cmp r0, #0 bne _020902f8 - ldr r0, _02090320 ; =data_027e0e60 + ldr r0, _02090320 ; =gMapManager add r1, sp, #0x18 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084164Ev @@ -11303,7 +11303,7 @@ _02090150: subeq r6, r6, #1 addeq r5, r5, #1 beq _020902f8 - ldr r0, _02090320 ; =data_027e0e60 + ldr r0, _02090320 ; =gMapManager add r1, sp, #0x18 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_54Ev @@ -11418,7 +11418,7 @@ _02090310: .word data_027e0f94 _02090314: .word data_027e0fe4 _02090318: .word 0x534e414b _0209031c: .word data_027e0764 -_02090320: .word data_027e0e60 +_02090320: .word gMapManager _02090324: .word 0x5053424c _02090328: .word data_027e0fe8 @@ -11431,7 +11431,7 @@ func_ov00_0209032c: ; 0x0209032c ldr r0, [r7, #0x168] cmp r6, r0 ldmgeia sp!, {r3, r4, r5, r6, r7, pc} - ldr r4, _02090374 ; =data_027e0e60 + ldr r4, _02090374 ; =gMapManager mov r5, #0 _0209034c: ldr r0, [r4] @@ -11446,7 +11446,7 @@ _0209034c: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_0209032c -_02090374: .word data_027e0e60 +_02090374: .word gMapManager .global func_ov00_02090378 arm_func_start func_ov00_02090378 @@ -13284,7 +13284,7 @@ func_ov00_020915e8: ; 0x020915e8 _0209167c: cmp r1, #0 bne _0209173c - ldr r0, _020917ac ; =data_027e0e60 + ldr r0, _020917ac ; =gMapManager ldr r6, _020917b0 ; =0x000004cd ldr r0, [r0] bl _ZN10MapManager18func_ov00_020848b8Ev @@ -13314,7 +13314,7 @@ _0209167c: str r0, [sp, #8] str r1, [sp, #0xc] str r1, [sp, #0x10] - ldr r0, _020917ac ; =data_027e0e60 + ldr r0, _020917ac ; =gMapManager add r1, sp, #0x34 ldr r0, [r0] mov r3, r2 @@ -13361,7 +13361,7 @@ _0209173c: arm_func_end func_ov00_020915e8 _020917a4: .word data_027e0d38 _020917a8: .word data_027e10a4 -_020917ac: .word data_027e0e60 +_020917ac: .word gMapManager _020917b0: .word 0x000004cd _020917b4: .word 0x0000ffff @@ -13671,7 +13671,7 @@ _02091bd4: ldrb r0, [r5, #0x18] cmp r0, #0 beq _02091ce0 - ldr r0, _02091d4c ; =data_027e0e60 + ldr r0, _02091d4c ; =gMapManager ldr r4, _02091d50 ; =0x000004cd ldr r0, [r0] bl _ZN10MapManager18func_ov00_020848b8Ev @@ -13701,7 +13701,7 @@ _02091bd4: str r0, [sp, #8] str r1, [sp, #0xc] str r1, [sp, #0x10] - ldr r0, _02091d4c ; =data_027e0e60 + ldr r0, _02091d4c ; =gMapManager add r1, sp, #0x5c ldr r0, [r0] mov r3, r2 @@ -13751,7 +13751,7 @@ _02091d3c: .word data_027e0f94 _02091d40: .word data_027e0fac _02091d44: .word data_027e10a4 _02091d48: .word data_027e0d38 -_02091d4c: .word data_027e0e60 +_02091d4c: .word gMapManager _02091d50: .word 0x000004cd _02091d54: .word 0x0000ffff @@ -15098,7 +15098,7 @@ _0209309c: strle r0, [sp, #0x104] b _020930d4 _020930b4: - ldr r0, _02093208 ; =data_027e0e60 + ldr r0, _02093208 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082538Ev add r3, sp, #0x28 @@ -15188,7 +15188,7 @@ _020931f8: .word data_027e0f94 _020931fc: .word 0x00001ccd _02093200: .word 0xffffe333 _02093204: .word 0x000004cd -_02093208: .word data_027e0e60 +_02093208: .word gMapManager .global func_ov00_0209320c arm_func_start func_ov00_0209320c @@ -15391,7 +15391,7 @@ _0209349c: strgt r0, [r4, #8] ldmia sp!, {r3, r4, pc} _020934c8: - ldr r0, _02093504 ; =data_027e0e60 + ldr r0, _02093504 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082538Ev add r3, sp, #0 @@ -15408,7 +15408,7 @@ _020934c8: .align 2, 0 arm_func_end func_ov00_020933d4 _02093500: .word data_027e0f94 -_02093504: .word data_027e0e60 +_02093504: .word gMapManager .global func_ov00_02093508 arm_func_start func_ov00_02093508 @@ -16155,7 +16155,7 @@ func_ov00_02093e00: ; 0x02093e00 sub sp, sp, #0x70 mov r10, r0 ldr r1, [r10, #4] - ldr r0, _020940cc ; =data_027e0e60 + ldr r0, _020940cc ; =gMapManager orr r1, r1, #0x800 str r1, [r10, #4] ldr r2, [r10, #0x18] @@ -16240,7 +16240,7 @@ _02093e70: strb r5, [sp, #0x54] strb r5, [sp, #0x55] bl _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 - ldr r0, _020940cc ; =data_027e0e60 + ldr r0, _020940cc ; =gMapManager add r1, sp, #0x40 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838f8EPi @@ -16272,7 +16272,7 @@ _02093f80: add r0, r8, #2 cmp r8, r0 bge _0209406c - ldr r4, _020940cc ; =data_027e0e60 + ldr r4, _020940cc ; =gMapManager add r6, sp, #6 mov r5, #1 add r11, sp, #4 @@ -16340,7 +16340,7 @@ _020940ac: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_02093e00 -_020940cc: .word data_027e0e60 +_020940cc: .word gMapManager _020940d0: .word 0x00000e66 _020940d4: .word gAdventureFlags @@ -17651,7 +17651,7 @@ func_ov00_02094e6c: ; 0x02094e6c strb r0, [r10] mov r5, r2 strh r6, [r10, #2] - ldr r0, _02094f84 ; =data_027e0e60 + ldr r0, _02094f84 ; =gMapManager strh r5, [r10, #4] ldr r0, [r0] mov r9, r3 @@ -17659,7 +17659,7 @@ func_ov00_02094e6c: ; 0x02094e6c ldrh r1, [r10, #2] bl func_02002c14 mov r1, r0, lsl #0xc - ldr r0, _02094f84 ; =data_027e0e60 + ldr r0, _02094f84 ; =gMapManager str r1, [r10, #0xc] ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv @@ -17718,7 +17718,7 @@ _02094f40: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_02094e6c -_02094f84: .word data_027e0e60 +_02094f84: .word gMapManager _02094f88: .word data_027e0ce0 _02094f8c: .word func_ov00_02094fa8 _02094f90: .word func_ov00_02094f94 @@ -17762,13 +17762,13 @@ func_ov00_02094fbc: ; 0x02094fbc cmpne r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} - ldr r0, _02095124 ; =data_027e0e60 + ldr r0, _02095124 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev ldrh r1, [r4, #2] bl func_02002c14 mov r1, r0, lsl #0xc - ldr r0, _02095124 ; =data_027e0e60 + ldr r0, _02095124 ; =gMapManager str r1, [r4, #0xc] ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv @@ -17842,7 +17842,7 @@ _0209510c: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov00_02094fbc -_02095124: .word data_027e0e60 +_02095124: .word gMapManager _02095128: .word data_027e0ce0 _0209512c: .word func_ov00_02094fa8 _02095130: .word func_ov00_02094f94 @@ -17958,7 +17958,7 @@ func_ov00_02095258: ; 0x02095258 func_ov00_02095278: ; 0x02095278 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x18 - ldr r3, _0209530c ; =data_027e0e60 + ldr r3, _0209530c ; =gMapManager add ip, sp, #0xc mov r4, r0 mov r6, r1 @@ -17995,7 +17995,7 @@ func_ov00_02095278: ; 0x02095278 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_02095278 -_0209530c: .word data_027e0e60 +_0209530c: .word gMapManager .global func_ov00_02095310 arm_func_start func_ov00_02095310 @@ -18171,26 +18171,26 @@ func_ov00_020954a0: ; 0x020954a0 mov r5, r1 bl func_ov00_020953fc ldr r1, _0209554c ; =data_ov00_020e3040 - ldr r0, _02095550 ; =data_027e0e60 + ldr r0, _02095550 ; =gMapManager str r1, [r6] ldrb r1, [r5, #1] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083bacEv - ldr r2, _02095550 ; =data_027e0e60 + ldr r2, _02095550 ; =gMapManager mov r4, r0 ldrb r1, [r5, #2] ldr r0, [r2] bl _ZN10MapManager18func_ov00_02083b84Ev mov r3, #0x5000 rsb r3, r3, #0 - ldr r2, _02095550 ; =data_027e0e60 + ldr r2, _02095550 ; =gMapManager str r0, [sp, #0xc] ldrb r1, [r5, #3] ldr r0, [r2] str r3, [sp, #0x10] str r4, [sp, #0x14] bl _ZN10MapManager18func_ov00_02083bfcEv - ldr r2, _02095550 ; =data_027e0e60 + ldr r2, _02095550 ; =gMapManager mov r4, r0 ldrb r1, [r5, #4] ldr r0, [r2] @@ -18211,7 +18211,7 @@ func_ov00_020954a0: ; 0x020954a0 .align 2, 0 arm_func_end func_ov00_020954a0 _0209554c: .word data_ov00_020e3040 -_02095550: .word data_027e0e60 +_02095550: .word gMapManager .global func_ov00_02095554 arm_func_start func_ov00_02095554 @@ -18222,26 +18222,26 @@ func_ov00_02095554: ; 0x02095554 mov r5, r1 bl func_ov00_020953fc ldr r1, _02095600 ; =data_ov00_020e3040 - ldr r0, _02095604 ; =data_027e0e60 + ldr r0, _02095604 ; =gMapManager str r1, [r6] ldrb r1, [r5, #1] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083bacEv - ldr r2, _02095604 ; =data_027e0e60 + ldr r2, _02095604 ; =gMapManager mov r4, r0 ldrb r1, [r5, #2] ldr r0, [r2] bl _ZN10MapManager18func_ov00_02083b84Ev mov r3, #0x5000 rsb r3, r3, #0 - ldr r2, _02095604 ; =data_027e0e60 + ldr r2, _02095604 ; =gMapManager str r0, [sp, #0xc] ldrb r1, [r5, #3] ldr r0, [r2] str r3, [sp, #0x10] str r4, [sp, #0x14] bl _ZN10MapManager18func_ov00_02083bfcEv - ldr r2, _02095604 ; =data_027e0e60 + ldr r2, _02095604 ; =gMapManager mov r4, r0 ldrb r1, [r5, #4] ldr r0, [r2] @@ -18262,7 +18262,7 @@ func_ov00_02095554: ; 0x02095554 .align 2, 0 arm_func_end func_ov00_02095554 _02095600: .word data_ov00_020e3040 -_02095604: .word data_027e0e60 +_02095604: .word gMapManager .global func_ov00_02095608 arm_func_start func_ov00_02095608 @@ -18311,11 +18311,11 @@ func_ov00_0209564c: ; 0x0209564c str r0, [r6, #0x14] str r0, [r6, #0x18] str r0, [r6, #0x1c] - ldr r0, _0209571c ; =data_027e0e60 + ldr r0, _0209571c ; =gMapManager ldrb r1, [r5, #1] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083bacEv - ldr r2, _0209571c ; =data_027e0e60 + ldr r2, _0209571c ; =gMapManager mov r4, r0 ldrb r1, [r5, #2] ldr r0, [r2] @@ -18353,7 +18353,7 @@ func_ov00_0209564c: ; 0x0209564c .align 2, 0 arm_func_end func_ov00_0209564c _02095718: .word data_ov00_020e301c -_0209571c: .word data_027e0e60 +_0209571c: .word gMapManager .global func_ov00_02095720 arm_func_start func_ov00_02095720 @@ -19067,7 +19067,7 @@ func_ov00_02095fe0: ; 0x02095fe0 addeq sp, sp, #0x34 ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} ldr r0, _0209614c ; =data_027e0d3c - ldr r1, _02096150 ; =data_027e0e60 + ldr r1, _02096150 ; =gMapManager ldr r2, [r0] ldr r0, [r1] ldr r1, [r2, #0x44] @@ -19084,7 +19084,7 @@ func_ov00_02095fe0: ; 0x02095fe0 cmp r8, r0 addeq sp, sp, #0x34 ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r4, _02096150 ; =data_027e0e60 + ldr r4, _02096150 ; =gMapManager add r6, sp, #0x1c add r5, sp, #0x28 add r11, sp, #0x10 @@ -19154,7 +19154,7 @@ _02096128: .align 2, 0 arm_func_end func_ov00_02095fe0 _0209614c: .word data_027e0d3c -_02096150: .word data_027e0e60 +_02096150: .word gMapManager _02096154: .word 0x43525953 _02096158: .word 0x464f5243 _0209615c: .word data_ov00_020db050 diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index 5cf35abe..3a4153df 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -95,7 +95,7 @@ .extern data_027e0d38 .extern data_027e0db0 .extern data_027e0de4 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f78 diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index 5e1a5e28..bc9cb609 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -301,7 +301,7 @@ _0209848c: sub r2, r3, #2 mov ip, #0x47 mov r1, #0xff - ldr r0, _020985b8 ; =data_027e0e60 + ldr r0, _020985b8 ; =gMapManager str r2, [sp, #0x18] str ip, [sp, #0xc] str r3, [sp, #0x10] @@ -354,7 +354,7 @@ _020985a8: .word data_027e0f64 _020985ac: .word data_027e0f90 _020985b0: .word data_027e0c54 _020985b4: .word data_027e0db0 -_020985b8: .word data_027e0e60 +_020985b8: .word gMapManager _020985bc: .word data_027e0d38 .global func_ov00_020985c0 @@ -1469,7 +1469,7 @@ _020993b4: sub r2, r3, #2 mov r4, #0x47 mov r1, #0xff - ldr r0, _020994cc ; =data_027e0e60 + ldr r0, _020994cc ; =gMapManager str r2, [sp, #0x14] str r4, [sp, #8] str r3, [sp, #0xc] @@ -1535,7 +1535,7 @@ _020994bc: .word data_027e0f68 _020994c0: .word data_027e0f64 _020994c4: .word data_027e0c68 _020994c8: .word data_027e0db0 -_020994cc: .word data_027e0e60 +_020994cc: .word gMapManager _020994d0: .word data_027e0d38 _020994d4: .word 0x414e4353 @@ -5632,7 +5632,7 @@ func_ov00_0209c8f4: ; 0x0209c8f4 str r1, [r4, #0xfc] ldmia sp!, {r4, pc} _0209c93c: - ldr r0, _0209c954 ; =data_027e0e60 + ldr r0, _0209c954 ; =gMapManager add r1, r4, #0xf8 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -5640,7 +5640,7 @@ _0209c93c: .align 2, 0 arm_func_end func_ov00_0209c8f4 _0209c950: .word data_027e0f94 -_0209c954: .word data_027e0e60 +_0209c954: .word gMapManager .global func_ov00_0209c958 arm_func_start func_ov00_0209c958 @@ -5743,11 +5743,11 @@ func_ov00_0209ca80: ; 0x0209ca80 bl func_01ffa8d4 ldr r1, _0209cbbc ; =0x04000444 mov r2, #0 - ldr r0, _0209cbc0 ; =data_027e0e60 + ldr r0, _0209cbc0 ; =gMapManager str r2, [r1] ldr r0, [r0] bl _ZN10MapManager18Get_MapData_Unk_d8Ev - ldr r1, _0209cbc0 ; =data_027e0e60 + ldr r1, _0209cbc0 ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d0Ev @@ -5820,7 +5820,7 @@ func_ov00_0209ca80: ; 0x0209ca80 .align 2, 0 arm_func_end func_ov00_0209ca80 _0209cbbc: .word 0x04000444 -_0209cbc0: .word data_027e0e60 +_0209cbc0: .word gMapManager _0209cbc4: .word 0x04000470 _0209cbc8: .word 0x4210ffff _0209cbcc: .word 0x001f0080 @@ -5830,7 +5830,7 @@ _0209cbd0: .word 0x04000504 arm_func_start func_ov00_0209cbd4 func_ov00_0209cbd4: ; 0x0209cbd4 stmdb sp!, {r3, r4, r5, lr} - ldr r3, _0209cc2c ; =data_027e0e60 + ldr r3, _0209cc2c ; =gMapManager mov r5, r0 ldr r0, [r3] mov r4, r2 @@ -5853,7 +5853,7 @@ func_ov00_0209cbd4: ; 0x0209cbd4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_0209cbd4 -_0209cc2c: .word data_027e0e60 +_0209cc2c: .word gMapManager .global func_ov00_0209cc30 arm_func_start func_ov00_0209cc30 @@ -5888,7 +5888,7 @@ func_ov00_0209cc48: ; 0x0209cc48 ldrh r1, [r4, #0x1a] ldr r0, [r0] bl func_ov00_020c4648 - ldr r0, _0209cce0 ; =data_027e0e60 + ldr r0, _0209cce0 ; =gMapManager ldrh r1, [r4, #0x1c] ldrh r2, [r4, #0x1e] ldr r0, [r0] @@ -5915,7 +5915,7 @@ func_ov00_0209cc48: ; 0x0209cc48 arm_func_end func_ov00_0209cc48 _0209ccd8: .word gItemManager _0209ccdc: .word data_027e0fec -_0209cce0: .word data_027e0e60 +_0209cce0: .word gMapManager _0209cce4: .word data_027e0f68 .global func_ov00_0209cce8 @@ -6642,7 +6642,7 @@ func_ov00_0209d564: ; 0x0209d564 mov r2, #2 str r0, [sp, #0x28] ldr r1, [lr, #0x288] - ldr r0, _0209d6cc ; =data_027e0e60 + ldr r0, _0209d6cc ; =gMapManager str r1, [sp, #0x2c] ldr lr, [lr, #0x28c] add r1, sp, #0x40 @@ -6698,7 +6698,7 @@ _0209d694: arm_func_end func_ov00_0209d564 _0209d6c4: .word 0x0000ffff _0209d6c8: .word 0x00000333 -_0209d6cc: .word data_027e0e60 +_0209d6cc: .word gMapManager .global func_ov00_0209d6d0 arm_func_start func_ov00_0209d6d0 @@ -8276,7 +8276,7 @@ _0209e9c0: strh r2, [r0, #0x18] cmp ip, #2 blo _0209e9c0 - ldr r0, _0209eafc ; =data_027e0e60 + ldr r0, _0209eafc ; =gMapManager add r1, sp, #0xc ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083928EPci @@ -8290,7 +8290,7 @@ _0209e9c0: moveq r0, #1 movne r0, #0 strb r0, [r4, #0x165] - ldr r0, _0209eafc ; =data_027e0e60 + ldr r0, _0209eafc ; =gMapManager ldrb r1, [r4, #0x163] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083908EcPi @@ -8357,7 +8357,7 @@ _0209eae4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_0209e994 -_0209eafc: .word data_027e0e60 +_0209eafc: .word gMapManager .global func_ov00_0209eb00 arm_func_start func_ov00_0209eb00 @@ -8448,7 +8448,7 @@ _0209ec14: cmp r2, #0 movne r0, #1 ldmneia sp!, {r4, pc} - ldr r0, _0209ecd0 ; =data_027e0e60 + ldr r0, _0209ecd0 ; =gMapManager ldrb r1, [r4, #0x162] ldr r0, [r0] mov r2, r3 @@ -8479,7 +8479,7 @@ _0209ec80: mov r3, #0 bl func_ov00_02087400 _0209ec9c: - ldr r0, _0209ecd0 ; =data_027e0e60 + ldr r0, _0209ecd0 ; =gMapManager ldrb r1, [r4, #0x16c] ldr r0, [r0] mov r2, #0 @@ -8496,7 +8496,7 @@ _0209ecc8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_0209ebec -_0209ecd0: .word data_027e0e60 +_0209ecd0: .word gMapManager _0209ecd4: .word data_027e0f64 .global func_ov00_0209ecd8 @@ -8509,7 +8509,7 @@ func_ov00_0209ecd8: ; 0x0209ecd8 cmp r1, #1 b _0209ed08 _0209ecf0: - ldr r2, _0209ed14 ; =data_027e0e60 + ldr r2, _0209ed14 ; =gMapManager ldrb r1, [r0, #0x164] ldr r0, [r2] mov r2, #0 @@ -8521,7 +8521,7 @@ _0209ed08: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_0209ecd8 -_0209ed14: .word data_027e0e60 +_0209ed14: .word gMapManager .global func_ov00_0209ed18 arm_func_start func_ov00_0209ed18 @@ -12501,7 +12501,7 @@ func_ov00_020a1dc8: ; 0x020a1dc8 _020a1de8: cmp r2, #0 bne _020a1e4c - ldr r0, _020a1e54 ; =data_027e0e60 + ldr r0, _020a1e54 ; =gMapManager ldrb r1, [r4, #0x15c] ldrb r2, [r4, #0x29] ldr r0, [r0] @@ -12510,7 +12510,7 @@ _020a1de8: b _020a1e4c _020a1e0c: bl func_ov00_020a1e58 - ldr r0, _020a1e54 ; =data_027e0e60 + ldr r0, _020a1e54 ; =gMapManager ldrb r1, [r4, #0x15c] ldrb r2, [r4, #0x29] ldr r0, [r0] @@ -12530,7 +12530,7 @@ _020a1e4c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020a1dc8 -_020a1e54: .word data_027e0e60 +_020a1e54: .word gMapManager .global func_ov00_020a1e58 arm_func_start func_ov00_020a1e58 @@ -12611,11 +12611,11 @@ func_ov00_020a1f24: ; 0x020a1f24 ldr r0, [r0, #0x15c] cmp r0, #0x24 bne _020a1f90 - ldr r0, _020a1fc8 ; =data_027e0e60 + ldr r0, _020a1fc8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082538Ev ldr r2, [r0] - ldr r1, _020a1fc8 ; =data_027e0e60 + ldr r1, _020a1fc8 ; =gMapManager str r2, [r4, #0x18] ldr r2, [r0, #4] str r2, [r4, #0x1c] @@ -12647,7 +12647,7 @@ _020a1f90: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020a1f24 -_020a1fc8: .word data_027e0e60 +_020a1fc8: .word gMapManager _020a1fcc: .word data_027e0f94 .global func_ov00_020a1fd0 @@ -12736,14 +12736,14 @@ func_ov00_020a1fd0: ; 0x020a1fd0 add r5, r0, r2 b _020a21d0 _020a2118: - ldr r0, _020a2224 ; =data_027e0e60 + ldr r0, _020a2224 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082424Ev rsb r0, r0, #0 sub r0, r0, #0x4000 cmp r4, r0 blt _020a21d0 - ldr r0, _020a2224 ; =data_027e0e60 + ldr r0, _020a2224 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082424Ev add r0, r4, r0 @@ -12806,7 +12806,7 @@ _020a21d0: .align 2, 0 arm_func_end func_ov00_020a1fd0 _020a2220: .word data_027e0fac -_020a2224: .word data_027e0e60 +_020a2224: .word gMapManager .global func_ov00_020a2228 arm_func_start func_ov00_020a2228 @@ -12833,7 +12833,7 @@ func_ov00_020a222c: ; 0x020a222c ldr r0, [r4, #0x28] sub r1, r1, #0x1000 cmp r0, r1 - ldr r0, _020a22b4 ; =data_027e0e60 + ldr r0, _020a22b4 ; =gMapManager strgt r1, [r4, #0x28] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082424Ev @@ -12843,7 +12843,7 @@ func_ov00_020a222c: ; 0x020a222c add r0, r1, r0 cmp r2, r0 ldmgeia sp!, {r4, pc} - ldr r0, _020a22b4 ; =data_027e0e60 + ldr r0, _020a22b4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082424Ev ldr r1, [r4, #0x1c] @@ -12853,7 +12853,7 @@ func_ov00_020a222c: ; 0x020a222c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020a222c -_020a22b4: .word data_027e0e60 +_020a22b4: .word gMapManager .global func_ov00_020a22b8 arm_func_start func_ov00_020a22b8 @@ -13107,12 +13107,12 @@ _020a2614: mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 beq _020a2680 - ldr r0, _020a26e0 ; =data_027e0e60 + ldr r0, _020a26e0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_06Ev cmp r0, #0 bne _020a2680 - ldr r0, _020a26e0 ; =data_027e0e60 + ldr r0, _020a26e0 ; =gMapManager mov r1, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083938Ei @@ -13157,7 +13157,7 @@ _020a2680: .align 2, 0 arm_func_end func_ov00_020a23a4 _020a26dc: .word data_027e0d38 -_020a26e0: .word data_027e0e60 +_020a26e0: .word gMapManager .global func_ov00_020a26e4 arm_func_start func_ov00_020a26e4 @@ -13180,7 +13180,7 @@ func_ov00_020a26e4: ; 0x020a26e4 stmia sp, {r0, r3} mov r1, #0 str r1, [sp, #8] - ldr r0, _020a2758 ; =data_027e0e60 + ldr r0, _020a2758 ; =gMapManager add r1, sp, #0xc ldr r0, [r0] add r2, sp, #0x18 @@ -13193,7 +13193,7 @@ func_ov00_020a26e4: ; 0x020a26e4 ldmia sp!, {pc} .align 2, 0 arm_func_end func_ov00_020a26e4 -_020a2758: .word data_027e0e60 +_020a2758: .word gMapManager .global func_ov00_020a275c arm_func_start func_ov00_020a275c @@ -13216,7 +13216,7 @@ func_ov00_020a275c: ; 0x020a275c stmia sp, {r0, r3} mov r1, #0 str r1, [sp, #8] - ldr r0, _020a27d0 ; =data_027e0e60 + ldr r0, _020a27d0 ; =gMapManager add r1, sp, #0xc ldr r0, [r0] add r2, sp, #0x18 @@ -13229,7 +13229,7 @@ func_ov00_020a275c: ; 0x020a275c ldmia sp!, {pc} .align 2, 0 arm_func_end func_ov00_020a275c -_020a27d0: .word data_027e0e60 +_020a27d0: .word gMapManager .global func_ov00_020a27d4 arm_func_start func_ov00_020a27d4 @@ -13252,7 +13252,7 @@ func_ov00_020a27d4: ; 0x020a27d4 stmia sp, {r0, r3} mov r1, #0 str r1, [sp, #8] - ldr r0, _020a2848 ; =data_027e0e60 + ldr r0, _020a2848 ; =gMapManager add r1, sp, #0xc ldr r0, [r0] add r2, sp, #0x18 @@ -13265,7 +13265,7 @@ func_ov00_020a27d4: ; 0x020a27d4 ldmia sp!, {pc} .align 2, 0 arm_func_end func_ov00_020a27d4 -_020a2848: .word data_027e0e60 +_020a2848: .word gMapManager .global func_ov00_020a284c arm_func_start func_ov00_020a284c @@ -13472,7 +13472,7 @@ _020a2b28: add r3, sp, #4 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _020a2c04 ; =data_027e0e60 + ldr r0, _020a2c04 ; =gMapManager mov r1, r3 ldr r0, [r0] mov r2, #1 @@ -13522,7 +13522,7 @@ _020a2ba8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020a2adc -_020a2c04: .word data_027e0e60 +_020a2c04: .word gMapManager .global func_ov00_020a2c08 arm_func_start func_ov00_020a2c08 @@ -13770,7 +13770,7 @@ _020a2f18: cmp r5, #2 blo _020a2f18 ldr r1, [r4, #4] - ldr r0, _020a2ff0 ; =data_027e0e60 + ldr r0, _020a2ff0 ; =gMapManager ldrb r2, [r1, #0x1b8] ldr r0, [r0] add r1, sp, #0x10 @@ -13822,7 +13822,7 @@ _020a2fac: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020a2e8c -_020a2ff0: .word data_027e0e60 +_020a2ff0: .word gMapManager .global func_ov00_020a2ff4 arm_func_start func_ov00_020a2ff4 @@ -13867,7 +13867,7 @@ _020a3074: cmp r5, #2 blo _020a3074 ldr r1, [r4, #4] - ldr r0, _020a3140 ; =data_027e0e60 + ldr r0, _020a3140 ; =gMapManager ldrb r2, [r1, #0x1b8] ldr r0, [r0] add r1, sp, #0x10 @@ -13916,7 +13916,7 @@ _020a3108: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020a2ff4 -_020a3140: .word data_027e0e60 +_020a3140: .word gMapManager .global func_ov00_020a3144 arm_func_start func_ov00_020a3144 @@ -15289,7 +15289,7 @@ func_ov00_020a41e4: ; 0x020a41e4 mov r5, r2 mov r4, r3 bl func_ov00_020a5e9c - ldr r1, _020a42c8 ; =data_027e0e60 + ldr r1, _020a42c8 ; =gMapManager str r0, [r6] ldr r0, [r1] bl _ZN10MapManager18func_ov00_02082d08Ev @@ -15335,7 +15335,7 @@ func_ov00_020a41e4: ; 0x020a41e4 .align 2, 0 arm_func_end func_ov00_020a41e4 _020a42c4: .word data_027e0d38 -_020a42c8: .word data_027e0e60 +_020a42c8: .word gMapManager .global func_ov00_020a42cc arm_func_start func_ov00_020a42cc @@ -15351,7 +15351,7 @@ func_ov00_020a42cc: ; 0x020a42cc mov r5, r2 mov r4, r3 bl func_ov00_020a5e9c - ldr r1, _020a4344 ; =data_027e0e60 + ldr r1, _020a4344 ; =gMapManager str r0, [r6] ldr r0, [r1] bl _ZN10MapManager18func_ov00_02082d08Ev @@ -15372,7 +15372,7 @@ func_ov00_020a42cc: ; 0x020a42cc .align 2, 0 arm_func_end func_ov00_020a42cc _020a4340: .word data_027e0d38 -_020a4344: .word data_027e0e60 +_020a4344: .word gMapManager .global func_ov00_020a4348 arm_func_start func_ov00_020a4348 @@ -16228,14 +16228,14 @@ func_ov00_020a4dd0: ; 0x020a4dd0 strb r3, [r4, #0x37] str r3, [r4, #0x38] bl func_ov00_020a5508 - ldr r0, _020a4e08 ; =data_027e0e60 + ldr r0, _020a4e08 ; =gMapManager add r1, r4, #0x28 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020a4dd0 -_020a4e08: .word data_027e0e60 +_020a4e08: .word gMapManager .global func_ov00_020a4e0c arm_func_start func_ov00_020a4e0c diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index c94f1c44..a0a41016 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -183,7 +183,7 @@ .extern data_027e0d84 .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f78 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 5bfdb1fc..3abb7153 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -280,7 +280,7 @@ _020b1788: .word data_027e0f6c func_ov00_020b178c: ; 0x020b178c stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, lr} - ldr r3, _020b17e8 ; =data_027e0e60 + ldr r3, _020b17e8 ; =gMapManager ldrb r1, [sp, #0xc] mov r4, r0 ldrb r2, [sp, #0xd] @@ -288,7 +288,7 @@ func_ov00_020b178c: ; 0x020b178c bl _ZN10MapManager18func_ov00_02083e34Ecci cmp r0, r4 bgt _020b17d8 - ldr r0, _020b17e8 ; =data_027e0e60 + ldr r0, _020b17e8 ; =gMapManager add r1, sp, #0xc ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -304,7 +304,7 @@ _020b17d8: bx lr .align 2, 0 arm_func_end func_ov00_020b178c -_020b17e8: .word data_027e0e60 +_020b17e8: .word gMapManager .global func_ov00_020b17ec arm_func_start func_ov00_020b17ec @@ -444,14 +444,14 @@ func_ov00_020b199c: ; 0x020b199c mov r5, r1 mov r4, r2 bmi _020b19e4 - ldr r0, _020b1a48 ; =data_027e0e60 + ldr r0, _020b1a48 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev cmp r0, r6 ble _020b19e4 cmp r5, #0 blt _020b19e4 - ldr r0, _020b1a48 ; =data_027e0e60 + ldr r0, _020b1a48 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv cmp r0, r5 @@ -461,7 +461,7 @@ _020b19e4: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, pc} _020b19f0: - ldr r0, _020b1a48 ; =data_027e0e60 + ldr r0, _020b1a48 ; =gMapManager add r1, sp, #0 ldr r0, [r0] strb r6, [sp] @@ -478,7 +478,7 @@ _020b19f0: moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, pc} _020b1a30: - ldr r0, _020b1a48 ; =data_027e0e60 + ldr r0, _020b1a48 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084164Ev @@ -486,20 +486,20 @@ _020b1a30: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020b199c -_020b1a48: .word data_027e0e60 +_020b1a48: .word gMapManager .global func_ov00_020b1a4c arm_func_start func_ov00_020b1a4c func_ov00_020b1a4c: ; 0x020b1a4c stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr} sub sp, sp, #0xc0 - ldr r2, _020b1b48 ; =data_027e0e60 + ldr r2, _020b1b48 ; =gMapManager mov r8, r1 mov r9, r0 ldr r0, [r2] ldr r1, [r8] bl _ZN10MapManager18func_ov00_020839d4Ev - ldr r1, _020b1b48 ; =data_027e0e60 + ldr r1, _020b1b48 ; =gMapManager mov r5, r0 ldr r0, [r1] ldr r1, [r8, #8] @@ -559,7 +559,7 @@ _020b1b34: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov00_020b1a4c -_020b1b48: .word data_027e0e60 +_020b1b48: .word gMapManager _020b1b4c: .word func_ov00_020b1940 _020b1b50: .word data_ov00_020dc704 @@ -568,7 +568,7 @@ _020b1b50: .word data_ov00_020dc704 func_ov00_020b1b54: ; 0x020b1b54 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r3, lr} - ldr r0, _020b1ba0 ; =data_027e0e60 + ldr r0, _020b1ba0 ; =gMapManager ldrb r1, [sp, #8] ldrb r2, [sp, #9] ldr r0, [r0] @@ -588,7 +588,7 @@ _020b1b90: bx lr .align 2, 0 arm_func_end func_ov00_020b1b54 -_020b1ba0: .word data_027e0e60 +_020b1ba0: .word gMapManager .global func_ov00_020b1ba4 arm_func_start func_ov00_020b1ba4 @@ -596,7 +596,7 @@ func_ov00_020b1ba4: ; 0x020b1ba4 stmdb sp!, {r3, lr} sub sp, sp, #0x10 ldr r2, [r0] - ldr r1, _020b1bf8 ; =data_027e0e60 + ldr r1, _020b1bf8 ; =gMapManager str r2, [sp, #4] ldr r2, [r0, #4] ldr r1, [r1] @@ -616,7 +616,7 @@ func_ov00_020b1ba4: ; 0x020b1ba4 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_020b1ba4 -_020b1bf8: .word data_027e0e60 +_020b1bf8: .word gMapManager .global func_ov00_020b1bfc arm_func_start func_ov00_020b1bfc @@ -625,7 +625,7 @@ func_ov00_020b1bfc: ; 0x020b1bfc stmdb sp!, {r3, r4, r5, r6, r7, lr} ldrb r5, [sp, #0x1d] ldrb r6, [sp, #0x1c] - ldr r1, _020b1d38 ; =data_027e0e60 + ldr r1, _020b1d38 ; =gMapManager mov r7, r0 ldr r0, [r1] mov r1, r6 @@ -702,7 +702,7 @@ func_ov00_020b1bfc: ; 0x020b1bfc bx lr .align 2, 0 arm_func_end func_ov00_020b1bfc -_020b1d38: .word data_027e0e60 +_020b1d38: .word gMapManager .global func_ov00_020b1d3c arm_func_start func_ov00_020b1d3c @@ -1435,7 +1435,7 @@ func_ov00_020b2598: ; 0x020b2598 mov r3, #0 sub r2, r3, #2 mov r5, #0x47 - ldr r0, _020b2b90 ; =data_027e0e60 + ldr r0, _020b2b90 ; =gMapManager mov r1, #0xff str r2, [sp, #0xc] str r5, [sp] @@ -1830,7 +1830,7 @@ _020b2b88: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020b2598 -_020b2b90: .word data_027e0e60 +_020b2b90: .word gMapManager _020b2b94: .word data_027e0d38 _020b2b98: .word data_02052f54 _020b2b9c: .word data_02051f54 @@ -2300,7 +2300,7 @@ func_ov00_020b30e4: ; 0x020b30e4 ldr r0, [r0, #4] cmp r2, r0 bne _020b325c - ldr r0, _020b3270 ; =data_027e0e60 + ldr r0, _020b3270 ; =gMapManager add r2, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838e8EjPi @@ -2375,7 +2375,7 @@ _020b325c: arm_func_end func_ov00_020b30e4 _020b3268: .word data_027e0d38 _020b326c: .word data_027e077c -_020b3270: .word data_027e0e60 +_020b3270: .word gMapManager _020b3274: .word gAdventureFlags .global func_ov00_020b3278 @@ -3112,7 +3112,7 @@ _020b3ce4: mov r0, r4 str r1, [sp, #8] bl _ZN13LinkStateBase12GetPlayerPosEv - ldr r1, _020b3d68 ; =data_027e0e60 + ldr r1, _020b3d68 ; =gMapManager ldr r5, [r0, #4] ldr r0, [r1] add r1, sp, #0 @@ -3137,7 +3137,7 @@ _020b3d58: .word data_027e0618 _020b3d5c: .word data_ov00_020eec9c _020b3d60: .word 0xffffe4cd _020b3d64: .word data_ov00_020e6194 -_020b3d68: .word data_027e0e60 +_020b3d68: .word gMapManager .global func_ov00_020b3d6c arm_func_start func_ov00_020b3d6c @@ -4606,7 +4606,7 @@ _020b4cfc: .word 0xffffb000 func_ov00_020b4d00: ; 0x020b4d00 push {r3, r4, lr} sub sp, #4 - ldr r1, _020b4d24 ; =data_027e0e60 + ldr r1, _020b4d24 ; =gMapManager add r4, r0, #0 add r2, r4, #0 ldr r1, [r1] @@ -4622,7 +4622,7 @@ func_ov00_020b4d00: ; 0x020b4d00 pop {r3, r4, pc} nop thumb_func_end func_ov00_020b4d00 -_020b4d24: .word data_027e0e60 +_020b4d24: .word gMapManager .global func_ov00_020b4d28 arm_func_start func_ov00_020b4d28 @@ -4645,7 +4645,7 @@ func_ov00_020b4d28: ; 0x020b4d28 rsblt r1, r4, #0 cmp r1, r0 ble _020b4ec8 - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r2, [r7, #0x20] ldr r1, [r7, #0x2c] ldr r0, [r0] @@ -4654,7 +4654,7 @@ func_ov00_020b4d28: ; 0x020b4d28 bl _ZN10MapManager18func_ov00_020839d4Ev ldr r3, [r7, #0x20] ldr r2, [r7, #0x2c] - ldr r1, _020b502c ; =data_027e0e60 + ldr r1, _020b502c ; =gMapManager mov r8, r0 sub r2, r3, r2 ldr r0, [r1] @@ -4664,14 +4664,14 @@ func_ov00_020b4d28: ; 0x020b4d28 mov r1, r0 cmp r2, #0 ble _020b4dd0 - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c24Ei mov r8, r0 b _020b4e60 _020b4dd0: bge _020b4dec - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager mov r1, r8 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c24Ei @@ -4697,24 +4697,24 @@ _020b4dec: str ip, [r3, #4] adds r0, r2, r0, ror #31 bne _020b4e4c - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c24Ei mov r8, r0 b _020b4e60 _020b4e4c: - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager mov r1, r8 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c24Ei mov r8, r0 _020b4e60: - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020833c4Ev cmp r8, r0 ble _020b4e88 - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020833dcEv cmp r8, r0 @@ -4738,7 +4738,7 @@ _020b4e90: str r0, [r6] b _020b501c _020b4ec8: - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r2, [r7, #0x28] ldr r1, [r7, #0x2c] ldr r0, [r0] @@ -4747,7 +4747,7 @@ _020b4ec8: bl _ZN10MapManager18func_ov00_020839f8Ev ldr r3, [r7, #0x28] ldr r2, [r7, #0x2c] - ldr r1, _020b502c ; =data_027e0e60 + ldr r1, _020b502c ; =gMapManager mov r8, r0 sub r2, r3, r2 ldr r0, [r1] @@ -4757,14 +4757,14 @@ _020b4ec8: mov r1, r0 cmp r2, #0 ble _020b4f28 - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c50Ei mov r8, r0 b _020b4fb8 _020b4f28: bge _020b4f44 - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager mov r1, r8 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c50Ei @@ -4790,24 +4790,24 @@ _020b4f44: str ip, [r3, #4] adds r0, r2, r0, ror #31 bne _020b4fa4 - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c50Ei mov r8, r0 b _020b4fb8 _020b4fa4: - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager mov r1, r8 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c50Ei mov r8, r0 _020b4fb8: - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020833d0Ev cmp r8, r0 ble _020b4fe0 - ldr r0, _020b502c ; =data_027e0e60 + ldr r0, _020b502c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020833e8Ev cmp r8, r0 @@ -4836,7 +4836,7 @@ _020b501c: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov00_020b4d28 -_020b502c: .word data_027e0e60 +_020b502c: .word gMapManager _020b5030: .word data_027e0764 .global func_ov00_020b5034 @@ -4849,7 +4849,7 @@ func_ov00_020b5034: ; 0x020b5034 ldr r4, [r5, #4] cmp r0, #0 blt _020b50cc - ldr r0, _020b50d4 ; =data_027e0e60 + ldr r0, _020b50d4 ; =gMapManager ldrb r3, [r6, #0x1c] ldrb r2, [r6, #0x1d] ldr r0, [r0] @@ -4885,7 +4885,7 @@ _020b50cc: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_020b5034 -_020b50d4: .word data_027e0e60 +_020b50d4: .word gMapManager _020b50d8: .word 0xfffff333 _020b50dc: .word func_ov00_020b1940 @@ -5024,7 +5024,7 @@ func_ov00_020b5268: ; 0x020b5268 mov r5, r1 str r2, [sp, #0x28] ldr r2, [r4, #4] - ldr r1, _020b5340 ; =data_027e0e60 + ldr r1, _020b5340 ; =gMapManager str r2, [sp, #0x2c] ldr r2, [r4, #8] mov r6, r0 @@ -5055,7 +5055,7 @@ _020b52d0: add r1, sp, #0x14 str r0, [sp, #0x20] ldr r2, [r4, #8] - ldr r0, _020b5340 ; =data_027e0e60 + ldr r0, _020b5340 ; =gMapManager str r2, [sp, #0x24] ldr r4, [r6, #0x2c] add r2, sp, #0x1c @@ -5075,7 +5075,7 @@ _020b52d0: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020b5268 -_020b5340: .word data_027e0e60 +_020b5340: .word gMapManager _020b5344: .word 0xfffff667 _020b5348: .word data_ov00_020e64a8 @@ -5520,7 +5520,7 @@ _020b5884: add r2, r1, r0, lsl #1 ldrb r4, [r1, r0, lsl #1] ldrb r3, [r2, #1] - ldr r0, _020b5c98 ; =data_027e0e60 + ldr r0, _020b5c98 ; =gMapManager sub r2, sp, #4 ldr r0, [r0] add r1, sp, #0x28 @@ -5742,7 +5742,7 @@ _020b5c88: .word data_02050f54 _020b5c8c: .word gAdventureFlags _020b5c90: .word 0x00000ccd _020b5c94: .word data_027e0fc8 -_020b5c98: .word data_027e0e60 +_020b5c98: .word gMapManager _020b5c9c: .word data_027e0f78 _020b5ca0: .word gItemManager _020b5ca4: .word 0x0000019a @@ -5882,7 +5882,7 @@ _020b5e88: str r1, [sp] str r0, [sp, #4] ldrh r2, [r7, #0xa4] - ldr r0, _020b6ac8 ; =data_027e0e60 + ldr r0, _020b6ac8 ; =gMapManager add r1, sp, #0x1e4 str r2, [sp, #8] str r7, [sp, #0xc] @@ -5964,7 +5964,7 @@ _020b5f34: str ip, [sp, #0xec] ldrh r11, [r7, #0xa4] add r0, sp, #0x28 - ldr lr, _020b6ac8 ; =data_027e0e60 + ldr lr, _020b6ac8 ; =gMapManager bic r11, r11, #2 mov r11, r11, lsl #0x10 str r9, [sp, #0xf4] @@ -6102,7 +6102,7 @@ _020b61d4: strh r0, [r7, #0x60] _020b61e0: ldr r0, [r7, #0x20] - ldr r1, _020b6ac8 ; =data_027e0e60 + ldr r1, _020b6ac8 ; =gMapManager stmia r10, {r0, r8} ldr r2, [r7, #0x28] add r0, sp, #0x14 @@ -6111,7 +6111,7 @@ _020b61e0: add r2, r7, #0x20 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r2, [sp, #0x14] - ldr r0, _020b6ac8 ; =data_027e0e60 + ldr r0, _020b6ac8 ; =gMapManager add r1, r7, #0x1c strb r2, [r7, #0x1c] ldrb r2, [sp, #0x15] @@ -6214,7 +6214,7 @@ _020b632c: ldmia r8, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [sp, #0xb4] - ldr r0, _020b6ac8 ; =data_027e0e60 + ldr r0, _020b6ac8 ; =gMapManager sub r1, r1, #0x1000 str r1, [sp, #0xb4] ldr r2, [r10] @@ -6265,7 +6265,7 @@ _020b632c: stmib sp, {r0, r1} str r0, [sp, #0xc] str r0, [sp, #0x10] - ldr r0, _020b6ac8 ; =data_027e0e60 + ldr r0, _020b6ac8 ; =gMapManager add r1, sp, #0x124 ldr r0, [r0] add r2, sp, #0x68 @@ -6284,7 +6284,7 @@ _020b6494: str r1, [r6, #8] strb r0, [r7, #0x55] _020b64a4: - ldr r0, _020b6ac8 ; =data_027e0e60 + ldr r0, _020b6ac8 ; =gMapManager ldr r1, [r10] ldr r8, [r0] mov r0, r8 @@ -6330,7 +6330,7 @@ _020b6538: subne r0, r8, #1 cmpne r1, r0 beq _020b65c0 - ldr r0, _020b6ac8 ; =data_027e0e60 + ldr r0, _020b6ac8 ; =gMapManager add r1, r7, #0xc4 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -6536,7 +6536,7 @@ _020b6830: cmp r1, r0 blt _020b68c0 ldr r1, [r10] - ldr r0, _020b6ac8 ; =data_027e0e60 + ldr r0, _020b6ac8 ; =gMapManager str r1, [sp, #0x50] ldr r2, [r10, #4] ldr r1, [r0] @@ -6705,7 +6705,7 @@ _020b6aa0: arm_func_end func_ov00_020b5cb4 _020b6ac0: .word data_027e0ff8 _020b6ac4: .word 0x0000ffff -_020b6ac8: .word data_027e0e60 +_020b6ac8: .word gMapManager _020b6acc: .word data_027e0d0c _020b6ad0: .word data_ov00_020e64a8 _020b6ad4: .word data_027e0d38 @@ -6721,7 +6721,7 @@ _020b6aec: .word data_ov00_020e647c func_ov00_020b6af0: ; 0x020b6af0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x14 - ldr r0, _020b6b94 ; =data_027e0e60 + ldr r0, _020b6b94 ; =gMapManager mov r5, r1 ldr r0, [r0] ldrb r1, [r0, #9] @@ -6743,7 +6743,7 @@ func_ov00_020b6af0: ; 0x020b6af0 beq _020b6b84 ldrh r1, [r0, #0x20] ldr r2, [r5] - ldr r0, _020b6b94 ; =data_027e0e60 + ldr r0, _020b6b94 ; =gMapManager str r2, [sp, #8] ldr r2, [r5, #4] ldr r0, [r0] @@ -6763,7 +6763,7 @@ _020b6b84: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020b6af0 -_020b6b94: .word data_027e0e60 +_020b6b94: .word gMapManager _020b6b98: .word data_027e0fe4 _020b6b9c: .word 0x574c4354 _020b6ba0: .word 0xfffff666 @@ -6881,7 +6881,7 @@ _020b6c3c: strb r0, [sp, #0xb9] str r1, [sp, #0x1c] ldr r1, [r6, #0x2c] - ldr r4, _020b6e6c ; =data_027e0e60 + ldr r4, _020b6e6c ; =gMapManager str r1, [sp] str r0, [sp, #4] ldrh r3, [r6, #0xa4] @@ -6956,7 +6956,7 @@ _020b6e28: .align 2, 0 arm_func_end func_ov00_020b6ba4 _020b6e68: .word 0x0000ffff -_020b6e6c: .word data_027e0e60 +_020b6e6c: .word gMapManager .global func_ov00_020b6e70 arm_func_start func_ov00_020b6e70 @@ -7106,7 +7106,7 @@ _020b7000: str ip, [sp, #0x20] str lr, [sp, #0x28] bl func_01ff9e64 - ldr r0, _020b7334 ; =data_027e0e60 + ldr r0, _020b7334 ; =gMapManager ldr r6, [sp, #0x14] ldr r3, [sp, #0x18] ldr r2, [sp, #0x1c] @@ -7286,7 +7286,7 @@ _020b7324: .word data_027e0f6c _020b7328: .word func_ov00_0207e968 _020b732c: .word func_ov00_0207e96c _020b7330: .word data_02050f54 -_020b7334: .word data_027e0e60 +_020b7334: .word gMapManager _020b7338: .word 0x00000e66 .global func_ov00_020b733c @@ -7495,7 +7495,7 @@ _020b75b0: str r1, [sp, #4] tst r0, #0x3f bne _020b7714 - ldr r0, _020b7750 ; =data_027e0e60 + ldr r0, _020b7750 ; =gMapManager ldrb r4, [r5, #0x14] ldrb r3, [r5, #0x15] ldr r0, [r0] @@ -7511,7 +7511,7 @@ _020b75b0: add r1, r6, #0x20 mov r2, r0 bl func_01ff9bf8 - ldr r0, _020b7750 ; =data_027e0e60 + ldr r0, _020b7750 ; =gMapManager ldrb r2, [r6, #0xc4] ldrb r1, [r6, #0xc5] ldr r0, [r0] @@ -7581,7 +7581,7 @@ _020b7714: .align 2, 0 arm_func_end func_ov00_020b73b0 _020b774c: .word data_027e0fa0 -_020b7750: .word data_027e0e60 +_020b7750: .word gMapManager .global func_ov00_020b7754 arm_func_start func_ov00_020b7754 @@ -9927,7 +9927,7 @@ _020b9260: _020b9278: mvn r1, #0 str r1, [r9, #0x280] - ldr r0, _020b92d4 ; =data_027e0e60 + ldr r0, _020b92d4 ; =gMapManager str r1, [r9, #0x284] ldr r1, [r0] add r0, sp, #4 @@ -9952,7 +9952,7 @@ _020b92b8: arm_func_end func_ov00_020b917c _020b92cc: .word data_ov00_020dc81c _020b92d0: .word data_027e0e58 -_020b92d4: .word data_027e0e60 +_020b92d4: .word gMapManager .global func_ov00_020b92d8 arm_func_start func_ov00_020b92d8 @@ -10135,7 +10135,7 @@ _020b94e8: add r0, r1, r0 str r0, [r7, #0x15c] _020b956c: - ldr r0, _020b9758 ; =data_027e0e60 + ldr r0, _020b9758 ; =gMapManager ldr r3, [sp] ldr r0, [r0] add r1, sp, #8 @@ -10268,7 +10268,7 @@ _020b9748: .word data_027e0fc8 _020b974c: .word data_027e0f94 _020b9750: .word data_027e0fe4 _020b9754: .word data_ov00_020e67d8 -_020b9758: .word data_027e0e60 +_020b9758: .word gMapManager .global func_ov00_020b975c arm_func_start func_ov00_020b975c @@ -11105,7 +11105,7 @@ func_ov00_020ba204: ; 0x020ba204 add r0, sp, #0x2c str r0, [sp, #0xc] str r3, [sp, #0x10] - ldr r0, _020ba34c ; =data_027e0e60 + ldr r0, _020ba34c ; =gMapManager add r1, sp, #0x4c ldr r0, [r0] add r2, sp, #0x20 @@ -11133,7 +11133,7 @@ _020ba32c: _020ba340: .word data_ov00_020e67b8 _020ba344: .word 0x0000ffff _020ba348: .word 0x00000333 -_020ba34c: .word data_027e0e60 +_020ba34c: .word gMapManager .global func_ov00_020ba350 arm_func_start func_ov00_020ba350 @@ -11624,7 +11624,7 @@ _020ba958: cmp r0, #0x31 bne _020baab8 ldr r1, _020bac68 ; =data_027e0f64 - ldr r0, _020bac6c ; =data_027e0e60 + ldr r0, _020bac6c ; =gMapManager ldr r1, [r1] ldr r2, _020bac70 ; =data_02050f54 ldr r1, [r1, #4] @@ -11727,7 +11727,7 @@ _020baab8: ldr r7, [sp, #0x18] orr r4, r4, ip, lsl #20 add r7, r7, r4 - ldr r1, _020bac6c ; =data_027e0e60 + ldr r1, _020bac6c ; =gMapManager orr r2, r2, r0, lsl #20 ldr r4, [sp, #0x20] ldr r0, [r1] @@ -11810,7 +11810,7 @@ _020bac5c: .word data_ov00_020eec9c _020bac60: .word data_027e0f94 _020bac64: .word data_027e0d38 _020bac68: .word data_027e0f64 -_020bac6c: .word data_027e0e60 +_020bac6c: .word gMapManager _020bac70: .word data_02050f54 .global func_ov00_020bac74 @@ -11940,7 +11940,7 @@ _020badf0: mov r0, #0x24 smlabb r3, r1, r0, r2 ldr r1, [r3, #4] - ldr r0, _020baf60 ; =data_027e0e60 + ldr r0, _020baf60 ; =gMapManager str r1, [r6, #0x158] ldr r2, [r3, #8] add r1, sp, #0xc @@ -12008,7 +12008,7 @@ _020baef0: mov r0, #0x24 smlabb r3, r1, r0, r2 ldr r1, [r3, #4] - ldr r0, _020baf60 ; =data_027e0e60 + ldr r0, _020baf60 ; =gMapManager str r1, [r6, #0x158] ldr r2, [r3, #8] add r1, sp, #0 @@ -12033,7 +12033,7 @@ _020baf50: .align 2, 0 arm_func_end func_ov00_020bad44 _020baf5c: .word data_ov00_020e8b08 -_020baf60: .word data_027e0e60 +_020baf60: .word gMapManager _020baf64: .word 0x00000333 .global func_ov00_020baf68 @@ -12093,7 +12093,7 @@ _020baff8: _020bb020: str r0, [r5, #0x160] ldr r1, [r5, #0x158] - ldr r0, _020bb0a8 ; =data_027e0e60 + ldr r0, _020bb0a8 ; =gMapManager str r1, [sp] ldr r1, [r5, #0x15c] ldr r0, [r0] @@ -12127,7 +12127,7 @@ _020bb020: .align 2, 0 arm_func_end func_ov00_020baf68 _020bb0a4: .word data_ov00_020e8b08 -_020bb0a8: .word data_027e0e60 +_020bb0a8: .word gMapManager .global func_ov00_020bb0ac arm_func_start func_ov00_020bb0ac @@ -13909,7 +13909,7 @@ _020bc3e0: ldr r0, [r2, #0xc] str r0, [sp, #0x14] _020bc40c: - ldr r0, _020bc464 ; =data_027e0e60 + ldr r0, _020bc464 ; =gMapManager ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -13933,7 +13933,7 @@ _020bc40c: .align 2, 0 arm_func_end func_ov00_020bc398 _020bc460: .word data_027e0f94 -_020bc464: .word data_027e0e60 +_020bc464: .word gMapManager _020bc468: .word data_027e0fac .global func_ov00_020bc46c @@ -14298,7 +14298,7 @@ _020bc8b4: .word data_027e0fd0 func_ov00_020bc8b8: ; 0x020bc8b8 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 - ldr r3, _020bc908 ; =data_027e0e60 + ldr r3, _020bc908 ; =gMapManager mov r5, r1 ldr r1, [r3] mov r6, r0 @@ -14318,7 +14318,7 @@ func_ov00_020bc8b8: ; 0x020bc8b8 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020bc8b8 -_020bc908: .word data_027e0e60 +_020bc908: .word gMapManager .global func_ov00_020bc90c arm_func_start func_ov00_020bc90c @@ -14326,7 +14326,7 @@ func_ov00_020bc90c: ; 0x020bc90c stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r2 - ldr r0, _020bc95c ; =data_027e0e60 + ldr r0, _020bc95c ; =gMapManager add r2, r6, r5, lsl #1 mov r4, r1 ldrb r1, [r2, #0x2c] @@ -14337,7 +14337,7 @@ func_ov00_020bc90c: ; 0x020bc90c ldr r0, [r0, #0x30] add r1, r6, r5, lsl #1 str r0, [r4, #4] - ldr r0, _020bc95c ; =data_027e0e60 + ldr r0, _020bc95c ; =gMapManager ldrb r1, [r1, #0x2d] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c50Ei @@ -14345,7 +14345,7 @@ func_ov00_020bc90c: ; 0x020bc90c ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020bc90c -_020bc95c: .word data_027e0e60 +_020bc95c: .word gMapManager .global func_ov00_020bc960 arm_func_start func_ov00_020bc960 @@ -16474,7 +16474,7 @@ _020be334: _020be338: cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _020be404 ; =data_027e0e60 + ldr r0, _020be404 ; =gMapManager ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 @@ -16528,7 +16528,7 @@ _020be3e4: .align 2, 0 arm_func_end func_ov00_020be294 _020be400: .word data_027e0fc8 -_020be404: .word data_027e0e60 +_020be404: .word gMapManager _020be408: .word gAdventureFlags .global func_ov00_020be40c @@ -18103,7 +18103,7 @@ _020bf70c: str r0, [sp, #0xc] mov r1, #0 str r1, [sp, #0x10] - ldr r0, _020bff3c ; =data_027e0e60 + ldr r0, _020bff3c ; =gMapManager add r1, sp, #0x154 ldr r0, [r0] add r2, sp, #0xe4 @@ -18238,7 +18238,7 @@ _020bf794: add r0, sp, #0x14 str r0, [sp, #0xc] str r3, [sp, #0x10] - ldr r0, _020bff3c ; =data_027e0e60 + ldr r0, _020bff3c ; =gMapManager add r1, sp, #0xf4 ldr r0, [r0] add r2, sp, #0x30 @@ -18637,7 +18637,7 @@ _020bff2c: .word data_ov00_020e6f90 _020bff30: .word data_ov00_020dd294 _020bff34: .word data_ov00_020eec9c _020bff38: .word gItemManager -_020bff3c: .word data_027e0e60 +_020bff3c: .word gMapManager _020bff40: .word 0x0000099a _020bff44: .word data_ov00_020dd268 _020bff48: .word data_027e0fe4 diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index 253cb127..758d0fdb 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -139,7 +139,7 @@ .extern data_027e0e28 .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f70 diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index a1d1b9cb..f75eab4c 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -296,7 +296,7 @@ _020c40b4: strlt r2, [r0, #0x3c] ldr r2, [r6] ldr r1, [r9, #0x1c] - ldr r0, _020c42d4 ; =data_027e0e60 + ldr r0, _020c42d4 ; =gMapManager str r1, [r2, #0x34] ldr r1, [r9, #0x20] str r1, [r2, #0x38] @@ -322,7 +322,7 @@ _020c40b4: ldr r0, [r0] bl _ZN10MapManager20GetCourseData_Unk_1cEv ldr r2, [r6] - ldr r1, _020c42d4 ; =data_027e0e60 + ldr r1, _020c42d4 ; =gMapManager strb r0, [r2, #0x10] ldr r0, [r1] bl _ZN10MapManager20GetCourseData_Unk_1dEv @@ -378,7 +378,7 @@ _020c42c4: arm_func_end func_ov00_020c4048 _020c42cc: .word data_027e0fe4 _020c42d0: .word 0x0000ffff -_020c42d4: .word data_027e0e60 +_020c42d4: .word gMapManager .global func_ov00_020c42d8 arm_func_start func_ov00_020c42d8 @@ -923,7 +923,7 @@ _020c498c: ldrb r0, [r6, #6] cmp r0, #0 beq _020c49fc - ldr r0, _020c4ae0 ; =data_027e0e60 + ldr r0, _020c4ae0 ; =gMapManager ldr lr, [sp, #0x20] ldr ip, [sp, #0x24] ldr r3, [sp, #0x28] @@ -1003,7 +1003,7 @@ _020c4ad4: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020c4924 -_020c4ae0: .word data_027e0e60 +_020c4ae0: .word gMapManager _020c4ae4: .word data_027e0ff0 .global func_ov00_020c4ae8 @@ -1605,7 +1605,7 @@ func_ov00_020c51d0: ; 0x020c51d0 arm_func_start func_ov00_020c522c func_ov00_020c522c: ; 0x020c522c stmdb sp!, {r4, r5, r6, lr} - ldr r2, _020c5284 ; =data_027e0e60 + ldr r2, _020c5284 ; =gMapManager mov r6, r0 ldr r4, [r2] mov r5, r1 @@ -1628,14 +1628,14 @@ func_ov00_020c522c: ; 0x020c522c ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020c522c -_020c5284: .word data_027e0e60 +_020c5284: .word gMapManager .global func_ov00_020c5288 arm_func_start func_ov00_020c5288 func_ov00_020c5288: ; 0x020c5288 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x14 - ldr r1, _020c532c ; =data_027e0e60 + ldr r1, _020c532c ; =gMapManager mov r2, #0 mov r5, r0 ldr r4, [r1] @@ -1676,19 +1676,19 @@ func_ov00_020c5288: ; 0x020c5288 ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020c5288 -_020c532c: .word data_027e0e60 +_020c532c: .word gMapManager .global func_ov00_020c5330 arm_func_start func_ov00_020c5330 func_ov00_020c5330: ; 0x020c5330 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 - ldr r0, _020c5370 ; =data_027e0e60 + ldr r0, _020c5370 ; =gMapManager mov r5, r1 ldrb r1, [r6, #1] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c50Ei - ldr r2, _020c5370 ; =data_027e0e60 + ldr r2, _020c5370 ; =gMapManager mov r4, r0 ldrb r1, [r6] ldr r0, [r2] @@ -1699,14 +1699,14 @@ func_ov00_020c5330: ; 0x020c5330 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020c5330 -_020c5370: .word data_027e0e60 +_020c5370: .word gMapManager .global func_ov00_020c5374 arm_func_start func_ov00_020c5374 func_ov00_020c5374: ; 0x020c5374 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 - ldr r3, _020c53ac ; =data_027e0e60 + ldr r3, _020c53ac ; =gMapManager mov r4, r1 ldr r1, [r3] mov r2, r0 @@ -1720,7 +1720,7 @@ func_ov00_020c5374: ; 0x020c5374 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov00_020c5374 -_020c53ac: .word data_027e0e60 +_020c53ac: .word gMapManager .global func_ov00_020c53b0 arm_func_start func_ov00_020c53b0 @@ -1902,7 +1902,7 @@ func_ov00_020c558c: ; 0x020c558c str r0, [sp, #4] add r1, sp, #0xc str r1, [sp, #8] - ldr r0, _020c5654 ; =data_027e0e60 + ldr r0, _020c5654 ; =gMapManager add r1, sp, #0x1c ldr r0, [r0] add r2, sp, #0x10 @@ -1923,7 +1923,7 @@ _020c5640: .align 2, 0 arm_func_end func_ov00_020c558c _020c5650: .word data_ov00_020e892c -_020c5654: .word data_027e0e60 +_020c5654: .word gMapManager .global func_ov00_020c5658 arm_func_start func_ov00_020c5658 @@ -4549,7 +4549,7 @@ func_ov00_020c7764: ; 0x020c7764 rsb r0, r0, #0 cmp r1, r0 strlt r0, [sp, #0x18] - ldr r0, _020c7e9c ; =data_027e0e60 + ldr r0, _020c7e9c ; =gMapManager ldr ip, [sp, #0x14] ldr r4, [r0] ldr r8, [sp, #0x18] @@ -4723,7 +4723,7 @@ _020c79b0: add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, pc} _020c7a38: - ldr r0, _020c7e9c ; =data_027e0e60 + ldr r0, _020c7e9c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084838Ev cmp r0, #0 @@ -5018,7 +5018,7 @@ _020c7e94: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov00_020c7764 -_020c7e9c: .word data_027e0e60 +_020c7e9c: .word gMapManager _020c7ea0: .word data_027e0d38 _020c7ea4: .word data_027e0e58 _020c7ea8: .word 0x000001ee @@ -5100,7 +5100,7 @@ func_ov00_020c7f98: ; 0x020c7f98 movs r5, r3 stmia r4, {r0, r1, r2} beq _020c7ffc - ldr r0, _020c8048 ; =data_027e0e60 + ldr r0, _020c8048 ; =gMapManager ldr ip, [sp, #0x10] ldr r4, [r0] ldr r7, [sp, #0x14] @@ -5142,7 +5142,7 @@ _020c8040: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_020c7f98 -_020c8048: .word data_027e0e60 +_020c8048: .word gMapManager _020c804c: .word 0x00000ccd .global func_ov00_020c8050 @@ -7684,7 +7684,7 @@ func_ov00_020ca094: ; 0x020ca094 cmp r0, #0 beq _020ca108 ldr r1, [r5, #0x48] - ldr r0, _020ca144 ; =data_027e0e60 + ldr r0, _020ca144 ; =gMapManager str r1, [sp] ldr r1, [r5, #0x4c] ldr r7, [r0] @@ -7719,7 +7719,7 @@ _020ca12c: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_020ca094 -_020ca144: .word data_027e0e60 +_020ca144: .word gMapManager .global func_ov00_020ca148 arm_func_start func_ov00_020ca148 @@ -8582,7 +8582,7 @@ _020cab14: strb r2, [sp, #4] strb r2, [sp, #5] bl func_ov00_020c5374 - ldr r0, _020cace8 ; =data_027e0e60 + ldr r0, _020cace8 ; =gMapManager add r1, sp, #4 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084164Ev @@ -8692,7 +8692,7 @@ _020cacd8: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020caa90 -_020cace8: .word data_027e0e60 +_020cace8: .word gMapManager _020cacec: .word data_027e0ffc _020cacf0: .word data_027e0f64 @@ -10366,7 +10366,7 @@ func_ov00_020cc180: ; 0x020cc180 sub sp, sp, #0xc mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _020cc1f4 ; =data_027e0e60 + ldr r0, _020cc1f4 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -10394,7 +10394,7 @@ _020cc1d8: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov00_020cc180 -_020cc1f4: .word data_027e0e60 +_020cc1f4: .word gMapManager .global func_ov00_020cc1f8 arm_func_start func_ov00_020cc1f8 @@ -10456,7 +10456,7 @@ func_ov00_020cc27c: ; 0x020cc27c stmdb sp!, {r3, lr} sub sp, sp, #0x10 ldr r2, [r0, #0x48] - ldr r1, _020cc2d0 ; =data_027e0e60 + ldr r1, _020cc2d0 ; =gMapManager str r2, [sp, #4] ldr r2, [r0, #0x4c] ldr r1, [r1] @@ -10476,7 +10476,7 @@ func_ov00_020cc27c: ; 0x020cc27c ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_020cc27c -_020cc2d0: .word data_027e0e60 +_020cc2d0: .word gMapManager .global func_ov00_020cc2d4 arm_func_start func_ov00_020cc2d4 @@ -10535,7 +10535,7 @@ func_ov00_020cc308: ; 0x020cc308 add lr, sp, #0x14 str r1, [sp, #0x30] ldr r1, [r4, #0x54] - ldr ip, _020cc3e4 ; =data_027e0e60 + ldr ip, _020cc3e4 ; =gMapManager str r1, [sp, #0x1c] ldr r2, [r4, #0x58] add r1, sp, #0x34 @@ -10557,7 +10557,7 @@ func_ov00_020cc308: ; 0x020cc308 .align 2, 0 arm_func_end func_ov00_020cc308 _020cc3e0: .word 0x0000ffff -_020cc3e4: .word data_027e0e60 +_020cc3e4: .word gMapManager .global func_ov00_020cc3e8 arm_func_start func_ov00_020cc3e8 @@ -11129,7 +11129,7 @@ func_ov00_020cca68: ; 0x020cca68 str ip, [sp, #0x1c] ldrh r0, [r4, #0x9c] ldr r1, [sp, #0x20] - ldr r2, _020ccb00 ; =data_027e0e60 + ldr r2, _020ccb00 ; =gMapManager bic r0, r0, #2 mov r0, r0, lsl #0x10 str r3, [sp, #0xc] @@ -11150,7 +11150,7 @@ func_ov00_020cca68: ; 0x020cca68 ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020cca68 -_020ccb00: .word data_027e0e60 +_020ccb00: .word gMapManager .global func_ov00_020ccb04 arm_func_start func_ov00_020ccb04 @@ -12720,7 +12720,7 @@ _020cdec8: str r0, [sp] mov r2, r3 ldrh r3, [r4, #0x9c] - ldr r0, _020cdfc8 ; =data_027e0e60 + ldr r0, _020cdfc8 ; =gMapManager add r1, sp, #0x18 str r3, [sp, #4] ldr r3, [r4, #0xa0] @@ -12742,7 +12742,7 @@ _020cdec8: .align 2, 0 arm_func_end func_ov00_020cde0c _020cdfc4: .word data_02050f54 -_020cdfc8: .word data_027e0e60 +_020cdfc8: .word gMapManager .global func_ov00_020cdfcc arm_func_start func_ov00_020cdfcc @@ -13787,7 +13787,7 @@ _020cecd4: .word 0x000002fd func_ov00_020cecd8: ; 0x020cecd8 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 - ldr r4, _020ced5c ; =data_027e0e60 + ldr r4, _020ced5c ; =gMapManager mov r6, r0 ldr r0, [r4] mov r5, r1 @@ -13820,7 +13820,7 @@ func_ov00_020cecd8: ; 0x020cecd8 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov00_020cecd8 -_020ced5c: .word data_027e0e60 +_020ced5c: .word gMapManager _020ced60: .word data_ov00_020eec9c .global func_ov00_020ced64 @@ -13839,7 +13839,7 @@ _020ced78: .word data_ov00_020eec9c arm_func_start func_ov00_020ced7c func_ov00_020ced7c: ; 0x020ced7c stmdb sp!, {r4, r5, r6, lr} - ldr r0, _020cedb4 ; =data_027e0e60 + ldr r0, _020cedb4 ; =gMapManager mov r5, r2 ldr r0, [r0] mov r4, r3 @@ -13854,7 +13854,7 @@ func_ov00_020ced7c: ; 0x020ced7c ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020ced7c -_020cedb4: .word data_027e0e60 +_020cedb4: .word gMapManager _020cedb8: .word data_ov00_020eec9c .global func_ov00_020cedbc @@ -14210,7 +14210,7 @@ func_ov00_020cf13c: ; 0x020cf13c blx func_ov00_02078e00 b _020cf184 _020cf168: - ldr r0, _020cf1b0 ; =data_027e0e60 + ldr r0, _020cf1b0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083588Ev mov r2, r0 @@ -14231,7 +14231,7 @@ _020cf184: .align 2, 0 arm_func_end func_ov00_020cf13c _020cf1ac: .word data_027e0d3c -_020cf1b0: .word data_027e0e60 +_020cf1b0: .word gMapManager _020cf1b4: .word data_027e0c54 .global func_ov00_020cf1b8 @@ -15359,7 +15359,7 @@ _020cfd50: ldreqb r0, [r0, #4] cmpeq r0, #0 bne _020cfdb8 - ldr r0, _020cfde0 ; =data_027e0e60 + ldr r0, _020cfde0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 @@ -15378,7 +15378,7 @@ _020cfdd0: .word data_027e0c68 _020cfdd4: .word data_027e0e28 _020cfdd8: .word data_ov09_0211f5b4 _020cfddc: .word data_027e0d04 -_020cfde0: .word data_027e0e60 +_020cfde0: .word gMapManager .global func_ov00_020cfde4 arm_func_start func_ov00_020cfde4 @@ -19103,7 +19103,7 @@ _020d2d34: .word data_ov00_020e8b64 arm_func_start func_ov00_020d2d38 func_ov00_020d2d38: ; 0x020d2d38 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _020d2da8 ; =data_027e0e60 + ldr r2, _020d2da8 ; =gMapManager mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -19133,7 +19133,7 @@ _020d2d84: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020d2d38 -_020d2da8: .word data_027e0e60 +_020d2da8: .word gMapManager _020d2dac: .word data_027e0f64 _020d2db0: .word data_027e0c68 @@ -19161,7 +19161,7 @@ _020d2de0: func_ov00_020d2de8: ; 0x020d2de8 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x18 - ldr r2, _020d2f00 ; =data_027e0e60 + ldr r2, _020d2f00 ; =gMapManager mov r6, r0 ldr r0, [r2] mov r5, r1 @@ -19234,7 +19234,7 @@ _020d2e8c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020d2de8 -_020d2f00: .word data_027e0e60 +_020d2f00: .word gMapManager _020d2f04: .word data_027e0c68 .global func_ov00_020d2f08 @@ -20208,7 +20208,7 @@ _020d3a00: .word data_027e0d0c func_ov00_020d3a04: ; 0x020d3a04 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 - ldr r0, _020d3b04 ; =data_027e0e60 + ldr r0, _020d3b04 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -20276,7 +20276,7 @@ _020d3afc: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020d3a04 -_020d3b04: .word data_027e0e60 +_020d3b04: .word gMapManager _020d3b08: .word gAdventureFlags _020d3b0c: .word data_027e0f90 _020d3b10: .word data_027e077c @@ -21200,7 +21200,7 @@ func_ov00_020d454c: ; 0x020d454c mov r1, r0 bl func_ov00_020b1a4c ldr r1, [r6, #0x158] - ldr r0, _020d4604 ; =data_027e0e60 + ldr r0, _020d4604 ; =gMapManager str r1, [sp] ldr r1, [r6, #0x15c] ldr r0, [r0] @@ -21232,7 +21232,7 @@ func_ov00_020d454c: ; 0x020d454c ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020d454c -_020d4604: .word data_027e0e60 +_020d4604: .word gMapManager .global func_ov00_020d4608 arm_func_start func_ov00_020d4608 @@ -21268,7 +21268,7 @@ _020d4648: str r0, [sp, #0x6c] _020d4660: ldr r1, [sp, #0x68] - ldr r0, _020d484c ; =data_027e0e60 + ldr r0, _020d484c ; =gMapManager add r3, r1, #0x40 ldr r6, [sp, #0x64] ldr r4, [sp, #0x6c] @@ -21279,7 +21279,7 @@ _020d4660: str r4, [sp, #0x60] str r3, [sp, #0x5c] bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _020d484c ; =data_027e0e60 + ldr r0, _020d484c ; =gMapManager ldr r6, [sp, #0x58] ldr r4, [sp, #0x5c] ldr r3, [sp, #0x60] @@ -21294,7 +21294,7 @@ _020d4660: ldr r4, [sp, #0x5c] ldr r3, [sp, #0x60] str r2, [sp, #0x20] - ldr r1, _020d484c ; =data_027e0e60 + ldr r1, _020d484c ; =gMapManager mov r8, r0 ldr r0, [r1] add r1, sp, #0x20 @@ -21359,7 +21359,7 @@ _020d4790: add r0, r1, r4, lsl #12 str r0, [sp] ldr r2, [sp] - ldr r0, _020d484c ; =data_027e0e60 + ldr r0, _020d484c ; =gMapManager str r2, [sp, #0x1c] ldrb r2, [sp, #0x11] ldr r0, [r0] @@ -21397,7 +21397,7 @@ _020d4834: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_020d4624 -_020d484c: .word data_027e0e60 +_020d484c: .word gMapManager _020d4850: .word func_ov00_020d4608 _020d4854: .word data_ov00_020df2f8 _020d4858: .word func_ov00_020b1940 @@ -21752,7 +21752,7 @@ _020d4d08: cmp r1, r0 blt _020d4da8 ldr r1, [r10, #0x48] - ldr r0, _020d4de0 ; =data_027e0e60 + ldr r0, _020d4de0 ; =gMapManager str r1, [sp, #0x10] ldr r1, [r10, #0x4c] ldr r0, [r0] @@ -21771,7 +21771,7 @@ _020d4d08: bl func_ov00_020b18d8 b _020d4db8 _020d4d68: - ldr r0, _020d4de0 ; =data_027e0e60 + ldr r0, _020d4de0 ; =gMapManager ldr r5, [r10, #0x4c] ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_48Ev @@ -21805,7 +21805,7 @@ _020d4db8: .align 2, 0 arm_func_end func_ov00_020d4b54 _020d4ddc: .word data_ov00_020ee670 -_020d4de0: .word data_027e0e60 +_020d4de0: .word gMapManager _020d4de4: .word 0x00000333 .global func_ov00_020d4de8 @@ -22568,7 +22568,7 @@ func_ov00_020d573c: ; 0x020d573c cmp r0, #0 beq _020d57b0 ldr r1, [r10, #0x48] - ldr r0, _020d58a8 ; =data_027e0e60 + ldr r0, _020d58a8 ; =gMapManager str r1, [sp, #4] ldr r1, [r10, #0x4c] ldr r5, [r0] @@ -22654,7 +22654,7 @@ _020d5888: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov00_020d573c -_020d58a8: .word data_027e0e60 +_020d58a8: .word gMapManager .global func_ov00_020d58ac arm_func_start func_ov00_020d58ac diff --git a/asm/ov02.inc b/asm/ov02.inc index 6b85cfea..3566fa97 100644 --- a/asm/ov02.inc +++ b/asm/ov02.inc @@ -31,7 +31,7 @@ .extern data_027e0d0c .extern data_027e0d44 .extern data_027e0d78 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f88 .extern data_027e0f8c .extern data_027e0fbc diff --git a/asm/ov02.s b/asm/ov02.s index 4775a3ab..f2e646ca 100644 --- a/asm/ov02.s +++ b/asm/ov02.s @@ -6629,7 +6629,7 @@ _020f430c: ldr r0, _020f4ce4 ; =data_027e0f88 ldr r0, [r0] bl func_ov00_020a1abc - ldr r0, _020f4ce8 ; =data_027e0e60 + ldr r0, _020f4ce8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020847e0Ev str r0, [r7, #0x2c] @@ -7282,7 +7282,7 @@ _020f4cd8: .word data_ov09_0211ee20 _020f4cdc: .word data_ov09_0211ee24 _020f4ce0: .word data_ov09_0211ee28 _020f4ce4: .word data_027e0f88 -_020f4ce8: .word data_027e0e60 +_020f4ce8: .word gMapManager _020f4cec: .word data_027e0f8c _020f4cf0: .word data_ov00_020ecdf6 _020f4cf4: .word data_ov00_020ee0a0 diff --git a/asm/ov03.inc b/asm/ov03.inc index e5bafba2..5f7fe179 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -93,7 +93,7 @@ .extern data_027e0e28 .extern data_027e0e2c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f7c .extern data_027e0f84 diff --git a/asm/ov03.s b/asm/ov03.s index ef9b6453..8f95b4b5 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -3622,7 +3622,7 @@ _020f0884: bl func_0202ed14 add r7, r7, r0, lsl #12 _020f08a4: - ldr r0, _020f0aa4 ; =data_027e0e60 + ldr r0, _020f0aa4 ; =gMapManager ldr r5, [r0] mov r0, r5 bl _ZN10MapManager13GetCourseMinXEv @@ -3755,7 +3755,7 @@ _020f0a30: arm_func_end func_ov03_020f0844 _020f0a9c: .word data_027e0c38 _020f0aa0: .word data_027e080c -_020f0aa4: .word data_027e0e60 +_020f0aa4: .word gMapManager .global func_ov03_020f0aa8 arm_func_start func_ov03_020f0aa8 @@ -3780,7 +3780,7 @@ func_ov03_020f0aa8: ; 0x020f0aa8 ldrb r0, [r1, #0x95] cmp r0, #0 beq _020f0b18 - ldr r0, _020f0b84 ; =data_027e0e60 + ldr r0, _020f0b84 ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, r4 @@ -3789,10 +3789,10 @@ func_ov03_020f0aa8: ; 0x020f0aa8 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _020f0b18: - ldr r0, _020f0b84 ; =data_027e0e60 + ldr r0, _020f0b84 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d40Ev - ldr r1, _020f0b84 ; =data_027e0e60 + ldr r1, _020f0b84 ; =gMapManager mov r2, r0 ldr r0, [r1] add r1, sp, #0 @@ -3804,7 +3804,7 @@ _020f0b18: bl strcmp cmp r0, #0 bne _020f0b74 - ldr r0, _020f0b84 ; =data_027e0e60 + ldr r0, _020f0b84 ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, r4 @@ -3819,7 +3819,7 @@ _020f0b74: .align 2, 0 arm_func_end func_ov03_020f0aa8 _020f0b80: .word data_027e1054 -_020f0b84: .word data_027e0e60 +_020f0b84: .word gMapManager _020f0b88: .word data_027e0d3c .global func_ov03_020f0b8c @@ -3896,7 +3896,7 @@ _020f0c7c: mov r4, r0 cmp r1, #0 blt _020f0ca4 - ldr r0, _020f0e3c ; =data_027e0e60 + ldr r0, _020f0e3c ; =gMapManager add r2, sp, #0x24 ldr r0, [r0] mov r3, #8 @@ -4011,7 +4011,7 @@ _020f0e2c: .word data_027e0c54 _020f0e30: .word data_027e0d3c _020f0e34: .word data_027e0f94 _020f0e38: .word 0x00001ccd -_020f0e3c: .word data_027e0e60 +_020f0e3c: .word gMapManager _020f0e40: .word 0x00002ccd _020f0e44: .word data_ov03_020fc45c _020f0e48: .word data_ov03_020fc460 @@ -9792,7 +9792,7 @@ func_ov03_020f4778: ; 0x020f4778 sub sp, #0x44 add r6, r0, #0 add r5, r1, #0 - ldr r0, _020f47d8 ; =data_027e0e60 + ldr r0, _020f47d8 ; =gMapManager lsl r2, r5, #0x18 ldr r0, [r0] add r1, sp, #4 @@ -9818,7 +9818,7 @@ func_ov03_020f4778: ; 0x020f4778 _020f47b4: mov r4, #7 _020f47b6: - ldr r0, _020f47d8 ; =data_027e0e60 + ldr r0, _020f47d8 ; =gMapManager lsl r1, r5, #0x18 ldr r0, [r0] lsr r1, r1, #0x18 @@ -9835,7 +9835,7 @@ _020f47b6: pop {r3, r4, r5, r6, pc} .align 2, 0 thumb_func_end func_ov03_020f4778 -_020f47d8: .word data_027e0e60 +_020f47d8: .word gMapManager _020f47dc: .word data_027e0d38 _020f47e0: .word data_027e103c @@ -10419,13 +10419,13 @@ _020f4ce4: mov r0, #7 str r0, [r5, #0xc] _020f4ce8: - ldr r0, _020f4d18 ; =data_027e0e60 + ldr r0, _020f4d18 ; =gMapManager add r1, r5, #0 ldr r0, [r0] add r1, #0x50 add r2, r4, #0 blx _ZN10MapManager18func_ov00_02082614Eii - ldr r0, _020f4d18 ; =data_027e0e60 + ldr r0, _020f4d18 ; =gMapManager add r1, r4, #0 ldr r0, [r0] blx _ZN10MapManager18func_ov00_02082d74Ei @@ -10439,7 +10439,7 @@ _020f4ce8: thumb_func_end func_ov03_020f4c94 _020f4d10: .word data_027e0d38 _020f4d14: .word data_027e103c -_020f4d18: .word data_027e0e60 +_020f4d18: .word gMapManager _020f4d1c: .word data_027e077c .global func_ov03_020f4d20 @@ -10552,7 +10552,7 @@ func_ov03_020f4de0: ; 0x020f4de0 add r4, r0, #0 ldr r0, _020f4e48 ; =data_027e0d3c ldr r5, [r0] - ldr r0, _020f4e4c ; =data_027e0e60 + ldr r0, _020f4e4c ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083588Ev ldr r1, _020f4e50 ; =data_ov00_020d878c @@ -10601,7 +10601,7 @@ _020f4e40: .align 2, 0 thumb_func_end func_ov03_020f4de0 _020f4e48: .word data_027e0d3c -_020f4e4c: .word data_027e0e60 +_020f4e4c: .word gMapManager _020f4e50: .word data_ov00_020d878c _020f4e54: .word data_027e0d38 _020f4e58: .word data_027e103c @@ -10613,7 +10613,7 @@ func_ov03_020f4e5c: ; 0x020f4e5c add r4, r0, #0 ldr r0, _020f4f30 ; =data_027e0d3c ldr r5, [r0] - ldr r0, _020f4f34 ; =data_027e0e60 + ldr r0, _020f4f34 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083588Ev add r1, r4, #0 @@ -10621,7 +10621,7 @@ func_ov03_020f4e5c: ; 0x020f4e5c add r0, r5, #0 add r1, #0x10 bl func_ov00_02078e00 - ldr r0, _020f4f34 ; =data_027e0e60 + ldr r0, _020f4f34 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02082accEv add r0, r4, #0 @@ -10715,7 +10715,7 @@ _020f4f20: nop thumb_func_end func_ov03_020f4e5c _020f4f30: .word data_027e0d3c -_020f4f34: .word data_027e0e60 +_020f4f34: .word gMapManager _020f4f38: .word data_027e103c _020f4f3c: .word data_027e0cbc _020f4f40: .word 0x0400100c @@ -10729,7 +10729,7 @@ func_ov03_020f4f4c: ; 0x020f4f4c add r5, r0, #0 ldr r0, _020f4fa8 ; =data_027e0d3c ldr r4, [r0] - ldr r0, _020f4fac ; =data_027e0e60 + ldr r0, _020f4fac ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083588Ev add r1, r5, #0 @@ -10770,7 +10770,7 @@ _020f4f9e: nop thumb_func_end func_ov03_020f4f4c _020f4fa8: .word data_027e0d3c -_020f4fac: .word data_027e0e60 +_020f4fac: .word gMapManager _020f4fb0: .word data_027e103c _020f4fb4: .word data_027e0cbc @@ -10780,7 +10780,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8 push {r3, r4, r5, lr} sub sp, #0x40 add r5, r0, #0 - ldr r0, _020f4ffc ; =data_027e0e60 + ldr r0, _020f4ffc ; =gMapManager mov r1, #0x93 ldrsb r1, [r5, r1] ldr r0, [r0] @@ -10795,7 +10795,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8 ldr r0, _020f5004 ; =data_027e103c mov r1, #0x93 ldr r4, [r0] - ldr r0, _020f4ffc ; =data_027e0e60 + ldr r0, _020f4ffc ; =gMapManager ldrsb r1, [r5, r1] ldr r0, [r0] blx _ZN10MapManager18func_ov00_020835f4Ei @@ -10809,7 +10809,7 @@ func_ov03_020f4fb8: ; 0x020f4fb8 pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov03_020f4fb8 -_020f4ffc: .word data_027e0e60 +_020f4ffc: .word gMapManager _020f5000: .word data_027e0d3c _020f5004: .word data_027e103c @@ -12830,7 +12830,7 @@ _020f6578: ldrb r0, [r0, #0x98] cmp r0, #0 bne _020f6600 - ldr r0, _020f670c ; =data_027e0e60 + ldr r0, _020f670c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083588Ev cmp r0, #0 @@ -12913,7 +12913,7 @@ _020f66fc: .word 0x000004cc _020f6700: .word data_027e077c _020f6704: .word data_02056be4 _020f6708: .word data_027e1054 -_020f670c: .word data_027e0e60 +_020f670c: .word gMapManager _020f6710: .word 0x0000ffff .global func_ov03_020f6714 @@ -14232,7 +14232,7 @@ _020f7760: bl func_ov03_020f4b7c cmp r0, #0 bne _020f7794 - ldr r0, _020f7bb4 ; =data_027e0e60 + ldr r0, _020f7bb4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 @@ -14523,7 +14523,7 @@ _020f7ba4: arm_func_end func_ov03_020f7730 _020f7bac: .word data_027e1054 _020f7bb0: .word data_027e0d3c -_020f7bb4: .word data_027e0e60 +_020f7bb4: .word gMapManager _020f7bb8: .word data_027e0f7c _020f7bbc: .word gAdventureFlags _020f7bc0: .word data_027e0618 @@ -14862,12 +14862,12 @@ func_ov03_020f7f6c: ; 0x020f7f6c bl func_ov03_020f74b8 cmp r0, #0 beq _020f7fbc - ldr r0, _020f7fe4 ; =data_027e0e60 + ldr r0, _020f7fe4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083588Ev cmp r0, #0 beq _020f7fbc - ldr r0, _020f7fe4 ; =data_027e0e60 + ldr r0, _020f7fe4 ; =gMapManager ldr r7, [r0] mov r0, r7 bl _ZN10MapManager18func_ov00_020835a4Ev @@ -14890,7 +14890,7 @@ _020f7fdc: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov03_020f7f6c -_020f7fe4: .word data_027e0e60 +_020f7fe4: .word gMapManager _020f7fe8: .word data_027e1054 .global func_ov03_020f7fec @@ -14909,40 +14909,40 @@ func_ov03_020f7fec: ; 0x020f7fec arm_func_start func_ov03_020f8008 func_ov03_020f8008: ; 0x020f8008 stmdb sp!, {r3, lr} - ldr r0, _020f8020 ; =data_027e0e60 + ldr r0, _020f8020 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083588Ev bl func_ov03_020f805c ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov03_020f8008 -_020f8020: .word data_027e0e60 +_020f8020: .word gMapManager .global func_ov03_020f8024 arm_func_start func_ov03_020f8024 func_ov03_020f8024: ; 0x020f8024 stmdb sp!, {r3, lr} - ldr r0, _020f803c ; =data_027e0e60 + ldr r0, _020f803c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020835a4Ev bl func_ov03_020f805c ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov03_020f8024 -_020f803c: .word data_027e0e60 +_020f803c: .word gMapManager .global func_ov03_020f8040 arm_func_start func_ov03_020f8040 func_ov03_020f8040: ; 0x020f8040 stmdb sp!, {r3, lr} - ldr r0, _020f8058 ; =data_027e0e60 + ldr r0, _020f8058 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020835b4Ev bl func_ov03_020f805c ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov03_020f8040 -_020f8058: .word data_027e0e60 +_020f8058: .word gMapManager .global func_ov03_020f805c arm_func_start func_ov03_020f805c @@ -18001,7 +18001,7 @@ func_ov03_020fa528: ; 0x020fa528 bl func_ov00_020a5e9c movs r1, r0 bne _020fa568 - ldr r0, _020fa5c8 ; =data_027e0e60 + ldr r0, _020fa5c8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev add r0, r0, #0xab @@ -18037,7 +18037,7 @@ _020fa590: .align 2, 0 arm_func_end func_ov03_020fa528 _020fa5c4: .word data_027e0d38 -_020fa5c8: .word data_027e0e60 +_020fa5c8: .word gMapManager _020fa5cc: .word data_027e0f7c _020fa5d0: .word data_ov03_020ff648 _020fa5d4: .word data_027e0c68 diff --git a/asm/ov04.inc b/asm/ov04.inc index 3f4f6d8b..0f2b9596 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -107,7 +107,7 @@ .extern data_027e0e28 .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov04.s b/asm/ov04.s index dc1a28a3..bd2df20b 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -921,7 +921,7 @@ _0210122a: str r0, [sp] mov r0, #1 str r0, [sp, #4] - ldr r0, _02101388 ; =data_027e0e60 + ldr r0, _02101388 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083588Ev str r0, [sp, #8] @@ -971,7 +971,7 @@ _02101292: ldr r0, _02101398 ; =data_027e0e58 ldr r0, [r0] bl func_ov04_02107e34 - ldr r0, _02101388 ; =data_027e0e60 + ldr r0, _02101388 ; =gMapManager add r1, r5, #4 ldr r0, [r0] blx _ZN10MapManager18func_ov00_02082b3cEi @@ -982,7 +982,7 @@ _02101292: cmp r7, #3 bne _021012d0 _021012b0: - ldr r0, _02101388 ; =data_027e0e60 + ldr r0, _02101388 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083588Ev add r1, r0, #0 @@ -1088,7 +1088,7 @@ _02101378: .word data_027e0d38 _0210137c: .word data_027e0fac _02101380: .word data_027e0f94 _02101384: .word data_027e0618 -_02101388: .word data_027e0e60 +_02101388: .word gMapManager _0210138c: .word data_027e077c _02101390: .word 0x04000304 _02101394: .word 0xffff7fff @@ -2204,7 +2204,7 @@ _02101bce: add r5, #0xc add r7, sp, #4 _02101bda: - ldr r0, _02101c0c ; =data_027e0e60 + ldr r0, _02101c0c ; =gMapManager add r1, r7, #0 ldr r0, [r0] blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -2229,7 +2229,7 @@ _02101bf6: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov04_02101bbc -_02101c0c: .word data_027e0e60 +_02101c0c: .word gMapManager _02101c10: .word data_027e0f6c .global func_ov04_02101c14 @@ -2765,7 +2765,7 @@ _02101fb6: thumb_func_start func_ov04_02101fbc func_ov04_02101fbc: ; 0x02101fbc push {r3, lr} - ldr r0, _02101fe0 ; =data_027e0e60 + ldr r0, _02101fe0 ; =gMapManager ldr r0, [r0] cmp r0, #0 bne _02101fde @@ -2778,20 +2778,20 @@ func_ov04_02101fbc: ; 0x02101fbc beq _02101fda bl func_ov04_02101f54 _02101fda: - ldr r1, _02101fe0 ; =data_027e0e60 + ldr r1, _02101fe0 ; =gMapManager str r0, [r1] _02101fde: pop {r3, pc} .align 2, 0 thumb_func_end func_ov04_02101fbc -_02101fe0: .word data_027e0e60 +_02101fe0: .word gMapManager _02101fe4: .word data_027e0ce0 .global func_ov04_02101fe8 thumb_func_start func_ov04_02101fe8 func_ov04_02101fe8: ; 0x02101fe8 push {r4, lr} - ldr r0, _02102008 ; =data_027e0e60 + ldr r0, _02102008 ; =gMapManager ldr r4, [r0] cmp r4, #0 beq _02102006 @@ -2801,14 +2801,14 @@ func_ov04_02101fe8: ; 0x02101fe8 add r0, r4, #0 blx _ZN9SysObjectdlEPv _02102000: - ldr r0, _02102008 ; =data_027e0e60 + ldr r0, _02102008 ; =gMapManager mov r1, #0 str r1, [r0] _02102006: pop {r4, pc} .align 2, 0 thumb_func_end func_ov04_02101fe8 -_02102008: .word data_027e0e60 +_02102008: .word gMapManager .global func_ov04_0210200c thumb_func_start func_ov04_0210200c @@ -7455,7 +7455,7 @@ _021045bc: mov r1, #0 strb r1, [r0, #0xa] strb r1, [r0, #0xb] - ldr r0, _021046bc ; =data_027e0e60 + ldr r0, _021046bc ; =gMapManager add r1, sp, #0x30 ldr r0, [r0] blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -7525,7 +7525,7 @@ _021045bc: ldrb r0, [r0, #0x15] strb r0, [r1, #0x15] _02104682: - ldr r0, _021046bc ; =data_027e0e60 + ldr r0, _021046bc ; =gMapManager add r1, sp, #0x18 ldr r0, [r0] blx _ZN10MapManager18func_ov00_020838f8EPi @@ -7554,7 +7554,7 @@ _021046b6: pop {r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov04_0210455c -_021046bc: .word data_027e0e60 +_021046bc: .word gMapManager _021046c0: .word data_ov00_020eab04 _021046c4: .word gAdventureFlags @@ -7868,7 +7868,7 @@ _02104920: ldr r0, _021049fc ; =data_027e0f78 ldr r0, [r0] bl func_ov04_02102e3c - ldr r0, _02104a00 ; =data_027e0e60 + ldr r0, _02104a00 ; =gMapManager ldr r0, [r0] bl func_ov04_02102260 ldr r0, _02104a04 ; =data_027e0f68 @@ -7894,7 +7894,7 @@ _02104920: ldrb r2, [r2] ldr r1, [sp] bl func_ov04_02109b78 - ldr r0, _02104a00 ; =data_027e0e60 + ldr r0, _02104a00 ; =gMapManager ldr r1, [sp] ldr r0, [r0] ldr r2, [sp, #4] @@ -7938,7 +7938,7 @@ _021049f0: .word data_027e0f64 _021049f4: .word data_ov09_0211f5b4 _021049f8: .word data_027e1048 _021049fc: .word data_027e0f78 -_02104a00: .word data_027e0e60 +_02104a00: .word gMapManager _02104a04: .word data_027e0f68 _02104a08: .word data_027e0f90 _02104a0c: .word data_027e0fc0 @@ -7971,7 +7971,7 @@ _02104a3c: ldr r0, _02104adc ; =data_027e0f68 ldr r0, [r0] bl func_ov04_02102ad8 - ldr r0, _02104ae0 ; =data_027e0e60 + ldr r0, _02104ae0 ; =gMapManager ldr r0, [r0] bl func_ov04_021025d8 ldr r0, _02104ae4 ; =data_027e0f64 @@ -8021,7 +8021,7 @@ _02104ad0: .word data_ov09_0211f5b4 _02104ad4: .word data_027e0e28 _02104ad8: .word data_ov00_020ee734 _02104adc: .word data_027e0f68 -_02104ae0: .word data_027e0e60 +_02104ae0: .word gMapManager _02104ae4: .word data_027e0f64 _02104ae8: .word gAdventureFlags _02104aec: .word data_027e0fe4 @@ -9864,7 +9864,7 @@ func_ov04_021058cc: ; 0x021058cc blx func_ov00_02078b40 cmp r0, #2 beq _021058f6 - ldr r0, _02105948 ; =data_027e0e60 + ldr r0, _02105948 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02084838Ev cmp r0, #0 @@ -9914,7 +9914,7 @@ _02105940: nop thumb_func_end func_ov04_021058cc _02105944: .word data_027e0d38 -_02105948: .word data_027e0e60 +_02105948: .word gMapManager _0210594c: .word 0x00000126 .global func_ov04_02105950 @@ -16578,7 +16578,7 @@ _02108c18: strh r1, [r4, #0x1c] ldrh r0, [r0, #0x16] strh r0, [r4, #0x1e] - ldr r0, _02108d20 ; =data_027e0e60 + ldr r0, _02108d20 ; =gMapManager ldrh r1, [r4, #0x14] ldr r0, [r0] lsr r1, r1, #4 @@ -16602,7 +16602,7 @@ _02108c18: ldrh r7, [r4, #0x16] lsl r0, r0, #0xc str r0, [sp, #0x3c] - ldr r0, _02108d20 ; =data_027e0e60 + ldr r0, _02108d20 ; =gMapManager lsr r1, r7, #4 ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083bacEv @@ -16689,7 +16689,7 @@ _02108d0e: .align 2, 0 thumb_func_end func_ov04_02108bd4 _02108d1c: .word data_027e0ff0 -_02108d20: .word data_027e0e60 +_02108d20: .word gMapManager _02108d24: .word 0x0b60b60b _02108d28: .word 0x00000800 @@ -16792,13 +16792,13 @@ func_ov04_02108de0: ; 0x02108de0 push {r4, r5, r6, r7, lr} sub sp, #0x44 add r4, r0, #0 - ldr r0, _02109090 ; =data_027e0e60 + ldr r0, _02109090 ; =gMapManager add r7, r1, #0 ldr r0, [r0] str r2, [sp, #4] blx _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0xc] - ldr r0, _02109090 ; =data_027e0e60 + ldr r0, _02109090 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp, #8] @@ -17172,7 +17172,7 @@ _0210906c: b _0210909c nop thumb_func_end func_ov04_02108de0 -_02109090: .word data_027e0e60 +_02109090: .word gMapManager _02109094: .word 0x0b60b60b _02109098: .word 0x00000800 _0210909c: @@ -17207,13 +17207,13 @@ func_ov04_021090c8: ; 0x021090c8 push {r3, r4, r5, r6, r7, lr} sub sp, #0x88 add r5, r0, #0 - ldr r0, _021092d0 ; =data_027e0e60 + ldr r0, _021092d0 ; =gMapManager str r1, [sp, #4] ldr r0, [r0] str r2, [sp, #8] blx _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0x18] - ldr r0, _021092d0 ; =data_027e0e60 + ldr r0, _021092d0 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp, #0x14] @@ -17270,7 +17270,7 @@ _021090f2: _02109148: b _021092ba _0210914a: - ldr r0, _021092d0 ; =data_027e0e60 + ldr r0, _021092d0 ; =gMapManager ldr r1, [r5, #0x10] ldr r0, [r0] lsl r1, r1, #0x10 @@ -17289,7 +17289,7 @@ _0210914a: _0210916c: b _021092b4 _0210916e: - ldr r0, _021092d0 ; =data_027e0e60 + ldr r0, _021092d0 ; =gMapManager add r1, r7, #0 ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083c24Ei @@ -17301,7 +17301,7 @@ _0210916e: blx func_0200388c add r0, r7, r0 str r0, [sp, #0x7c] - ldr r0, _021092d0 ; =data_027e0e60 + ldr r0, _021092d0 ; =gMapManager add r1, r6, #0 ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083c50Ei @@ -17316,7 +17316,7 @@ _0210916e: mov r0, #5 lsl r0, r0, #0xc str r0, [sp, #0x80] - ldr r0, _021092d0 ; =data_027e0e60 + ldr r0, _021092d0 ; =gMapManager add r1, sp, #0x7c ldr r0, [r0] mov r2, #0 @@ -17466,7 +17466,7 @@ _021092ca: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov04_021090c8 -_021092d0: .word data_027e0e60 +_021092d0: .word gMapManager _021092d4: .word 0x414e4353 _021092d8: .word 0x0b60b60b _021092dc: .word 0x00000800 @@ -17553,13 +17553,13 @@ _02109360: beq _02109382 b _0210938a _02109378: - ldr r0, _02109480 ; =data_027e0e60 + ldr r0, _02109480 ; =gMapManager ldr r1, [r0] mov r0, #1 strb r0, [r1, #8] b _0210938a _02109382: - ldr r0, _02109480 ; =data_027e0e60 + ldr r0, _02109480 ; =gMapManager ldr r1, [r0] mov r0, #0 strb r0, [r1, #8] @@ -17704,7 +17704,7 @@ _0210946c: nop thumb_func_end func_ov04_021092e8 _0210947c: .word 0x00001333 -_02109480: .word data_027e0e60 +_02109480: .word gMapManager _02109484: .word data_027e0618 _02109488: .word data_027e0d38 _0210948c: .word gOverlayManager @@ -17763,7 +17763,7 @@ _021094b2: lsr r0, r0, #0x1c add r0, r5, r0 asr r7, r0, #4 - ldr r0, _021095b0 ; =data_027e0e60 + ldr r0, _021095b0 ; =gMapManager add r1, r7, #0 ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083c50Ei @@ -17782,12 +17782,12 @@ _021094b2: add r2, r7, #0 add r0, r1, r0 str r0, [sp, #8] - ldr r0, _021095b0 ; =data_027e0e60 + ldr r0, _021095b0 ; =gMapManager ldr r1, [sp, #0xc] ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083e34Ecci add r5, r0, #0 - ldr r0, _021095b0 ; =data_027e0e60 + ldr r0, _021095b0 ; =gMapManager ldr r1, [sp, #0xc] ldr r0, [r0] blx _ZN10MapManager18func_ov00_02083c24Ei @@ -17848,7 +17848,7 @@ _021095a8: pop {r4, r5, r6, r7, pc} nop thumb_func_end func_ov04_021094a0 -_021095b0: .word data_027e0e60 +_021095b0: .word gMapManager _021095b4: .word 0x0b60b60b _021095b8: .word 0x00000800 @@ -17938,7 +17938,7 @@ _021095ec: lsl r0, r0, #0xa add r0, r1, r0 asr r6, r0, #0xc - ldr r0, _0210974c ; =data_027e0e60 + ldr r0, _0210974c ; =gMapManager asr r1, r6, #3 lsr r1, r1, #0x1c add r1, r6, r1 @@ -17977,7 +17977,7 @@ _021095ec: mul r1, r2 add r6, r1, r0 ldr r1, [sp, #8] - ldr r0, _0210974c ; =data_027e0e60 + ldr r0, _0210974c ; =gMapManager asr r1, r1, #3 lsr r2, r1, #0x1c ldr r1, [sp, #8] @@ -18052,7 +18052,7 @@ _02109746: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov04_021095bc -_0210974c: .word data_027e0e60 +_0210974c: .word gMapManager _02109750: .word 0x00001333 _02109754: .word 0x00000133 _02109758: .word 0x0b60b60b @@ -24825,7 +24825,7 @@ func_ov04_0210cb38: ; 0x0210cb38 str r0, [sp, #0xa0] add r0, sp, #0x80 blx func_ov00_020c3348 - ldr r0, _0210cc0c ; =data_027e0e60 + ldr r0, _0210cc0c ; =gMapManager add r1, sp, #0x74 ldr r0, [r0] blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -24857,7 +24857,7 @@ _0210cb7a: str r0, [sp, #0x68] add r0, sp, #0x48 blx func_ov00_020c3348 - ldr r0, _0210cc0c ; =data_027e0e60 + ldr r0, _0210cc0c ; =gMapManager add r1, sp, #0x3c ldr r0, [r0] blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -24886,7 +24886,7 @@ _0210cbc2: str r0, [sp, #0x30] add r0, sp, #0x10 blx func_ov00_020c3348 - ldr r0, _0210cc0c ; =data_027e0e60 + ldr r0, _0210cc0c ; =gMapManager add r1, sp, #4 ldr r0, [r0] blx _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -24904,7 +24904,7 @@ _0210cc04: .align 2, 0 thumb_func_end func_ov04_0210cb38 _0210cc08: .word data_027e0d38 -_0210cc0c: .word data_027e0e60 +_0210cc0c: .word gMapManager _0210cc10: .word data_027e0fe8 _0210cc14: .word 0x49434645 _0210cc18: .word 0x534e4546 diff --git a/asm/ov05.inc b/asm/ov05.inc index cb564927..0947554a 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -159,7 +159,7 @@ .extern data_027e0e2c .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov05.s b/asm/ov05.s index 41a25650..1e6810e9 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -604,7 +604,7 @@ _02101280: ldr r0, [r1, #4] tst r0, #1 bne _02101338 - ldr r0, _02101420 ; =data_027e0e60 + ldr r0, _02101420 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_84Ev ldr r3, [r8] @@ -709,7 +709,7 @@ _021013f4: .align 2, 0 arm_func_end func_ov05_02101230 _0210141c: .word data_027e077c -_02101420: .word data_027e0e60 +_02101420: .word gMapManager .global func_ov05_02101424 arm_func_start func_ov05_02101424 @@ -1340,12 +1340,12 @@ _02101c04: bl func_ov00_020a5e9c cmp r0, #0x12 bne _02101c90 - ldr r0, _021021dc ; =data_027e0e60 + ldr r0, _021021dc ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #2 beq _02101c44 - ldr r0, _021021dc ; =data_027e0e60 + ldr r0, _021021dc ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #3 @@ -1561,7 +1561,7 @@ _02101f18: cmp r0, #0 addne sp, sp, #0x58 ldmneia sp!, {r4, r5, r6, pc} - ldr r0, _021021dc ; =data_027e0e60 + ldr r0, _021021dc ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 @@ -1730,7 +1730,7 @@ _02102140: arm_func_end func_ov05_02101b14 _021021d4: .word data_027e0f64 _021021d8: .word data_027e0d38 -_021021dc: .word data_027e0e60 +_021021dc: .word gMapManager _021021e0: .word data_027e0f94 _021021e4: .word data_027e0ffc _021021e8: .word data_ov00_020eec9c @@ -2009,7 +2009,7 @@ _0210259c: mov r1, r8 ldr r0, [r0] bl func_ov05_021017e8 - ldr r0, _021026e0 ; =data_027e0e60 + ldr r0, _021026e0 ; =gMapManager mov r1, r8 ldr r0, [r0] bl func_ov05_0210112c @@ -2081,7 +2081,7 @@ _021026d0: .word data_027e0d04 _021026d4: .word data_027e0f90 _021026d8: .word data_027e0f64 _021026dc: .word data_027e0f78 -_021026e0: .word data_027e0e60 +_021026e0: .word gMapManager _021026e4: .word data_027e0fe4 _021026e8: .word data_027e0f6c _021026ec: .word data_ov12_0213deb0 @@ -2100,7 +2100,7 @@ func_ov05_021026f8: ; 0x021026f8 bl func_ov05_02103df0 cmp r5, #1 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _02102744 ; =data_027e0e60 + ldr r0, _02102744 ; =gMapManager mov r1, r4 ldr r0, [r0] bl func_ov05_021011b4 @@ -2112,7 +2112,7 @@ func_ov05_021026f8: ; 0x021026f8 .align 2, 0 arm_func_end func_ov05_021026f8 _02102740: .word data_027e103c -_02102744: .word data_027e0e60 +_02102744: .word gMapManager _02102748: .word data_027e0fc0 .global func_ov05_0210274c @@ -2164,7 +2164,7 @@ _021027d8: mov r1, r4 ldr r0, [r0] bl func_ov05_02105304 - ldr r0, _02102824 ; =data_027e0e60 + ldr r0, _02102824 ; =gMapManager mov r1, r4 ldr r0, [r0] bl func_ov05_021011cc @@ -2176,7 +2176,7 @@ _02102814: .word data_027e103c _02102818: .word data_027e0c54 _0210281c: .word data_027e0f90 _02102820: .word data_027e0fe4 -_02102824: .word data_027e0e60 +_02102824: .word gMapManager .global func_ov05_02102828 arm_func_start func_ov05_02102828 @@ -2266,7 +2266,7 @@ _0210294c: bl func_ov05_02101804 cmp r7, #0 bne _02102978 - ldr r0, _02102a5c ; =data_027e0e60 + ldr r0, _02102a5c ; =gMapManager mov r1, r8 ldr r0, [r0] bl func_ov05_021011fc @@ -2333,7 +2333,7 @@ _02102a4c: .word data_027e0de4 _02102a50: .word data_027e0de8 _02102a54: .word data_027e0f88 _02102a58: .word data_027e0f64 -_02102a5c: .word data_027e0e60 +_02102a5c: .word gMapManager _02102a60: .word data_027e0f90 _02102a64: .word data_027e0fe4 _02102a68: .word data_027e0618 @@ -2389,7 +2389,7 @@ _02102b08: .word data_027e0cbc arm_func_start func_ov05_02102b0c func_ov05_02102b0c: ; 0x02102b0c stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr ip, _02102c28 ; =data_027e0e60 + ldr ip, _02102c28 ; =gMapManager mov r8, r0 mov r7, r1 mov r4, r2 @@ -2471,7 +2471,7 @@ _02102c20: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov05_02102b0c -_02102c28: .word data_027e0e60 +_02102c28: .word gMapManager .global func_ov05_02102c2c arm_func_start func_ov05_02102c2c @@ -3320,7 +3320,7 @@ func_ov05_0210373c: ; 0x0210373c stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x10 ldr r7, [sp, #0x44] - ldr r4, _021038c0 ; =data_027e0e60 + ldr r4, _021038c0 ; =gMapManager ldr r6, [r7, #8] ldr r5, [sp, #0x3c] ldr r4, [r4] @@ -3419,7 +3419,7 @@ _021038b4: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov05_0210373c -_021038c0: .word data_027e0e60 +_021038c0: .word gMapManager _021038c4: .word data_ov05_021122a8 .global func_ov05_021038c8 @@ -3428,7 +3428,7 @@ func_ov05_021038c8: ; 0x021038c8 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x18 ldr r7, [sp, #0x4c] - ldr r4, _02103a9c ; =data_027e0e60 + ldr r4, _02103a9c ; =gMapManager ldr r6, [r7] ldr r5, [sp, #0x44] ldr r4, [r4] @@ -3548,7 +3548,7 @@ _02103a90: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov05_021038c8 -_02103a9c: .word data_027e0e60 +_02103a9c: .word gMapManager _02103aa0: .word data_ov05_021122a8 .global func_ov05_02103aa4 @@ -3684,12 +3684,12 @@ func_ov05_02103b88: ; 0x02103b88 .global func_ov05_02103ba0 arm_func_start func_ov05_02103ba0 func_ov05_02103ba0: ; 0x02103ba0 - ldr r0, _02103bac ; =data_027e0e60 + ldr r0, _02103bac ; =gMapManager ldr r0, [r0] bx lr .align 2, 0 arm_func_end func_ov05_02103ba0 -_02103bac: .word data_027e0e60 +_02103bac: .word gMapManager .global func_ov05_02103bb0 arm_func_start func_ov05_02103bb0 @@ -6070,7 +6070,7 @@ _021059f0: add r3, sp, #0 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02105c0c ; =data_027e0e60 + ldr r0, _02105c0c ; =gMapManager mov r1, r3 ldr r0, [r0] mov r2, #1 @@ -6210,7 +6210,7 @@ _02105bfc: .word 0x00000112 _02105c00: .word 0x00000113 _02105c04: .word 0x00000666 _02105c08: .word data_ov05_021124f0 -_02105c0c: .word data_027e0e60 +_02105c0c: .word gMapManager _02105c10: .word data_02050f54 _02105c14: .word 0x00000266 _02105c18: .word 0x00000115 @@ -7366,7 +7366,7 @@ func_ov05_02106bbc: ; 0x02106bbc mov r0, r5 bl _ZN13LinkStateBase12GetPlayerPosEv ldr r0, [r0, #4] - ldr r1, _02106c70 ; =data_027e0e60 + ldr r1, _02106c70 ; =gMapManager add r0, r0, #0x33 add r0, r0, #0x1300 str r0, [r4, #4] @@ -7387,7 +7387,7 @@ _02106c64: .align 2, 0 arm_func_end func_ov05_02106bbc _02106c6c: .word data_027e0fb8 -_02106c70: .word data_027e0e60 +_02106c70: .word gMapManager .global func_ov05_02106c74 arm_func_start func_ov05_02106c74 @@ -7700,7 +7700,7 @@ _0210707c: add r3, sp, #0x28 ldmia r4, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _021071e8 ; =data_027e0e60 + ldr r0, _021071e8 ; =gMapManager ldr r4, [sp, #0x28] ldr r5, [sp, #0x2c] ldr r2, [sp, #0x30] @@ -7721,7 +7721,7 @@ _0210707c: add r0, r0, #0x800 cmp r0, r8 bge _02107148 - ldr r0, _021071e8 ; =data_027e0e60 + ldr r0, _021071e8 ; =gMapManager add r1, sp, #0x10 ldr r0, [r0] mov r2, #1 @@ -7775,7 +7775,7 @@ _021071d8: .word data_ov05_021126ac _021071dc: .word data_027e0fb8 _021071e0: .word 0x00000ccd _021071e4: .word data_027e0e58 -_021071e8: .word data_027e0e60 +_021071e8: .word gMapManager _021071ec: .word 0xfffffb33 _021071f0: .word func_ov05_02106c74 _021071f4: .word data_027e103c @@ -8382,7 +8382,7 @@ _02107a18: ldrsh r0, [r4, #0x10] cmp r0, #0 bgt _02107b1c - ldr r1, _02107b68 ; =data_027e0e60 + ldr r1, _02107b68 ; =gMapManager mov r0, r4 ldr r5, [r1] bl _ZN13LinkStateBase12GetPlayerPosEv @@ -8452,7 +8452,7 @@ _02107b1c: _02107b5c: .word data_ov05_021126ac _02107b60: .word data_ov05_021126b4 _02107b64: .word data_027e0fb8 -_02107b68: .word data_027e0e60 +_02107b68: .word gMapManager _02107b6c: .word data_ov05_021122e0 _02107b70: .word data_027e0d0c @@ -10028,7 +10028,7 @@ _02109018: bl func_ov00_020d70a4 b _02109080 _02109060: - ldr r0, _02109294 ; =data_027e0e60 + ldr r0, _02109294 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 @@ -10180,7 +10180,7 @@ _02109278: arm_func_end func_ov05_02108f98 _0210928c: .word data_ov00_020eec68 _02109290: .word data_027e071c -_02109294: .word data_027e0e60 +_02109294: .word gMapManager _02109298: .word data_027e0d38 _0210929c: .word data_027e0618 _021092a0: .word data_027e0c54 @@ -10966,7 +10966,7 @@ _02109d0c: str r1, [r7, #0x40] str r3, [r7, #0x44] str r2, [r7, #0x48] - ldr r0, _02109e80 ; =data_027e0e60 + ldr r0, _02109e80 ; =gMapManager add r1, r7, #0x40 ldr r0, [r0] mov r2, #1 @@ -11058,7 +11058,7 @@ _02109e74: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov05_02109cd0 -_02109e80: .word data_027e0e60 +_02109e80: .word gMapManager .global func_ov05_02109e84 arm_func_start func_ov05_02109e84 @@ -11801,12 +11801,12 @@ func_ov05_0210a7d4: ; 0x0210a7d4 str r1, [r0, #4] b _0210aa98 _0210a830: - ldr r1, _0210aad8 ; =data_027e0e60 + ldr r1, _0210aad8 ; =gMapManager add r0, sp, #0x14 ldr r1, [r1] add r2, sp, #0x2c bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _0210aad8 ; =data_027e0e60 + ldr r0, _0210aad8 ; =gMapManager add r1, sp, #0x14 ldr r0, [r0] mov r5, #0 @@ -11829,7 +11829,7 @@ _0210a830: movls r5, #0 cmp r1, r0 bne _0210a904 - ldr r1, _0210aad8 ; =data_027e0e60 + ldr r1, _0210aad8 ; =gMapManager mov r0, r6 ldr r7, [r1] bl _ZN13LinkStateBase15GetGrabActorRefEv @@ -11867,7 +11867,7 @@ _0210a904: mov r5, #1 cmp r1, r0 beq _0210aa20 - ldr r0, _0210aad8 ; =data_027e0e60 + ldr r0, _0210aad8 ; =gMapManager add r1, sp, #0x2c ldr r0, [r0] mov r2, #0 @@ -11906,7 +11906,7 @@ _0210a904: mov ip, #0 str r1, [sp, #0x24] ldr r1, [r0, #8] - ldr r0, _0210aad8 ; =data_027e0e60 + ldr r0, _0210aad8 ; =gMapManager str r1, [sp, #0x28] ldr r2, [r4, #0x98] add r1, sp, #0x38 @@ -11979,7 +11979,7 @@ _0210aac0: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov05_0210a7d4 -_0210aad8: .word data_027e0e60 +_0210aad8: .word gMapManager _0210aadc: .word 0x424f4d42 _0210aae0: .word gItemManager _0210aae4: .word 0x43525953 @@ -12399,7 +12399,7 @@ _0210ae98: movne r1, #1 moveq r1, #0 strb r1, [r5, #0xb1] - ldr r0, _0210b290 ; =data_027e0e60 + ldr r0, _0210b290 ; =gMapManager ldr r7, [sp, #0x28] ldr r6, [sp, #0x2c] ldr r3, [sp, #0x30] @@ -12514,7 +12514,7 @@ _0210b280: .word data_027e0fe4 _0210b284: .word gAdventureFlags _0210b288: .word data_02050f54 _0210b28c: .word 0x0000ffff -_0210b290: .word data_027e0e60 +_0210b290: .word gMapManager _0210b294: .word data_027e0fb8 _0210b298: .word data_ov05_021128a4 _0210b29c: .word data_ov05_021128b4 @@ -12818,7 +12818,7 @@ _0210b684: ldr r0, _0210b95c ; =data_027e0fb8 ldr r0, [r0] bl _ZN13PlayerControl9SetUnk_80Ev - ldr r1, _0210b968 ; =data_027e0e60 + ldr r1, _0210b968 ; =gMapManager add r0, sp, #0x12 ldr r4, [r1] add r2, r5, #0x24 @@ -12865,7 +12865,7 @@ _0210b6dc: ldmia sp!, {r3, r4, r5, r6, pc} _0210b73c: mov r1, #2 - ldr r0, _0210b968 ; =data_027e0e60 + ldr r0, _0210b968 ; =gMapManager str r1, [r5, #0xc] ldr r4, [r0] add r0, sp, #0x10 @@ -12910,7 +12910,7 @@ _0210b7b0: _0210b7dc: mov r0, r5 bl _ZN13LinkStateBase18EquipItem_vfunc_28Ev - ldr r1, _0210b968 ; =data_027e0e60 + ldr r1, _0210b968 ; =gMapManager mov r0, r5 ldr r6, [r1] bl _ZN13LinkStateBase12GetPlayerPosEv @@ -12919,7 +12919,7 @@ _0210b7dc: mov r0, r6 bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [r4] - ldr r1, _0210b968 ; =data_027e0e60 + ldr r1, _0210b968 ; =gMapManager mov r0, r5 ldr r6, [r1] bl _ZN13LinkStateBase12GetPlayerPosEv @@ -13012,7 +13012,7 @@ _0210b954: _0210b95c: .word data_027e0fb8 _0210b960: .word data_ov05_02112984 _0210b964: .word data_ov05_021129f4 -_0210b968: .word data_027e0e60 +_0210b968: .word gMapManager .global func_ov05_0210b96c arm_func_start func_ov05_0210b96c @@ -13064,7 +13064,7 @@ func_ov05_0210b9c4: ; 0x0210b9c4 ldr r1, _0210ba8c ; =data_027e0fe4 str r0, [sp] ldr r2, [r4, #0x28] - ldr r0, _0210ba90 ; =data_027e0e60 + ldr r0, _0210ba90 ; =gMapManager str r2, [sp, #4] ldr r3, [r4, #0x2c] ldr r5, [r1] @@ -13106,7 +13106,7 @@ _0210ba7c: .align 2, 0 arm_func_end func_ov05_0210b9c4 _0210ba8c: .word data_027e0fe4 -_0210ba90: .word data_027e0e60 +_0210ba90: .word gMapManager _0210ba94: .word data_ov00_020eec9c .global func_ov05_0210ba98 @@ -13135,7 +13135,7 @@ func_ov05_0210babc: ; 0x0210babc cmp r0, #0 beq _0210bb10 ldr r1, [r4, #0x24] - ldr r0, _0210bb48 ; =data_027e0e60 + ldr r0, _0210bb48 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x28] ldr r0, [r0] @@ -13164,7 +13164,7 @@ _0210bb10: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov05_0210babc -_0210bb48: .word data_027e0e60 +_0210bb48: .word gMapManager _0210bb4c: .word data_027e0fb8 .global func_ov05_0210bb50 @@ -13199,7 +13199,7 @@ func_ov05_0210bb98: ; 0x0210bb98 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev mov r1, #0 strb r1, [r0, #0xbc] - ldr r1, _0210bd58 ; =data_027e0e60 + ldr r1, _0210bd58 ; =gMapManager add r0, sp, #0 ldr r4, [r1] add r2, r5, #0x24 @@ -13314,7 +13314,7 @@ _0210bd48: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov05_0210bb98 -_0210bd58: .word data_027e0e60 +_0210bd58: .word gMapManager _0210bd5c: .word gAdventureFlags _0210bd60: .word data_027e0fb8 _0210bd64: .word data_ov05_021129d4 @@ -13334,7 +13334,7 @@ func_ov05_0210bd70: ; 0x0210bd70 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev mov r1, #0 strb r1, [r0, #0xbc] - ldr r1, _0210bf40 ; =data_027e0e60 + ldr r1, _0210bf40 ; =gMapManager add r0, sp, #0 ldr r4, [r1] add r2, r5, #0x24 @@ -13451,7 +13451,7 @@ _0210beb8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov05_0210bd70 -_0210bf40: .word data_027e0e60 +_0210bf40: .word gMapManager _0210bf44: .word data_027e0fb8 _0210bf48: .word gAdventureFlags _0210bf4c: .word 0x00000155 @@ -13662,7 +13662,7 @@ func_ov05_0210c20c: ; 0x0210c20c bl _ZN13PlayerControl18func_ov00_020af01cEPc cmp r0, #0 beq _0210c2a8 - ldr r0, _0210c950 ; =data_027e0e60 + ldr r0, _0210c950 ; =gMapManager ldrb r2, [sp, #8] ldrb r1, [sp, #9] ldr r0, [r0] @@ -13752,7 +13752,7 @@ _0210c398: ldr r5, [r0, #0xa0] cmp r5, #0 beq _0210c3ec - ldr r0, _0210c950 ; =data_027e0e60 + ldr r0, _0210c950 ; =gMapManager add r1, r5, #0x18 ldr r0, [r0] add r2, r7, #0x24 @@ -13841,7 +13841,7 @@ _0210c4d8: ldr r0, [r0] bl _ZN13PlayerControl13StopFollowingEv ldr r1, [r7, #0x24] - ldr r0, _0210c950 ; =data_027e0e60 + ldr r0, _0210c950 ; =gMapManager str r1, [sp, #0x3c] ldr r1, [r7, #0x28] ldr r0, [r0] @@ -13863,7 +13863,7 @@ _0210c528: ldmia sp!, {r3, r4, r5, r6, r7, pc} _0210c540: ldr r1, [r7, #0x24] - ldr r0, _0210c950 ; =data_027e0e60 + ldr r0, _0210c950 ; =gMapManager str r1, [sp, #0x30] ldr r1, [r7, #0x28] ldr r0, [r0] @@ -13953,7 +13953,7 @@ _0210c650: ldmia sp!, {r3, r4, r5, r6, r7, pc} _0210c680: ldr r1, [r7, #0x24] - ldr r0, _0210c950 ; =data_027e0e60 + ldr r0, _0210c950 ; =gMapManager str r1, [sp, #0x24] ldr r1, [r7, #0x28] ldr r0, [r0] @@ -13964,7 +13964,7 @@ _0210c680: str r3, [sp, #0x2c] bl _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi str r0, [r7, #0x10] - ldr r1, _0210c950 ; =data_027e0e60 + ldr r1, _0210c950 ; =gMapManager add r0, sp, #6 ldr r1, [r1] add r2, r7, #0x24 @@ -14049,7 +14049,7 @@ _0210c7cc: cmpne r1, r0 bne _0210c818 ldr r1, [r7, #0x24] - ldr r0, _0210c950 ; =data_027e0e60 + ldr r0, _0210c950 ; =gMapManager str r1, [sp, #0x18] ldr r1, [r7, #0x28] ldr r0, [r0] @@ -14074,7 +14074,7 @@ _0210c824: mov r1, #0 str r2, [sp, #0x14] bl _ZNK11ItemManager8GetFairyEi - ldr r1, _0210c950 ; =data_027e0e60 + ldr r1, _0210c950 ; =gMapManager mov r4, r0 ldr r0, [r1] add r1, sp, #0xc @@ -14143,7 +14143,7 @@ _0210c93c: arm_func_end func_ov05_0210c20c _0210c948: .word data_027e0618 _0210c94c: .word data_027e0fb8 -_0210c950: .word data_027e0e60 +_0210c950: .word gMapManager _0210c954: .word data_ov00_020eec9c _0210c958: .word data_ov05_02112324 _0210c95c: .word data_ov05_02112360 @@ -14195,7 +14195,7 @@ _0210c9d0: _0210c9e4: mov r5, #2 _0210c9e8: - ldr r1, _0210ca7c ; =data_027e0e60 + ldr r1, _0210ca7c ; =gMapManager add r0, sp, #0 ldr r6, [r1] add r2, r4, #0x24 @@ -14234,7 +14234,7 @@ _0210c9e8: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov05_0210c990 -_0210ca7c: .word data_027e0e60 +_0210ca7c: .word gMapManager .global func_ov05_0210ca80 arm_func_start func_ov05_0210ca80 @@ -16372,7 +16372,7 @@ _0210e6d8: cmp r0, #0 beq _0210e72c ldr r0, _0210e884 ; =data_027e0fd4 - ldr r1, _0210e894 ; =data_027e0e60 + ldr r1, _0210e894 ; =gMapManager ldr r2, [r0] ldr r0, [r1] add r1, r2, #0xc4 @@ -16474,7 +16474,7 @@ _0210e884: .word data_027e0fd4 _0210e888: .word data_027e0fa0 _0210e88c: .word data_027e0fd0 _0210e890: .word data_027e0f94 -_0210e894: .word data_027e0e60 +_0210e894: .word gMapManager _0210e898: .word gAdventureFlags _0210e89c: .word 0x66666667 _0210e8a0: .word data_027e0fac @@ -16504,7 +16504,7 @@ func_ov05_0210e8b4: ; 0x0210e8b4 ldr r1, [r1, #0x14] cmp r1, #1 bne _0210e918 - ldr r0, _0210ea8c ; =data_027e0e60 + ldr r0, _0210ea8c ; =gMapManager ldrh r2, [r5, #0xe] ldr r0, [r0] add r1, sp, #4 @@ -16619,7 +16619,7 @@ _0210ea38: .align 2, 0 arm_func_end func_ov05_0210e8b4 _0210ea88: .word data_027e0d38 -_0210ea8c: .word data_027e0e60 +_0210ea8c: .word gMapManager _0210ea90: .word data_027e0fac _0210ea94: .word data_027e0f94 _0210ea98: .word data_027e0fcc @@ -18859,7 +18859,7 @@ func_ov05_021109c0: ; 0x021109c0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 ldr r1, _02110b38 ; =data_027e0fd4 - ldr r2, _02110b3c ; =data_027e0e60 + ldr r2, _02110b3c ; =gMapManager ldr r1, [r1] mov r6, r0 ldr r0, [r2] @@ -18972,7 +18972,7 @@ _02110b2c: .align 2, 0 arm_func_end func_ov05_021109c0 _02110b38: .word data_027e0fd4 -_02110b3c: .word data_027e0e60 +_02110b3c: .word gMapManager .global func_ov05_02110b40 arm_func_start func_ov05_02110b40 @@ -19393,7 +19393,7 @@ _021110cc: _02111100: bl _ZN13LinkStateBase12GetPlayerPosEv ldr r2, [r0] - ldr r1, _021112e8 ; =data_027e0e60 + ldr r1, _021112e8 ; =gMapManager str r2, [sp, #0xc] ldr r2, [r0, #4] ldr r5, [r1] @@ -19522,7 +19522,7 @@ _021112d8: .word data_ov05_02112b34 _021112dc: .word data_027e0e58 _021112e0: .word 0x0000102e _021112e4: .word 0x000001a7 -_021112e8: .word data_027e0e60 +_021112e8: .word gMapManager .global func_ov05_021112ec arm_func_start func_ov05_021112ec @@ -20206,7 +20206,7 @@ func_ov05_02111c00: ; 0x02111c00 mov r0, r5 mov r1, r4 bl func_ov00_02080de8 - ldr r0, _02111c68 ; =data_027e0e60 + ldr r0, _02111c68 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -20219,7 +20219,7 @@ func_ov05_02111c00: ; 0x02111c00 ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov05_02111c00 -_02111c68: .word data_027e0e60 +_02111c68: .word gMapManager .global func_ov05_02111c6c arm_func_start func_ov05_02111c6c @@ -20446,7 +20446,7 @@ func_ov05_02111f40: ; 0x02111f40 ldr r0, [r5, #0xf0] cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _02111fb0 ; =data_027e0e60 + ldr r0, _02111fb0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020848b8Ev cmp r0, #0 @@ -20466,7 +20466,7 @@ func_ov05_02111f40: ; 0x02111f40 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov05_02111f40 -_02111fb0: .word data_027e0e60 +_02111fb0: .word gMapManager _02111fb4: .word data_027e0d3c .global func_ov05_02111fb8 diff --git a/asm/ov09.inc b/asm/ov09.inc index a19e48af..5f97c006 100644 --- a/asm/ov09.inc +++ b/asm/ov09.inc @@ -49,7 +49,7 @@ .extern data_027e0e28 .extern data_027e0e2c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f90 .extern data_027e0fbc diff --git a/asm/ov09.s b/asm/ov09.s index b9675189..acb0357c 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -3206,7 +3206,7 @@ func_ov09_02114554: ; 0x02114554 blx _ZN12ActorManager14Actor_vfunc_28Ev mov r0, #0 str r0, [sp, #8] - ldr r0, _021146ac ; =data_027e0e60 + ldr r0, _021146ac ; =gMapManager add r1, sp, #0x14 ldr r7, [r0] ldr r0, [sp, #8] @@ -3345,7 +3345,7 @@ _02114688: ldr r1, [sp, #8] add r0, r5, #0 bl func_ov09_02114520 - ldr r0, _021146ac ; =data_027e0e60 + ldr r0, _021146ac ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_02082adcEv add sp, #0x1ec @@ -3353,7 +3353,7 @@ _02114688: .align 2, 0 thumb_func_end func_ov09_02114554 _021146a8: .word data_027e0fe4 -_021146ac: .word data_027e0e60 +_021146ac: .word gMapManager _021146b0: .word data_027e0d38 _021146b4: .word data_ov00_020e9f10 _021146b8: .word data_ov00_020ea110 @@ -16510,7 +16510,7 @@ _0211c3d4: .word data_027e0ce0 func_ov09_0211c3d8: ; 0x0211c3d8 push {r3, r4, r5, lr} add r4, r0, #0 - ldr r0, _0211c418 ; =data_027e0e60 + ldr r0, _0211c418 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager18func_ov00_020848b8Ev strb r0, [r4, #0xa] @@ -16541,7 +16541,7 @@ _0211c416: pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov09_0211c3d8 -_0211c418: .word data_027e0e60 +_0211c418: .word gMapManager .global func_ov09_0211c41c thumb_func_start func_ov09_0211c41c @@ -18378,7 +18378,7 @@ func_ov09_0211d180: ; 0x0211d180 str r2, [sp, #0x94] add r3, r2, r1 ldr r9, [r4, #8] - ldr r1, _0211d658 ; =data_027e0e60 + ldr r1, _0211d658 ; =gMapManager mov r5, r0 ldr r0, [r1] add r1, sp, #0x90 @@ -18690,7 +18690,7 @@ _0211d628: .align 2, 0 arm_func_end func_ov09_0211d180 _0211d654: .word 0xfffffccd -_0211d658: .word data_027e0e60 +_0211d658: .word gMapManager _0211d65c: .word 0x00000385 _0211d660: .word 0xfffff4a4 _0211d664: .word 0x0000099a @@ -18850,7 +18850,7 @@ func_ov09_0211d860: ; 0x0211d860 push {r3, r4, r5, r6, r7, lr} sub sp, #0x40 add r6, r0, #0 - ldr r0, _0211d89c ; =data_027e0e60 + ldr r0, _0211d89c ; =gMapManager mov r5, #0 ldr r4, [r0] add r7, sp, #0 @@ -18879,7 +18879,7 @@ _0211d88a: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov09_0211d860 -_0211d89c: .word data_027e0e60 +_0211d89c: .word gMapManager .global func_ov09_0211d8a0 thumb_func_start func_ov09_0211d8a0 diff --git a/asm/ov12.inc b/asm/ov12.inc index 4131efbf..601b38ee 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -128,7 +128,7 @@ .extern data_027e0dcc .extern data_027e0e2c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f84 diff --git a/asm/ov12.s b/asm/ov12.s index 36039620..f3e1e475 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -931,7 +931,7 @@ _0211371c: .word data_027e0fe0 arm_func_start func_ov12_02113720 func_ov12_02113720: ; 0x02113720 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0211378c ; =data_027e0e60 + ldr r2, _0211378c ; =gMapManager mov r4, r0 ldr r0, [r2] mov r5, r1 @@ -959,13 +959,13 @@ func_ov12_02113720: ; 0x02113720 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_02113720 -_0211378c: .word data_027e0e60 +_0211378c: .word gMapManager .global func_ov12_02113790 arm_func_start func_ov12_02113790 func_ov12_02113790: ; 0x02113790 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _021137e4 ; =data_027e0e60 + ldr r2, _021137e4 ; =gMapManager mov r4, r0 ldr r0, [r2] mov r5, r1 @@ -987,7 +987,7 @@ func_ov12_02113790: ; 0x02113790 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_02113790 -_021137e4: .word data_027e0e60 +_021137e4: .word gMapManager .global func_ov12_021137e8 arm_func_start func_ov12_021137e8 @@ -1003,7 +1003,7 @@ func_ov12_021137e8: ; 0x021137e8 add r0, r2, r0, lsr #22 add r0, r0, r1, lsr #20 mov r4, r0, lsl #0x6 - ldr r0, _02113834 ; =data_027e0e60 + ldr r0, _02113834 ; =gMapManager tst r4, #0x20000 orrne r4, r4, #0x3fc0000 ldr r0, [r0] @@ -1013,7 +1013,7 @@ func_ov12_021137e8: ; 0x021137e8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov12_021137e8 -_02113834: .word data_027e0e60 +_02113834: .word gMapManager .global func_ov12_02113838 arm_func_start func_ov12_02113838 @@ -1026,7 +1026,7 @@ func_ov12_02113838: ; 0x02113838 mov r0, r0, lsl #0x1a add r0, r1, r0, lsr #20 mov r4, r0, lsl #0x6 - ldr r0, _02113878 ; =data_027e0e60 + ldr r0, _02113878 ; =gMapManager tst r4, #0x20000 orrne r4, r4, #0x3fc0000 ldr r0, [r0] @@ -1036,7 +1036,7 @@ func_ov12_02113838: ; 0x02113838 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov12_02113838 -_02113878: .word data_027e0e60 +_02113878: .word gMapManager .global func_ov12_0211387c arm_func_start func_ov12_0211387c @@ -6736,12 +6736,12 @@ func_ov12_02118428: ; 0x02118428 addeq sp, sp, #0x128 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r0, _02118808 ; =data_027e0e60 + ldr r0, _02118808 ; =gMapManager add r1, sp, #0xbc ldr r0, [r0] mov r2, #0 bl _ZN10MapManager16MapData_vfunc_68Ev - ldr r1, _02118808 ; =data_027e0e60 + ldr r1, _02118808 ; =gMapManager str r0, [sp, #0x9c] ldr r0, [r1] add r1, sp, #0xbc @@ -6785,7 +6785,7 @@ _0211857c: cmp r10, #0 stmia r7, {r0, r1, r2} ble _0211877c - ldr r11, _02118808 ; =data_027e0e60 + ldr r11, _02118808 ; =gMapManager add r5, r8, #0x8c add r4, sp, #0x44 mov r6, #0 @@ -6934,7 +6934,7 @@ _0211877c: _021187fc: .word data_027e0c38 _02118800: .word data_027e0d3c _02118804: .word data_ov12_02137d20 -_02118808: .word data_027e0e60 +_02118808: .word gMapManager _0211880c: .word 0x0000ffff _02118810: .word 0xfffff0f7 @@ -8226,12 +8226,12 @@ func_ov12_021196d4: ; 0x021196d4 bl func_ov00_020bbb64 cmp r0, #0 bne _02119774 - ldr r1, _0211977c ; =data_027e0e60 + ldr r1, _0211977c ; =gMapManager add r0, sp, #0 ldr r1, [r1] mov r2, r4 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _0211977c ; =data_027e0e60 + ldr r0, _0211977c ; =gMapManager ldrb r1, [sp] ldrb r2, [sp, #1] ldr r0, [r0] @@ -8264,7 +8264,7 @@ _02119774: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_021196d4 -_0211977c: .word data_027e0e60 +_0211977c: .word gMapManager .global func_ov12_02119780 arm_func_start func_ov12_02119780 @@ -8361,7 +8361,7 @@ func_ov12_02119840: ; 0x02119840 arm_func_start func_ov12_0211986c func_ov12_0211986c: ; 0x0211986c stmdb sp!, {r3, r4, r5, lr} - ldr r2, _02119964 ; =data_027e0e60 + ldr r2, _02119964 ; =gMapManager mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -8377,7 +8377,7 @@ func_ov12_0211986c: ; 0x0211986c strb r0, [r5, #0x118] ldrb r2, [r5, #0x119] and r1, r3, #0x1f00 - ldr r0, _02119964 ; =data_027e0e60 + ldr r0, _02119964 ; =gMapManager bic r3, r2, #0x1f and r2, r3, #0xff orr r1, r2, r1, asr #8 @@ -8424,7 +8424,7 @@ func_ov12_0211986c: ; 0x0211986c ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_0211986c -_02119964: .word data_027e0e60 +_02119964: .word gMapManager .global func_ov12_02119968 arm_func_start func_ov12_02119968 @@ -8437,7 +8437,7 @@ func_ov12_02119968: ; 0x02119968 mov r0, r0, lsl #0x1b add r0, r2, r0, lsr #19 mov r6, r0, lsl #0x5 - ldr r0, _02119a24 ; =data_027e0e60 + ldr r0, _02119a24 ; =gMapManager tst r6, #0x20000 orrne r6, r6, #0x3fc0000 ldr r0, [r0] @@ -8467,7 +8467,7 @@ func_ov12_02119968: ; 0x02119968 add r0, r1, r0, lsr #22 add r0, r0, r2, lsr #19 mov r5, r0, lsl #0x5 - ldr r0, _02119a24 ; =data_027e0e60 + ldr r0, _02119a24 ; =gMapManager tst r5, #0x20000 orrne r5, r5, #0x3fc0000 ldr r0, [r0] @@ -8478,7 +8478,7 @@ func_ov12_02119968: ; 0x02119968 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov12_02119968 -_02119a24: .word data_027e0e60 +_02119a24: .word gMapManager .global func_ov12_02119a28 arm_func_start func_ov12_02119a28 @@ -9488,7 +9488,7 @@ func_ov12_0211a7d0: ; 0x0211a7d0 _0211a830: mov r4, r2 _0211a834: - ldr r0, _0211a948 ; =data_027e0e60 + ldr r0, _0211a948 ; =gMapManager add r1, sp, #8 ldr r0, [r0] mov r2, r4 @@ -9560,7 +9560,7 @@ _0211a884: .align 2, 0 arm_func_end func_ov12_0211a7d0 _0211a944: .word data_ov12_02137c64 -_0211a948: .word data_027e0e60 +_0211a948: .word gMapManager _0211a94c: .word data_027e0f94 _0211a950: .word data_027e0fcc _0211a954: .word data_027e0fd4 @@ -10858,7 +10858,7 @@ func_ov12_0211b9c4: ; 0x0211b9c4 add r4, r0, #0xd8 str r1, [sp] ldr r1, [r7, r8] - ldr r0, _0211ba90 ; =data_027e0e60 + ldr r0, _0211ba90 ; =gMapManager str r1, [sp, #4] ldr r2, [r4, r8] ldr r0, [r0] @@ -10889,7 +10889,7 @@ _0211ba84: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov12_0211b9c4 -_0211ba90: .word data_027e0e60 +_0211ba90: .word gMapManager .global func_ov12_0211ba94 arm_func_start func_ov12_0211ba94 @@ -27791,10 +27791,10 @@ func_ov12_021296a4: ; 0x021296a4 mov r1, r1, asr #0x5 and r1, r1, #7 bl func_ov12_0212a258 - ldr r0, _0212975c ; =data_027e0e60 + ldr r0, _0212975c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18Get_MapData_Unk_d0Ev - ldr r1, _0212975c ; =data_027e0e60 + ldr r1, _0212975c ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d8Ev @@ -27833,7 +27833,7 @@ func_ov12_021296a4: ; 0x021296a4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_021296a4 -_0212975c: .word data_027e0e60 +_0212975c: .word gMapManager .global func_ov12_02129760 arm_func_start func_ov12_02129760 @@ -28545,7 +28545,7 @@ func_ov12_0212a104: ; 0x0212a104 add r0, r0, #0x1300 cmp r1, r0 bge _0212a15c - ldr r0, _0212a164 ; =data_027e0e60 + ldr r0, _0212a164 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_48Ev ldr r1, [r5, #0x4c] @@ -28561,20 +28561,20 @@ _0212a15c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_0212a104 -_0212a164: .word data_027e0e60 +_0212a164: .word gMapManager .global func_ov12_0212a168 arm_func_start func_ov12_0212a168 func_ov12_0212a168: ; 0x0212a168 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0212a230 ; =data_027e0e60 + ldr r2, _0212a230 ; =gMapManager mov r5, r0 mov r4, r1 ldr r1, [r2] add r0, sp, #0 add r2, r5, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _0212a230 ; =data_027e0e60 + ldr r0, _0212a230 ; =gMapManager ldrb r1, [sp] ldrb r2, [sp, #1] ldr r0, [r0] @@ -28624,7 +28624,7 @@ _0212a220: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_0212a168 -_0212a230: .word data_027e0e60 +_0212a230: .word gMapManager .global func_ov12_0212a234 arm_func_start func_ov12_0212a234 @@ -28870,10 +28870,10 @@ _0212a520: add r1, sp, #0 mov r0, r5 bl func_ov12_0212a234 - ldr r0, _0212a618 ; =data_027e0e60 + ldr r0, _0212a618 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18Get_MapData_Unk_d0Ev - ldr r1, _0212a618 ; =data_027e0e60 + ldr r1, _0212a618 ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d8Ev @@ -28925,7 +28925,7 @@ _0212a60c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_0212a4d4 -_0212a618: .word data_027e0e60 +_0212a618: .word gMapManager .global func_ov12_0212a61c arm_func_start func_ov12_0212a61c @@ -29007,7 +29007,7 @@ _0212a6cc: bl func_01ff9bc4 _0212a740: ldr r1, [r6, #0x48] - ldr r0, _0212a9ec ; =data_027e0e60 + ldr r0, _0212a9ec ; =gMapManager str r1, [sp, #0x14] ldr r1, [r6, #0x4c] ldr r0, [r0] @@ -29025,12 +29025,12 @@ _0212a740: ldrb r0, [r6, #0x256] cmp r0, #0 beq _0212a8e4 - ldr r1, _0212a9ec ; =data_027e0e60 + ldr r1, _0212a9ec ; =gMapManager add r0, sp, #0 ldr r1, [r1] add r2, r6, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _0212a9ec ; =data_027e0e60 + ldr r0, _0212a9ec ; =gMapManager ldrb r1, [sp] ldrb r2, [sp, #1] ldr r0, [r0] @@ -29073,7 +29073,7 @@ _0212a81c: b _0212a8c0 _0212a830: ldr r1, [r6, #0x48] - ldr r0, _0212a9ec ; =data_027e0e60 + ldr r0, _0212a9ec ; =gMapManager str r1, [sp, #8] ldr r2, [r6, #0x4c] ldr r1, [r0] @@ -29193,7 +29193,7 @@ _0212a9d4: arm_func_end func_ov12_0212a61c _0212a9e4: .word 0x00000555 _0212a9e8: .word 0xc00c00c1 -_0212a9ec: .word data_027e0e60 +_0212a9ec: .word gMapManager _0212a9f0: .word data_ov12_0213dd0c _0212a9f4: .word data_ov12_02137c64 _0212a9f8: .word data_ov00_020eec9c @@ -29254,7 +29254,7 @@ _0212aa88: .word data_ov12_0213dc88 func_ov12_0212aa8c: ; 0x0212aa8c stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr} sub sp, sp, #0x30 - ldr r1, _0212ad00 ; =data_027e0e60 + ldr r1, _0212ad00 ; =gMapManager mov r10, r0 ldr r0, [r1] mov r1, #0 @@ -29263,7 +29263,7 @@ func_ov12_0212aa8c: ; 0x0212aa8c mov r1, #3 mov r7, r0 bl func_01ff9b4c - ldr r0, _0212ad00 ; =data_027e0e60 + ldr r0, _0212ad00 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv str r0, [sp] @@ -29320,13 +29320,13 @@ _0212ab2c: mla r2, r1, r0, r2 mov r9, r2 _0212ab90: - ldr r0, _0212ad00 ; =data_027e0e60 + ldr r0, _0212ad00 ; =gMapManager mov r1, r8 ldr r0, [r0] mov r2, r9 bl _ZN10MapManager18func_ov00_020840a0Ecci mov r5, r0 - ldr r0, _0212ad00 ; =data_027e0e60 + ldr r0, _0212ad00 ; =gMapManager ldr r2, _0212ad08 ; =func_ov00_020b1940 ldr r6, [r0] mov r0, r8 @@ -29374,7 +29374,7 @@ _0212ab90: ldr r0, [sp, #0x28] ldr r1, [sp, #0x24] str r0, [sp, #0x10] - ldr r0, _0212ad00 ; =data_027e0e60 + ldr r0, _0212ad00 ; =gMapManager str r1, [sp, #0xc] ldr r1, [sp, #0x2c] ldr r0, [r0] @@ -29415,7 +29415,7 @@ _0212acec: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov12_0212aa8c -_0212ad00: .word data_027e0e60 +_0212ad00: .word gMapManager _0212ad04: .word data_027e0764 _0212ad08: .word func_ov00_020b1940 @@ -29713,12 +29713,12 @@ _0212b0bc: ldrb r0, [r4, #0x255] cmp r0, #0 beq _0212b11c - ldr r1, _0212b13c ; =data_027e0e60 + ldr r1, _0212b13c ; =gMapManager add r0, sp, #0 ldr r1, [r1] add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _0212b13c ; =data_027e0e60 + ldr r0, _0212b13c ; =gMapManager ldrb r1, [sp] ldrb r2, [sp, #1] ldr r0, [r0] @@ -29748,7 +29748,7 @@ _0212b130: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov12_0212b078 -_0212b13c: .word data_027e0e60 +_0212b13c: .word gMapManager _0212b140: .word data_ov12_0213dd0c .global func_ov12_0212b144 @@ -30526,7 +30526,7 @@ func_ov12_0212ba84: ; 0x0212ba84 sub sp, sp, #0x1c mov r6, r2 mov r7, r1 - ldr r2, _0212bb9c ; =data_027e0e60 + ldr r2, _0212bb9c ; =gMapManager mov r8, r0 ldrb r1, [r6, #1] ldr r0, [r2] @@ -30538,7 +30538,7 @@ func_ov12_0212ba84: ; 0x0212ba84 mov r1, r6 ldr r2, [r2, #0x60] blx r2 - ldr r1, _0212bb9c ; =data_027e0e60 + ldr r1, _0212bb9c ; =gMapManager mov r9, r0 ldr r0, [r1] ldrb r1, [r6] @@ -30597,7 +30597,7 @@ _0212bb90: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov12_0212ba84 -_0212bb9c: .word data_027e0e60 +_0212bb9c: .word gMapManager _0212bba0: .word data_027e0f68 .global func_ov12_0212bba4 @@ -33922,10 +33922,10 @@ func_ov12_0212e3e8: ; 0x0212e3e8 mov r0, r5 bl func_ov12_0212e990 _0212e42c: - ldr r0, _0212e4cc ; =data_027e0e60 + ldr r0, _0212e4cc ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18Get_MapData_Unk_d0Ev - ldr r1, _0212e4cc ; =data_027e0e60 + ldr r1, _0212e4cc ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d8Ev @@ -33964,7 +33964,7 @@ _0212e42c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_0212e3e8 -_0212e4cc: .word data_027e0e60 +_0212e4cc: .word gMapManager .global func_ov12_0212e4d0 arm_func_start func_ov12_0212e4d0 @@ -34453,7 +34453,7 @@ _0212eb6c: beq _0212ec88 ldrb r1, [r5, #0x218] ldr r6, [r5, #0x130] - ldr r0, _0212eca8 ; =data_027e0e60 + ldr r0, _0212eca8 ; =gMapManager bic r3, r1, #0x20 and r2, r3, #0xff mov r1, r6, lsl #0x1f @@ -34461,7 +34461,7 @@ _0212eb6c: strb r1, [r5, #0x218] ldr r0, [r0] bl _ZN10MapManager18Get_MapData_Unk_d0Ev - ldr r1, _0212eca8 ; =data_027e0e60 + ldr r1, _0212eca8 ; =gMapManager mov r6, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d8Ev @@ -34529,7 +34529,7 @@ _0212ec94: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov12_0212eb14 -_0212eca8: .word data_027e0e60 +_0212eca8: .word gMapManager _0212ecac: .word 0x00001fe0 .global func_ov12_0212ecb0 @@ -34537,14 +34537,14 @@ _0212ecac: .word 0x00001fe0 func_ov12_0212ecb0: ; 0x0212ecb0 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x14 - ldr r1, _0212ed4c ; =data_027e0e60 + ldr r1, _0212ed4c ; =gMapManager mov r4, r0 ldr r1, [r1] add r0, sp, #0 add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r1, [r4, #0x48] - ldr r0, _0212ed4c ; =data_027e0e60 + ldr r0, _0212ed4c ; =gMapManager str r1, [sp, #8] ldr r2, [r4, #0x4c] ldr r1, [r0] @@ -34578,7 +34578,7 @@ _0212ed40: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov12_0212ecb0 -_0212ed4c: .word data_027e0e60 +_0212ed4c: .word gMapManager .global func_ov12_0212ed50 arm_func_start func_ov12_0212ed50 @@ -35599,7 +35599,7 @@ _0212fa88: cmp r5, r4 bne _0212fa88 _0212fa9c: - ldr r0, _0212fb04 ; =data_027e0e60 + ldr r0, _0212fb04 ; =gMapManager add r1, r6, #0x74 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839c4Ei @@ -35627,7 +35627,7 @@ _0212fa9c: .align 2, 0 arm_func_end func_ov12_0212fa68 _0212fb00: .word data_ov12_021375ac -_0212fb04: .word data_027e0e60 +_0212fb04: .word gMapManager _0212fb08: .word func_ov12_021194c0 .global func_ov12_0212fb0c @@ -35648,7 +35648,7 @@ _0212fb2c: cmp r5, r4 bne _0212fb2c _0212fb40: - ldr r0, _0212fba0 ; =data_027e0e60 + ldr r0, _0212fba0 ; =gMapManager add r1, r6, #0x74 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839c4Ei @@ -35674,7 +35674,7 @@ _0212fb40: .align 2, 0 arm_func_end func_ov12_0212fb0c _0212fb9c: .word data_ov12_021375ac -_0212fba0: .word data_027e0e60 +_0212fba0: .word gMapManager _0212fba4: .word func_ov12_021194c0 .global func_ov12_0212fba8 @@ -35822,7 +35822,7 @@ _0212fc68: mov r2, #0 str r0, [r4, #0x7c] ldr r1, [sp, #0x10] - ldr r0, _0212fe9c ; =data_027e0e60 + ldr r0, _0212fe9c ; =gMapManager str r1, [r4, #0x80] ldr r3, [sp, #0x14] add r1, r4, #0x74 @@ -35878,7 +35878,7 @@ _0212fe78: _0212fe90: .word 0xfffff666 _0212fe94: .word data_02050f54 _0212fe98: .word 0x000004cd -_0212fe9c: .word data_027e0e60 +_0212fe9c: .word gMapManager _0212fea0: .word 0x0000026e .global func_ov12_0212fea4 @@ -36220,7 +36220,7 @@ func_ov12_0213024c: ; 0x0213024c mov r0, #0 str r0, [sp, #0xc] str r0, [sp, #0x10] - ldr r0, _021306a0 ; =data_027e0e60 + ldr r0, _021306a0 ; =gMapManager add r1, sp, #0xa4 ldr r0, [r0] add r2, sp, #0x80 @@ -36458,7 +36458,7 @@ _02130598: .align 2, 0 arm_func_end func_ov12_0213024c _0213069c: .word 0x0000ffff -_021306a0: .word data_027e0e60 +_021306a0: .word gMapManager _021306a4: .word 0x00000d9a _021306a8: .word data_ov12_0213758c _021306ac: .word data_ov12_02137574 @@ -36738,11 +36738,11 @@ _02130990: .word func_ov12_02130994 arm_func_start func_ov12_02130994 func_ov12_02130994: ; 0x02130994 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _02130a90 ; =data_027e0e60 + ldr r1, _02130a90 ; =gMapManager mov r5, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d0Ev - ldr r1, _02130a90 ; =data_027e0e60 + ldr r1, _02130a90 ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d8Ev @@ -36809,7 +36809,7 @@ _02130a84: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_02130994 -_02130a90: .word data_027e0e60 +_02130a90: .word gMapManager .global func_ov12_02130a94 arm_func_start func_ov12_02130a94 @@ -37593,7 +37593,7 @@ func_ov12_021314e8: ; 0x021314e8 add r0, r4, #0x48 bl func_ov00_020c70ac ldr r1, [r4, #0x48] - ldr r0, _021315b4 ; =data_027e0e60 + ldr r0, _021315b4 ; =gMapManager str r1, [sp, #0xc] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -37621,7 +37621,7 @@ func_ov12_021314e8: ; 0x021314e8 .align 2, 0 arm_func_end func_ov12_021314e8 _021315b0: .word data_ov12_02137d1c -_021315b4: .word data_027e0e60 +_021315b4: .word gMapManager _021315b8: .word data_ov12_02137680 .global func_ov12_021315bc @@ -37905,7 +37905,7 @@ _021318d0: ldr r0, [r10, #8] stmib sp, {r0, r11} str r5, [sp, #0xc] - ldr r0, _02131a28 ; =data_027e0e60 + ldr r0, _02131a28 ; =gMapManager str r5, [sp, #0x10] ldr r0, [r0] bl func_01ffbe78 @@ -37937,7 +37937,7 @@ _02131a00: _02131a1c: .word data_027e0764 _02131a20: .word data_02050f54 _02131a24: .word 0x0000ffff -_02131a28: .word data_027e0e60 +_02131a28: .word gMapManager _02131a2c: .word data_ov12_02137680 .global func_ov12_02131a30 @@ -38132,10 +38132,10 @@ _02131c90: ldrb r0, [r4, #0x754] cmp r0, #0 beq _02131d64 - ldr r0, _02131d78 ; =data_027e0e60 + ldr r0, _02131d78 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18Get_MapData_Unk_d0Ev - ldr r1, _02131d78 ; =data_027e0e60 + ldr r1, _02131d78 ; =gMapManager mov r5, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d8Ev @@ -38190,7 +38190,7 @@ _02131d64: arm_func_end func_ov12_02131bdc _02131d70: .word data_ov12_02137c64 _02131d74: .word data_027e0f90 -_02131d78: .word data_027e0e60 +_02131d78: .word gMapManager .global func_ov12_02131d7c arm_func_start func_ov12_02131d7c @@ -38691,7 +38691,7 @@ func_ov12_0213234c: ; 0x0213234c moveq r0, #0 ldmeqia sp!, {pc} ldr r2, [r1, #0x48] - ldr r0, _021323c8 ; =data_027e0e60 + ldr r0, _021323c8 ; =gMapManager str r2, [sp] ldr r2, [r1, #0x4c] ldr r0, [r0] @@ -38710,7 +38710,7 @@ _021323b8: .align 2, 0 arm_func_end func_ov12_0213234c _021323c4: .word 0x42545246 -_021323c8: .word data_027e0e60 +_021323c8: .word gMapManager .global func_ov12_021323cc arm_func_start func_ov12_021323cc @@ -41089,7 +41089,7 @@ func_ov12_02134300: ; 0x02134300 mov lr, #0x47 mov r2, #0xff strb r2, [sp, #0x12] - ldr r1, _02134374 ; =data_027e0e60 + ldr r1, _02134374 ; =gMapManager mov r4, r0 str lr, [sp] str ip, [sp, #4] @@ -41113,7 +41113,7 @@ func_ov12_02134300: ; 0x02134300 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov12_02134300 -_02134374: .word data_027e0e60 +_02134374: .word gMapManager .global func_ov12_02134378 arm_func_start func_ov12_02134378 diff --git a/asm/ov14/Actor/ActorRupee.inc b/asm/ov14/Actor/ActorRupee.inc index e9efdb15..503947b8 100644 --- a/asm/ov14/Actor/ActorRupee.inc +++ b/asm/ov14/Actor/ActorRupee.inc @@ -56,7 +56,7 @@ .extern _ZN9SysObjectnwEmPjj .extern __register_global_object .extern data_027e0764 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0fc8 .extern data_027e0fe0 .extern data_ov00_020e9370 diff --git a/asm/ov14/Actor/ActorRupee.s b/asm/ov14/Actor/ActorRupee.s index c5d567e4..8a454123 100644 --- a/asm/ov14/Actor/ActorRupee.s +++ b/asm/ov14/Actor/ActorRupee.s @@ -431,7 +431,7 @@ _0213b3cc: cmp r0, #0 beq _0213b4fc ldr r1, [r5, #0x48] - ldr r0, _0213b518 ; =data_027e0e60 + ldr r0, _0213b518 ; =gMapManager str r1, [sp, #4] ldr r2, [r5, #0x4c] ldr r1, [r0] @@ -517,7 +517,7 @@ _0213b4fc: _0213b50c: .word data_027e0fc8 _0213b510: .word gItemManager _0213b514: .word data_ov00_020eec9c -_0213b518: .word data_027e0e60 +_0213b518: .word gMapManager .global _ZN10ActorRupee8vfunc_14Ej arm_func_start _ZN10ActorRupee8vfunc_14Ej diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index e2e3a669..d0057a03 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -159,7 +159,7 @@ .extern data_027e0d44 .extern data_027e0d78 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 639e0deb..56e7282a 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -322,7 +322,7 @@ func_ov14_0211f980: ; 0x0211f980 ldr r0, _0211faa4 ; =gItemManager mvn r5, #0 ldr r3, _0211faa8 ; =data_027e0d3c - ldr r2, _0211faac ; =data_027e0e60 + ldr r2, _0211faac ; =gMapManager ldr r0, [r0] mov r1, #7 str r5, [sp, #4] @@ -389,7 +389,7 @@ _0211fa8c: arm_func_end func_ov14_0211f980 _0211faa4: .word gItemManager _0211faa8: .word data_027e0d3c -_0211faac: .word data_027e0e60 +_0211faac: .word gMapManager .global func_ov14_0211fab0 arm_func_start func_ov14_0211fab0 @@ -2675,7 +2675,7 @@ _021218e4: add lr, sp, #0x34 str r1, [sp, #0x30] ldr r1, [r5, #0x48] - ldr ip, _021219e0 ; =data_027e0e60 + ldr ip, _021219e0 ; =gMapManager str r1, [sp, #0x1c] ldr r2, [r5, #0x4c] add r1, sp, #0x44 @@ -2705,7 +2705,7 @@ _021219d0: .word data_027e0fb8 _021219d4: .word data_027e0f64 _021219d8: .word 0x0000ffff _021219dc: .word data_ov14_02155aa4 -_021219e0: .word data_027e0e60 +_021219e0: .word gMapManager .global func_ov14_021219e4 arm_func_start func_ov14_021219e4 @@ -3267,7 +3267,7 @@ _02122124: cmp r0, #3 bne _02122420 ldr r1, [r5, #0x248] - ldr r0, _02122acc ; =data_027e0e60 + ldr r0, _02122acc ; =gMapManager str r1, [sp, #0x2c] ldr r1, [r5, #0x24c] ldr r0, [r0] @@ -3312,7 +3312,7 @@ _02122174: mov r7, #0 str r0, [sp, #0x8c] ldr r1, [r5, #0x4c] - ldr r0, _02122acc ; =data_027e0e60 + ldr r0, _02122acc ; =gMapManager str r1, [sp, #0x90] ldr r8, _02122ad4 ; =0x0000ffff ldr r1, [r5, #0x50] @@ -3735,7 +3735,7 @@ _02122820: cmp r0, #0 beq _02122864 ldr r1, [r5, #0x48] - ldr r0, _02122acc ; =data_027e0e60 + ldr r0, _02122acc ; =gMapManager str r1, [sp, #0x14] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -3913,7 +3913,7 @@ _02122abc: .word 0x0000059a _02122ac0: .word 0x00000333 _02122ac4: .word data_02050f54 _02122ac8: .word 0x000004cd -_02122acc: .word data_027e0e60 +_02122acc: .word gMapManager _02122ad0: .word 0x00000e66 _02122ad4: .word 0x0000ffff _02122ad8: .word data_027e0764 @@ -5961,7 +5961,7 @@ _0212448c: mov r0, r5 bl _ZN5Actor12ApplyGravityEv ldr r1, [r5, #0x48] - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager str r1, [sp, #0x74] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -6020,7 +6020,7 @@ _02124580: bl func_ov14_0213ed94 ldrb r2, [r0] ldrb r3, [r0, #1] - ldr r1, _02124c54 ; =data_027e0e60 + ldr r1, _02124c54 ; =gMapManager strb r2, [sp, #0xe] ldr r1, [r1] add r0, sp, #0xc @@ -6045,7 +6045,7 @@ _02124580: str r0, [r5, #0x174] b _02124724 _02124608: - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager ldrb r1, [sp, #0xe] ldr r0, [r0] sub r3, sp, #4 @@ -6071,7 +6071,7 @@ _02124608: b _02124724 _02124668: ldr r1, [r5, #0x48] - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager str r1, [sp, #0x68] ldr r2, [r5, #0x4c] ldr r1, [r0] @@ -6082,7 +6082,7 @@ _02124668: str r3, [sp, #0x70] bl _ZN10MapManager18func_ov00_02083fb0EiPS_i ldr r1, [r5, #0x48] - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager str r1, [sp, #0x5c] ldr r1, [r5, #0x4c] ldr r7, [r0] @@ -6180,7 +6180,7 @@ _021247d8: mov r1, #0 str r1, [r0, #0x34] ldr r1, [r5, #0x48] - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager str r1, [sp, #0x80] ldr r7, [r5, #0x4c] ldr r0, [r0] @@ -6226,7 +6226,7 @@ _021248a8: cmp r0, #0 beq _02124930 ldr r1, [r5, #0xb8] - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager str r1, [r5, #0x48] ldr r2, [r5, #0xbc] add r1, sp, #0x44 @@ -6290,7 +6290,7 @@ _02124948: bl func_ov00_0208967c _021249a4: ldr r1, [r5, #0x48] - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager str r1, [sp, #0x38] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -6309,7 +6309,7 @@ _021249a4: cmp r0, #0 beq _02124a6c ldr r1, [r5, #0x48] - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager str r1, [sp, #0x2c] ldr r2, [r5, #0x4c] ldr r1, [r0] @@ -6382,7 +6382,7 @@ _02124af0: cmp r0, #0 bne _02124b50 ldr r1, [r5, #0x48] - ldr r0, _02124c54 ; =data_027e0e60 + ldr r0, _02124c54 ; =gMapManager str r1, [sp, #0x20] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -6477,7 +6477,7 @@ _02124c44: .word data_027e077c _02124c48: .word data_02056be4 _02124c4c: .word data_027e0ffc _02124c50: .word 0x000001a1 -_02124c54: .word data_027e0e60 +_02124c54: .word gMapManager _02124c58: .word 0x00000333 _02124c5c: .word data_ov14_02153bfc _02124c60: .word data_ov14_0215ac9c @@ -6866,7 +6866,7 @@ _021250fc: .word data_ov14_02155fd4 arm_func_start func_ov14_02125100 func_ov14_02125100: ; 0x02125100 stmdb sp!, {r3, lr} - ldr r2, _02125124 ; =data_027e0e60 + ldr r2, _02125124 ; =gMapManager ldrsh r1, [r0, #0x34] ldr r0, [r2] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -6876,7 +6876,7 @@ func_ov14_02125100: ; 0x02125100 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_02125100 -_02125124: .word data_027e0e60 +_02125124: .word gMapManager .global func_ov14_02125128 arm_func_start func_ov14_02125128 @@ -7041,7 +7041,7 @@ func_ov14_021252b8: ; 0x021252b8 cmp r0, #1 bne _02125340 ldr r0, [r5, #0x18] - ldr r1, _02125598 ; =data_027e0e60 + ldr r1, _02125598 ; =gMapManager add r0, r0, #0x3fc add r0, r0, #0x400 str r0, [r5, #0x18] @@ -7054,7 +7054,7 @@ func_ov14_021252b8: ; 0x021252b8 strb r3, [sp, #0xd] bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r2, [sp, #0xc] - ldr r0, _02125598 ; =data_027e0e60 + ldr r0, _02125598 ; =gMapManager add r1, sp, #0xc add r3, r2, #1 ldr r0, [r0] @@ -7089,7 +7089,7 @@ _02125340: add r1, sp, #0x14 mov r2, r0 bl func_01ff9bc4 - ldr r0, _02125598 ; =data_027e0e60 + ldr r0, _02125598 ; =gMapManager ldrb r3, [r5, #0x15] ldrb r2, [r5, #0x14] ldr r0, [r0] @@ -7102,7 +7102,7 @@ _02125340: ldrb r1, [r5, #0x14] cmp r0, #1 bne _02125444 - ldr r0, _02125598 ; =data_027e0e60 + ldr r0, _02125598 ; =gMapManager ldrb r3, [r5, #0x15] ldr r0, [r0] sub r2, r1, #1 @@ -7115,7 +7115,7 @@ _02125340: ldrb r2, [sp, #0xa] subgt r0, r0, #0x800 strgt r0, [sp, #0x50] - ldr r0, _02125598 ; =data_027e0e60 + ldr r0, _02125598 ; =gMapManager add r2, r2, #3 ldr r0, [r0] add r1, sp, #0xa @@ -7128,7 +7128,7 @@ _02125340: str r0, [sp, #0x44] b _021254a0 _02125444: - ldr r0, _02125598 ; =data_027e0e60 + ldr r0, _02125598 ; =gMapManager ldrb r3, [r5, #0x15] ldr r0, [r0] sub r2, r1, #1 @@ -7141,7 +7141,7 @@ _02125444: ldrb r2, [sp, #8] subeq r0, r0, #0x800 streq r0, [sp, #0x50] - ldr r0, _02125598 ; =data_027e0e60 + ldr r0, _02125598 ; =gMapManager add r2, r2, #2 ldr r0, [r0] add r1, sp, #8 @@ -7153,7 +7153,7 @@ _02125444: streq r0, [sp, #0x44] _021254a0: ldrb r1, [r5, #0x15] - ldr r0, _02125598 ; =data_027e0e60 + ldr r0, _02125598 ; =gMapManager ldrb r3, [r5, #0x14] sub r2, r1, #1 ldr r0, [r0] @@ -7163,7 +7163,7 @@ _021254a0: bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 bne _021254ec - ldr r0, _02125598 ; =data_027e0e60 + ldr r0, _02125598 ; =gMapManager add r1, sp, #6 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_60Ev @@ -7218,7 +7218,7 @@ _0212553c: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov14_021252b8 -_02125598: .word data_027e0e60 +_02125598: .word gMapManager .global func_ov14_0212559c arm_func_start func_ov14_0212559c @@ -7420,14 +7420,14 @@ _02125864: beq _02125890 cmp r0, #2 ldmneia sp!, {r4, pc} - ldr r0, _021258b0 ; =data_027e0e60 + ldr r0, _021258b0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084ce4Ei ldmia sp!, {r4, pc} _02125890: - ldr r0, _021258b0 ; =data_027e0e60 + ldr r0, _021258b0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -7437,7 +7437,7 @@ _02125890: arm_func_end func_ov14_0212559c _021258a8: .word gAdventureFlags _021258ac: .word data_ov14_02153c04 -_021258b0: .word data_027e0e60 +_021258b0: .word gMapManager .global func_ov14_021258b4 arm_func_start func_ov14_021258b4 @@ -7565,7 +7565,7 @@ _021259c4: ldrb r2, [r4, #0x36] strb r2, [sp, #0xc0] bl _ZN14AdventureFlags18func_Ov00_02097810Ei - ldr r1, _02125c18 ; =data_027e0e60 + ldr r1, _02125c18 ; =gMapManager str r0, [r4, #0x68] ldr r0, [r1] add r1, r4, #0x18 @@ -7653,7 +7653,7 @@ _02125b40: ldrb r0, [r4, #0x71] cmp r0, #0 beq _02125b88 - ldr r0, _02125c18 ; =data_027e0e60 + ldr r0, _02125c18 ; =gMapManager ldr r1, [r4, #0x64] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej @@ -7686,7 +7686,7 @@ _02125bd8: ldrb r0, [r4, #0x71] cmp r0, #0 beq _02125bfc - ldr r0, _02125c18 ; =data_027e0e60 + ldr r0, _02125c18 ; =gMapManager ldr r1, [r4, #0x64] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej @@ -7703,7 +7703,7 @@ _02125c04: arm_func_end func_ov14_0212595c _02125c10: .word data_ov14_02153c04 _02125c14: .word gAdventureFlags -_02125c18: .word data_027e0e60 +_02125c18: .word gMapManager _02125c1c: .word data_027e0ffc _02125c20: .word 0x000001af @@ -7763,7 +7763,7 @@ _02125cc0: moveq r0, #0 ldmia sp!, {r4, pc} _02125cd8: - ldr r0, _02125d48 ; =data_027e0e60 + ldr r0, _02125d48 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cfcEi @@ -7778,7 +7778,7 @@ _02125cd8: moveq r0, #0 ldmia sp!, {r4, pc} _02125d10: - ldr r0, _02125d48 ; =data_027e0e60 + ldr r0, _02125d48 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -7794,7 +7794,7 @@ _02125d10: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02125c98 -_02125d48: .word data_027e0e60 +_02125d48: .word gMapManager .global func_ov14_02125d4c arm_func_start func_ov14_02125d4c @@ -8156,7 +8156,7 @@ _02126110: .word data_ov14_021562ac arm_func_start func_ov14_02126114 func_ov14_02126114: ; 0x02126114 stmdb sp!, {r3, lr} - ldr r2, _02126138 ; =data_027e0e60 + ldr r2, _02126138 ; =gMapManager ldrsh r1, [r0, #0x34] ldr r0, [r2] bl _ZN10MapManager18func_ov00_02084cfcEi @@ -8166,7 +8166,7 @@ func_ov14_02126114: ; 0x02126114 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_02126114 -_02126138: .word data_027e0e60 +_02126138: .word gMapManager .global func_ov14_0212613c arm_func_start func_ov14_0212613c @@ -8878,7 +8878,7 @@ _02126898: mov r2, #1 strb r2, [r5, #0x83] ldrb r1, [r5, #0x15] - ldr r0, _02126ab4 ; =data_027e0e60 + ldr r0, _02126ab4 ; =gMapManager ldrb r3, [r5, #0x14] add ip, r1, #1 ldr r0, [r0] @@ -8929,7 +8929,7 @@ _02126958: str r3, [sp, #0x2c] bl func_01ff9bc4 ldrb r1, [r5, #0x14] - ldr r0, _02126ab4 ; =data_027e0e60 + ldr r0, _02126ab4 ; =gMapManager ldrb ip, [r5, #0x15] add r3, r1, #1 ldr r0, [r0] @@ -8978,7 +8978,7 @@ _02126a20: .align 2, 0 arm_func_end func_ov14_02126854 _02126ab0: .word 0x0000059a -_02126ab4: .word data_027e0e60 +_02126ab4: .word gMapManager _02126ab8: .word 0x00002666 .global func_ov14_02126abc @@ -9397,7 +9397,7 @@ _02127064: ldmgtia sp!, {r4, pc} mov r1, #1 strb r1, [r4, #0x3c] - ldr r0, _02127180 ; =data_027e0e60 + ldr r0, _02127180 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -9417,7 +9417,7 @@ _021270b0: ldmgtia sp!, {r4, pc} mov r1, #1 strb r1, [r4, #0x3c] - ldr r0, _02127180 ; =data_027e0e60 + ldr r0, _02127180 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -9434,7 +9434,7 @@ _021270fc: ldmltia sp!, {r4, pc} mov r1, #0 strb r1, [r4, #0x3c] - ldr r0, _02127180 ; =data_027e0e60 + ldr r0, _02127180 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 @@ -9451,7 +9451,7 @@ _0212713c: cmp r0, #0 ldmneia sp!, {r4, pc} mov r1, #1 - ldr r0, _02127180 ; =data_027e0e60 + ldr r0, _02127180 ; =gMapManager strb r1, [r4, #0x3c] ldr r0, [r0] add r1, r4, #0x38 @@ -9460,7 +9460,7 @@ _0212713c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02127034 -_02127180: .word data_027e0e60 +_02127180: .word gMapManager _02127184: .word gAdventureFlags .global func_ov14_02127188 @@ -9582,7 +9582,7 @@ _0212731c: _02127338: cmp r4, #0 bne _021276a0 - ldr r0, _021276b0 ; =data_027e0e60 + ldr r0, _021276b0 ; =gMapManager ldrsh r1, [r5, #0x34] ldr r0, [r0] mov r2, #0 @@ -9609,7 +9609,7 @@ _02127378: b _021276a0 _0212739c: mvn r1, #0 - ldr r0, _021276b0 ; =data_027e0e60 + ldr r0, _021276b0 ; =gMapManager str r1, [r5, #0x64] ldr r0, [r0] add r1, r5, #0x38 @@ -9747,7 +9747,7 @@ _02127548: cmp r0, #0 cmpne r0, #1 bne _021275cc - ldr r0, _021276b0 ; =data_027e0e60 + ldr r0, _021276b0 ; =gMapManager mov r2, r4 ldr r0, [r0] add r1, r5, #0x18 @@ -9755,7 +9755,7 @@ _02127548: bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _021276a0 _021275cc: - ldr r0, _021276b0 ; =data_027e0e60 + ldr r0, _021276b0 ; =gMapManager mov r2, r4 ldr r0, [r0] add r1, r5, #0x18 @@ -9796,14 +9796,14 @@ _02127644: mov r0, r5 mov r2, r1 bl func_ov00_0208ba08 - ldr r0, _021276b0 ; =data_027e0e60 + ldr r0, _021276b0 ; =gMapManager ldrsh r1, [r5, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084cb0Ei _02127674: mov r1, #0 - ldr r0, _021276b0 ; =data_027e0e60 + ldr r0, _021276b0 ; =gMapManager strb r1, [r5, #0x3c] ldr r0, [r0] add r1, r5, #0x38 @@ -9820,7 +9820,7 @@ _021276a0: .align 2, 0 arm_func_end func_ov14_02127188 _021276ac: .word gAdventureFlags -_021276b0: .word data_027e0e60 +_021276b0: .word gMapManager _021276b4: .word data_027e0ffc _021276b8: .word 0x000001b5 _021276bc: .word data_ov14_02153c38 @@ -9834,14 +9834,14 @@ func_ov14_021276c0: ; 0x021276c0 .global func_ov14_021276c4 arm_func_start func_ov14_021276c4 func_ov14_021276c4: ; 0x021276c4 - ldr r2, _021276d8 ; =data_027e0e60 + ldr r2, _021276d8 ; =gMapManager 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 +_021276d8: .word gMapManager _021276dc: .word _ZN10MapManager18func_ov00_02084cc8Ei .global func_ov14_021276e0 @@ -10057,7 +10057,7 @@ func_ov14_02127984: ; 0x02127984 mov r2, r1 str r3, [r4, #0x64] bl func_ov00_0208ba08 - ldr r0, _021279c8 ; =data_027e0e60 + ldr r0, _021279c8 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -10069,7 +10069,7 @@ func_ov14_02127984: ; 0x02127984 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02127984 -_021279c8: .word data_027e0e60 +_021279c8: .word gMapManager .global func_ov14_021279cc arm_func_start func_ov14_021279cc @@ -10244,7 +10244,7 @@ func_ov14_02127bb0: ; 0x02127bb0 cmp r11, r0 addge sp, sp, #8 ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r4, _02127c5c ; =data_027e0e60 + ldr r4, _02127c5c ; =gMapManager add r5, sp, #4 _02127bfc: ldrb r7, [r10, #0x15] @@ -10275,7 +10275,7 @@ _02127c3c: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_02127bb0 -_02127c5c: .word data_027e0e60 +_02127c5c: .word gMapManager .global func_ov14_02127c60 arm_func_start func_ov14_02127c60 @@ -10521,7 +10521,7 @@ func_ov14_02127eb8: ; 0x02127eb8 bl _ZN14AdventureFlags3GetEj ldmia sp!, {r3, pc} _02127edc: - ldr r2, _02127ef4 ; =data_027e0e60 + ldr r2, _02127ef4 ; =gMapManager ldrsh r1, [r0, #0x34] ldr r0, [r2] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -10529,7 +10529,7 @@ _02127edc: .align 2, 0 arm_func_end func_ov14_02127eb8 _02127ef0: .word gAdventureFlags -_02127ef4: .word data_027e0e60 +_02127ef4: .word gMapManager .global func_ov14_02127ef8 arm_func_start func_ov14_02127ef8 @@ -13623,7 +13623,7 @@ func_ov14_0212a758: ; 0x0212a758 ldrh r0, [r4, #0x26] cmp r0, #1 bne _0212a8f4 - ldr r0, _0212a91c ; =data_027e0e60 + ldr r0, _0212a91c ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -13657,7 +13657,7 @@ _0212a8f4: arm_func_end func_ov14_0212a758 _0212a914: .word 0x000007fc _0212a918: .word 0x000002cd -_0212a91c: .word data_027e0e60 +_0212a91c: .word gMapManager .global func_ov14_0212a920 arm_func_start func_ov14_0212a920 @@ -13754,7 +13754,7 @@ _0212aa30: mov r0, r4 mov r2, r1 bl func_ov00_0208ba08 - ldr r0, _0212aaa4 ; =data_027e0e60 + ldr r0, _0212aaa4 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -13771,7 +13771,7 @@ _0212aa8c: _0212aa98: .word data_027e0e58 _0212aa9c: .word 0x000001a1 _0212aaa0: .word data_027e0ffc -_0212aaa4: .word data_027e0e60 +_0212aaa4: .word gMapManager .global func_ov14_0212aaa8 arm_func_start func_ov14_0212aaa8 @@ -14033,7 +14033,7 @@ func_ov14_0212acdc: ; 0x0212acdc blx ip ldrb r1, [r4, #0x14] ldrb r3, [r4, #0x15] - ldr r0, _0212ae9c ; =data_027e0e60 + ldr r0, _0212ae9c ; =gMapManager add r2, r1, #1 strb r2, [sp, #4] ldr r0, [r0] @@ -14044,7 +14044,7 @@ func_ov14_0212acdc: ; 0x0212acdc ldrh r0, [r4, #0x26] cmp r0, #1 bne _0212ae78 - ldr r0, _0212ae9c ; =data_027e0e60 + ldr r0, _0212ae9c ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -14077,7 +14077,7 @@ _0212ae78: .align 2, 0 arm_func_end func_ov14_0212acdc _0212ae98: .word 0x0000059a -_0212ae9c: .word data_027e0e60 +_0212ae9c: .word gMapManager .global func_ov14_0212aea0 arm_func_start func_ov14_0212aea0 @@ -14162,7 +14162,7 @@ _0212af98: mov r0, r4 mov r2, r1 bl func_ov00_0208ba08 - ldr r0, _0212b00c ; =data_027e0e60 + ldr r0, _0212b00c ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -14179,7 +14179,7 @@ _0212aff4: _0212b000: .word data_027e0e58 _0212b004: .word 0x000001a1 _0212b008: .word data_027e0ffc -_0212b00c: .word data_027e0e60 +_0212b00c: .word gMapManager .global func_ov14_0212b010 arm_func_start func_ov14_0212b010 @@ -14243,22 +14243,22 @@ func_ov14_0212b0c0: ; 0x0212b0c0 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldrh r4, [r6, #0x28] - ldr r0, _0212b124 ; =data_027e0e60 + ldr r0, _0212b124 ; =gMapManager ldrh r5, [r6, #0x2a] ldr r0, [r0] mov r1, r4 bl _ZN10MapManager18func_ov00_020823d4Ei - ldr r1, _0212b124 ; =data_027e0e60 + ldr r1, _0212b124 ; =gMapManager str r0, [r6, #0xcc] ldr r0, [r1] mov r1, r4 bl _ZN10MapManager18func_ov00_020823e4Ei - ldr r1, _0212b124 ; =data_027e0e60 + ldr r1, _0212b124 ; =gMapManager str r0, [r6, #0xd0] ldr r0, [r1] mov r1, r5 bl _ZN10MapManager18func_ov00_020823d4Ei - ldr r1, _0212b124 ; =data_027e0e60 + ldr r1, _0212b124 ; =gMapManager str r0, [r6, #0xd4] ldr r0, [r1] mov r1, r5 @@ -14267,7 +14267,7 @@ func_ov14_0212b0c0: ; 0x0212b0c0 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_0212b0c0 -_0212b124: .word data_027e0e60 +_0212b124: .word gMapManager .global func_ov14_0212b128 arm_func_start func_ov14_0212b128 @@ -14290,7 +14290,7 @@ func_ov14_0212b128: ; 0x0212b128 mov r0, r5 ldr r1, _0212b1f4 ; =data_ov14_02153cd4 bl func_0201933c - ldr r0, _0212b1f8 ; =data_027e0e60 + ldr r0, _0212b1f8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_b4Ev mov r4, r0 @@ -14326,7 +14326,7 @@ _0212b1e8: .word data_ov14_02153c98 _0212b1ec: .word data_ov14_02153cac _0212b1f0: .word data_ov14_02153cc0 _0212b1f4: .word data_ov14_02153cd4 -_0212b1f8: .word data_027e0e60 +_0212b1f8: .word gMapManager .global func_ov14_0212b1fc arm_func_start func_ov14_0212b1fc @@ -14506,7 +14506,7 @@ func_ov14_0212b31c: ; 0x0212b31c strb r0, [r4, #0x3c] ldrb r2, [r4, #0x14] ldrb r3, [r4, #0x15] - ldr r0, _0212b4c0 ; =data_027e0e60 + ldr r0, _0212b4c0 ; =gMapManager add r2, r2, #1 strb r2, [sp, #4] ldr r0, [r0] @@ -14514,7 +14514,7 @@ func_ov14_0212b31c: ; 0x0212b31c mov r2, #1 strb r3, [sp, #5] bl _ZN10MapManager18func_ov00_02082680Eii - ldr r0, _0212b4c0 ; =data_027e0e60 + ldr r0, _0212b4c0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -14538,7 +14538,7 @@ _0212b4a4: .align 2, 0 arm_func_end func_ov14_0212b31c _0212b4bc: .word 0x000002cd -_0212b4c0: .word data_027e0e60 +_0212b4c0: .word gMapManager .global func_ov14_0212b4c4 arm_func_start func_ov14_0212b4c4 @@ -14628,7 +14628,7 @@ _0212b5d8: mov r2, r1 strb r1, [r4, #0x3c] bl func_ov00_0208ba08 - ldr r0, _0212b650 ; =data_027e0e60 + ldr r0, _0212b650 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -14653,7 +14653,7 @@ _0212b640: .word data_027e0e58 _0212b644: .word 0x000001a1 _0212b648: .word data_027e0ffc _0212b64c: .word 0x00000255 -_0212b650: .word data_027e0e60 +_0212b650: .word gMapManager _0212b654: .word data_027e0f68 .global func_ov14_0212b658 @@ -14893,7 +14893,7 @@ func_ov14_0212b81c: ; 0x0212b81c blx r4 mov r0, #1 mov r5, #0 - ldr r8, _0212b9c8 ; =data_027e0e60 + ldr r8, _0212b9c8 ; =gMapManager strb r0, [r7, #0x3c] add r10, sp, #4 mov r9, r0 @@ -14922,7 +14922,7 @@ _0212b97c: .align 2, 0 arm_func_end func_ov14_0212b81c _0212b9c4: .word 0x00000b34 -_0212b9c8: .word data_027e0e60 +_0212b9c8: .word gMapManager .global func_ov14_0212b9cc arm_func_start func_ov14_0212b9cc @@ -16230,7 +16230,7 @@ _0212c9ec: ; jump table _0212ca00: mov r2, #0 strh r2, [r3, #0x6c] - ldr r0, _0212ca70 ; =data_027e0e60 + ldr r0, _0212ca70 ; =gMapManager str r2, [r3, #0x68] ldr r0, [r0] add r1, r3, #0x38 @@ -16251,7 +16251,7 @@ _0212ca38: b _0212ca68 _0212ca48: ldr r1, [r3, #4] - ldr r0, _0212ca70 ; =data_027e0e60 + ldr r0, _0212ca70 ; =gMapManager bic r1, r1, #1 str r1, [r3, #4] ldr r0, [r0] @@ -16263,7 +16263,7 @@ _0212ca68: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_0212c9d4 -_0212ca70: .word data_027e0e60 +_0212ca70: .word gMapManager .global func_ov14_0212ca74 arm_func_start func_ov14_0212ca74 @@ -16646,7 +16646,7 @@ _0212cf24: ; jump table b _0212cfac ; case 3 _0212cf34: ldr r1, [r4, #4] - ldr r0, _0212cfb4 ; =data_027e0e60 + ldr r0, _0212cfb4 ; =gMapManager orr r1, r1, #4 str r1, [r4, #4] ldr r0, [r0] @@ -16669,7 +16669,7 @@ _0212cf58: str r0, [r4, #4] b _0212cfac _0212cf8c: - ldr r0, _0212cfb4 ; =data_027e0e60 + ldr r0, _0212cfb4 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 @@ -16682,7 +16682,7 @@ _0212cfac: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0212cf0c -_0212cfb4: .word data_027e0e60 +_0212cfb4: .word gMapManager _0212cfb8: .word data_027e0ffc _0212cfbc: .word 0x000001f9 _0212cfc0: .word data_027e1038 @@ -18984,7 +18984,7 @@ func_ov14_0212eca8: ; 0x0212eca8 sub sp, sp, #0x10 mov r4, r0 ldr r1, [r4, #4] - ldr r0, _0212ecf0 ; =data_027e0e60 + ldr r0, _0212ecf0 ; =gMapManager orr r1, r1, #0x200 str r1, [r4, #4] ldr r0, [r0] @@ -19000,7 +19000,7 @@ func_ov14_0212eca8: ; 0x0212eca8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0212eca8 -_0212ecf0: .word data_027e0e60 +_0212ecf0: .word gMapManager .global func_ov14_0212ecf4 arm_func_start func_ov14_0212ecf4 @@ -19125,7 +19125,7 @@ func_ov14_0212ee58: ; 0x0212ee58 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x70 mov r5, r0 - ldr r0, _0212f070 ; =data_027e0e60 + ldr r0, _0212f070 ; =gMapManager ldrb r1, [r5, #0x14] ldrb r2, [r5, #0x15] ldr r0, [r0] @@ -19258,7 +19258,7 @@ func_ov14_0212ee58: ; 0x0212ee58 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_0212ee58 -_0212f070: .word data_027e0e60 +_0212f070: .word gMapManager _0212f074: .word 0x00000fa5 _0212f078: .word data_ov00_020ec9d6 _0212f07c: .word data_ov00_020ec9d4 @@ -19487,13 +19487,13 @@ _0212f374: ldr r4, _0212f550 ; =0x544d4150 b _0212f458 _0212f380: - ldr r0, _0212f554 ; =data_027e0e60 + ldr r0, _0212f554 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_09Ev cmp r0, #0 addeq sp, sp, #0x58 ldmeqia sp!, {r4, r5, r6, pc} - ldr r0, _0212f554 ; =data_027e0e60 + ldr r0, _0212f554 ; =gMapManager ldrb r4, [r6, #0x15] ldrb r3, [r6, #0x14] ldr r0, [r0] @@ -19613,7 +19613,7 @@ _0212f544: .word 0x52555059 _0212f548: .word 0x4e4b4559 _0212f54c: .word 0x464f5243 _0212f550: .word 0x544d4150 -_0212f554: .word data_027e0e60 +_0212f554: .word gMapManager _0212f558: .word data_027e0764 _0212f55c: .word 0x48415254 _0212f560: .word 0x00000666 @@ -19961,7 +19961,7 @@ _0212f9fc: add r0, r0, #1 cmp r0, #0 ble _0212fab4 - ldr r5, _0212fb20 ; =data_027e0e60 + ldr r5, _0212fb20 ; =gMapManager mov r11, #1 add r6, sp, #4 add r7, sp, #0x24 @@ -20037,7 +20037,7 @@ _0212fb04: arm_func_end func_ov14_0212f7b0 _0212fb18: .word 0x00001333 _0212fb1c: .word data_027e0d38 -_0212fb20: .word data_027e0e60 +_0212fb20: .word gMapManager _0212fb24: .word 0x00004e20 .global func_ov14_0212fb28 @@ -20117,7 +20117,7 @@ _0212fb88: add r1, r7, r7, lsl #2 bl func_02002c14 ldrb r3, [r5, #0x14] - ldr r2, _0213011c ; =data_027e0e60 + ldr r2, _0213011c ; =gMapManager add r1, sp, #0xe add r3, r0, r3 ldr r0, [r2] @@ -20182,7 +20182,7 @@ _0212fc6c: add r1, r7, r7, lsl #2 bl func_02002c14 ldrb r3, [r5, #0x14] - ldr r2, _0213011c ; =data_027e0e60 + ldr r2, _0213011c ; =gMapManager add r1, sp, #0xc add r3, r0, r3 ldr r0, [r2] @@ -20490,7 +20490,7 @@ _0213010c: _02130114: .word 0x0000ffff .endif _02130118: .word 0x66666667 -_0213011c: .word data_027e0e60 +_0213011c: .word gMapManager _02130120: .word data_027e0ffc _02130124: .word data_027e0f64 _02130128: .word data_027e0e58 @@ -20539,7 +20539,7 @@ _02130198: ldrb r0, [r6, #0xa8] cmp r0, #0 beq _021304ac - ldr r0, _021304bc ; =data_027e0e60 + ldr r0, _021304bc ; =gMapManager ldr r1, [r6, #0x6c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej @@ -20585,7 +20585,7 @@ _02130268: ldrb r0, [r6, #0xaa] cmp r0, #0 beq _02130290 - ldr r0, _021304bc ; =data_027e0e60 + ldr r0, _021304bc ; =gMapManager add r1, sp, #0x1c ldr r0, [r0] mov r2, #1 @@ -20640,7 +20640,7 @@ _02130318: ldrb r0, [r6, #0xa8] cmp r0, #0 beq _021304ac - ldr r0, _021304bc ; =data_027e0e60 + ldr r0, _021304bc ; =gMapManager ldr r1, [r6, #0x6c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej @@ -20679,7 +20679,7 @@ _021303c0: ldrb r0, [r6, #0xab] cmp r0, #0 beq _021303e8 - ldr r0, _021304bc ; =data_027e0e60 + ldr r0, _021304bc ; =gMapManager add r1, sp, #0x10 ldr r0, [r0] mov r2, #1 @@ -20747,7 +20747,7 @@ _021304ac: .align 2, 0 arm_func_end func_ov14_0213012c _021304b8: .word data_027e0e58 -_021304bc: .word data_027e0e60 +_021304bc: .word gMapManager _021304c0: .word gAdventureFlags _021304c4: .word data_027e0ffc _021304c8: .word 0x000002a2 @@ -21175,10 +21175,10 @@ func_ov14_021309bc: ; 0x021309bc ldrb r0, [r10, #0x79] cmp r0, #0 bne _02130a70 - ldr r0, _02130be0 ; =data_027e0e60 + ldr r0, _02130be0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev - ldr r1, _02130be0 ; =data_027e0e60 + ldr r1, _02130be0 ; =gMapManager str r0, [sp] ldr r0, [r1] bl _ZN10MapManager17Get_MapData_Unk2aEv @@ -21187,7 +21187,7 @@ func_ov14_021309bc: ; 0x021309bc mov r11, #0 cmp r0, #0 ble _02130a70 - ldr r4, _02130be0 ; =data_027e0e60 + ldr r4, _02130be0 ; =gMapManager add r6, sp, #6 _02130a0c: mov r9, #0 @@ -21255,7 +21255,7 @@ _02130ae8: add r0, r8, r0 cmp r8, r0 bgt _02130b7c - ldr r9, _02130be0 ; =data_027e0e60 + ldr r9, _02130be0 ; =gMapManager and r6, r7, #0xff add r5, sp, #4 _02130b08: @@ -21319,7 +21319,7 @@ _02130bc8: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_021309bc -_02130be0: .word data_027e0e60 +_02130be0: .word gMapManager _02130be4: .word data_ov14_0215aecc .global func_ov14_02130be8 @@ -21709,11 +21709,11 @@ _02131100: bl _ZN14AdventureFlags18func_Ov00_02097810Ei str r0, [r4, #0x70] mov r1, #0 - ldr r0, _02131410 ; =data_027e0e60 + ldr r0, _02131410 ; =gMapManager strb r1, [r4, #0x78] ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev - ldr r1, _02131410 ; =data_027e0e60 + ldr r1, _02131410 ; =gMapManager str r0, [sp, #0xc] ldr r0, [r1] bl _ZN10MapManager17Get_MapData_Unk2aEv @@ -21727,7 +21727,7 @@ _021311bc: mov r9, #0 cmp r10, #0 ble _02131230 - ldr r11, _02131410 ; =data_027e0e60 + ldr r11, _02131410 ; =gMapManager and r7, r8, #0xff _021311d0: ldrb r0, [r4, #0x14] @@ -21765,11 +21765,11 @@ _02131240: mvn r0, #0 cmp r1, r0 beq _0213125c - ldr r0, _02131410 ; =data_027e0e60 + ldr r0, _02131410 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej _0213125c: - ldr r0, _02131410 ; =data_027e0e60 + ldr r0, _02131410 ; =gMapManager ldr r5, [r4, #0x88] ldr r3, [r4, #0x84] ldr r2, [r4, #0x80] @@ -21810,7 +21810,7 @@ _021312dc: bgt _02131348 and r8, r11, #0xff _021312f4: - ldr r0, _02131410 ; =data_027e0e60 + ldr r0, _02131410 ; =gMapManager mov r1, r7 ldr r0, [r0] strb r8, [sp, #0x10] @@ -21889,7 +21889,7 @@ _02131400: .word data_ov14_02157314 _02131404: .word data_027e0e58 _02131408: .word 0x0000025b _0213140c: .word gAdventureFlags -_02131410: .word data_027e0e60 +_02131410: .word gMapManager _02131414: .word 0xfffff333 .global func_ov14_02131418 @@ -21969,7 +21969,7 @@ func_ov14_021314b8: ; 0x021314b8 addne sp, sp, #0x10 ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} ldrb r0, [r10, #0x14] - ldr r1, _021316c0 ; =data_027e0e60 + ldr r1, _021316c0 ; =gMapManager str r0, [sp, #4] ldrb r0, [r10, #0x15] str r0, [sp] @@ -21983,17 +21983,17 @@ func_ov14_021314b8: ; 0x021314b8 ldr r1, [sp, #8] cmp r1, r0 blt _02131520 - ldr r0, _021316c0 ; =data_027e0e60 + ldr r0, _021316c0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #8] _02131520: - ldr r0, _021316c0 ; =data_027e0e60 + ldr r0, _021316c0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv cmp r7, r0 blt _02131544 - ldr r0, _021316c0 ; =data_027e0e60 + ldr r0, _021316c0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv mov r7, r0 @@ -22002,7 +22002,7 @@ _02131544: mov r0, r8 cmp r0, r7 bge _021315cc - ldr r9, _021316c0 ; =data_027e0e60 + ldr r9, _021316c0 ; =gMapManager mov r4, #0 add r6, sp, #0xe _02131560: @@ -22058,7 +22058,7 @@ _021315f4: ldr r0, [sp, #4] and r6, r0, #0xff _02131620: - ldr r0, _021316c0 ; =data_027e0e60 + ldr r0, _021316c0 ; =gMapManager mov r1, r11 ldr r0, [r0] strb r6, [sp, #0xc] @@ -22104,7 +22104,7 @@ _021316b0: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_021314b8 -_021316c0: .word data_027e0e60 +_021316c0: .word gMapManager .global func_ov14_021316c4 arm_func_start func_ov14_021316c4 @@ -24728,7 +24728,7 @@ _021338b4: cmp r5, #2 add r6, r6, #0xc blo _021338b4 - ldr r0, _02133924 ; =data_027e0e60 + ldr r0, _02133924 ; =gMapManager add r1, r7, #0x6c ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839c4Ei @@ -24751,7 +24751,7 @@ _021338b4: arm_func_end func_ov14_02133894 _0213391c: .word data_ov14_021576d4 _02133920: .word data_027e0e58 -_02133924: .word data_027e0e60 +_02133924: .word gMapManager _02133928: .word func_ov14_02121cd8 - 1 .global func_ov14_0213392c @@ -24773,7 +24773,7 @@ _0213394c: cmp r5, #2 add r6, r6, #0xc blo _0213394c - ldr r0, _021339b4 ; =data_027e0e60 + ldr r0, _021339b4 ; =gMapManager add r1, r7, #0x6c ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839c4Ei @@ -24794,7 +24794,7 @@ _0213394c: arm_func_end func_ov14_0213392c _021339ac: .word data_ov14_021576d4 _021339b0: .word data_027e0e58 -_021339b4: .word data_027e0e60 +_021339b4: .word gMapManager _021339b8: .word func_ov14_02121cd8 - 1 .global func_ov14_021339bc @@ -24883,7 +24883,7 @@ func_ov14_021339bc: ; 0x021339bc str r3, [sp, #0x28] bl func_01fffbec ldr r1, [sp, #0x20] - ldr r0, _02133c58 ; =data_027e0e60 + ldr r0, _02133c58 ; =gMapManager str r1, [r4, #0x74] ldr r2, [sp, #0x24] add r1, r4, #0x6c @@ -24899,7 +24899,7 @@ func_ov14_021339bc: ; 0x021339bc add r0, r0, #1 str r0, [r4, #0xbc] str r1, [r4, #0xc0] - ldr r0, _02133c58 ; =data_027e0e60 + ldr r0, _02133c58 ; =gMapManager add r1, r4, #0x18 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ebcEi @@ -24907,7 +24907,7 @@ func_ov14_021339bc: ; 0x021339bc movne r0, #1 moveq r0, #0 strb r0, [r4, #0x65] - ldr r0, _02133c58 ; =data_027e0e60 + ldr r0, _02133c58 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -24973,7 +24973,7 @@ _02133c3c: arm_func_end func_ov14_021339bc _02133c50: .word 0x00002666 _02133c54: .word 0x000004cd -_02133c58: .word data_027e0e60 +_02133c58: .word gMapManager .global func_ov14_02133c5c arm_func_start func_ov14_02133c5c @@ -25723,7 +25723,7 @@ func_ov14_02134554: ; 0x02134554 ldr ip, [ip, #0x14] add r1, sp, #0x20 blx ip - ldr r0, _02134670 ; =data_027e0e60 + ldr r0, _02134670 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -25746,7 +25746,7 @@ _02134658: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02134554 -_02134670: .word data_027e0e60 +_02134670: .word gMapManager .global func_ov14_02134674 arm_func_start func_ov14_02134674 @@ -25767,7 +25767,7 @@ func_ov14_02134678: ; 0x02134678 beq _021346b4 b _021347c0 _0213469c: - ldr r0, _021347cc ; =data_027e0e60 + ldr r0, _021347cc ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -25826,13 +25826,13 @@ _02134770: mov r1, #0 mov r2, #1 bl func_ov00_0208ba08 - ldr r0, _021347cc ; =data_027e0e60 + ldr r0, _021347cc ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084cb0Ei ldr r1, [r4, #4] - ldr r0, _021347cc ; =data_027e0e60 + ldr r0, _021347cc ; =gMapManager bic r1, r1, #0x10 str r1, [r4, #4] ldr r0, [r0] @@ -25848,7 +25848,7 @@ _021347c0: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov14_02134678 -_021347cc: .word data_027e0e60 +_021347cc: .word gMapManager _021347d0: .word data_027e0ffc _021347d4: .word 0x00000256 _021347d8: .word data_027e0e58 @@ -26007,7 +26007,7 @@ func_ov14_0213497c: ; 0x0213497c stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x24 mov r10, r0 - ldr r0, _02134be4 ; =data_027e0e60 + ldr r0, _02134be4 ; =gMapManager ldrb r3, [r10, #0x15] ldrb r2, [r10, #0x14] ldr r0, [r0] @@ -26044,7 +26044,7 @@ _021349e0: mov r0, #0 strh r0, [r10, #0xc] ldrb r1, [r10, #0x14] - ldr r0, _02134be4 ; =data_027e0e60 + ldr r0, _02134be4 ; =gMapManager ldrb r2, [r10, #0x15] ldr r0, [r0] sub r1, r1, #1 @@ -26054,7 +26054,7 @@ _02134a28: mov r0, #0x4000 strh r0, [r10, #0xc] ldrb r2, [r10, #0x15] - ldr r0, _02134be4 ; =data_027e0e60 + ldr r0, _02134be4 ; =gMapManager ldrb r1, [r10, #0x14] ldr r0, [r0] sub r2, r2, #1 @@ -26104,7 +26104,7 @@ _02134ad4: cmp r0, r1 bge _02134b84 mov r6, #1 - ldr r4, _02134be4 ; =data_027e0e60 + ldr r4, _02134be4 ; =gMapManager add r7, sp, #6 add r5, sp, #4 mov r11, r6 @@ -26171,7 +26171,7 @@ _02134b84: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_0213497c -_02134be4: .word data_027e0e60 +_02134be4: .word gMapManager _02134be8: .word 0x0000099a .global func_ov14_02134bec @@ -27765,7 +27765,7 @@ _02135f4c: .word data_027e0fc8 func_ov14_02135f50: ; 0x02135f50 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 - ldr r1, _02135fec ; =data_027e0e60 + ldr r1, _02135fec ; =gMapManager mov r2, r0 ldr r4, [r1] add r0, sp, #0 @@ -27807,21 +27807,21 @@ _02135fd4: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov14_02135f50 -_02135fec: .word data_027e0e60 +_02135fec: .word gMapManager .global func_ov14_02135ff0 arm_func_start func_ov14_02135ff0 func_ov14_02135ff0: ; 0x02135ff0 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 - ldr r1, _02136074 ; =data_027e0e60 + ldr r1, _02136074 ; =gMapManager mov r2, r0 ldr r1, [r1] add r0, sp, #0 add r2, r2, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r0, [sp, #1] - ldr r5, _02136074 ; =data_027e0e60 + ldr r5, _02136074 ; =gMapManager mov r4, #0 sub r0, r0, #1 strb r0, [sp, #1] @@ -27849,7 +27849,7 @@ _02136060: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov14_02135ff0 -_02136074: .word data_027e0e60 +_02136074: .word gMapManager .global func_ov14_02136078 arm_func_start func_ov14_02136078 @@ -27995,12 +27995,12 @@ _0213625c: bl func_ov14_0213650c cmp r5, #0 beq _021362d0 - ldr r1, _02136350 ; =data_027e0e60 + ldr r1, _02136350 ; =gMapManager add r0, sp, #0 ldr r1, [r1] add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _02136350 ; =data_027e0e60 + ldr r0, _02136350 ; =gMapManager ldrb r2, [sp] ldrb r1, [sp, #1] ldr r0, [r0] @@ -28057,7 +28057,7 @@ _0213630c: .align 2, 0 arm_func_end func_ov14_0213618c _0213634c: .word data_027e0fc8 -_02136350: .word data_027e0e60 +_02136350: .word gMapManager .global func_ov14_02136354 arm_func_start func_ov14_02136354 @@ -28360,13 +28360,13 @@ func_ov14_021366e4: ; 0x021366e4 str r3, [sp, #0x1c] str ip, [sp, #0x20] bl func_01ff9bc4 - ldr r1, _021368c4 ; =data_027e0e60 + ldr r1, _021368c4 ; =gMapManager add r0, sp, #8 ldr r1, [r1] add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r1, [sp, #8] - ldr r0, _021368c4 ; =data_027e0e60 + ldr r0, _021368c4 ; =gMapManager ldrb r2, [sp, #9] sub r3, r1, #1 ldr r0, [r0] @@ -28380,7 +28380,7 @@ func_ov14_021366e4: ; 0x021366e4 subeq r0, r0, #0x800 streq r0, [sp, #0x54] add r3, r1, #1 - ldr r0, _021368c4 ; =data_027e0e60 + ldr r0, _021368c4 ; =gMapManager ldrb r2, [sp, #9] ldr r0, [r0] add r1, sp, #4 @@ -28393,7 +28393,7 @@ func_ov14_021366e4: ; 0x021366e4 addeq r0, r0, #0x800 streq r0, [sp, #0x48] sub r2, r1, #1 - ldr r0, _021368c4 ; =data_027e0e60 + ldr r0, _021368c4 ; =gMapManager ldrb r3, [sp, #8] ldr r0, [r0] add r1, sp, #2 @@ -28406,7 +28406,7 @@ func_ov14_021366e4: ; 0x021366e4 subeq r0, r0, #0x800 streq r0, [sp, #0x5c] add r2, r1, #1 - ldr r0, _021368c4 ; =data_027e0e60 + ldr r0, _021368c4 ; =gMapManager ldrb r3, [sp, #8] ldr r0, [r0] add r1, sp, #0 @@ -28450,7 +28450,7 @@ _021368a8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_021366e4 -_021368c4: .word data_027e0e60 +_021368c4: .word gMapManager .global func_ov14_021368c8 arm_func_start func_ov14_021368c8 @@ -28738,7 +28738,7 @@ _02136c04: ldr r1, _02136d08 ; =0x000004cd bl func_01fffbec ldr r1, [sp, #4] - ldr r0, _02136d0c ; =data_027e0e60 + ldr r0, _02136d0c ; =gMapManager str r1, [r4, #0x1d8] ldr r2, [sp, #8] add r1, r4, #0x1d0 @@ -28762,7 +28762,7 @@ _02136c04: _02136d00: .word 0xfffff666 _02136d04: .word data_02050f54 _02136d08: .word 0x000004cd -_02136d0c: .word data_027e0e60 +_02136d0c: .word gMapManager _02136d10: .word 0x0000026e .global func_ov14_02136d14 @@ -29006,7 +29006,7 @@ _02136fb8: mov r0, #0 str r0, [sp, #0xc] str r0, [sp, #0x10] - ldr r0, _021373cc ; =data_027e0e60 + ldr r0, _021373cc ; =gMapManager add r1, sp, #0x84 ldr r0, [r0] add r2, sp, #0x6c @@ -29257,7 +29257,7 @@ _021372c8: arm_func_end func_ov14_02136e30 _021373c4: .word 0x0000ffff _021373c8: .word 0xfffff666 -_021373cc: .word data_027e0e60 +_021373cc: .word gMapManager _021373d0: .word data_ov14_02157ecc _021373d4: .word data_ov14_02157eb4 @@ -30799,7 +30799,7 @@ _021386e8: add ip, sp, #0x24 str r1, [sp, #0x4c] ldr r1, [r5, #0x54] - ldr r4, _021389d0 ; =data_027e0e60 + ldr r4, _021389d0 ; =gMapManager str r1, [sp, #0x38] ldr r2, [r5, #0x58] add r1, sp, #0x50 @@ -30826,7 +30826,7 @@ _021386e8: str r1, [sp, #0x20] cmp r0, #0 beq _02138810 - ldr r0, _021389d0 ; =data_027e0e60 + ldr r0, _021389d0 ; =gMapManager add r1, sp, #0xa0 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -30890,7 +30890,7 @@ _02138890: str r1, [sp, #0x1c] cmp r0, #0 beq _021388f8 - ldr r0, _021389d0 ; =data_027e0e60 + ldr r0, _021389d0 ; =gMapManager add r1, sp, #0x9e ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -30973,7 +30973,7 @@ _021389c0: arm_func_end func_ov14_02138568 _021389c8: .word data_027e0fc8 _021389cc: .word data_ov00_020e242c -_021389d0: .word data_027e0e60 +_021389d0: .word gMapManager _021389d4: .word data_027e0f6c .global func_ov14_021389d8 @@ -31105,7 +31105,7 @@ func_ov14_02138b18: ; 0x02138b18 addge sp, sp, #0x68 ldmgeia sp!, {r4, r5, r6, pc} ldr r1, [r6, #0x48] - ldr r0, _02138d50 ; =data_027e0e60 + ldr r0, _02138d50 ; =gMapManager str r1, [sp, #0x1c] ldr r2, [r6, #0x4c] ldr r1, [r0] @@ -31125,7 +31125,7 @@ func_ov14_02138b18: ; 0x02138b18 cmp r4, #0x10 bne _02138c74 ldr r1, [r6, #0x48] - ldr r0, _02138d50 ; =data_027e0e60 + ldr r0, _02138d50 ; =gMapManager str r1, [sp, #0x10] ldr r1, [r6, #0x4c] ldr r0, [r0] @@ -31171,7 +31171,7 @@ _02138c20: cmp r3, #2 add r1, r1, #1 blo _02138c20 - ldr r1, _02138d50 ; =data_027e0e60 + ldr r1, _02138d50 ; =gMapManager add r0, sp, #4 ldr r5, [r1] add r2, r6, #0x48 @@ -31226,7 +31226,7 @@ _02138cb8: add r3, sp, #0x28 bl func_ov00_020c4048 _02138d08: - ldr r1, _02138d50 ; =data_027e0e60 + ldr r1, _02138d50 ; =gMapManager mov r0, r6 ldr r5, [r1] bl _ZN5Actor18func_ov00_020c1788Ev @@ -31237,7 +31237,7 @@ _02138d08: addne sp, sp, #0x68 ldmneia sp!, {r4, r5, r6, pc} add r0, r6, #0x100 - ldr r2, _02138d50 ; =data_027e0e60 + ldr r2, _02138d50 ; =gMapManager ldrsh r1, [r0, #0x70] ldr r0, [r2] mov r2, #1 @@ -31246,7 +31246,7 @@ _02138d08: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_02138b18 -_02138d50: .word data_027e0e60 +_02138d50: .word gMapManager _02138d54: .word 0x0000ffff _02138d58: .word data_027e0f6c _02138d5c: .word 0x48415254 @@ -31286,7 +31286,7 @@ _02138dbc: .word data_027e0fcc arm_func_start func_ov14_02138dc0 func_ov14_02138dc0: ; 0x02138dc0 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _02138e04 ; =data_027e0e60 + ldr r1, _02138e04 ; =gMapManager mov r6, r0 ldr r5, [r1] bl _ZN5Actor18func_ov00_020c1788Ev @@ -31296,7 +31296,7 @@ func_ov14_02138dc0: ; 0x02138dc0 cmp r4, r0 ldmneia sp!, {r4, r5, r6, pc} add r0, r6, #0x100 - ldr r2, _02138e04 ; =data_027e0e60 + ldr r2, _02138e04 ; =gMapManager ldrsh r1, [r0, #0x70] ldr r0, [r2] mov r2, #1 @@ -31304,7 +31304,7 @@ func_ov14_02138dc0: ; 0x02138dc0 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_02138dc0 -_02138e04: .word data_027e0e60 +_02138e04: .word gMapManager .global func_ov14_02138e08 arm_func_start func_ov14_02138e08 @@ -32369,7 +32369,7 @@ _02139af0: ldmia sp!, {r3, r4, pc} _02139b24: ldr r1, [r4, #0x48] - ldr r0, _02139b7c ; =data_027e0e60 + ldr r0, _02139b7c ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -32392,7 +32392,7 @@ _02139b24: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov14_02139a7c -_02139b7c: .word data_027e0e60 +_02139b7c: .word gMapManager _02139b80: .word data_027e0fe4 .global func_ov14_02139b84 @@ -33290,7 +33290,7 @@ _0213a68c: cmp r0, #0 beq _0213a7fc ldr r1, [r5, #0x48] - ldr r0, _0213a81c ; =data_027e0e60 + ldr r0, _0213a81c ; =gMapManager str r1, [sp, #0x38] ldr r2, [r5, #0x4c] ldr r1, [r0] @@ -33364,7 +33364,7 @@ _0213a80c: .word data_027e0f90 _0213a810: .word data_027e0fc8 _0213a814: .word data_ov00_020eec9c _0213a818: .word data_02050f54 -_0213a81c: .word data_027e0e60 +_0213a81c: .word gMapManager .global func_ov14_0213a820 arm_func_start func_ov14_0213a820 @@ -33672,7 +33672,7 @@ _0213ab94: cmp r0, #0 beq _0213ac98 ldr r1, [r5, #0x48] - ldr r0, _0213acb0 ; =data_027e0e60 + ldr r0, _0213acb0 ; =gMapManager str r1, [sp, #4] ldr r2, [r5, #0x4c] ldr r1, [r0] @@ -33745,7 +33745,7 @@ _0213ac98: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_0213aaec -_0213acb0: .word data_027e0e60 +_0213acb0: .word gMapManager _0213acb4: .word data_027e0fc8 .global func_ov14_0213acb8 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index d32a69a9..ad41220e 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -124,7 +124,7 @@ .extern data_027e0d44 .extern data_027e0d78 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 51bc0854..0f633201 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -2764,7 +2764,7 @@ func_ov14_0213d684: ; 0x0213d684 ldreqsh r1, [r0, #0x2e] cmpeq r1, #2 bne _0213d6d4 - ldr r2, _0213d6dc ; =data_027e0e60 + ldr r2, _0213d6dc ; =gMapManager add r1, r0, #0x2c ldr r0, [r2] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -2784,7 +2784,7 @@ _0213d6d4: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_0213d684 -_0213d6dc: .word data_027e0e60 +_0213d6dc: .word gMapManager .global func_ov14_0213d6e0 arm_func_start func_ov14_0213d6e0 @@ -2971,7 +2971,7 @@ func_ov14_0213d91c: ; 0x0213d91c cmp r0, #3 b _0213d990 _0213d944: - ldr r0, _0213d9a8 ; =data_027e0e60 + ldr r0, _0213d9a8 ; =gMapManager add r1, r6, #0x2c ldr r0, [r0] add r1, r1, r5 @@ -2999,7 +2999,7 @@ _0213d990: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov14_0213d91c -_0213d9a8: .word data_027e0e60 +_0213d9a8: .word gMapManager .global func_ov14_0213d9ac arm_func_start func_ov14_0213d9ac @@ -3026,7 +3026,7 @@ _0213d9e4: beq _0213da84 b _0213daa4 _0213d9fc: - ldr r0, _0213dad4 ; =data_027e0e60 + ldr r0, _0213dad4 ; =gMapManager mov r1, r8 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -3085,7 +3085,7 @@ _0213dac0: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_0213d9ac -_0213dad4: .word data_027e0e60 +_0213dad4: .word gMapManager _0213dad8: .word data_027e0fe4 .global func_ov14_0213dadc @@ -3628,7 +3628,7 @@ func_ov14_0213e20c: ; 0x0213e20c mov r3, #0x1c mul r6, r1, r3 mov r8, r0 - ldr r0, _0213e324 ; =data_027e0e60 + ldr r0, _0213e324 ; =gMapManager add r1, r8, #0x2c ldr r0, [r0] add r1, r1, r6 @@ -3698,7 +3698,7 @@ _0213e318: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov14_0213e20c -_0213e324: .word data_027e0e60 +_0213e324: .word gMapManager .global func_ov14_0213e328 arm_func_start func_ov14_0213e328 @@ -3736,7 +3736,7 @@ _0213e394: cmp r0, #2 movne r0, #0 bne _0213e3b4 - ldr r0, _0213e53c ; =data_027e0e60 + ldr r0, _0213e53c ; =gMapManager mov r1, r7 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -3852,7 +3852,7 @@ _0213e52c: .align 2, 0 arm_func_end func_ov14_0213e328 _0213e538: .word data_027e0fe4 -_0213e53c: .word data_027e0e60 +_0213e53c: .word gMapManager _0213e540: .word data_027e0fd4 .global func_ov14_0213e544 @@ -5124,7 +5124,7 @@ _0213f378: .word gItemManager arm_func_start func_ov14_0213f37c func_ov14_0213f37c: ; 0x0213f37c stmdb sp!, {r4, lr} - ldr r1, _0213f44c ; =data_027e0e60 + ldr r1, _0213f44c ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager17GetMapData_Unk_06Ev @@ -5178,7 +5178,7 @@ _0213f434: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0213f37c -_0213f44c: .word data_027e0e60 +_0213f44c: .word gMapManager _0213f450: .word data_027e077c _0213f454: .word gAdventureFlags _0213f458: .word data_027e0c68 @@ -6976,7 +6976,7 @@ _021407e0: smull r0, r1, r2, r4 sub r4, r3, r0 ldr r1, _02141134 ; =data_027e0d38 - ldr r0, _02141138 ; =data_027e0e60 + ldr r0, _02141138 ; =gMapManager cmp r4, #0x28 movlt r8, #1 ldr r7, [r1] @@ -7588,7 +7588,7 @@ _0214110c: arm_func_end func_ov14_021407b8 _02141130: .word 0x88888889 _02141134: .word data_027e0d38 -_02141138: .word data_027e0e60 +_02141138: .word gMapManager _0214113c: .word data_027e1054 _02141140: .word data_027e0d3c _02141144: .word data_02063e4c @@ -8082,7 +8082,7 @@ func_ov14_0214178c: ; 0x0214178c ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} add r5, r10, #0xd0 ldr r1, [r5, r8] - ldr r0, _021418e8 ; =data_027e0e60 + ldr r0, _021418e8 ; =gMapManager str r1, [sp] ldr r1, [r7, r8] add r4, r10, #0xd8 @@ -8153,7 +8153,7 @@ _021418dc: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov14_0214178c -_021418e8: .word data_027e0e60 +_021418e8: .word gMapManager .global func_ov14_021418ec arm_func_start func_ov14_021418ec @@ -8181,7 +8181,7 @@ func_ov14_021418ec: ; 0x021418ec add r4, r8, #0xd4 str r1, [sp] ldr r1, [r4, r6] - ldr r0, _021419d4 ; =data_027e0e60 + ldr r0, _021419d4 ; =gMapManager str r1, [sp, #4] ldr r2, [r2, #0xd8] ldr r0, [r0] @@ -8219,7 +8219,7 @@ _021419c8: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov14_021418ec -_021419d4: .word data_027e0e60 +_021419d4: .word gMapManager .global func_ov14_021419d8 arm_func_start func_ov14_021419d8 @@ -8469,7 +8469,7 @@ _02141cdc: rsb r0, r0, #0 strh r0, [r9, #0xc] ldrb r2, [r9, #0x15] - ldr r0, _02142040 ; =data_027e0e60 + ldr r0, _02142040 ; =gMapManager ldrb r1, [r9, #0x14] ldr r0, [r0] add r2, r2, #1 @@ -8481,7 +8481,7 @@ _02141d0c: mov r0, r4 strh r0, [r9, #0xc] ldrb r2, [r9, #0x15] - ldr r0, _02142040 ; =data_027e0e60 + ldr r0, _02142040 ; =gMapManager ldrb r1, [r9, #0x14] ldr r0, [r0] sub r2, r2, #1 @@ -8493,7 +8493,7 @@ _02141d34: rsb r0, r0, #0 strh r0, [r9, #0xc] ldrb r1, [r9, #0x14] - ldr r0, _02142040 ; =data_027e0e60 + ldr r0, _02142040 ; =gMapManager ldrb r2, [r9, #0x15] ldr r0, [r0] add r1, r1, #1 @@ -8505,7 +8505,7 @@ _02141d64: mov r0, #0x4000 strh r0, [r9, #0xc] ldrb r1, [r9, #0x14] - ldr r0, _02142040 ; =data_027e0e60 + ldr r0, _02142040 ; =gMapManager ldrb r2, [r9, #0x15] ldr r0, [r0] sub r1, r1, #1 @@ -8527,7 +8527,7 @@ _02141d88: cmp r1, r2 ble _02141f0c mov r5, #1 - ldr r4, _02142040 ; =data_027e0e60 + ldr r4, _02142040 ; =gMapManager add r6, sp, #0xe add r10, sp, #0xc mov r11, r5 @@ -8576,7 +8576,7 @@ _02141e5c: cmp r1, r2 bge _02141f0c mov r5, #1 - ldr r4, _02142040 ; =data_027e0e60 + ldr r4, _02142040 ; =gMapManager add r6, sp, #0xa add r10, sp, #8 mov r11, r5 @@ -8702,7 +8702,7 @@ _02142004: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_02141c60 -_02142040: .word data_027e0e60 +_02142040: .word gMapManager .global func_ov14_02142044 arm_func_start func_ov14_02142044 @@ -9133,11 +9133,11 @@ _02142634: ldr r1, [r5, #0x48] cmp r1, r0 beq _02142664 - ldr r0, _02142778 ; =data_027e0e60 + ldr r0, _02142778 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej _02142664: - ldr r0, _02142778 ; =data_027e0e60 + ldr r0, _02142778 ; =gMapManager mov r2, #0 ldr r0, [r0] mov r3, r2 @@ -9192,11 +9192,11 @@ _02142714: ldr r1, [r5, #0x48] cmp r1, r0 beq _02142744 - ldr r0, _02142778 ; =data_027e0e60 + ldr r0, _02142778 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej _02142744: - ldr r0, _02142778 ; =data_027e0e60 + ldr r0, _02142778 ; =gMapManager mov r2, #0 ldr r0, [r0] mov r3, r2 @@ -9212,7 +9212,7 @@ _02142768: .align 2, 0 arm_func_end func_ov14_021424b8 _02142774: .word gAdventureFlags -_02142778: .word data_027e0e60 +_02142778: .word gMapManager .global func_ov14_0214277c arm_func_start func_ov14_0214277c @@ -9255,12 +9255,12 @@ func_ov14_0214278c: ; 0x0214278c bl func_ov00_02078b40 cmp r0, #0 bne _02142818 - ldr r0, _02142908 ; =data_027e0e60 + ldr r0, _02142908 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager20GetCourseData_Unk_86Ev cmp r0, #1 bgt _02142814 - ldr r0, _02142908 ; =data_027e0e60 + ldr r0, _02142908 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager20GetCourseData_Unk_87Ev cmp r0, #1 @@ -9339,7 +9339,7 @@ _021428d8: .align 2, 0 arm_func_end func_ov14_0214278c _02142904: .word data_027e0d38 -_02142908: .word data_027e0e60 +_02142908: .word gMapManager .global func_ov14_0214290c arm_func_start func_ov14_0214290c @@ -14534,7 +14534,7 @@ _02146548: add lr, r5, #0x8c str r1, [sp, #0x28] ldr r1, [r5, #0x4c] - ldr ip, _02146604 ; =data_027e0e60 + ldr ip, _02146604 ; =gMapManager str r1, [sp, #0x2c] ldr r1, [r5, #0x50] add r2, sp, #0x28 @@ -14578,7 +14578,7 @@ _021465e4: arm_func_end func_ov14_021463e4 _021465fc: .word 0x00000b33 _02146600: .word data_ov14_0215b280 -_02146604: .word data_027e0e60 +_02146604: .word gMapManager .global func_ov14_02146608 arm_func_start func_ov14_02146608 @@ -15149,7 +15149,7 @@ func_ov14_02146d48: ; 0x02146d48 add sp, sp, #0x10 ldmia sp!, {r4, pc} _02146dd8: - ldr r0, _02146e20 ; =data_027e0e60 + ldr r0, _02146e20 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084c94Ei @@ -15170,7 +15170,7 @@ _02146df8: arm_func_end func_ov14_02146d48 _02146e18: .word data_027e0f90 _02146e1c: .word 0x00000333 -_02146e20: .word data_027e0e60 +_02146e20: .word gMapManager .global func_ov14_02146e24 arm_func_start func_ov14_02146e24 @@ -15244,7 +15244,7 @@ _02146f08: add r0, r4, #0x38 mov r1, #0 bl func_ov00_02094884 - ldr r0, _02147094 ; =data_027e0e60 + ldr r0, _02147094 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -15265,7 +15265,7 @@ _02146f54: add r0, r4, #0x38 mov r1, #2 bl func_ov00_02094884 - ldr r0, _02147094 ; =data_027e0e60 + ldr r0, _02147094 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -15312,19 +15312,19 @@ _02146ff0: mov r1, r0 mov r0, r4 bl func_ov00_0208c4f8 - ldr r0, _02147094 ; =data_027e0e60 + ldr r0, _02147094 ; =gMapManager ldrb r5, [r4, #0x13] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, r5 bne _02147040 - ldr r0, _02147094 ; =data_027e0e60 + ldr r0, _02147094 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084c7cEi _02147040: - ldr r0, _02147094 ; =data_027e0e60 + ldr r0, _02147094 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 @@ -15334,7 +15334,7 @@ _02147040: str r0, [r4, #4] b _02147084 _02147064: - ldr r0, _02147094 ; =data_027e0e60 + ldr r0, _02147094 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 @@ -15349,7 +15349,7 @@ _02147084: .align 2, 0 arm_func_end func_ov14_02146eb4 _02147090: .word data_027e0ffc -_02147094: .word data_027e0e60 +_02147094: .word gMapManager _02147098: .word data_027e0fe8 _0214709c: .word 0x54534248 @@ -16550,7 +16550,7 @@ func_ov14_02147ee4: ; 0x02147ee4 sub r2, r3, #2 mov ip, #0x47 mov r1, #0xff - ldr r0, _02147fb4 ; =data_027e0e60 + ldr r0, _02147fb4 ; =gMapManager str r2, [sp, #0xc] str ip, [sp] str r3, [sp, #4] @@ -16578,7 +16578,7 @@ _02147f9c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02147ee4 -_02147fb4: .word data_027e0e60 +_02147fb4: .word gMapManager _02147fb8: .word data_027e0d38 .global func_ov14_02147fbc @@ -16919,7 +16919,7 @@ func_ov14_02148334: ; 0x02148334 func_ov14_02148364: ; 0x02148364 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x128 - ldr r2, _02148644 ; =data_027e0e60 + ldr r2, _02148644 ; =gMapManager mov r10, r0 ldr r0, [r2] mov r2, #0 @@ -16930,12 +16930,12 @@ func_ov14_02148364: ; 0x02148364 addlt sp, sp, #0x128 movlt r0, #0 ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r1, _02148644 ; =data_027e0e60 + ldr r1, _02148644 ; =gMapManager add r0, sp, #0x14 ldr r1, [r1] mov r2, r9 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _02148644 ; =data_027e0e60 + ldr r0, _02148644 ; =gMapManager add r1, sp, #0x14 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020840dcEv @@ -16981,7 +16981,7 @@ _021483f8: add r2, r10, #0x100 str r3, [sp, #0x30] ldr r3, [r10, #0x50] - ldr r4, _02148644 ; =data_027e0e60 + ldr r4, _02148644 ; =gMapManager str r3, [sp, #0x34] str r1, [sp] ldr r3, [r10, #8] @@ -17109,7 +17109,7 @@ _02148638: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_02148364 -_02148644: .word data_027e0e60 +_02148644: .word gMapManager _02148648: .word 0x0000ffff _0214864c: .word data_ov14_02153ed8 _02148650: .word data_027e0fe4 @@ -17495,7 +17495,7 @@ _02148b34: str r0, [r4, #0x50] b _02148c38 _02148b50: - ldr r0, _021497e8 ; =data_027e0e60 + ldr r0, _021497e8 ; =gMapManager add r1, sp, #0x60 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -17526,7 +17526,7 @@ _02148bb4: mov r1, #0 strb r1, [r4, #0x1b6] strb r1, [r4, #0x1b7] - ldr r0, _021497e8 ; =data_027e0e60 + ldr r0, _021497e8 ; =gMapManager add r1, sp, #0x54 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -17540,7 +17540,7 @@ _02148bb4: _02148bec: mov r1, #0 strb r1, [r4, #0x1b7] - ldr r0, _021497e8 ; =data_027e0e60 + ldr r0, _021497e8 ; =gMapManager add r1, sp, #0x48 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -18373,7 +18373,7 @@ _021497dc: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov14_021488c0 -_021497e8: .word data_027e0e60 +_021497e8: .word gMapManager _021497ec: .word data_027e0f68 _021497f0: .word data_027e0fec _021497f4: .word gAdventureFlags @@ -18851,7 +18851,7 @@ _02149cec: ldr r4, [r4, #0x14] blx r4 ldr r1, [r5, #0x18] - ldr r0, _02149e8c ; =data_027e0e60 + ldr r0, _02149e8c ; =gMapManager sub r1, r1, #4 str r1, [r5, #0x18] ldr r1, [r5, #0x20] @@ -18884,7 +18884,7 @@ _02149e7c: .word data_ov14_02153f28 _02149e80: .word data_ov14_02153f3c _02149e84: .word func_ov14_0214a4e4 _02149e88: .word 0x00001333 -_02149e8c: .word data_027e0e60 +_02149e8c: .word gMapManager .global func_ov14_02149e90 arm_func_start func_ov14_02149e90 @@ -19112,7 +19112,7 @@ _0214a194: mov r2, #0 str r2, [r6, #0x78] ldr r1, [r6, #4] - ldr r0, _0214a3b8 ; =data_027e0e60 + ldr r0, _0214a3b8 ; =gMapManager orr r1, r1, #0x14 str r1, [r6, #4] ldr r0, [r0] @@ -19209,7 +19209,7 @@ _0214a2e4: cmp r0, #1 moveq r0, #0 streqb r0, [r6, #0x3c] - ldr r0, _0214a3b8 ; =data_027e0e60 + ldr r0, _0214a3b8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020843ecEPi ldr r1, [r6, #0x74] @@ -19247,7 +19247,7 @@ _0214a358: mov r2, #1 bl func_ov00_0208ba08 _0214a398: - ldr r0, _0214a3b8 ; =data_027e0e60 + ldr r0, _0214a3b8 ; =gMapManager ldrsh r1, [r6, #0x34] ldr r0, [r0] mov r2, #1 @@ -19258,7 +19258,7 @@ _0214a3ac: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov14_0214a160 -_0214a3b8: .word data_027e0e60 +_0214a3b8: .word gMapManager _0214a3bc: .word data_027e0ffc _0214a3c0: .word 0x0000030f _0214a3c4: .word gAdventureFlags @@ -20082,7 +20082,7 @@ _0214adf8: .word 0x534e574d func_ov14_0214adfc: ; 0x0214adfc stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - ldr r0, _0214ae84 ; =data_027e0e60 + ldr r0, _0214ae84 ; =gMapManager ldrh r1, [r5, #0x20] ldr r0, [r0] mov r2, #0 @@ -20119,7 +20119,7 @@ _0214ae7c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_0214adfc -_0214ae84: .word data_027e0e60 +_0214ae84: .word gMapManager _0214ae88: .word gAdventureFlags _0214ae8c: .word data_027e0f90 @@ -21484,7 +21484,7 @@ func_ov14_0214c018: ; 0x0214c018 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0214c0a8 ; =data_027e0e60 + ldr r0, _0214c0a8 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -21512,7 +21512,7 @@ _0214c09c: .align 2, 0 arm_func_end func_ov14_0214c018 _0214c0a4: .word data_027e0f90 -_0214c0a8: .word data_027e0e60 +_0214c0a8: .word gMapManager _0214c0ac: .word data_ov00_020eed2c _0214c0b0: .word 0x00000bb8 @@ -21688,7 +21688,7 @@ func_ov14_0214c274: ; 0x0214c274 mov r2, r0 bl func_01ff9bc4 ldrb r1, [r4, #0x14] - ldr r0, _0214c2e4 ; =data_027e0e60 + ldr r0, _0214c2e4 ; =gMapManager ldrb ip, [r4, #0x15] add r3, r1, #1 ldr r0, [r0] @@ -21701,7 +21701,7 @@ func_ov14_0214c274: ; 0x0214c274 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214c274 -_0214c2e4: .word data_027e0e60 +_0214c2e4: .word gMapManager .global func_ov14_0214c2e8 arm_func_start func_ov14_0214c2e8 @@ -21723,22 +21723,22 @@ func_ov14_0214c30c: ; 0x0214c30c stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldrh r4, [r6, #0x28] - ldr r0, _0214c370 ; =data_027e0e60 + ldr r0, _0214c370 ; =gMapManager ldrh r5, [r6, #0x2a] ldr r0, [r0] mov r1, r4 bl _ZN10MapManager18func_ov00_020823d4Ei - ldr r1, _0214c370 ; =data_027e0e60 + ldr r1, _0214c370 ; =gMapManager str r0, [r6, #0x94] ldr r0, [r1] mov r1, r4 bl _ZN10MapManager18func_ov00_020823e4Ei - ldr r1, _0214c370 ; =data_027e0e60 + ldr r1, _0214c370 ; =gMapManager str r0, [r6, #0x98] ldr r0, [r1] mov r1, r5 bl _ZN10MapManager18func_ov00_020823d4Ei - ldr r1, _0214c370 ; =data_027e0e60 + ldr r1, _0214c370 ; =gMapManager str r0, [r6, #0x9c] ldr r0, [r1] mov r1, r5 @@ -21747,7 +21747,7 @@ func_ov14_0214c30c: ; 0x0214c30c ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_0214c30c -_0214c370: .word data_027e0e60 +_0214c370: .word gMapManager .global func_ov14_0214c374 arm_func_start func_ov14_0214c374 @@ -21770,7 +21770,7 @@ func_ov14_0214c374: ; 0x0214c374 mov r0, r5 ldr r1, _0214c440 ; =data_ov14_02153fa0 bl func_0201933c - ldr r0, _0214c444 ; =data_027e0e60 + ldr r0, _0214c444 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_b4Ev mov r4, r0 @@ -21806,7 +21806,7 @@ _0214c434: .word data_ov14_02153f64 _0214c438: .word data_ov14_02153f78 _0214c43c: .word data_ov14_02153f8c _0214c440: .word data_ov14_02153fa0 -_0214c444: .word data_027e0e60 +_0214c444: .word gMapManager .global func_ov14_0214c448 arm_func_start func_ov14_0214c448 @@ -22077,7 +22077,7 @@ _0214c7d0: sub r0, r11, #0x8000 mov r7, #0 ldr r6, _0214c93c ; =data_02050f54 - ldr r4, _0214c940 ; =data_027e0e60 + ldr r4, _0214c940 ; =gMapManager strh r0, [sp, #0x1a] add r11, sp, #0x1c mov r5, r7 @@ -22172,7 +22172,7 @@ _0214c92c: arm_func_end func_ov14_0214c678 _0214c938: .word data_027e0764 _0214c93c: .word data_02050f54 -_0214c940: .word data_027e0e60 +_0214c940: .word gMapManager _0214c944: .word 0x0000ffff .global func_ov14_0214c948 @@ -22430,7 +22430,7 @@ _0214cc34: .word gAdventureFlags .global func_ov14_0214cc38 arm_func_start func_ov14_0214cc38 func_ov14_0214cc38: ; 0x0214cc38 - ldr r2, _0214cc50 ; =data_027e0e60 + ldr r2, _0214cc50 ; =gMapManager ldr ip, _0214cc54 ; =_ZN10MapManager18func_ov00_020836dcEii ldrb r1, [r0, #0x160] ldr r0, [r2] @@ -22438,7 +22438,7 @@ func_ov14_0214cc38: ; 0x0214cc38 bx ip .align 2, 0 arm_func_end func_ov14_0214cc38 -_0214cc50: .word data_027e0e60 +_0214cc50: .word gMapManager _0214cc54: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov14_0214cc58 @@ -22865,7 +22865,7 @@ _0214d134: cmp r5, #2 add r6, r6, #0xc blo _0214d134 - ldr r0, _0214d1b4 ; =data_027e0e60 + ldr r0, _0214d1b4 ; =gMapManager add r1, r7, #0x74 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839c4Ei @@ -22892,7 +22892,7 @@ _0214d134: arm_func_end func_ov14_0214d114 _0214d1ac: .word data_ov14_0215a1d8 _0214d1b0: .word data_027e0e58 -_0214d1b4: .word data_027e0e60 +_0214d1b4: .word gMapManager _0214d1b8: .word func_ov14_02121cd8 .global func_ov14_0214d1bc @@ -22914,7 +22914,7 @@ _0214d1dc: cmp r5, #2 add r6, r6, #0xc blo _0214d1dc - ldr r0, _0214d254 ; =data_027e0e60 + ldr r0, _0214d254 ; =gMapManager add r1, r7, #0x74 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839c4Ei @@ -22939,7 +22939,7 @@ _0214d1dc: arm_func_end func_ov14_0214d1bc _0214d24c: .word data_ov14_0215a1d8 _0214d250: .word data_027e0e58 -_0214d254: .word data_027e0e60 +_0214d254: .word gMapManager _0214d258: .word func_ov14_02121cd8 .global func_ov14_0214d25c @@ -23173,7 +23173,7 @@ _0214d46c: ldr r1, _0214d6ac ; =0x000004cd bl func_01fffbec ldr r1, [sp, #0xc] - ldr r0, _0214d6b0 ; =data_027e0e60 + ldr r0, _0214d6b0 ; =gMapManager str r1, [r4, #0x7c] ldr r2, [sp, #0x10] add r1, r4, #0x74 @@ -23238,7 +23238,7 @@ _0214d6a0: .word 0xfffff666 _0214d6a4: .word data_027e0d38 _0214d6a8: .word data_02050f54 _0214d6ac: .word 0x000004cd -_0214d6b0: .word data_027e0e60 +_0214d6b0: .word gMapManager _0214d6b4: .word 0x0000026e .global func_ov14_0214d6b8 @@ -23757,7 +23757,7 @@ _0214ddcc: mov r1, #0 str r1, [sp, #0xc] str r1, [sp, #0x10] - ldr r0, _0214e124 ; =data_027e0e60 + ldr r0, _0214e124 ; =gMapManager add r1, sp, #0x98 ldr r0, [r0] add r2, sp, #0x74 @@ -23985,7 +23985,7 @@ _0214e01c: .align 2, 0 arm_func_end func_ov14_0214dc7c _0214e120: .word 0x0000ffff -_0214e124: .word data_027e0e60 +_0214e124: .word gMapManager _0214e128: .word 0x00000d9a _0214e12c: .word data_ov14_0215a1b8 _0214e130: .word data_ov14_0215a1a0 @@ -23995,12 +23995,12 @@ _0214e130: .word data_ov14_0215a1a0 func_ov14_0214e134: ; 0x0214e134 stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0xc - ldr r2, _0214e268 ; =data_027e0e60 + ldr r2, _0214e268 ; =gMapManager mov r5, r0 ldr r0, [r2] mov r4, r1 bl _ZN10MapManager17Get_MapData_Unk28Ev - ldr r1, _0214e268 ; =data_027e0e60 + ldr r1, _0214e268 ; =gMapManager mov r6, r0 ldr r0, [r1] bl _ZN10MapManager17Get_MapData_Unk2aEv @@ -24047,7 +24047,7 @@ _0214e1e4: cmp r9, r0 addgt sp, sp, #0xc ldmgtia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r6, _0214e268 ; =data_027e0e60 + ldr r6, _0214e268 ; =gMapManager add r11, sp, #8 _0214e1fc: ldr r10, [sp] @@ -24082,7 +24082,7 @@ _0214e250: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_0214e134 -_0214e268: .word data_027e0e60 +_0214e268: .word gMapManager .global func_ov14_0214e26c arm_func_start func_ov14_0214e26c @@ -24247,7 +24247,7 @@ func_ov14_0214e38c: ; 0x0214e38c ldrh r0, [r4, #0x24] cmp r0, #0 bne _0214e4d0 - ldr r0, _0214e51c ; =data_027e0e60 + ldr r0, _0214e51c ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -24291,7 +24291,7 @@ _0214e504: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214e38c -_0214e51c: .word data_027e0e60 +_0214e51c: .word gMapManager .global func_ov14_0214e520 arm_func_start func_ov14_0214e520 @@ -24328,7 +24328,7 @@ func_ov14_0214e550: ; 0x0214e550 beq _0214e58c b _0214e6b0 _0214e574: - ldr r0, _0214e6bc ; =data_027e0e60 + ldr r0, _0214e6bc ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -24393,14 +24393,14 @@ _0214e654: ldrh r0, [r4, #0x24] cmp r0, #0 bne _0214e684 - ldr r0, _0214e6bc ; =data_027e0e60 + ldr r0, _0214e6bc ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084cb0Ei _0214e684: ldr r1, [r4, #4] - ldr r0, _0214e6bc ; =data_027e0e60 + ldr r0, _0214e6bc ; =gMapManager bic r1, r1, #0x10 str r1, [r4, #4] ldr r0, [r0] @@ -24416,7 +24416,7 @@ _0214e6b0: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov14_0214e550 -_0214e6bc: .word data_027e0e60 +_0214e6bc: .word gMapManager _0214e6c0: .word data_027e0e58 _0214e6c4: .word 0x000001a1 _0214e6c8: .word data_027e0ffc @@ -24666,7 +24666,7 @@ func_ov14_0214e8f0: ; 0x0214e8f0 blx ip mov r0, #0 strb r0, [r4, #0x3c] - ldr r0, _0214ea70 ; =data_027e0e60 + ldr r0, _0214ea70 ; =gMapManager ldrh r2, [r4, #0x28] ldr r0, [r0] add r1, r4, #0x88 @@ -24674,7 +24674,7 @@ func_ov14_0214e8f0: ; 0x0214e8f0 cmp r0, #0 addeq sp, sp, #0x50 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0214ea70 ; =data_027e0e60 + ldr r0, _0214ea70 ; =gMapManager ldrh r2, [r4, #0x2a] ldr r0, [r0] add r1, r4, #0x80 @@ -24682,7 +24682,7 @@ func_ov14_0214e8f0: ; 0x0214e8f0 cmp r0, #0 addeq sp, sp, #0x50 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0214ea70 ; =data_027e0e60 + ldr r0, _0214ea70 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -24705,7 +24705,7 @@ _0214ea58: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_0214e8f0 -_0214ea70: .word data_027e0e60 +_0214ea70: .word gMapManager .global func_ov14_0214ea74 arm_func_start func_ov14_0214ea74 @@ -24726,7 +24726,7 @@ func_ov14_0214ea78: ; 0x0214ea78 beq _0214eac0 b _0214ebb4 _0214ea9c: - ldr r0, _0214ebc0 ; =data_027e0e60 + ldr r0, _0214ebc0 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -24781,7 +24781,7 @@ _0214eac0: mov r1, #0x3c bl func_ov00_020ce8e4 _0214eb70: - ldr r0, _0214ebc0 ; =data_027e0e60 + ldr r0, _0214ebc0 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 @@ -24790,7 +24790,7 @@ _0214eb70: mov r1, #0 mov r2, #1 bl func_ov00_0208ba08 - ldr r0, _0214ebc0 ; =data_027e0e60 + ldr r0, _0214ebc0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -24804,7 +24804,7 @@ _0214ebb4: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov14_0214ea78 -_0214ebc0: .word data_027e0e60 +_0214ebc0: .word gMapManager _0214ebc4: .word data_027e0ffc _0214ebc8: .word 0x00000256 _0214ebcc: .word data_027e0e58 @@ -25420,7 +25420,7 @@ _0214f3c0: ldrb r0, [r5, #0xb0] cmp r0, #0 beq _0214f41c - ldr r0, _0214f500 ; =data_027e0e60 + ldr r0, _0214f500 ; =gMapManager mov r2, #0 ldr r0, [r0] mov r3, r2 @@ -25434,14 +25434,14 @@ _0214f41c: cmpne r0, #1 mov r2, #0 bne _0214f44c - ldr r0, _0214f500 ; =data_027e0e60 + ldr r0, _0214f500 ; =gMapManager add r1, r5, #0x18 ldr r0, [r0] mov r3, #2 bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _0214f4e8 _0214f44c: - ldr r0, _0214f500 ; =data_027e0e60 + ldr r0, _0214f500 ; =gMapManager add r1, r5, #0x18 ldr r0, [r0] mov r3, #1 @@ -25475,7 +25475,7 @@ _0214f4b4: mov r0, r5 mov r2, r1 bl func_ov00_0208ba08 - ldr r0, _0214f500 ; =data_027e0e60 + ldr r0, _0214f500 ; =gMapManager ldrh r1, [r5, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083840Ei @@ -25493,7 +25493,7 @@ _0214f4e8: _0214f4f4: .word data_ov14_02153fd4 _0214f4f8: .word gAdventureFlags _0214f4fc: .word data_ov00_020eec68 -_0214f500: .word data_027e0e60 +_0214f500: .word gMapManager .global func_ov14_0214f504 arm_func_start func_ov14_0214f504 @@ -25507,7 +25507,7 @@ func_ov14_0214f504: ; 0x0214f504 cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} - ldr r0, _0214f59c ; =data_027e0e60 + ldr r0, _0214f59c ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 @@ -25540,7 +25540,7 @@ _0214f594: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214f504 -_0214f59c: .word data_027e0e60 +_0214f59c: .word gMapManager _0214f5a0: .word data_027e0fe4 .global func_ov14_0214f5a4 @@ -25563,7 +25563,7 @@ func_ov14_0214f5a4: ; 0x0214f5a4 mov r0, #1 ldmia sp!, {r4, pc} _0214f5e4: - ldr r0, _0214f660 ; =data_027e0e60 + ldr r0, _0214f660 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -25581,7 +25581,7 @@ _0214f600: cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0214f660 ; =data_027e0e60 + ldr r0, _0214f660 ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083840Ei @@ -25598,7 +25598,7 @@ _0214f640: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214f5a4 -_0214f660: .word data_027e0e60 +_0214f660: .word gMapManager _0214f664: .word data_027e0fe4 .global func_ov14_0214f668 @@ -25628,7 +25628,7 @@ func_ov14_0214f668: ; 0x0214f668 mov r0, #0 ldmia sp!, {r4, pc} _0214f6c4: - ldr r0, _0214f76c ; =data_027e0e60 + ldr r0, _0214f76c ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -25656,7 +25656,7 @@ _0214f70c: moveq r0, #0 ldmeqia sp!, {r4, pc} _0214f728: - ldr r0, _0214f76c ; =data_027e0e60 + ldr r0, _0214f76c ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 @@ -25664,7 +25664,7 @@ _0214f728: cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0214f76c ; =data_027e0e60 + ldr r0, _0214f76c ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083790Ei @@ -25676,7 +25676,7 @@ _0214f760: .align 2, 0 arm_func_end func_ov14_0214f668 _0214f768: .word data_027e077c -_0214f76c: .word data_027e0e60 +_0214f76c: .word gMapManager _0214f770: .word data_027e0fe4 .global func_ov14_0214f774 @@ -26154,7 +26154,7 @@ _0214fd64: .word data_ov00_020eec9c .global func_ov14_0214fd68 arm_func_start func_ov14_0214fd68 func_ov14_0214fd68: ; 0x0214fd68 - ldr r2, _0214fd80 ; =data_027e0e60 + ldr r2, _0214fd80 ; =gMapManager ldr ip, _0214fd84 ; =_ZN10MapManager18func_ov00_020836dcEii ldrb r1, [r0, #0x15c] ldr r0, [r2] @@ -26162,7 +26162,7 @@ func_ov14_0214fd68: ; 0x0214fd68 bx ip .align 2, 0 arm_func_end func_ov14_0214fd68 -_0214fd80: .word data_027e0e60 +_0214fd80: .word gMapManager _0214fd84: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov14_0214fd88 @@ -26287,7 +26287,7 @@ _0214fee0: mov r0, #0x4000 strh r0, [r4, #0xc] ldrb r2, [r4, #0x15] - ldr r0, _021500d0 ; =data_027e0e60 + ldr r0, _021500d0 ; =gMapManager ldrb r1, [r4, #0x14] ldr r0, [r0] sub r2, r2, #1 @@ -26299,7 +26299,7 @@ _0214ff0c: mov r0, #0 strh r0, [r4, #0xc] ldrb r1, [r4, #0x14] - ldr r0, _021500d0 ; =data_027e0e60 + ldr r0, _021500d0 ; =gMapManager ldrb r2, [r4, #0x15] ldr r0, [r0] sub r1, r1, #1 @@ -26351,7 +26351,7 @@ _0214ffc0: cmp r0, r1 bge _02150070 mov r7, #1 - ldr r5, _021500d0 ; =data_027e0e60 + ldr r5, _021500d0 ; =gMapManager add r8, sp, #6 add r6, sp, #4 mov r11, r7 @@ -26418,7 +26418,7 @@ _02150070: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov14_0214fe98 -_021500d0: .word data_027e0e60 +_021500d0: .word gMapManager _021500d4: .word 0x0000099a .global func_ov14_021500d8 @@ -27614,7 +27614,7 @@ _02150d70: mul r0, r1, r0 _02150d88: str r0, [r4, #0x68] - ldr r0, _02150e24 ; =data_027e0e60 + ldr r0, _02150e24 ; =gMapManager ldrb r3, [r4, #0x15] ldrb r2, [r4, #0x14] ldr r0, [r0] @@ -27656,7 +27656,7 @@ _02150e0c: .align 2, 0 arm_func_end func_ov14_02150bb4 _02150e20: .word 0x00001333 -_02150e24: .word data_027e0e60 +_02150e24: .word gMapManager _02150e28: .word data_027e0d38 .global func_ov14_02150e2c @@ -28191,7 +28191,7 @@ func_ov14_0215141c: ; 0x0215141c str r0, [r4, #0x84] str r0, [r4, #0x88] ldr r1, [r4, #0x7c] - ldr r0, _02151518 ; =data_027e0e60 + ldr r0, _02151518 ; =gMapManager str r1, [r4, #0x8c] ldr r2, [r4, #0x80] add r1, sp, #0xc @@ -28249,7 +28249,7 @@ _0215150c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0215141c -_02151518: .word data_027e0e60 +_02151518: .word gMapManager _0215151c: .word data_027e0d38 _02151520: .word data_027e0f68 _02151524: .word data_ov14_0215401c diff --git a/asm/ov15.inc b/asm/ov15.inc index 0b7b720d..2cdde376 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -149,7 +149,7 @@ .extern data_027e0e2c .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov15.s b/asm/ov15.s index 048841fc..08c04702 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -70,7 +70,7 @@ func_ov15_0211f69c: ; 0x0211f69c ands r1, r1, #0x3f addeq sp, sp, #0x3c ldmeqia sp!, {r4, r5, r6, r7, pc} - ldr r0, _0211f858 ; =data_027e0e60 + ldr r0, _0211f858 ; =gMapManager mov r7, #0x47 ldr r0, [r0] sub lr, r7, #0x49 @@ -163,7 +163,7 @@ _0211f848: .align 2, 0 arm_func_end func_ov15_0211f69c _0211f854: .word data_027e0f6c -_0211f858: .word data_027e0e60 +_0211f858: .word gMapManager _0211f85c: .word data_02050f54 _0211f860: .word data_027e0d3c @@ -259,7 +259,7 @@ func_ov15_0211f954: ; 0x0211f954 bl func_ov15_0211fd64 bl func_ov15_0213ce4c bl func_ov15_0213d3d4 - ldr r0, _0211f9a4 ; =data_027e0e60 + ldr r0, _0211f9a4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082594Ev ldr r0, _0211f9a8 ; =data_027e0fe4 @@ -270,7 +270,7 @@ func_ov15_0211f954: ; 0x0211f954 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0211f954 -_0211f9a4: .word data_027e0e60 +_0211f9a4: .word gMapManager _0211f9a8: .word data_027e0fe4 .global func_ov15_0211f9ac @@ -402,7 +402,7 @@ _0211fab4: mov r0, #8 str r0, [sp, #8] ldr r1, _0211fc38 ; =data_ov15_0218ec18 - ldr r0, _0211fc4c ; =data_027e0e60 + ldr r0, _0211fc4c ; =gMapManager str r1, [sp, #0xc] ldr r0, [r0] add r1, sp, #0x18 @@ -427,7 +427,7 @@ _0211fbac: beq _0211fbe8 ldr r0, [r5, #0x2c] bl func_ov15_02121988 - ldr r0, _0211fc4c ; =data_027e0e60 + ldr r0, _0211fc4c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020825acEv ldr r0, _0211fc54 ; =data_027e0fe4 @@ -462,7 +462,7 @@ _0211fc3c: .word func_ov15_0211fc58 _0211fc40: .word data_ov15_0218ec0c _0211fc44: .word data_027e0d78 _0211fc48: .word 0x0000ffff -_0211fc4c: .word data_027e0e60 +_0211fc4c: .word gMapManager _0211fc50: .word data_ov00_020eec9c _0211fc54: .word data_027e0fe4 @@ -717,7 +717,7 @@ _0211ff18: mov r2, #0x49 str r0, [sp, #0x3c] ldr r5, [r9, #0x3c] - ldr r0, _021205bc ; =data_027e0e60 + ldr r0, _021205bc ; =gMapManager str r5, [sp, #0x40] str r4, [sp] str r3, [sp, #4] @@ -876,7 +876,7 @@ _02120184: mov r1, #0x49 str r0, [sp, #0x2c] ldr r4, [r9, #0x3c] - ldr r0, _021205bc ; =data_027e0e60 + ldr r0, _021205bc ; =gMapManager str r4, [sp, #0x30] str r3, [sp] str r2, [sp, #4] @@ -1039,7 +1039,7 @@ _02120354: mov r2, #0x49 str r1, [sp, #0x1c] ldr ip, [r9, #0x34] - ldr r1, _021205bc ; =data_027e0e60 + ldr r1, _021205bc ; =gMapManager str ip, [sp, #0x20] str r10, [sp] str r3, [sp, #4] @@ -1129,7 +1129,7 @@ _021205ac: .word data_ov15_0218946c _021205b0: .word func_ov15_0211fc6c _021205b4: .word data_ov15_0218ec34 _021205b8: .word 0x0000ffff -_021205bc: .word data_027e0e60 +_021205bc: .word gMapManager _021205c0: .word data_ov15_02189420 _021205c4: .word data_027e0d3c _021205c8: .word data_027e0c38 @@ -2313,7 +2313,7 @@ _02121550: mov r1, #0x24 bl _ZNK11ItemManager7HasItemEi mov r5, #0 - ldr r1, _021216fc ; =data_027e0e60 + ldr r1, _021216fc ; =gMapManager mov r4, r0 ldr r0, [r1] mov r6, r5 @@ -2408,7 +2408,7 @@ _021216ec: .word data_027e1054 _021216f0: .word data_027e0d3c _021216f4: .word data_ov15_02185b5c _021216f8: .word gItemManager -_021216fc: .word data_027e0e60 +_021216fc: .word gMapManager .global func_ov15_02121700 arm_func_start func_ov15_02121700 @@ -2501,7 +2501,7 @@ func_ov15_021217e4: ; 0x021217e4 mov r8, #0 bne _021218b0 ldrb r7, [r9, #0x12] - ldr r0, _02121970 ; =data_027e0e60 + ldr r0, _02121970 ; =gMapManager add r1, r7, #0xa6 ldr r0, [r0] add r9, r1, #0x50000 @@ -2605,7 +2605,7 @@ _02121940: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov15_021217e4 -_02121970: .word data_027e0e60 +_02121970: .word gMapManager _02121974: .word data_027e0f7c _02121978: .word data_027e0fe4 _0212197c: .word 0x000500aa @@ -3597,7 +3597,7 @@ func_ov15_02122674: ; 0x02122674 ldr r3, [sp, #0xd8] ldr r2, [sp, #0xdc] ldr r1, [sp, #0xe0] - ldr r0, _02122da0 ; =data_027e0e60 + ldr r0, _02122da0 ; =gMapManager str r2, [sp, #0x50] str r3, [sp, #0x4c] str r1, [sp, #0x54] @@ -4047,7 +4047,7 @@ _02122d58: .align 2, 0 arm_func_end func_ov15_02122674 _02122d9c: .word data_027e0f94 -_02122da0: .word data_027e0e60 +_02122da0: .word gMapManager _02122da4: .word data_02050f54 _02122da8: .word data_027e0fe8 _02122dac: .word 0x42554949 @@ -4159,7 +4159,7 @@ _02122edc: cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _021230c8 ; =data_027e0e60 + ldr r0, _021230c8 ; =gMapManager ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 @@ -4260,7 +4260,7 @@ _0212307c: cmp r1, r0 addne sp, sp, #0x18 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _021230c8 ; =data_027e0e60 + ldr r0, _021230c8 ; =gMapManager ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 @@ -4276,7 +4276,7 @@ _0212307c: arm_func_end func_ov15_02122e34 _021230c0: .word data_027e10a4 _021230c4: .word data_027e0d3c -_021230c8: .word data_027e0e60 +_021230c8: .word gMapManager _021230cc: .word data_027e0fe4 _021230d0: .word 0x53454b45 _021230d4: .word 0x464c5052 @@ -4459,7 +4459,7 @@ func_ov15_021232b4: ; 0x021232b4 str lr, [sp, #0x64] ldrh lr, [r0, #0x20] mov r3, #0xd - ldr r2, _02123460 ; =data_027e0e60 + ldr r2, _02123460 ; =gMapManager ldr ip, [ip, lr, lsl #2] str r5, [sp, #0x4c] str r5, [sp, #0x50] @@ -4523,7 +4523,7 @@ func_ov15_021232b4: ; 0x021232b4 _02123454: .word data_027e0f94 _02123458: .word 0x0000ffff _0212345c: .word data_ov15_02185b60 -_02123460: .word data_027e0e60 +_02123460: .word gMapManager _02123464: .word data_ov15_02189610 _02123468: .word data_027e0fe4 @@ -6170,7 +6170,7 @@ func_ov15_02124a40: ; 0x02124a40 movs r4, r0 beq _02124b9c ldr r1, [r10, #0x48] - ldr r0, _0212502c ; =data_027e0e60 + ldr r0, _0212502c ; =gMapManager str r1, [r10, #0x54] ldr r2, [r10, #0x4c] add r1, sp, #4 @@ -6561,7 +6561,7 @@ _02124ffc: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov15_02124a40 -_0212502c: .word data_027e0e60 +_0212502c: .word gMapManager _02125030: .word 0x00000733 _02125034: .word data_02050f54 _02125038: .word 0xfffffb33 @@ -6580,7 +6580,7 @@ func_ov15_0212504c: ; 0x0212504c add r3, sp, #0x14 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02125108 ; =data_027e0e60 + ldr r0, _02125108 ; =gMapManager ldr lr, [sp, #0x14] ldr ip, [sp, #0x18] ldr r3, [sp, #0x1c] @@ -6622,7 +6622,7 @@ func_ov15_0212504c: ; 0x0212504c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0212504c -_02125108: .word data_027e0e60 +_02125108: .word gMapManager _0212510c: .word data_027e0e58 _02125110: .word 0x000009ec _02125114: .word data_027e0ffc @@ -6637,7 +6637,7 @@ func_ov15_02125118: ; 0x02125118 add r3, sp, #0x14 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _021251d4 ; =data_027e0e60 + ldr r0, _021251d4 ; =gMapManager ldr lr, [sp, #0x14] ldr ip, [sp, #0x18] ldr r3, [sp, #0x1c] @@ -6679,7 +6679,7 @@ func_ov15_02125118: ; 0x02125118 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02125118 -_021251d4: .word data_027e0e60 +_021251d4: .word gMapManager _021251d8: .word 0x00000333 _021251dc: .word data_027e0e58 _021251e0: .word 0x00000666 @@ -7350,7 +7350,7 @@ _02125a88: ; jump table b _02125d4c ; case 7 _02125aa8: ldr r1, [r4, #0x48] - ldr r0, _02125dec ; =data_027e0e60 + ldr r0, _02125dec ; =gMapManager str r1, [sp, #0x14] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -7496,7 +7496,7 @@ _02125ca8: b _02125d68 _02125cd0: ldr r1, [r4, #0x48] - ldr r0, _02125dec ; =data_027e0e60 + ldr r0, _02125dec ; =gMapManager str r1, [sp, #8] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -7573,7 +7573,7 @@ _02125ddc: .word data_ov15_02185bc8 _02125de0: .word data_ov15_02185bc8 _02125de4: .word data_027e0ffc _02125de8: .word 0x000001dd -_02125dec: .word data_027e0e60 +_02125dec: .word gMapManager _02125df0: .word data_02050f54 _02125df4: .word 0x00000e39 _02125df8: .word 0x0000019a @@ -7856,7 +7856,7 @@ func_ov15_0212619c: ; 0x0212619c stmdb sp!, {r4, lr} ldr r1, _021261dc ; =data_ov15_02189990 mov r4, r0 - ldr r0, _021261e0 ; =data_027e0e60 + ldr r0, _021261e0 ; =gMapManager str r1, [r4] ldr r0, [r0] add r1, r4, #0xac @@ -7872,7 +7872,7 @@ func_ov15_0212619c: ; 0x0212619c .align 2, 0 arm_func_end func_ov15_0212619c _021261dc: .word data_ov15_02189990 -_021261e0: .word data_027e0e60 +_021261e0: .word gMapManager .global func_ov15_021261e4 arm_func_start func_ov15_021261e4 @@ -7880,7 +7880,7 @@ func_ov15_021261e4: ; 0x021261e4 stmdb sp!, {r4, lr} ldr r1, _0212622c ; =data_ov15_02189990 mov r4, r0 - ldr r0, _02126230 ; =data_027e0e60 + ldr r0, _02126230 ; =gMapManager str r1, [r4] ldr r0, [r0] add r1, r4, #0xac @@ -7898,7 +7898,7 @@ func_ov15_021261e4: ; 0x021261e4 .align 2, 0 arm_func_end func_ov15_021261e4 _0212622c: .word data_ov15_02189990 -_02126230: .word data_027e0e60 +_02126230: .word gMapManager .global func_ov15_02126234 arm_func_start func_ov15_02126234 @@ -7906,7 +7906,7 @@ func_ov15_02126234: ; 0x02126234 stmdb sp!, {r4, lr} ldr r1, _02126274 ; =data_ov15_02189990 mov r4, r0 - ldr r0, _02126278 ; =data_027e0e60 + ldr r0, _02126278 ; =gMapManager str r1, [r4] ldr r0, [r0] add r1, r4, #0xac @@ -7922,7 +7922,7 @@ func_ov15_02126234: ; 0x02126234 .align 2, 0 arm_func_end func_ov15_02126234 _02126274: .word data_ov15_02189990 -_02126278: .word data_027e0e60 +_02126278: .word gMapManager .global func_ov15_0212627c arm_func_start func_ov15_0212627c @@ -7940,7 +7940,7 @@ func_ov15_0212627c: ; 0x0212627c str r1, [ip, #0xc8] ldr r1, _021262cc ; =0x0000399a str r3, [ip, #0xcc] - ldr r0, _021262d0 ; =data_027e0e60 + ldr r0, _021262d0 ; =gMapManager str r1, [ip, #0xd0] ldr r0, [r0] add r1, ip, #0xac @@ -7950,7 +7950,7 @@ func_ov15_0212627c: ; 0x0212627c .align 2, 0 arm_func_end func_ov15_0212627c _021262cc: .word 0x0000399a -_021262d0: .word data_027e0e60 +_021262d0: .word gMapManager .global func_ov15_021262d4 arm_func_start func_ov15_021262d4 @@ -10308,7 +10308,7 @@ func_ov15_02127d9c: ; 0x02127d9c mov r1, #0x4000 str r0, [r4, #0x70] ldr r2, [sp, #0x2c] - ldr r0, _02127ee8 ; =data_027e0e60 + ldr r0, _02127ee8 ; =gMapManager str r2, [r4, #0x74] ldr r2, [sp, #0x30] str r2, [r4, #0x78] @@ -10373,7 +10373,7 @@ _02127e38: arm_func_end func_ov15_02127d9c _02127ee0: .word data_027e0f68 _02127ee4: .word data_ov15_02185ce8 -_02127ee8: .word data_027e0e60 +_02127ee8: .word gMapManager _02127eec: .word 0xffffd99a _02127ef0: .word 0x00004ccc _02127ef4: .word data_027e0f6c @@ -10560,7 +10560,7 @@ _02128184: mov r3, r2 bl func_ov00_020c75f4 _02128198: - ldr r0, _021281dc ; =data_027e0e60 + ldr r0, _021281dc ; =gMapManager ldrsh r1, [r5, #0x34] ldr r0, [r0] mov r2, #1 @@ -10580,7 +10580,7 @@ _021281cc: .word 0x0000020f _021281d0: .word data_027e1038 _021281d4: .word data_ov15_02185cdc _021281d8: .word data_027e0e58 -_021281dc: .word data_027e0e60 +_021281dc: .word gMapManager .global func_ov15_021281e0 arm_func_start func_ov15_021281e0 @@ -10959,7 +10959,7 @@ func_ov15_02128670: ; 0x02128670 ldr r0, [r6, #0x80] cmp r0, #0x20000 bge _02128888 - ldr r0, _021288b4 ; =data_027e0e60 + ldr r0, _021288b4 ; =gMapManager add r1, r6, #0x18 ldr r0, [r0] ldr r7, [r6, #0x1c] @@ -11097,7 +11097,7 @@ _02128894: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov15_02128670 -_021288b4: .word data_027e0e60 +_021288b4: .word gMapManager _021288b8: .word 0x0000ffff _021288bc: .word 0x04e20000 _021288c0: .word 0x00001b33 @@ -11240,7 +11240,7 @@ _02128a0c: mov r3, #4 bl func_ov00_0207c1b0 _02128ad8: - ldr r0, _02128b84 ; =data_027e0e60 + ldr r0, _02128b84 ; =gMapManager add r1, r4, #0x18 ldr r0, [r0] mov r2, #0 @@ -11287,7 +11287,7 @@ _02128b74: .word 0x43424c53 _02128b78: .word data_027e0ffc _02128b7c: .word 0x0000020e _02128b80: .word data_027e0e58 -_02128b84: .word data_027e0e60 +_02128b84: .word gMapManager _02128b88: .word 0x00001333 .global func_ov15_02128b8c @@ -11827,20 +11827,20 @@ func_ov15_02129254: ; 0x02129254 func_ov15_0212925c: ; 0x0212925c stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x74 - ldr r2, _021296c0 ; =data_027e0e60 + ldr r2, _021296c0 ; =gMapManager mov r9, r0 ldr r0, [r2] mov r8, r1 add r1, sp, #0x68 bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p - ldr r0, _021296c0 ; =data_027e0e60 + ldr r0, _021296c0 ; =gMapManager add r1, sp, #0x5c ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p - ldr r0, _021296c0 ; =data_027e0e60 + ldr r0, _021296c0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083374Ev - ldr r1, _021296c0 ; =data_027e0e60 + ldr r1, _021296c0 ; =gMapManager mov r11, r0 ldr r0, [r1] bl _ZN10MapManager18func_ov00_02083384Ev @@ -12122,7 +12122,7 @@ _021296ac: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov15_0212925c -_021296c0: .word data_027e0e60 +_021296c0: .word gMapManager _021296c4: .word data_027e0ce0 _021296c8: .word data_ov00_020e2f04 _021296cc: .word data_ov00_020e2dd8 @@ -12478,7 +12478,7 @@ func_ov15_02129a6c: ; 0x02129a6c sub sp, sp, #0x1c mov r7, r2 mov r8, r1 - ldr r2, _02129b14 ; =data_027e0e60 + ldr r2, _02129b14 ; =gMapManager mov r9, r0 ldrb r1, [r7, #1] ldr r0, [r2] @@ -12490,7 +12490,7 @@ func_ov15_02129a6c: ; 0x02129a6c mov r1, r7 ldr r2, [r2, #0x60] blx r2 - ldr r1, _02129b14 ; =data_027e0e60 + ldr r1, _02129b14 ; =gMapManager mov r4, r0 ldr r0, [r1] ldrb r1, [r7] @@ -12519,7 +12519,7 @@ _02129b08: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov15_02129a6c -_02129b14: .word data_027e0e60 +_02129b14: .word gMapManager _02129b18: .word data_027e0f68 .global func_ov15_02129b1c @@ -16449,7 +16449,7 @@ _0212cf44: bl func_ov15_0212d008 _0212cf4c: ldr r1, [r4, #0x48] - ldr r0, _0212cfb8 ; =data_027e0e60 + ldr r0, _0212cfb8 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -16477,7 +16477,7 @@ _0212cfa8: .word data_027e0d38 _0212cfac: .word data_027e10a4 _0212cfb0: .word data_027e0f94 _0212cfb4: .word data_027e0fe4 -_0212cfb8: .word data_027e0e60 +_0212cfb8: .word gMapManager _0212cfbc: .word data_ov15_0218a464 _0212cfc0: .word data_ov15_0218a470 @@ -16748,7 +16748,7 @@ _0212d358: sub r0, r0, #1 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _0212d514 ; =data_027e0e60 + ldr r0, _0212d514 ; =gMapManager str r1, [sp, #0x20] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -16803,7 +16803,7 @@ _0212d430: sub r0, r0, #1 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _0212d514 ; =data_027e0e60 + ldr r0, _0212d514 ; =gMapManager str r1, [sp, #0x14] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -16851,7 +16851,7 @@ _0212d494: .align 2, 0 arm_func_end func_ov15_0212d29c _0212d510: .word data_ov15_02185d50 -_0212d514: .word data_027e0e60 +_0212d514: .word gMapManager _0212d518: .word data_ov15_0218a464 _0212d51c: .word data_ov15_0218a470 _0212d520: .word data_027e0fe4 @@ -17575,7 +17575,7 @@ _0212df28: sub r2, r3, #2 mov r5, #0x47 mov r1, #0xff - ldr r0, _0212e06c ; =data_027e0e60 + ldr r0, _0212e06c ; =gMapManager str r2, [sp, #0x38] str r5, [sp, #0x2c] str r3, [sp, #0x30] @@ -17639,7 +17639,7 @@ _0212e05c: .word data_027e0fac _0212e060: .word data_02050f54 _0212e064: .word data_027e0c68 _0212e068: .word 0x00050022 -_0212e06c: .word data_027e0e60 +_0212e06c: .word gMapManager _0212e070: .word data_027e10a4 _0212e074: .word gAdventureFlags @@ -18868,7 +18868,7 @@ _0212f13c: ldr r0, [r4, #0x130] cmp r0, #4 bne _0212f1fc - ldr r0, _0212f25c ; =data_027e0e60 + ldr r0, _0212f25c ; =gMapManager ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -18914,7 +18914,7 @@ _0212f204: arm_func_end func_ov15_0212f0b8 _0212f254: .word data_027e077c _0212f258: .word data_02050f54 -_0212f25c: .word data_027e0e60 +_0212f25c: .word gMapManager _0212f260: .word data_027e0e58 .global func_ov15_0212f264 @@ -18959,7 +18959,7 @@ func_ov15_0212f2c8: ; 0x0212f2c8 mov r0, #2 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _0212f340 ; =data_027e0e60 + ldr r0, _0212f340 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -18985,7 +18985,7 @@ func_ov15_0212f2c8: ; 0x0212f2c8 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_0212f2c8 -_0212f340: .word data_027e0e60 +_0212f340: .word gMapManager _0212f344: .word data_ov15_0218a46c _0212f348: .word data_ov15_0218a468 @@ -19234,7 +19234,7 @@ func_ov15_0212f5f0: ; 0x0212f5f0 cmp r1, r4 moveq r1, #0 streq r1, [r0] - ldr r0, _0212f6b8 ; =data_027e0e60 + ldr r0, _0212f6b8 ; =gMapManager add r1, r4, #0x334 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838d8Ei @@ -19278,7 +19278,7 @@ _0212f65c: arm_func_end func_ov15_0212f5f0 _0212f6b0: .word data_ov15_0218a5b8 _0212f6b4: .word data_027e10a0 -_0212f6b8: .word data_027e0e60 +_0212f6b8: .word gMapManager _0212f6bc: .word data_ov00_020eec68 _0212f6c0: .word data_ov15_02190458 @@ -19294,7 +19294,7 @@ func_ov15_0212f6c4: ; 0x0212f6c4 cmp r1, r4 moveq r1, #0 streq r1, [r0] - ldr r0, _0212f794 ; =data_027e0e60 + ldr r0, _0212f794 ; =gMapManager add r1, r4, #0x334 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838d8Ei @@ -19340,7 +19340,7 @@ _0212f730: arm_func_end func_ov15_0212f6c4 _0212f78c: .word data_ov15_0218a5b8 _0212f790: .word data_027e10a0 -_0212f794: .word data_027e0e60 +_0212f794: .word gMapManager _0212f798: .word data_ov00_020eec68 _0212f79c: .word data_ov15_02190458 @@ -19508,7 +19508,7 @@ _0212f824: bl _ZN14AdventureFlags3SetEjb mov r1, #4 str r1, [r4, #0x130] - ldr r0, _0212fc24 ; =data_027e0e60 + ldr r0, _0212fc24 ; =gMapManager add r1, r4, #0x334 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838c8Ei @@ -19653,7 +19653,7 @@ _0212fc14: .word data_027e10a0 _0212fc18: .word 0x00002666 _0212fc1c: .word 0x00006e67 _0212fc20: .word 0x000024cd -_0212fc24: .word data_027e0e60 +_0212fc24: .word gMapManager .global func_ov15_0212fc28 arm_func_start func_ov15_0212fc28 @@ -19695,7 +19695,7 @@ _0212fc6c: str r0, [r4, #0x330] _0212fcb0: ldr r1, [r4, #0x48] - ldr r0, _0212fd18 ; =data_027e0e60 + ldr r0, _0212fd18 ; =gMapManager str r1, [sp, #0x10] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -19722,7 +19722,7 @@ _0212fcb0: _0212fd0c: .word data_027e0fe4 _0212fd10: .word 0x4647474e _0212fd14: .word 0x47534d47 -_0212fd18: .word data_027e0e60 +_0212fd18: .word gMapManager _0212fd1c: .word data_ov15_0218a5a0 _0212fd20: .word data_ov15_0218a5ac @@ -19976,7 +19976,7 @@ _0212fe8c: str r2, [sp, #0x258] strb r11, [sp, #0x1da] bl _ZN14AdventureFlags18func_Ov00_02097810Ei - ldr r1, _02130540 ; =data_027e0e60 + ldr r1, _02130540 ; =gMapManager str r0, [r5, #0x488] ldr r0, [r1] add r1, r5, #0x334 @@ -20011,7 +20011,7 @@ _0213010c: strh r0, [r5, #0x7a] mov r1, #0 strb r1, [r5, #0x490] - ldr r0, _02130540 ; =data_027e0e60 + ldr r0, _02130540 ; =gMapManager add r1, r5, #0x334 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838c8Ei @@ -20082,7 +20082,7 @@ _02130220: add r1, r5, #0x48 mov r2, r0 bl func_01ff9bc4 - ldr r0, _02130540 ; =data_027e0e60 + ldr r0, _02130540 ; =gMapManager add r1, sp, #0x24 ldr r0, [r0] mov r2, #0 @@ -20122,7 +20122,7 @@ _02130220: add r1, r5, #0x48 mov r2, r0 bl func_01ff9bc4 - ldr r0, _02130540 ; =data_027e0e60 + ldr r0, _02130540 ; =gMapManager add r1, sp, #0x18 ldr r0, [r0] mov r2, #0 @@ -20260,7 +20260,7 @@ _02130530: .word 0x0000ffff _02130534: .word data_027e0f94 _02130538: .word data_027e0f64 _0213053c: .word gAdventureFlags -_02130540: .word data_027e0e60 +_02130540: .word gMapManager _02130544: .word data_027e10a4 _02130548: .word 0xffffc568 _0213054c: .word 0x00001388 @@ -20365,7 +20365,7 @@ _02130694: movne r0, #0 strneb r0, [r4, #0x118] ldmneia sp!, {r4, pc} - ldr r0, _02130780 ; =data_027e0e60 + ldr r0, _02130780 ; =gMapManager ldrh r1, [r4, #0x26] ldr r0, [r0] mov r2, #0 @@ -20423,7 +20423,7 @@ _02130724: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02130558 -_02130780: .word data_027e0e60 +_02130780: .word gMapManager _02130784: .word data_ov15_0218a5a0 _02130788: .word data_ov15_0218a5ac _0213078c: .word data_ov15_02185e40 @@ -21602,7 +21602,7 @@ _021317fc: bl func_ov00_020c66e4 b _021318fc _02131840: - ldr r0, _02131930 ; =data_027e0e60 + ldr r0, _02131930 ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 @@ -21667,7 +21667,7 @@ _02131920: .word gAdventureFlags _02131924: .word data_027e0e2c _02131928: .word func_ov15_0212f3cc _0213192c: .word 0x00050021 -_02131930: .word data_027e0e60 +_02131930: .word gMapManager _02131934: .word 0x00000171 .global func_ov15_02131938 @@ -21903,7 +21903,7 @@ _02131c70: ldr ip, [ip, #0x34] add r1, r4, #0x14 blx ip - ldr r0, _02131f08 ; =data_027e0e60 + ldr r0, _02131f08 ; =gMapManager add r1, r4, #0x334 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838d8Ei @@ -22066,7 +22066,7 @@ _02131ef8: .word 0x000002e2 _02131efc: .word data_02050f54 _02131f00: .word data_027e0f90 _02131f04: .word data_027e0fac -_02131f08: .word data_027e0e60 +_02131f08: .word gMapManager .global func_ov15_02131f0c arm_func_start func_ov15_02131f0c @@ -22346,7 +22346,7 @@ _021322e8: cmp r0, #0x1000 ldrltb r0, [r4, #0x490] ldr r2, _021325e4 ; =data_02050f54 - ldr r1, _021325e8 ; =data_027e0e60 + ldr r1, _021325e8 ; =gMapManager addlt r0, r0, #1 strltb r0, [r4, #0x490] ldr r0, _021325ec ; =data_027e0fac @@ -22446,7 +22446,7 @@ _0213246c: strh r1, [sp] ldrsh r1, [r4, #0x78] bl func_0202b154 - ldr r0, _021325e8 ; =data_027e0e60 + ldr r0, _021325e8 ; =gMapManager ldr r1, [sp, #0x80] ldrsh r7, [sp] orr r6, r1, #2 @@ -22486,7 +22486,7 @@ _02132504: sub r2, r3, #2 mov r5, #0x47 mov r1, #0xff - ldr r0, _021325e8 ; =data_027e0e60 + ldr r0, _021325e8 ; =gMapManager str r2, [sp, #0x58] str r5, [sp, #0x4c] str r3, [sp, #0x50] @@ -22538,7 +22538,7 @@ _021325d8: .word data_027e0f94 _021325dc: .word data_027e0c68 _021325e0: .word 0x00050082 _021325e4: .word data_02050f54 -_021325e8: .word data_027e0e60 +_021325e8: .word gMapManager _021325ec: .word data_027e0fac _021325f0: .word data_027e10a4 @@ -22673,7 +22673,7 @@ func_ov15_0213278c: ; 0x0213278c sub r0, r0, #4 cmp r0, #1 bhi _021327d0 - ldr r0, _021327d8 ; =data_027e0e60 + ldr r0, _021327d8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 @@ -22689,7 +22689,7 @@ _021327d0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0213278c -_021327d8: .word data_027e0e60 +_021327d8: .word gMapManager .global func_ov15_021327dc arm_func_start func_ov15_021327dc @@ -23502,7 +23502,7 @@ _021332ac: ldr r0, [r7, #0x360] cmp r0, #0 beq _02133338 - ldr r0, _02133c9c ; =data_027e0e60 + ldr r0, _02133c9c ; =gMapManager ldrh r1, [r7, #0x22] ldr r0, [r0] mov r2, #0 @@ -24172,7 +24172,7 @@ _02133c6c: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov15_0213321c -_02133c9c: .word data_027e0e60 +_02133c9c: .word gMapManager _02133ca0: .word data_ov15_02185e74 _02133ca4: .word data_ov15_02185e70 _02133ca8: .word data_ov15_02185e6c @@ -25498,7 +25498,7 @@ _02134e00: ldmia sp!, {r3, r4, pc} _02134e14: ldr r1, [r4, #0x48] - ldr r0, _02135108 ; =data_027e0e60 + ldr r0, _02135108 ; =gMapManager str r1, [sp, #0x14] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -25527,7 +25527,7 @@ _02134e6c: add r3, sp, #0x20 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02135108 ; =data_027e0e60 + ldr r0, _02135108 ; =gMapManager ldr lr, [sp, #0x20] ldr ip, [sp, #0x24] ldr r3, [sp, #0x28] @@ -25698,7 +25698,7 @@ _021350e8: .align 2, 0 arm_func_end func_ov15_02134d6c _02135104: .word data_ov15_02185ea0 -_02135108: .word data_027e0e60 +_02135108: .word gMapManager _0213510c: .word data_027e0e58 _02135110: .word 0x00000829 _02135114: .word 0x00000ae1 @@ -26921,7 +26921,7 @@ func_ov15_021360e4: ; 0x021360e4 b _0213618c _02136168: ldr r2, _021363dc ; =data_027e0d78 - ldr r0, _021363e0 ; =data_027e0e60 + ldr r0, _021363e0 ; =gMapManager ldr r1, [r2, #0x24] ldr r0, [r0] ldr r2, [r2, #0x28] @@ -27085,7 +27085,7 @@ _021363cc: arm_func_end func_ov15_021360e4 _021363d8: .word data_027e0fe4 _021363dc: .word data_027e0d78 -_021363e0: .word data_027e0e60 +_021363e0: .word gMapManager _021363e4: .word data_027e0f94 _021363e8: .word data_027e10a4 _021363ec: .word data_02050f54 @@ -28127,7 +28127,7 @@ func_ov15_02137138: ; 0x02137138 bl func_ov00_020b7e6c _02137164: ldr r1, _0213725c ; =data_027e0f94 - ldr r0, _02137260 ; =data_027e0e60 + ldr r0, _02137260 ; =gMapManager ldr r3, [r1] ldr r2, [r1, #4] str r3, [sp, #8] @@ -28191,7 +28191,7 @@ _02137164: arm_func_end func_ov15_02137138 _02137258: .word data_027e0fa0 _0213725c: .word data_027e0f94 -_02137260: .word data_027e0e60 +_02137260: .word gMapManager _02137264: .word 0x000004cd _02137268: .word data_027e0e58 _0213726c: .word data_027e0ffc @@ -29249,7 +29249,7 @@ _02138150: cmp r0, #0x28 blt _02138224 ldr r3, _021382e8 ; =data_027e0f94 - ldr r0, _021382f4 ; =data_027e0e60 + ldr r0, _021382f4 ; =gMapManager ldr r2, [r3] ldr r1, [r3, #4] str r2, [sp, #0x1c] @@ -29357,7 +29357,7 @@ _021382e4: .word 0xfffff8a4 _021382e8: .word data_027e0f94 _021382ec: .word data_027e0e58 _021382f0: .word 0x0000019a -_021382f4: .word data_027e0e60 +_021382f4: .word gMapManager _021382f8: .word data_027e0fb8 _021382fc: .word data_ov00_020eec9c _02138300: .word 0xfffffa66 @@ -29449,7 +29449,7 @@ func_ov15_02138408: ; 0x02138408 cmp r0, #1 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0213846c ; =data_027e0e60 + ldr r0, _0213846c ; =gMapManager mov r2, #0 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_68Ev @@ -29470,7 +29470,7 @@ func_ov15_02138408: ; 0x02138408 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02138408 -_0213846c: .word data_027e0e60 +_0213846c: .word gMapManager _02138470: .word 0xfffffccd _02138474: .word 0x00000ccc @@ -29596,7 +29596,7 @@ func_ov15_02138478: ; 0x02138478 cmp r0, #0 bne _021386b0 ldr r1, _02138bb8 ; =data_027e0f94 - ldr r0, _02138bbc ; =data_027e0e60 + ldr r0, _02138bbc ; =gMapManager ldr r2, [r1, #4] ldr r3, [r1] str r2, [sp, #4] @@ -29957,7 +29957,7 @@ _02138bac: .word data_027e0fb0 _02138bb0: .word data_02050f54 _02138bb4: .word data_027e0fac _02138bb8: .word data_027e0f94 -_02138bbc: .word data_027e0e60 +_02138bbc: .word gMapManager _02138bc0: .word 0xffffc71c _02138bc4: .word 0x000004cd @@ -30050,7 +30050,7 @@ _02138c30: mov r0, #0xcd str r0, [sp, #8] ldr r1, _02138fac ; =data_ov15_0218eec0 - ldr r0, _02138fb0 ; =data_027e0e60 + ldr r0, _02138fb0 ; =gMapManager str r1, [sp, #0xc] str r2, [sp, #0x10] ldr r0, [r0] @@ -30222,7 +30222,7 @@ _02138fa0: .word data_027e0fa0 _02138fa4: .word data_027e0ff8 _02138fa8: .word 0x0000ffff _02138fac: .word data_ov15_0218eec0 -_02138fb0: .word data_027e0e60 +_02138fb0: .word gMapManager _02138fb4: .word data_027e0fac _02138fb8: .word data_02050f54 _02138fbc: .word data_027e0f6c @@ -30319,7 +30319,7 @@ _02139100: add r0, sp, #0 bl func_ov15_02139164 ldr r1, [sp] - ldr r0, _02139160 ; =data_027e0e60 + ldr r0, _02139160 ; =gMapManager mov r1, r1, lsr #0x10 ldr r0, [r0] and r1, r1, #0x3f @@ -30342,7 +30342,7 @@ _02139144: _02139154: .word data_ov15_0218eec0 _02139158: .word data_027e0d38 _0213915c: .word data_027e0e2c -_02139160: .word data_027e0e60 +_02139160: .word gMapManager .global func_ov15_02139164 arm_func_start func_ov15_02139164 @@ -32183,7 +32183,7 @@ _0213aa30: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r5, #0x48] - ldr r0, _0213abac ; =data_027e0e60 + ldr r0, _0213abac ; =gMapManager str r1, [sp, #8] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -32280,7 +32280,7 @@ _0213ab94: .align 2, 0 arm_func_end func_ov15_0213a9c8 _0213aba8: .word 0xffffe668 -_0213abac: .word data_027e0e60 +_0213abac: .word gMapManager _0213abb0: .word 0x0000051f _0213abb4: .word data_027e0e58 _0213abb8: .word data_027e0ffc @@ -32298,7 +32298,7 @@ func_ov15_0213abc4: ; 0x0213abc4 subne r0, r0, #1 strne r0, [r5, #0x178] ldr r1, [r5, #0x48] - ldr r0, _0213b120 ; =data_027e0e60 + ldr r0, _0213b120 ; =gMapManager str r1, [sp, #0x9c] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -32618,7 +32618,7 @@ _0213b05c: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r5, #0x48] - ldr r0, _0213b120 ; =data_027e0e60 + ldr r0, _0213b120 ; =gMapManager str r1, [sp, #0x10] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -32653,7 +32653,7 @@ _0213b0f8: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0213abc4 -_0213b120: .word data_027e0e60 +_0213b120: .word gMapManager _0213b124: .word data_027e0c68 _0213b128: .word 0xffffe668 _0213b12c: .word data_ov00_020e83cc @@ -36692,7 +36692,7 @@ func_ov15_0213e754: ; 0x0213e754 stmdb sp!, {r4, lr} ldr r1, _0213e7d4 ; =data_ov15_0218aeb0 mov r4, r0 - ldr r0, _0213e7d8 ; =data_027e0e60 + ldr r0, _0213e7d8 ; =gMapManager str r1, [r4] ldr r0, [r0] add r1, r4, #0x31c @@ -36724,7 +36724,7 @@ func_ov15_0213e754: ; 0x0213e754 .align 2, 0 arm_func_end func_ov15_0213e754 _0213e7d4: .word data_ov15_0218aeb0 -_0213e7d8: .word data_027e0e60 +_0213e7d8: .word gMapManager _0213e7dc: .word data_027e103c _0213e7e0: .word func_ov00_020b7d74 @@ -36734,7 +36734,7 @@ func_ov15_0213e7e4: ; 0x0213e7e4 stmdb sp!, {r4, lr} ldr r1, _0213e86c ; =data_ov15_0218aeb0 mov r4, r0 - ldr r0, _0213e870 ; =data_027e0e60 + ldr r0, _0213e870 ; =gMapManager str r1, [r4] ldr r0, [r0] add r1, r4, #0x31c @@ -36768,7 +36768,7 @@ func_ov15_0213e7e4: ; 0x0213e7e4 .align 2, 0 arm_func_end func_ov15_0213e7e4 _0213e86c: .word data_ov15_0218aeb0 -_0213e870: .word data_027e0e60 +_0213e870: .word gMapManager _0213e874: .word data_027e103c _0213e878: .word func_ov00_020b7d74 @@ -37292,7 +37292,7 @@ _0213f03c: add r0, r4, #0x48 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0213f4b8 ; =data_027e0e60 + ldr r0, _0213f4b8 ; =gMapManager ldr r6, [sp, #0x84] ldr r5, [sp, #0x88] ldr r3, [sp, #0x8c] @@ -37332,7 +37332,7 @@ _0213f03c: str r0, [r4, #0x33c] mov r0, #0x14000 str r0, [r4, #0x340] - ldr r0, _0213f4b8 ; =data_027e0e60 + ldr r0, _0213f4b8 ; =gMapManager add r1, r4, #0x31c ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838c8Ei @@ -37360,7 +37360,7 @@ _0213f110: _0213f154: ldr r1, [r4, #0x1b8] mov r2, #1 - ldr r0, _0213f4b8 ; =data_027e0e60 + ldr r0, _0213f4b8 ; =gMapManager strh r2, [r1, #0xc] ldr r0, [r0] add r1, r4, #0x31c @@ -37585,7 +37585,7 @@ _0213f4a8: .word data_027e0f64 _0213f4ac: .word 0x00001388 _0213f4b0: .word gAdventureFlags _0213f4b4: .word data_027e0f94 -_0213f4b8: .word data_027e0e60 +_0213f4b8: .word gMapManager _0213f4bc: .word data_027e0e58 _0213f4c0: .word data_ov15_02190458 _0213f4c4: .word data_ov00_020eec68 @@ -37614,7 +37614,7 @@ func_ov15_0213f4d4: ; 0x0213f4d4 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r4, #0x48] - ldr r0, _0213f574 ; =data_027e0e60 + ldr r0, _0213f574 ; =gMapManager str r1, [sp, #4] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -37638,7 +37638,7 @@ func_ov15_0213f4d4: ; 0x0213f4d4 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_0213f4d4 -_0213f574: .word data_027e0e60 +_0213f574: .word gMapManager .global func_ov15_0213f578 arm_func_start func_ov15_0213f578 @@ -37762,7 +37762,7 @@ _0213f684: add r3, sp, #0x38 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0213f7bc ; =data_027e0e60 + ldr r0, _0213f7bc ; =gMapManager ldr ip, [sp, #0x38] ldr r4, [sp, #0x3c] ldr r3, [sp, #0x40] @@ -37799,7 +37799,7 @@ _0213f7ac: .word data_027e0fe4 _0213f7b0: .word data_ov15_02185fcc _0213f7b4: .word data_ov15_0218ae88 _0213f7b8: .word data_027e0ff8 -_0213f7bc: .word data_027e0e60 +_0213f7bc: .word gMapManager _0213f7c0: .word data_027e0ffc _0213f7c4: .word 0x00000216 _0213f7c8: .word data_027e10a4 @@ -37861,7 +37861,7 @@ func_ov15_0213f80c: ; 0x0213f80c ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r2, [sp, #0x94] - ldr r0, _0213fb7c ; =data_027e0e60 + ldr r0, _0213fb7c ; =gMapManager ldr r1, [sp, #0x98] str r2, [sp, #0x88] ldr r2, [sp, #0x9c] @@ -37910,7 +37910,7 @@ _0213f91c: ldr r4, [sp, #0x74] ldr ip, [sp, #0x70] ldr r3, [sp, #0x78] - ldr r0, _0213fb7c ; =data_027e0e60 + ldr r0, _0213fb7c ; =gMapManager add r1, sp, #0x64 ldr r0, [r0] mov r2, #0 @@ -38056,7 +38056,7 @@ _0213facc: .align 2, 0 arm_func_end func_ov15_0213f80c _0213fb78: .word data_027e0f94 -_0213fb7c: .word data_027e0e60 +_0213fb7c: .word gMapManager _0213fb80: .word data_027e0fac _0213fb84: .word data_027e10a4 _0213fb88: .word 0x00000d9a @@ -38701,7 +38701,7 @@ func_ov15_02140424: ; 0x02140424 cmp r0, #0 addeq sp, sp, #0x20 ldmeqia sp!, {r4, r5, r6, pc} - ldr r0, _02140588 ; =data_027e0e60 + ldr r0, _02140588 ; =gMapManager add r1, r4, #0x31c ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838d8Ei @@ -38772,7 +38772,7 @@ _02140540: .align 2, 0 arm_func_end func_ov15_02140424 _02140584: .word data_ov00_020e83cc -_02140588: .word data_027e0e60 +_02140588: .word gMapManager _0214058c: .word data_027e103c _02140590: .word data_027e10a4 _02140594: .word data_027e0ffc @@ -41768,7 +41768,7 @@ func_ov15_02142ba0: ; 0x02142ba0 ldrb r0, [r4, #0x353] cmp r0, #0 bne _02142c38 - ldr r0, _02142c5c ; =data_027e0e60 + ldr r0, _02142c5c ; =gMapManager mov lr, #0 ldr r0, [r0] sub ip, lr, #2 @@ -41810,7 +41810,7 @@ _02142c44: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02142ba0 -_02142c5c: .word data_027e0e60 +_02142c5c: .word gMapManager _02142c60: .word data_027e0d38 _02142c64: .word data_027e1094 @@ -42455,7 +42455,7 @@ _0214352c: ldr r0, [r5, #0x324] cmp r0, #1 bne _02143578 - ldr r0, _021436c0 ; =data_027e0e60 + ldr r0, _021436c0 ; =gMapManager add r2, sp, #0 ldr r0, [r0] add r1, r5, #0x294 @@ -42559,7 +42559,7 @@ _021436a4: .align 2, 0 arm_func_end func_ov15_02143408 _021436bc: .word 0x00001ccc -_021436c0: .word data_027e0e60 +_021436c0: .word gMapManager .global func_ov15_021436c4 arm_func_start func_ov15_021436c4 @@ -43543,7 +43543,7 @@ _0214449c: cmp r0, #0 addne sp, sp, #0xc8 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02144540 ; =data_027e0e60 + ldr r0, _02144540 ; =gMapManager mov lr, #0 ldr r0, [r0] sub ip, lr, #2 @@ -43583,7 +43583,7 @@ _02144530: .word gAdventureFlags _02144534: .word data_ov15_0218613c _02144538: .word data_ov15_02186130 _0214453c: .word data_027e0ffc -_02144540: .word data_027e0e60 +_02144540: .word gMapManager _02144544: .word data_027e0d38 .global func_ov15_02144548 @@ -43709,7 +43709,7 @@ _021446d8: addne sp, sp, #0xc8 str r0, [r4, #0x378] ldmneia sp!, {r4, pc} - ldr r0, _0214476c ; =data_027e0e60 + ldr r0, _0214476c ; =gMapManager mov ip, #0 ldr r0, [r0] sub r4, ip, #2 @@ -43741,7 +43741,7 @@ _0214475c: .word gAdventureFlags _02144760: .word data_027e0fa0 _02144764: .word data_027e0ffc _02144768: .word 0x000003ea -_0214476c: .word data_027e0e60 +_0214476c: .word gMapManager _02144770: .word data_027e0d38 .global func_ov15_02144774 @@ -44103,7 +44103,7 @@ _02144a40: mov r2, r0 bl func_01ff9bc4 ldr r1, [r9, #0x294] - ldr r0, _021457e0 ; =data_027e0e60 + ldr r0, _021457e0 ; =gMapManager str r1, [r9, #0x4b8] ldr r2, [r9, #0x298] add r1, r9, #0x2a0 @@ -44129,7 +44129,7 @@ _02144d14: add r3, sp, #0xd8 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _021457e0 ; =data_027e0e60 + ldr r0, _021457e0 ; =gMapManager ldr r5, [sp, #0xd8] ldr r4, [sp, #0xdc] ldr r3, [sp, #0xe0] @@ -44851,7 +44851,7 @@ _021457d0: .word gAdventureFlags _021457d4: .word data_027e0f94 _021457d8: .word data_027e0fac _021457dc: .word 0xfffffccd -_021457e0: .word data_027e0e60 +_021457e0: .word gMapManager _021457e4: .word 0xfffffe66 _021457e8: .word data_027e0ffc _021457ec: .word 0x000003e2 @@ -45934,14 +45934,14 @@ _02146558: .word data_ov15_0218f42e arm_func_start func_ov15_0214655c func_ov15_0214655c: ; 0x0214655c stmdb sp!, {r3, lr} - ldr r0, _02146574 ; =data_027e0e60 + ldr r0, _02146574 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082424Ev rsb r0, r0, #0 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov15_0214655c -_02146574: .word data_027e0e60 +_02146574: .word gMapManager .global func_ov15_02146578 arm_func_start func_ov15_02146578 @@ -46279,7 +46279,7 @@ _02146958: mov r0, r4 bl func_ov15_021469f8 _02146960: - ldr r0, _021469ec ; =data_027e0e60 + ldr r0, _021469ec ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082424Ev ldr r1, [r4, #0x4c] @@ -46287,7 +46287,7 @@ _02146960: cmp r0, #0x2000 addgt sp, sp, #0x18 ldmgtia sp!, {r4, pc} - ldr r0, _021469ec ; =data_027e0e60 + ldr r0, _021469ec ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082424Ev ldr r1, [r4, #0x4c] @@ -46316,7 +46316,7 @@ _02146960: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_021468f8 -_021469ec: .word data_027e0e60 +_021469ec: .word gMapManager _021469f0: .word 0x00000333 _021469f4: .word data_ov00_020e9370 @@ -48430,7 +48430,7 @@ func_ov15_021486a0: ; 0x021486a0 movlt r0, #0x400 str r0, [r5, #0x40c] ldr r1, [r5, #0x48] - ldr r0, _02148ac0 ; =data_027e0e60 + ldr r0, _02148ac0 ; =gMapManager str r1, [sp, #0x34] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -48685,7 +48685,7 @@ _02148aa8: .align 2, 0 arm_func_end func_ov15_021486a0 _02148abc: .word data_027e10a4 -_02148ac0: .word data_027e0e60 +_02148ac0: .word gMapManager _02148ac4: .word 0x00000aab _02148ac8: .word data_02050f54 _02148acc: .word data_ov15_0218b59c @@ -54825,7 +54825,7 @@ _0214db1c: mov r6, #4 str r1, [sp, #0x30] ldr r1, [r5, #0x48] - ldr ip, _0214dc04 ; =data_027e0e60 + ldr ip, _0214dc04 ; =gMapManager str r1, [sp, #0x1c] ldr r2, [r5, #0x4c] add r1, sp, #0x34 @@ -54855,7 +54855,7 @@ _0214dbf4: .word data_ov15_0218f65c _0214dbf8: .word func_ov15_0214dc08 _0214dbfc: .word data_ov15_0218f650 _0214dc00: .word 0x0000ffff -_0214dc04: .word data_027e0e60 +_0214dc04: .word gMapManager .global func_ov15_0214dc08 arm_func_start func_ov15_0214dc08 @@ -55882,7 +55882,7 @@ _0214eab8: .word data_027e0ff8 arm_func_start func_ov15_0214eabc func_ov15_0214eabc: ; 0x0214eabc stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0214eb14 ; =data_027e0e60 + ldr r2, _0214eb14 ; =gMapManager mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -55905,7 +55905,7 @@ func_ov15_0214eabc: ; 0x0214eabc ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0214eabc -_0214eb14: .word data_027e0e60 +_0214eb14: .word gMapManager .global func_ov15_0214eb18 arm_func_start func_ov15_0214eb18 @@ -57644,7 +57644,7 @@ _02150234: add r1, r2, r1 str r1, [r10, #0x1a0] ldr r1, [r0] - ldr r0, _02150858 ; =data_027e0e60 + ldr r0, _02150858 ; =gMapManager ldrb r6, [r1, #0x28] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d40Ev @@ -57731,7 +57731,7 @@ _02150460: add r3, sp, #0x48 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02150858 ; =data_027e0e60 + ldr r0, _02150858 ; =gMapManager add r1, sp, #0x30 ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208346cEP4AABB @@ -58001,7 +58001,7 @@ _02150848: .word data_027e0dbc _0215084c: .word data_027e0dcc _02150850: .word data_027e0fe4 _02150854: .word 0x00000999 -_02150858: .word data_027e0e60 +_02150858: .word gMapManager _0215085c: .word data_027e0ff0 _02150860: .word data_ov15_02186394 _02150864: .word data_ov15_0218bef4 @@ -58022,7 +58022,7 @@ func_ov15_02150874: ; 0x02150874 mov r0, r4 bl func_ov15_02151174 ldr r1, [r4, #0x48] - ldr r0, _021508f4 ; =data_027e0e60 + ldr r0, _021508f4 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -58046,7 +58046,7 @@ func_ov15_02150874: ; 0x02150874 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_02150874 -_021508f4: .word data_027e0e60 +_021508f4: .word gMapManager _021508f8: .word data_ov15_0218bef4 _021508fc: .word data_ov15_0218bef8 @@ -58607,7 +58607,7 @@ func_ov15_021510c0: ; 0x021510c0 sub r0, r0, #1 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _02151164 ; =data_027e0e60 + ldr r0, _02151164 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -58637,7 +58637,7 @@ _0215112c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_021510c0 -_02151164: .word data_027e0e60 +_02151164: .word gMapManager _02151168: .word data_ov15_0218bef4 _0215116c: .word data_ov15_0218bef8 _02151170: .word data_ov15_021863a4 @@ -59018,7 +59018,7 @@ func_ov15_02151680: ; 0x02151680 mov r0, #2 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _021516f8 ; =data_027e0e60 + ldr r0, _021516f8 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -59044,7 +59044,7 @@ func_ov15_02151680: ; 0x02151680 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_02151680 -_021516f8: .word data_027e0e60 +_021516f8: .word gMapManager _021516fc: .word data_ov15_0218bf00 _02151700: .word data_ov15_0218befc @@ -59519,7 +59519,7 @@ _02151cf8: .word data_ov15_0218bff8 func_ov15_02151cfc: ; 0x02151cfc stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _02151d7c ; =data_027e0e60 + ldr r0, _02151d7c ; =gMapManager ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 @@ -59533,7 +59533,7 @@ func_ov15_02151cfc: ; 0x02151cfc ldreqb r0, [r1, #0x4d5] cmpeq r0, #0 bne _02151d68 - ldr r0, _02151d7c ; =data_027e0e60 + ldr r0, _02151d7c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 @@ -59552,7 +59552,7 @@ _02151d68: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02151cfc -_02151d7c: .word data_027e0e60 +_02151d7c: .word gMapManager _02151d80: .word data_027e10a4 .global func_ov15_02151d84 @@ -59673,7 +59673,7 @@ _02151ef4: .word data_ov15_0218bff8 func_ov15_02151ef8: ; 0x02151ef8 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _02151f60 ; =data_027e0e60 + ldr r0, _02151f60 ; =gMapManager ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 @@ -59687,7 +59687,7 @@ func_ov15_02151ef8: ; 0x02151ef8 ldreqb r0, [r1, #0x4d5] cmpeq r0, #0 bne _02151f4c - ldr r0, _02151f60 ; =data_027e0e60 + ldr r0, _02151f60 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 @@ -59700,7 +59700,7 @@ _02151f4c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02151ef8 -_02151f60: .word data_027e0e60 +_02151f60: .word gMapManager _02151f64: .word data_027e10a4 .global func_ov15_02151f68 @@ -60242,7 +60242,7 @@ _02152590: strh r2, [r1, #0x4c] bl func_ov00_0209a508 _021525f4: - ldr r0, _02152688 ; =data_027e0e60 + ldr r0, _02152688 ; =gMapManager mov lr, #0 ldr r0, [r0] sub ip, lr, #2 @@ -60282,7 +60282,7 @@ _0215265c: .align 2, 0 arm_func_end func_ov15_02152560 _02152684: .word gAdventureFlags -_02152688: .word data_027e0e60 +_02152688: .word gMapManager _0215268c: .word data_027e0d38 _02152690: .word data_027e0fa0 @@ -60849,7 +60849,7 @@ _02152e6c: strlt r0, [r5, #0x3ac] ldr r2, [r5, #0x3a0] ldr r1, [r5, #0x3ac] - ldr r0, _02153488 ; =data_027e0e60 + ldr r0, _02153488 ; =gMapManager add r1, r2, r1 str r1, [r5, #0x3a0] ldr r0, [r0] @@ -60864,7 +60864,7 @@ _02152e6c: add r3, sp, #0xd8 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02153488 ; =data_027e0e60 + ldr r0, _02153488 ; =gMapManager ldr r7, [sp, #0xd8] ldr r6, [sp, #0xdc] ldr r3, [sp, #0xe0] @@ -60995,7 +60995,7 @@ _021530c4: ldrb r0, [r5, #0x436] cmp r0, #4 bne _021531b0 - ldr r0, _02153488 ; =data_027e0e60 + ldr r0, _02153488 ; =gMapManager add r1, r5, #0x39c ldr r0, [r0] mov r2, #0 @@ -61247,7 +61247,7 @@ _02153478: .word data_02050f54 _0215347c: .word 0xfffffd9a _02153480: .word 0x000004aa _02153484: .word data_027e0ffc -_02153488: .word data_027e0e60 +_02153488: .word gMapManager _0215348c: .word 0x00000266 _02153490: .word data_027e0e58 _02153494: .word 0x00001002 @@ -61848,7 +61848,7 @@ _02153ce0: strneb r0, [r5, #0x436] b _02153d74 _02153d0c: - ldr r0, _02153f78 ; =data_027e0e60 + ldr r0, _02153f78 ; =gMapManager mov r7, #0 ldr r0, [r0] sub r6, r7, #2 @@ -62006,7 +62006,7 @@ _02153f68: .word 0x000006f6 _02153f6c: .word 0xffffdf2b _02153f70: .word 0x000004cd _02153f74: .word 0xfffff8e1 -_02153f78: .word data_027e0e60 +_02153f78: .word gMapManager _02153f7c: .word data_027e0d38 _02153f80: .word data_027e0fac _02153f84: .word data_02050f54 @@ -62029,7 +62029,7 @@ func_ov15_02153f94: ; 0x02153f94 mov r0, r5 bl func_ov15_02175ba8 ldr r1, _0215417c ; =data_027e0f94 - ldr r0, _02154180 ; =data_027e0e60 + ldr r0, _02154180 ; =gMapManager ldr r2, [r1, #4] ldr r3, [r1] str r2, [sp, #0x10] @@ -62142,7 +62142,7 @@ func_ov15_02153f94: ; 0x02153f94 arm_func_end func_ov15_02153f94 _02154178: .word data_027e0fe4 _0215417c: .word data_027e0f94 -_02154180: .word data_027e0e60 +_02154180: .word gMapManager _02154184: .word 0x000003d7 _02154188: .word data_027e0fac _0215418c: .word data_ov15_021863bc @@ -62223,7 +62223,7 @@ _02154280: ldr r0, [r0, #0x44] cmp r0, #0 beq _02154304 - ldr r0, _02154320 ; =data_027e0e60 + ldr r0, _02154320 ; =gMapManager mov lr, #0 ldr r0, [r0] sub ip, lr, #2 @@ -62259,7 +62259,7 @@ _02154304: _02154314: .word data_027e0fe4 _02154318: .word data_027e1060 _0215431c: .word data_027e0c68 -_02154320: .word data_027e0e60 +_02154320: .word gMapManager _02154324: .word data_027e0d38 .global func_ov15_02154328 @@ -62332,7 +62332,7 @@ _02154404: ldr r0, [r5, #0x3e4] cmp r0, #0 bne _02154490 - ldr r0, _02154624 ; =data_027e0e60 + ldr r0, _02154624 ; =gMapManager mov ip, #0 ldr r0, [r0] sub r4, ip, #2 @@ -62431,7 +62431,7 @@ _02154490: ldmia r0, {r0, r1, r2} stmia r4, {r0, r1, r2} ldr r2, [sp, #0x28] - ldr r3, _02154624 ; =data_027e0e60 + ldr r3, _02154624 ; =gMapManager ldr r1, [sp, #0x2c] str r2, [sp, #4] ldr r2, [sp, #0x30] @@ -62463,7 +62463,7 @@ _0215460c: arm_func_end func_ov15_02154328 _0215461c: .word data_027e0fe4 _02154620: .word data_ov00_020eec68 -_02154624: .word data_027e0e60 +_02154624: .word gMapManager _02154628: .word data_027e0d38 _0215462c: .word data_02050f54 @@ -62480,7 +62480,7 @@ func_ov15_02154630: ; 0x02154630 beq _021546d0 b _021546e8 _02154654: - ldr r0, _021546f8 ; =data_027e0e60 + ldr r0, _021546f8 ; =gMapManager mov lr, #0 ldr r0, [r0] sub ip, lr, #2 @@ -62525,7 +62525,7 @@ _021546e8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02154630 -_021546f8: .word data_027e0e60 +_021546f8: .word gMapManager _021546fc: .word data_027e0d38 _02154700: .word data_ov00_020eec9c @@ -64338,7 +64338,7 @@ _02156084: add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02156194 ; =data_027e0e60 + ldr r0, _02156194 ; =gMapManager ldr ip, [sp, #0xc] ldr r4, [sp, #0x10] ldr r3, [sp, #0x14] @@ -64394,7 +64394,7 @@ _02156184: .word 0x00000171 _02156188: .word data_ov15_0218c0e4 _0215618c: .word data_ov15_0218c0f0 _02156190: .word data_027e0f94 -_02156194: .word data_027e0e60 +_02156194: .word gMapManager _02156198: .word 0x00000333 .global func_ov15_0215619c @@ -65041,7 +65041,7 @@ func_ov15_02156970: ; 0x02156970 mov r4, r1 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02156a2c ; =data_027e0e60 + ldr r0, _02156a2c ; =gMapManager ldr lr, [sp, #0x14] ldr ip, [sp, #0x18] ldr r3, [sp, #0x1c] @@ -65083,7 +65083,7 @@ func_ov15_02156970: ; 0x02156970 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02156970 -_02156a2c: .word data_027e0e60 +_02156a2c: .word gMapManager _02156a30: .word 0x00000333 _02156a34: .word data_027e0e58 _02156a38: .word 0x00000666 @@ -65099,7 +65099,7 @@ func_ov15_02156a44: ; 0x02156a44 add r3, sp, #0x14 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02156af0 ; =data_027e0e60 + ldr r0, _02156af0 ; =gMapManager ldr lr, [sp, #0x14] ldr ip, [sp, #0x18] ldr r3, [sp, #0x1c] @@ -65138,7 +65138,7 @@ func_ov15_02156a44: ; 0x02156a44 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov15_02156a44 -_02156af0: .word data_027e0e60 +_02156af0: .word gMapManager _02156af4: .word data_027e0e58 _02156af8: .word 0x000009ec _02156afc: .word data_027e0ffc @@ -66208,7 +66208,7 @@ func_ov15_021578e0: ; 0x021578e0 str r2, [r8] ldrh r1, [r1, #0x10] add r8, sp, #0x38 - ldr r6, _02157c30 ; =data_027e0e60 + ldr r6, _02157c30 ; =gMapManager mov r1, r1, asr #0x4 mov r1, r1, lsl #0x2 ldrsh r1, [r5, r1] @@ -66352,7 +66352,7 @@ _02157c20: .word data_ov15_0218c1d8 _02157c24: .word data_ov15_0218c1e4 _02157c28: .word data_027e0f94 _02157c2c: .word data_02050f54 -_02157c30: .word data_027e0e60 +_02157c30: .word gMapManager _02157c34: .word 0x000004cd _02157c38: .word data_027e0fe4 _02157c3c: .word 0x00001333 @@ -66577,7 +66577,7 @@ _02157ed8: cmp r0, #0 addne sp, sp, #0x5c ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r0, _021583a8 ; =data_027e0e60 + ldr r0, _021583a8 ; =gMapManager ldrh r1, [r10, #0x20] ldr r0, [r0] mov r2, #0 @@ -66897,7 +66897,7 @@ _02158394: .align 2, 0 arm_func_end func_ov15_02157e68 _021583a4: .word data_027e10a4 -_021583a8: .word data_027e0e60 +_021583a8: .word gMapManager _021583ac: .word data_027e0764 _021583b0: .word data_027e0f94 _021583b4: .word data_027e0fe8 @@ -66973,7 +66973,7 @@ func_ov15_0215846c: ; 0x0215846c mov r4, #0 ands r1, r0, #0xff beq _021584f8 - ldr r0, _0215856c ; =data_027e0e60 + ldr r0, _0215856c ; =gMapManager mov r2, r4 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020836dcEii @@ -67005,7 +67005,7 @@ _021584f8: ldrh r0, [r5, #0x26] ands r1, r0, #0xff ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} - ldr r0, _0215856c ; =data_027e0e60 + ldr r0, _0215856c ; =gMapManager mov r2, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020836dcEii @@ -67035,7 +67035,7 @@ _02158554: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov15_0215846c -_0215856c: .word data_027e0e60 +_0215856c: .word gMapManager _02158570: .word data_027e0fe4 .global func_ov15_02158574 @@ -67464,7 +67464,7 @@ _02158b30: b _02158c9c _02158b38: ldr r1, [r5, #0x48] - ldr r0, _02158cc8 ; =data_027e0e60 + ldr r0, _02158cc8 ; =gMapManager str r1, [sp] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -67571,7 +67571,7 @@ _02158cb8: .word data_02050f54 _02158cbc: .word data_027e0f94 _02158cc0: .word data_027e0fac _02158cc4: .word data_027e0c68 -_02158cc8: .word data_027e0e60 +_02158cc8: .word gMapManager _02158ccc: .word data_ov15_0218c384 _02158cd0: .word 0x00000ccd _02158cd4: .word data_027e0fe4 @@ -67856,7 +67856,7 @@ _021590c4: str r3, [r4, #0x60] ldrsh r2, [r5, r1] ldr r1, [r4, #0x2e0] - ldr r0, _02159280 ; =data_027e0e60 + ldr r0, _02159280 ; =gMapManager smull r3, r1, r2, r1 adds r2, r3, #0x800 adc r1, r1, #0 @@ -67959,7 +67959,7 @@ _02159270: .word data_027e0d0c _02159274: .word data_02050f54 _02159278: .word data_027e0f94 _0215927c: .word 0x0000019a -_02159280: .word data_027e0e60 +_02159280: .word gMapManager .global func_ov15_02159284 arm_func_start func_ov15_02159284 @@ -68200,7 +68200,7 @@ func_ov15_0215957c: ; 0x0215957c cmp r6, #0x2b000 bge _0215969c ldr r1, [r5, #0x48] - ldr r0, _021597b8 ; =data_027e0e60 + ldr r0, _021597b8 ; =gMapManager str r1, [sp, #0x14] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -68271,7 +68271,7 @@ _0215969c: bne _0215976c bl _ZN5Actor12ApplyGravityEv ldr r1, [r5, #0x48] - ldr r0, _021597b8 ; =data_027e0e60 + ldr r0, _021597b8 ; =gMapManager str r1, [sp, #8] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -68340,7 +68340,7 @@ _0215976c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov15_0215957c -_021597b8: .word data_027e0e60 +_021597b8: .word gMapManager _021597bc: .word data_ov15_0218c384 _021597c0: .word 0x00000d9a _021597c4: .word data_027e0e58 @@ -68621,7 +68621,7 @@ func_ov15_02159b70: ; 0x02159b70 sub sp, sp, #0xc mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _02159be8 ; =data_027e0e60 + ldr r0, _02159be8 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -68650,7 +68650,7 @@ _02159bd4: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_02159b70 -_02159be8: .word data_027e0e60 +_02159be8: .word gMapManager .global func_ov15_02159bec arm_func_start func_ov15_02159bec @@ -68791,7 +68791,7 @@ func_ov15_02159db8: ; 0x02159db8 sub sp, sp, #0xc mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _02159e34 ; =data_027e0e60 + ldr r0, _02159e34 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -68821,7 +68821,7 @@ _02159e24: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_02159db8 -_02159e34: .word data_027e0e60 +_02159e34: .word gMapManager _02159e38: .word 0xfffff4cd .global func_ov15_02159e3c @@ -68909,7 +68909,7 @@ _02159ea0: str r3, [sp, #0x10] bl func_01ff9bc4 ldr r0, [sp] - ldr r1, _0215a1ac ; =data_027e0e60 + ldr r1, _0215a1ac ; =gMapManager ldr r0, [r0, #0x48] str r0, [sp, #0x24] ldr r0, [sp] @@ -69058,7 +69058,7 @@ _0215a17c: .align 2, 0 arm_func_end func_ov15_02159e3c _0215a1a8: .word data_02050f54 -_0215a1ac: .word data_027e0e60 +_0215a1ac: .word gMapManager _0215a1b0: .word data_ov15_021864ec _0215a1b4: .word data_027e0e58 @@ -69365,7 +69365,7 @@ _0215a500: addlt sp, sp, #0x30 movlt r0, #0 ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r0, _0215a75c ; =data_027e0e60 + ldr r0, _0215a75c ; =gMapManager ldrh r1, [r10, #0x20] ldr r0, [r0] add r2, sp, #0x18 @@ -69500,7 +69500,7 @@ _0215a74c: .word data_027e10a8 _0215a750: .word data_ov15_021865c8 _0215a754: .word data_ov15_021865dc _0215a758: .word data_027e0fec -_0215a75c: .word data_027e0e60 +_0215a75c: .word gMapManager _0215a760: .word data_027e0ff0 _0215a764: .word 0x02f44000 @@ -69514,7 +69514,7 @@ func_ov15_0215a768: ; 0x0215a768 cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r4, pc} - ldr r0, _0215a8bc ; =data_027e0e60 + ldr r0, _0215a8bc ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -69574,7 +69574,7 @@ _0215a858: mov r0, #1 strb r0, [r4, #0x236] _0215a860: - ldr r0, _0215a8bc ; =data_027e0e60 + ldr r0, _0215a8bc ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d40Ev cmp r0, #0 @@ -69599,7 +69599,7 @@ _0215a860: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0215a768 -_0215a8bc: .word data_027e0e60 +_0215a8bc: .word gMapManager _0215a8c0: .word gAdventureFlags _0215a8c4: .word data_ov15_021865e8 _0215a8c8: .word data_ov15_021865fc @@ -69682,7 +69682,7 @@ func_ov15_0215a970: ; 0x0215a970 add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} _0215a9c0: - ldr r0, _0215b26c ; =data_027e0e60 + ldr r0, _0215b26c ; =gMapManager mov r6, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d40Ev @@ -69780,7 +69780,7 @@ _0215ab28: mov r5, #0 cmp r1, #0 beq _0215ab4c - ldr r0, _0215b26c ; =data_027e0e60 + ldr r0, _0215b26c ; =gMapManager mov r2, r5 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020836dcEii @@ -69789,7 +69789,7 @@ _0215ab4c: ldrb r0, [r4, #0x236] cmp r0, #4 beq _0215ab84 - ldr r0, _0215b26c ; =data_027e0e60 + ldr r0, _0215b26c ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -70224,7 +70224,7 @@ _0215b164: orr r5, r5, r1, lsl #20 cmpeq r10, #1 bne _0215b240 - ldr r0, _0215b26c ; =data_027e0e60 + ldr r0, _0215b26c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d40Ev cmp r0, #0 @@ -70269,7 +70269,7 @@ _0215b248: arm_func_end func_ov15_0215a970 _0215b264: .word data_027e0f94 _0215b268: .word data_027e10a8 -_0215b26c: .word data_027e0e60 +_0215b26c: .word gMapManager _0215b270: .word data_027e0c68 _0215b274: .word 0x0005000f _0215b278: .word data_02050f54 @@ -70513,11 +70513,11 @@ _0215b54c: mov r1, r1, lsl #0x10 mov r1, r1, lsr #0x10 bl func_ov00_0209cdbc - ldr r0, _0215b62c ; =data_027e0e60 + ldr r0, _0215b62c ; =gMapManager mov r1, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020823b4Ev - ldr r0, _0215b62c ; =data_027e0e60 + ldr r0, _0215b62c ; =gMapManager mov r1, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020823a4Ei @@ -70527,7 +70527,7 @@ _0215b54c: _0215b620: .word data_ov00_020ee0a0 _0215b624: .word data_ov15_021865c8 _0215b628: .word 0x00000249 -_0215b62c: .word data_027e0e60 +_0215b62c: .word gMapManager .global func_ov15_0215b630 arm_func_start func_ov15_0215b630 @@ -70707,7 +70707,7 @@ _0215b848: .word data_027e0f94 arm_func_start func_ov15_0215b84c func_ov15_0215b84c: ; 0x0215b84c stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr} - ldr r1, _0215bac0 ; =data_027e0e60 + ldr r1, _0215bac0 ; =gMapManager mov r4, r0 ldr r0, [r1] mov r1, #1 @@ -70869,7 +70869,7 @@ _0215ba10: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov15_0215b84c -_0215bac0: .word data_027e0e60 +_0215bac0: .word gMapManager _0215bac4: .word data_ov00_020ee0a0 _0215bac8: .word 0x00000249 @@ -71094,7 +71094,7 @@ _0215bd68: mov r0, #0 strb r0, [r4, #0x1b8] _0215bd70: - ldr r0, _0215bda8 ; =data_027e0e60 + ldr r0, _0215bda8 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -71111,7 +71111,7 @@ _0215bd98: arm_func_end func_ov15_0215bcf4 _0215bda0: .word data_027e0d38 _0215bda4: .word data_027e0e2c -_0215bda8: .word data_027e0e60 +_0215bda8: .word gMapManager .global func_ov15_0215bdac arm_func_start func_ov15_0215bdac @@ -71256,7 +71256,7 @@ _0215bf70: sub r2, r3, #2 mov r5, #0x47 mov r1, #0xff - ldr r0, _0215c340 ; =data_027e0e60 + ldr r0, _0215c340 ; =gMapManager str r2, [sp, #0x48] str r5, [sp, #0x3c] str r3, [sp, #0x40] @@ -71370,7 +71370,7 @@ _0215c154: add r3, sp, #0x30 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0215c340 ; =data_027e0e60 + ldr r0, _0215c340 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0x18 @@ -71495,7 +71495,7 @@ _0215c330: .word gAdventureFlags _0215c334: .word data_027e10a4 _0215c338: .word data_027e0c68 _0215c33c: .word 0x0005004a -_0215c340: .word data_027e0e60 +_0215c340: .word gMapManager _0215c344: .word 0x00000186 _0215c348: .word data_027e0e2c _0215c34c: .word func_ov15_0215bb6c @@ -71583,7 +71583,7 @@ _0215c474: add r3, sp, #0x18 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0215c578 ; =data_027e0e60 + ldr r0, _0215c578 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0 @@ -71647,7 +71647,7 @@ _0215c568: .word 0x00050010 _0215c56c: .word func_ov15_0215bb6c _0215c570: .word data_027e103c _0215c574: .word data_027e0f94 -_0215c578: .word data_027e0e60 +_0215c578: .word gMapManager _0215c57c: .word data_027e0f64 _0215c580: .word gAdventureFlags @@ -71657,7 +71657,7 @@ func_ov15_0215c584: ; 0x0215c584 stmdb sp!, {r4, lr} sub sp, sp, #0xb0 mov r4, r0 - ldr r0, _0215c690 ; =data_027e0e60 + ldr r0, _0215c690 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -71725,7 +71725,7 @@ _0215c660: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0215c584 -_0215c690: .word data_027e0e60 +_0215c690: .word gMapManager _0215c694: .word data_027e0f64 _0215c698: .word gAdventureFlags _0215c69c: .word data_027e10a4 @@ -72459,7 +72459,7 @@ func_ov15_0215d078: ; 0x0215d078 mov r6, #0x47 mov r3, #0xff str r4, [sp, #0x60] - ldr r2, _0215d22c ; =data_027e0e60 + ldr r2, _0215d22c ; =gMapManager str r6, [sp, #0x54] str r5, [sp, #0x58] str r5, [sp, #0x5c] @@ -72564,7 +72564,7 @@ _0215d1cc: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov15_0215d078 -_0215d22c: .word data_027e0e60 +_0215d22c: .word gMapManager _0215d230: .word data_027e0f64 _0215d234: .word data_027e10a4 @@ -73795,7 +73795,7 @@ _0215e0f4: ldrneb r0, [r6, #0x3eb] cmpne r0, #0 beq _0215e558 - ldr r0, _0215e570 ; =data_027e0e60 + ldr r0, _0215e570 ; =gMapManager mov r2, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020836dcEii @@ -74087,7 +74087,7 @@ _0215e558: arm_func_end func_ov15_0215dff8 _0215e568: .word data_027e0d0c _0215e56c: .word data_027e0764 -_0215e570: .word data_027e0e60 +_0215e570: .word gMapManager _0215e574: .word data_027e0dbc _0215e578: .word 0x00000ccc _0215e57c: .word data_027e0f64 @@ -74323,7 +74323,7 @@ func_ov15_0215e890: ; 0x0215e890 add r1, r1, #1 str r1, [r9, #0x3b8] ldrsh r3, [r0, #0xe4] - ldr r2, _0215f7b8 ; =data_027e0e60 + ldr r2, _0215f7b8 ; =gMapManager add r1, sp, #0x4c add r3, r3, #1 strh r3, [r0, #0xe4] @@ -74351,7 +74351,7 @@ _0215e8f8: ; jump table b _0215f70c ; case 6 b _0215f50c ; case 7 _0215e918: - ldr r0, _0215f7b8 ; =data_027e0e60 + ldr r0, _0215f7b8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 @@ -74547,7 +74547,7 @@ _0215ebbc: bl func_ov15_0215fb6c cmp r0, #0 beq _0215ec14 - ldr r0, _0215f7b8 ; =data_027e0e60 + ldr r0, _0215f7b8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 @@ -74804,7 +74804,7 @@ _0215ef7c: mov r2, r0 bl func_01ff9bc4 ldr r1, [r9, #0x48] - ldr r0, _0215f7b8 ; =data_027e0e60 + ldr r0, _0215f7b8 ; =gMapManager str r1, [sp, #0x40] ldr r1, [r9, #0x4c] ldr r0, [r0] @@ -74877,7 +74877,7 @@ _0215f048: mov r0, #1 strb r0, [r9, #0x3ea] ldr r1, [r9, #0x48] - ldr r0, _0215f7b8 ; =data_027e0e60 + ldr r0, _0215f7b8 ; =gMapManager str r1, [sp, #0x34] ldr r3, [r9, #0x4c] ldr r0, [r0] @@ -74918,7 +74918,7 @@ _0215f158: add r0, r9, #0x200 strh r1, [r0, #0x82] ldr r1, [r9, #0x48] - ldr r0, _0215f7b8 ; =data_027e0e60 + ldr r0, _0215f7b8 ; =gMapManager str r1, [sp, #0x28] ldr r1, [r9, #0x4c] ldr r0, [r0] @@ -74971,7 +74971,7 @@ _0215f1f4: b _0215f478 _0215f250: ldr r1, [r9, #0x48] - ldr r0, _0215f7b8 ; =data_027e0e60 + ldr r0, _0215f7b8 ; =gMapManager str r1, [sp, #0x1c] ldr r1, [r9, #0x4c] ldr r0, [r0] @@ -75043,7 +75043,7 @@ _0215f350: b _0215f478 _0215f35c: ldr r1, [r9, #0x48] - ldr r0, _0215f7b8 ; =data_027e0e60 + ldr r0, _0215f7b8 ; =gMapManager str r1, [sp, #0x10] ldr r1, [r9, #0x4c] ldr r0, [r0] @@ -75336,7 +75336,7 @@ _0215f7a8: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov15_0215e890 -_0215f7b8: .word data_027e0e60 +_0215f7b8: .word gMapManager _0215f7bc: .word data_027e0764 _0215f7c0: .word data_027e0e58 _0215f7c4: .word data_027e0f94 @@ -75413,7 +75413,7 @@ func_ov15_0215f8b0: ; 0x0215f8b0 mov r6, r0 ldr r5, [r6, #0x64] ldr r1, [r6, #0x48] - ldr r0, _0215fa20 ; =data_027e0e60 + ldr r0, _0215fa20 ; =gMapManager str r1, [sp] ldr r1, [r6, #0x4c] ldr r0, [r0] @@ -75505,7 +75505,7 @@ _0215f9e0: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov15_0215f8b0 -_0215fa20: .word data_027e0e60 +_0215fa20: .word gMapManager _0215fa24: .word data_027e0ffc _0215fa28: .word 0x00000289 _0215fa2c: .word 0x00000286 @@ -75615,7 +75615,7 @@ func_ov15_0215fb6c: ; 0x0215fb6c ldrh r0, [r4, #0x20] ands r1, r0, #0xff beq _0215fba8 - ldr r0, _0215fc94 ; =data_027e0e60 + ldr r0, _0215fc94 ; =gMapManager mov r2, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020836dcEii @@ -75635,7 +75635,7 @@ _0215fba8: addne sp, sp, #0x18 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _0215fc94 ; =data_027e0e60 + ldr r0, _0215fc94 ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, #0 @@ -75692,7 +75692,7 @@ _0215fc88: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0215fb6c -_0215fc94: .word data_027e0e60 +_0215fc94: .word gMapManager _0215fc98: .word data_027e0dbc _0215fc9c: .word data_027e0dcc @@ -75886,7 +75886,7 @@ func_ov15_0215fefc: ; 0x0215fefc ldrh r0, [r4, #0x24] cmp r0, #3 ldmneia sp!, {r4, pc} - ldr r0, _0215ff58 ; =data_027e0e60 + ldr r0, _0215ff58 ; =gMapManager ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 @@ -75897,7 +75897,7 @@ func_ov15_0215fefc: ; 0x0215fefc ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0215fefc -_0215ff58: .word data_027e0e60 +_0215ff58: .word gMapManager .global func_ov15_0215ff5c arm_func_start func_ov15_0215ff5c @@ -76903,7 +76903,7 @@ func_ov15_02160c24: ; 0x02160c24 mov r0, r4 bl func_ov15_02161458 ldr r1, [r4, #0x48] - ldr r0, _02160ca4 ; =data_027e0e60 + ldr r0, _02160ca4 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -76927,7 +76927,7 @@ func_ov15_02160c24: ; 0x02160c24 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_02160c24 -_02160ca4: .word data_027e0e60 +_02160ca4: .word gMapManager _02160ca8: .word data_ov15_0218caec _02160cac: .word data_ov15_0218caf8 @@ -77435,7 +77435,7 @@ func_ov15_021613a4: ; 0x021613a4 sub r0, r0, #1 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _02161448 ; =data_027e0e60 + ldr r0, _02161448 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -77465,7 +77465,7 @@ _02161410: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_021613a4 -_02161448: .word data_027e0e60 +_02161448: .word gMapManager _0216144c: .word data_ov15_0218caec _02161450: .word data_ov15_0218caf8 _02161454: .word data_ov15_0218677c @@ -77789,7 +77789,7 @@ func_ov15_02161880: ; 0x02161880 mov r0, #2 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _021618f8 ; =data_027e0e60 + ldr r0, _021618f8 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -77815,7 +77815,7 @@ func_ov15_02161880: ; 0x02161880 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_02161880 -_021618f8: .word data_027e0e60 +_021618f8: .word gMapManager _021618fc: .word data_ov15_0218caf4 _02161900: .word data_ov15_0218caf0 @@ -78220,7 +78220,7 @@ _02161cd0: str r1, [r10, #0x278] mov r0, #0xad str r0, [r10, #0x280] - ldr r0, _02162430 ; =data_027e0e60 + ldr r0, _02162430 ; =gMapManager str r1, [r10, #0x284] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d40Ev @@ -78387,7 +78387,7 @@ _021620bc: add r3, sp, #0x44 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02162430 ; =data_027e0e60 + ldr r0, _02162430 ; =gMapManager add r1, sp, #0x2c ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208346cEP4AABB @@ -78624,7 +78624,7 @@ _021623c4: _02162424: .word gAdventureFlags _02162428: .word data_027e0fec _0216242c: .word 0x00000999 -_02162430: .word data_027e0e60 +_02162430: .word gMapManager _02162434: .word data_027e0d38 _02162438: .word data_027e0fe4 _0216243c: .word data_ov15_0218cc00 @@ -78668,7 +78668,7 @@ func_ov15_02162454: ; 0x02162454 strh r0, [r4, #0x78] _021624c8: ldr r1, [r4, #0x48] - ldr r0, _0216252c ; =data_027e0e60 + ldr r0, _0216252c ; =gMapManager str r1, [sp, #4] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -78694,7 +78694,7 @@ _021624c8: arm_func_end func_ov15_02162454 _02162524: .word data_027e0d38 _02162528: .word data_027e0f94 -_0216252c: .word data_027e0e60 +_0216252c: .word gMapManager _02162530: .word data_ov15_0218cc00 _02162534: .word data_ov15_0218cc0c @@ -78741,7 +78741,7 @@ _021625a0: sub r0, r0, #1 strb r0, [r5, #0x1ac] ldr r1, [r5, #0x48] - ldr r0, _02162678 ; =data_027e0e60 + ldr r0, _02162678 ; =gMapManager str r1, [sp] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -78787,7 +78787,7 @@ _02162634: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02162538 -_02162678: .word data_027e0e60 +_02162678: .word gMapManager _0216267c: .word data_ov15_0218cc00 _02162680: .word data_ov15_0218cc0c _02162684: .word data_ov15_021867d4 @@ -79503,7 +79503,7 @@ _021630ec: bl _ZN5Actor18func_Ov00_020c1bfcEi cmp r0, #0 bne _02163160 - ldr r0, _02163c48 ; =data_027e0e60 + ldr r0, _02163c48 ; =gMapManager ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 @@ -79811,7 +79811,7 @@ _0216346c: mov r0, r0, asr #0x4 mov r0, r0, lsl #0x2 ldrsh r1, [ip, r0] - ldr r0, _02163c48 ; =data_027e0e60 + ldr r0, _02163c48 ; =gMapManager ldr r5, [sp, #0x90] mov r1, r1, lsl #0xc add r1, r1, #0x800 @@ -79991,7 +79991,7 @@ _02163854: sub r2, r3, #2 mov r5, #0x47 mov r1, #0xff - ldr r0, _02163c48 ; =data_027e0e60 + ldr r0, _02163c48 ; =gMapManager str r2, [sp, #0x68] str r5, [sp, #0x5c] str r3, [sp, #0x60] @@ -80210,7 +80210,7 @@ _02163b90: sub r0, r0, #1 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _02163c48 ; =data_027e0e60 + ldr r0, _02163c48 ; =gMapManager str r1, [sp, #8] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -80247,7 +80247,7 @@ _02163c38: .word data_027e0fe4 _02163c3c: .word data_ov15_02190458 _02163c40: .word data_ov00_020eec68 _02163c44: .word data_027e10a4 -_02163c48: .word data_027e0e60 +_02163c48: .word gMapManager _02163c4c: .word data_027e0f94 _02163c50: .word data_027e0d0c _02163c54: .word data_027e0764 @@ -80588,7 +80588,7 @@ _021640c4: ldr r3, _021643c4 ; =data_02050f54 str r4, [sp, #0x2c] ldr lr, [r6, #0x4c] - ldr r0, _021643c8 ; =data_027e0e60 + ldr r0, _021643c8 ; =gMapManager str lr, [sp, #0x30] ldr ip, [r6, #0x50] ldr r0, [r0] @@ -80762,7 +80762,7 @@ _021643b8: .word data_027e10a4 _021643bc: .word data_027e0e2c _021643c0: .word 0x00050017 _021643c4: .word data_02050f54 -_021643c8: .word data_027e0e60 +_021643c8: .word gMapManager _021643cc: .word data_027e0fe8 _021643d0: .word 0x544f5044 _021643d4: .word 0x0000019a @@ -80899,7 +80899,7 @@ _021644d0: str r2, [sp, #4] str r1, [sp, #8] str r0, [sp, #0xc] - ldr r1, _02164600 ; =data_027e0e60 + ldr r1, _02164600 ; =gMapManager str r0, [sp, #0x10] ldr r0, [r1] add r1, sp, #0x48 @@ -80921,7 +80921,7 @@ _021645f0: .word gAdventureFlags _021645f4: .word data_027e10a4 _021645f8: .word data_027e0f94 _021645fc: .word 0x0000ffff -_02164600: .word data_027e0e60 +_02164600: .word gMapManager .global func_ov15_02164604 arm_func_start func_ov15_02164604 @@ -81663,7 +81663,7 @@ _021650ac: mov r0, #2 strb r0, [r4, #0x1ac] ldr r1, [r4, #0x48] - ldr r0, _0216511c ; =data_027e0e60 + ldr r0, _0216511c ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -81690,7 +81690,7 @@ _021650ac: .align 2, 0 arm_func_end func_ov15_02165078 _02165118: .word data_ov15_02190458 -_0216511c: .word data_027e0e60 +_0216511c: .word gMapManager _02165120: .word data_ov15_0218cc08 _02165124: .word data_ov15_0218cc04 @@ -82083,7 +82083,7 @@ _02165620: mov r0, #1 str r0, [sp, #4] ldr r1, _02165a18 ; =data_ov15_0218f8cc - ldr r0, _02165a24 ; =data_027e0e60 + ldr r0, _02165a24 ; =gMapManager str r1, [sp, #8] ldr r0, [r0] add r1, sp, #0x18 @@ -82352,7 +82352,7 @@ _02165a14: .word data_ov15_0218cce0 _02165a18: .word data_ov15_0218f8cc _02165a1c: .word func_ov15_02165a34 _02165a20: .word data_ov15_0218f8c0 -_02165a24: .word data_027e0e60 +_02165a24: .word gMapManager _02165a28: .word gAdventureFlags _02165a2c: .word data_ov15_021867d8 _02165a30: .word data_027e0c68 @@ -82586,7 +82586,7 @@ _02165d5c: b _02165e14 _02165d70: ldr r1, [r4, #4] - ldr r0, _02165e54 ; =data_027e0e60 + ldr r0, _02165e54 ; =gMapManager orr r1, r1, #0x10 str r1, [r4, #4] ldr r0, [r0] @@ -82647,7 +82647,7 @@ _02165e44: .word 0x0b60b60b _02165e48: .word data_027e0c68 _02165e4c: .word 0x0005001a _02165e50: .word 0x00050018 -_02165e54: .word data_027e0e60 +_02165e54: .word gMapManager _02165e58: .word 0x00001770 .global func_ov15_02165e5c @@ -83159,7 +83159,7 @@ func_ov15_0216648c: ; 0x0216648c sub sp, sp, #0x18 mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _02166574 ; =data_027e0e60 + ldr r0, _02166574 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -83216,7 +83216,7 @@ _02166564: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0216648c -_02166574: .word data_027e0e60 +_02166574: .word gMapManager _02166578: .word data_02050f54 _0216657c: .word data_027e0e58 _02166580: .word 0xfffffe66 @@ -83232,7 +83232,7 @@ func_ov15_02166584: ; 0x02166584 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r4, #0x48] - ldr r0, _02166678 ; =data_027e0e60 + ldr r0, _02166678 ; =gMapManager str r1, [sp, #8] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -83288,7 +83288,7 @@ _02166644: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov15_02166584 -_02166678: .word data_027e0e60 +_02166678: .word gMapManager _0216667c: .word data_027e0e58 _02166680: .word 0x000009ec _02166684: .word data_027e0ffc @@ -83905,7 +83905,7 @@ _02166d48: add r2, r5, #0x48 bl func_01ff9bc4 ldr r1, [r5, #0x48] - ldr r0, _02166eec ; =data_027e0e60 + ldr r0, _02166eec ; =gMapManager str r1, [sp, #0x10] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -83989,7 +83989,7 @@ _02166ecc: _02166ee0: .word 0x000004cd _02166ee4: .word data_027e0f64 _02166ee8: .word data_027e0f94 -_02166eec: .word data_027e0e60 +_02166eec: .word gMapManager _02166ef0: .word data_027e0ffc _02166ef4: .word 0x00000666 _02166ef8: .word data_027e0e58 @@ -84139,12 +84139,12 @@ func_ov15_021670dc: ; 0x021670dc beq _02167208 b _02167238 _02167114: - ldr r0, _0216728c ; =data_027e0e60 + ldr r0, _0216728c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #6 ldmeqia sp!, {r4, r5, r6, pc} - ldr r0, _0216728c ; =data_027e0e60 + ldr r0, _0216728c ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -84240,7 +84240,7 @@ _0216726c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov15_021670dc -_0216728c: .word data_027e0e60 +_0216728c: .word gMapManager _02167290: .word data_027e0764 _02167294: .word data_027e0ff4 _02167298: .word data_027e10a4 @@ -85274,7 +85274,7 @@ _02168078: mov r3, #0 bl func_0202b418 _02168098: - ldr r0, _0216834c ; =data_027e0e60 + ldr r0, _0216834c ; =gMapManager ldr r5, [sp, #0x28] ldr r3, [sp, #0x2c] ldr r2, [sp, #0x30] @@ -85457,7 +85457,7 @@ _02168338: _02168340: .word data_027e0fac _02168344: .word data_027e0f94 _02168348: .word data_02050f54 -_0216834c: .word data_027e0e60 +_0216834c: .word gMapManager _02168350: .word 0x00000666 _02168354: .word data_027e0d0c @@ -85967,7 +85967,7 @@ _02168a78: mov r3, #0 bl func_0202b418 _02168a9c: - ldr r0, _02168b2c ; =data_027e0e60 + ldr r0, _02168b2c ; =gMapManager ldr ip, [sp, #0x30] ldr r3, [sp, #0x34] ldr r2, [sp, #0x38] @@ -86005,7 +86005,7 @@ _02168a9c: _02168b20: .word data_ov15_0218d094 _02168b24: .word data_027e0f94 _02168b28: .word data_02050f54 -_02168b2c: .word data_027e0e60 +_02168b2c: .word gMapManager .global func_ov15_02168b30 arm_func_start func_ov15_02168b30 @@ -86835,7 +86835,7 @@ _02169594: ldr r3, [r5, r9, lsl #2] str r0, [sp, #8] ldr r1, [r10, #0x4c] - ldr r0, _0216967c ; =data_027e0e60 + ldr r0, _0216967c ; =gMapManager str r1, [sp, #0xc] ldr r2, [r10, #0x50] ldr r0, [r0] @@ -86891,7 +86891,7 @@ _0216966c: .word data_ov15_0218d1bc _02169670: .word data_ov15_0218d1c8 _02169674: .word data_027e0ffc _02169678: .word data_ov15_02186918 -_0216967c: .word data_027e0e60 +_0216967c: .word gMapManager _02169680: .word 0x00000359 .global func_ov15_02169684 @@ -88054,7 +88054,7 @@ _0216a680: _0216a6a8: cmp r4, #0 bne _0216a6c4 - ldr r0, _0216a750 ; =data_027e0e60 + ldr r0, _0216a750 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020848b8Ev cmp r0, #0 @@ -88100,7 +88100,7 @@ _0216a740: .word data_027e0d38 _0216a744: .word data_027e10a4 _0216a748: .word data_027e0d3c _0216a74c: .word data_027e0d04 -_0216a750: .word data_027e0e60 +_0216a750: .word gMapManager .global func_ov15_0216a754 arm_func_start func_ov15_0216a754 @@ -90470,7 +90470,7 @@ func_ov15_0216c650: ; 0x0216c650 arm_func_start func_ov15_0216c664 func_ov15_0216c664: ; 0x0216c664 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _0216c6b4 ; =data_027e0e60 + ldr r1, _0216c6b4 ; =gMapManager mov r4, r0 ldr r0, [r1] mov r5, #0 @@ -90492,7 +90492,7 @@ _0216c6ac: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0216c664 -_0216c6b4: .word data_027e0e60 +_0216c6b4: .word gMapManager .global func_ov15_0216c6b8 arm_func_start func_ov15_0216c6b8 @@ -91813,7 +91813,7 @@ _0216d8c4: .word data_027e0fb8 func_ov15_0216d8c8: ; 0x0216d8c8 stmdb sp!, {r4, lr} sub sp, sp, #0x18 - ldr r1, _0216d95c ; =data_027e0e60 + ldr r1, _0216d95c ; =gMapManager mov r2, #1 strb r2, [r0, #0xc] mov lr, #0 @@ -91850,7 +91850,7 @@ func_ov15_0216d8c8: ; 0x0216d8c8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0216d8c8 -_0216d95c: .word data_027e0e60 +_0216d95c: .word gMapManager _0216d960: .word data_027e0d38 _0216d964: .word gAdventureFlags @@ -91880,7 +91880,7 @@ _0216d9b0: bl func_ov15_0216dd8c cmp r0, #0 beq _0216da38 - ldr r0, _0216da98 ; =data_027e0e60 + ldr r0, _0216da98 ; =gMapManager mov lr, #0 ldr r0, [r0] sub ip, lr, #2 @@ -91938,7 +91938,7 @@ _0216da84: .align 2, 0 arm_func_end func_ov15_0216d968 _0216da94: .word data_027e0c68 -_0216da98: .word data_027e0e60 +_0216da98: .word gMapManager _0216da9c: .word data_027e0d38 _0216daa0: .word gAdventureFlags _0216daa4: .word data_027e0fe4 @@ -94346,7 +94346,7 @@ func_ov15_0216fa98: ; 0x0216fa98 stmdb sp!, {r4, lr} ldr r1, _0216fb48 ; =data_ov15_0218d978 mov r4, r0 - ldr r0, _0216fb4c ; =data_027e0e60 + ldr r0, _0216fb4c ; =gMapManager str r1, [r4] add r1, r4, #0x74 ldr r0, [r0] @@ -94390,7 +94390,7 @@ func_ov15_0216fa98: ; 0x0216fa98 .align 2, 0 arm_func_end func_ov15_0216fa98 _0216fb48: .word data_ov15_0218d978 -_0216fb4c: .word data_027e0e60 +_0216fb4c: .word gMapManager .global func_ov15_0216fb50 arm_func_start func_ov15_0216fb50 @@ -94398,7 +94398,7 @@ func_ov15_0216fb50: ; 0x0216fb50 stmdb sp!, {r4, lr} ldr r1, _0216fc08 ; =data_ov15_0218d978 mov r4, r0 - ldr r0, _0216fc0c ; =data_027e0e60 + ldr r0, _0216fc0c ; =gMapManager str r1, [r4] add r1, r4, #0x74 ldr r0, [r0] @@ -94444,7 +94444,7 @@ func_ov15_0216fb50: ; 0x0216fb50 .align 2, 0 arm_func_end func_ov15_0216fb50 _0216fc08: .word data_ov15_0218d978 -_0216fc0c: .word data_027e0e60 +_0216fc0c: .word gMapManager .global func_ov15_0216fc10 arm_func_start func_ov15_0216fc10 @@ -94627,7 +94627,7 @@ _0216fe54: str r3, [r5, #0x490] str r0, [r5, #0x494] mov r2, #0x14000 - ldr r0, _0217062c ; =data_027e0e60 + ldr r0, _0217062c ; =gMapManager str r2, [r5, #0x498] ldr r0, [r0] bl _ZN10MapManager18func_ov00_020838c8Ei @@ -94994,7 +94994,7 @@ _021703e8: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r5, #0x48] - ldr r0, _0217062c ; =data_027e0e60 + ldr r0, _0217062c ; =gMapManager str r1, [sp] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -95114,7 +95114,7 @@ _0217060c: arm_func_end func_ov15_0216fe00 _02170624: .word 0x0000ffff _02170628: .word data_027e103c -_0217062c: .word data_027e0e60 +_0217062c: .word gMapManager _02170630: .word data_027e0f94 _02170634: .word data_027e0f64 _02170638: .word gAdventureFlags @@ -95252,7 +95252,7 @@ _021707e4: .word data_027e10a4 func_ov15_021707e8: ; 0x021707e8 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _0217082c ; =data_027e0e60 + ldr r0, _0217082c ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -95269,7 +95269,7 @@ func_ov15_021707e8: ; 0x021707e8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_021707e8 -_0217082c: .word data_027e0e60 +_0217082c: .word gMapManager .global func_ov15_02170830 arm_func_start func_ov15_02170830 @@ -96002,7 +96002,7 @@ _021712c8: bl _ZN5Actor12ApplyGravityEv ldr r2, [r4, #0x4c] ldr r1, [r4, #0x64] - ldr r0, _021718f4 ; =data_027e0e60 + ldr r0, _021718f4 ; =gMapManager add r1, r2, r1 str r1, [r4, #0x4c] ldr r1, [r4, #0x48] @@ -96085,7 +96085,7 @@ _021713f8: _0217140c: bl func_ov15_02172d18 ldr r1, [r4, #0x4c] - ldr r0, _021718f4 ; =data_027e0e60 + ldr r0, _021718f4 ; =gMapManager add r1, r1, #0x148 str r1, [r4, #0x4c] ldr r1, [r4, #0x48] @@ -96144,7 +96144,7 @@ _0217140c: ldmia sp!, {r4, pc} _021714f8: ldr r1, [r4, #0x4c] - ldr r0, _021718f4 ; =data_027e0e60 + ldr r0, _021718f4 ; =gMapManager add r1, r1, #0x148 str r1, [r4, #0x4c] ldr r1, [r4, #0x48] @@ -96221,7 +96221,7 @@ _021715ac: _0217161c: mvn r1, #0 str r1, [r4, #0x53c] - ldr r0, _021718f4 ; =data_027e0e60 + ldr r0, _021718f4 ; =gMapManager add r1, r4, #0x74 ldr r0, [r0] add r1, r1, #0x400 @@ -96409,7 +96409,7 @@ _021718ec: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0217128c -_021718f4: .word data_027e0e60 +_021718f4: .word gMapManager _021718f8: .word 0x00000d9a _021718fc: .word data_027e0e58 _02171900: .word data_027e0ffc @@ -97826,7 +97826,7 @@ func_ov15_02172d18: ; 0x02172d18 sub sp, sp, #0x18 mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _02172d88 ; =data_027e0e60 + ldr r0, _02172d88 ; =gMapManager str r1, [sp, #0xc] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -97852,7 +97852,7 @@ func_ov15_02172d18: ; 0x02172d18 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02172d18 -_02172d88: .word data_027e0e60 +_02172d88: .word gMapManager _02172d8c: .word data_027e0e58 .global func_ov15_02172d90 @@ -97862,7 +97862,7 @@ func_ov15_02172d90: ; 0x02172d90 sub sp, sp, #0x1c mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _02172eec ; =data_027e0e60 + ldr r0, _02172eec ; =gMapManager str r1, [sp, #0x10] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -97948,7 +97948,7 @@ _02172ecc: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov15_02172d90 -_02172eec: .word data_027e0e60 +_02172eec: .word gMapManager _02172ef0: .word data_02050f54 _02172ef4: .word 0x0000119a _02172ef8: .word data_027e0e58 @@ -98201,7 +98201,7 @@ func_ov15_0217317c: ; 0x0217317c add r0, r1, r0 str r0, [sp, #0x34] ldr r0, [sp, #0x54] - ldr r3, _021733a8 ; =data_027e0e60 + ldr r3, _021733a8 ; =gMapManager mov r0, r0, lsl #0x10 mov r7, r0, lsr #0x10 ldmia r9, {r0, r1, r2} @@ -98311,7 +98311,7 @@ _02173350: arm_func_end func_ov15_0217317c _021733a0: .word data_027e0f64 _021733a4: .word data_027e0f94 -_021733a8: .word data_027e0e60 +_021733a8: .word gMapManager _021733ac: .word data_02050f54 .global func_ov15_021733b0 @@ -98346,7 +98346,7 @@ func_ov15_021733b0: ; 0x021733b0 str r1, [r4, #0x52c] ldrsh ip, [r0, #0x5e] ldrsh r3, [r0, #0x60] - ldr r2, _0217359c ; =data_027e0e60 + ldr r2, _0217359c ; =gMapManager add r1, sp, #0x20 add r3, ip, r3 strh r3, [r0, #0x5e] @@ -98445,7 +98445,7 @@ _021734d0: .align 2, 0 arm_func_end func_ov15_021733b0 _02173598: .word 0x00000133 -_0217359c: .word data_027e0e60 +_0217359c: .word gMapManager _021735a0: .word data_027e10a4 _021735a4: .word data_027e0f64 @@ -98491,7 +98491,7 @@ func_ov15_021735a8: ; 0x021735a8 add r1, sp, #0x30 mov r2, r5 bl func_01ff9bc4 - ldr r3, _02173718 ; =data_027e0e60 + ldr r3, _02173718 ; =gMapManager add r8, sp, #0xc ldmia r5, {r0, r1, r2} stmia r8, {r0, r1, r2} @@ -98548,7 +98548,7 @@ _02173708: .word 0x00001770 _0217370c: .word data_027e0fac _02173710: .word 0x000008a4 _02173714: .word 0xfffffae1 -_02173718: .word data_027e0e60 +_02173718: .word gMapManager .global func_ov15_0217371c arm_func_start func_ov15_0217371c @@ -99306,7 +99306,7 @@ func_ov15_021740e4: ; 0x021740e4 func_ov15_02174100: ; 0x02174100 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 - ldr r0, _02174174 ; =data_027e0e60 + ldr r0, _02174174 ; =gMapManager ldrsh r5, [r4, #0x78] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082504Ev @@ -99337,7 +99337,7 @@ _0217414c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02174100 -_02174174: .word data_027e0e60 +_02174174: .word gMapManager .global func_ov15_02174178 arm_func_start func_ov15_02174178 @@ -99359,13 +99359,13 @@ func_ov15_02174188: ; 0x02174188 beq _021741b8 b _021741c8 _021741a4: - ldr r2, _021741d0 ; =data_027e0e60 + ldr r2, _021741d0 ; =gMapManager add r1, r0, #0x160 ldr r0, [r2] bl _ZN10MapManager18func_ov00_02082494Ei b _021741c8 _021741b8: - ldr r2, _021741d0 ; =data_027e0e60 + ldr r2, _021741d0 ; =gMapManager add r1, r0, #0x160 ldr r0, [r2] bl _ZN10MapManager18func_ov00_020824ccEi @@ -99374,7 +99374,7 @@ _021741c8: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov15_02174188 -_021741d0: .word data_027e0e60 +_021741d0: .word gMapManager .global func_ov15_021741d4 arm_func_start func_ov15_021741d4 @@ -99422,7 +99422,7 @@ _02174268: mov r1, #4 bl func_01fffbec _02174270: - ldr r0, _021742a8 ; =data_027e0e60 + ldr r0, _021742a8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082504Ev mov r1, r0 @@ -99438,7 +99438,7 @@ _02174270: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_021741d4 -_021742a8: .word data_027e0e60 +_021742a8: .word gMapManager .global func_ov15_021742ac arm_func_start func_ov15_021742ac @@ -99749,7 +99749,7 @@ _0217465c: mov r0, #0x100 _02174660: str r0, [r4, #0x28] - ldr r0, _02174694 ; =data_027e0e60 + ldr r0, _02174694 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082424Ev mov r0, #0 @@ -99763,7 +99763,7 @@ _02174660: arm_func_end func_ov15_021745e4 _0217468c: .word 0x0000100a _02174690: .word 0x000001f5 -_02174694: .word data_027e0e60 +_02174694: .word gMapManager .global func_ov15_02174698 arm_func_start func_ov15_02174698 @@ -99893,7 +99893,7 @@ _0217481c: mov r1, #0x3c8 mov r3, #0 bl func_ov00_020ceacc - ldr r0, _02174888 ; =data_027e0e60 + ldr r0, _02174888 ; =gMapManager ldrb r1, [r4, #0x35] ldrb r2, [r4, #0x34] ldr r0, [r0] @@ -99908,7 +99908,7 @@ _02174878: .word data_ov00_020eec9c _0217487c: .word data_027e0e58 _02174880: .word 0x00001009 _02174884: .word data_027e0ffc -_02174888: .word data_027e0e60 +_02174888: .word gMapManager .global func_ov15_0217488c arm_func_start func_ov15_0217488c @@ -103300,7 +103300,7 @@ func_ov15_021776c4: ; 0x021776c4 stmdb sp!, {r4, lr} ldr r1, _021777e8 ; =data_ov15_0218de14 mov r4, r0 - ldr r0, _021777ec ; =data_027e0e60 + ldr r0, _021777ec ; =gMapManager str r1, [r4] ldr r0, [r0] add r1, r4, #0x374 @@ -103375,7 +103375,7 @@ _02177774: .align 2, 0 arm_func_end func_ov15_021776c4 _021777e8: .word data_ov15_0218de14 -_021777ec: .word data_027e0e60 +_021777ec: .word gMapManager _021777f0: .word data_027e0f6c _021777f4: .word data_027e0d38 _021777f8: .word data_027e10b0 @@ -103389,7 +103389,7 @@ func_ov15_02177808: ; 0x02177808 stmdb sp!, {r4, lr} ldr r1, _02177934 ; =data_ov15_0218de14 mov r4, r0 - ldr r0, _02177938 ; =data_027e0e60 + ldr r0, _02177938 ; =gMapManager str r1, [r4] ldr r0, [r0] add r1, r4, #0x374 @@ -103466,7 +103466,7 @@ _021778b8: .align 2, 0 arm_func_end func_ov15_02177808 _02177934: .word data_ov15_0218de14 -_02177938: .word data_027e0e60 +_02177938: .word gMapManager _0217793c: .word data_027e0f6c _02177940: .word data_027e0d38 _02177944: .word data_027e10b0 @@ -103493,7 +103493,7 @@ func_ov15_02177964: ; 0x02177964 mov r4, r0 str r4, [r1] ldr r1, [r4, #0x48] - ldr r0, _02177ef8 ; =data_027e0e60 + ldr r0, _02177ef8 ; =gMapManager str r1, [sp, #0x38] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -103674,7 +103674,7 @@ _02177c20: str r2, [r4, #0x390] str r0, [r4, #0x394] mov r1, #0x14000 - ldr r0, _02177ef8 ; =data_027e0e60 + ldr r0, _02177ef8 ; =gMapManager str r1, [r4, #0x398] ldr r0, [r0] add r1, r4, #0x374 @@ -103851,7 +103851,7 @@ _02177c84: .align 2, 0 arm_func_end func_ov15_02177964 _02177ef4: .word data_027e10b0 -_02177ef8: .word data_027e0e60 +_02177ef8: .word gMapManager _02177efc: .word data_027e0764 _02177f00: .word 0x0000a332 _02177f04: .word 0x00003666 @@ -104453,7 +104453,7 @@ _021784d0: add r2, sp, #0x2c mov r3, #2 bl func_ov00_0207c1b0 - ldr r0, _021789a0 ; =data_027e0e60 + ldr r0, _021789a0 ; =gMapManager ldr r2, [r5, #0x4c] ldr r4, [r5, #0x50] ldr r3, [r5, #0x48] @@ -104504,7 +104504,7 @@ _02178810: rsb r4, r2, #0x82 str r1, [sp, #8] ldr r1, [r5, #0x4c] - ldr r0, _021789a0 ; =data_027e0e60 + ldr r0, _021789a0 ; =gMapManager str r1, [sp, #0xc] ldr r3, [r5, #0x50] ldr r0, [r0] @@ -104605,7 +104605,7 @@ _02178990: .word data_ov15_0218ddc8 _02178994: .word data_ov15_02186d80 _02178998: .word data_027e0e58 _0217899c: .word 0x00001003 -_021789a0: .word data_027e0e60 +_021789a0: .word gMapManager _021789a4: .word 0x00001ccd _021789a8: .word data_ov00_020eec9c _021789ac: .word 0x00000462 @@ -104757,7 +104757,7 @@ func_ov15_02178b7c: ; 0x02178b7c sub r2, r3, #2 mov r5, #0x47 mov r1, #0xff - ldr r0, _02178c68 ; =data_027e0e60 + ldr r0, _02178c68 ; =gMapManager str r2, [sp, #0x24] str r5, [sp, #0x18] str r3, [sp, #0x1c] @@ -104804,7 +104804,7 @@ _02178c58: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov15_02178b7c -_02178c68: .word data_027e0e60 +_02178c68: .word gMapManager _02178c6c: .word data_027e10a4 .global func_ov15_02178c70 @@ -104815,7 +104815,7 @@ func_ov15_02178c70: ; 0x02178c70 mov r4, r0 bl func_ov15_0217aa30 ldr r1, [r4, #0x48] - ldr r0, _02178d64 ; =data_027e0e60 + ldr r0, _02178d64 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -104875,7 +104875,7 @@ _02178d40: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_02178c70 -_02178d64: .word data_027e0e60 +_02178d64: .word gMapManager _02178d68: .word data_ov15_0218ddcc _02178d6c: .word data_ov15_0218ddc8 _02178d70: .word gAdventureFlags @@ -106304,12 +106304,12 @@ _0217a208: cmp r1, #8 mov r5, r0, lsr #0x10 bne _0217a270 - ldr r0, _0217a550 ; =data_027e0e60 + ldr r0, _0217a550 ; =gMapManager mov r1, #0x11 ldr r0, [r0] sub r2, r1, #0x12 bl _ZN10MapManager18func_ov00_02082650Eiii - ldr r0, _0217a550 ; =data_027e0e60 + ldr r0, _0217a550 ; =gMapManager mov r1, #0x27 ldr r0, [r0] sub r2, r1, #0x28 @@ -106514,7 +106514,7 @@ _0217a52c: arm_func_end func_ov15_0217a0b0 _0217a548: .word 0x00000ccd _0217a54c: .word 0x00000fff -_0217a550: .word data_027e0e60 +_0217a550: .word gMapManager _0217a554: .word data_027e0764 _0217a558: .word data_027e0c68 _0217a55c: .word 0x0005003d @@ -106753,7 +106753,7 @@ func_ov15_0217a850: ; 0x0217a850 add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0217aa20 ; =data_027e0e60 + ldr r0, _0217aa20 ; =gMapManager ldr r6, [sp, #0xc] ldr r5, [sp, #0x10] ldr r3, [sp, #0x14] @@ -106862,7 +106862,7 @@ func_ov15_0217a850: ; 0x0217a850 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov15_0217a850 -_0217aa20: .word data_027e0e60 +_0217aa20: .word gMapManager _0217aa24: .word data_027e0f64 _0217aa28: .word 0x000024cd _0217aa2c: .word gAdventureFlags @@ -109014,7 +109014,7 @@ func_ov15_0217c67c: ; 0x0217c67c strgeb r0, [r5, #0x118] ldmgeia sp!, {r3, r4, r5, pc} ldr r1, [r5, #0x48] - ldr r0, _0217c7ec ; =data_027e0e60 + ldr r0, _0217c7ec ; =gMapManager str r1, [sp, #4] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -109088,7 +109088,7 @@ _0217c7d4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0217c67c -_0217c7ec: .word data_027e0e60 +_0217c7ec: .word gMapManager _0217c7f0: .word data_ov15_02187018 _0217c7f4: .word data_027e0f94 @@ -109421,7 +109421,7 @@ _0217cc78: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r4, #0x48] - ldr r0, _0217cec8 ; =data_027e0e60 + ldr r0, _0217cec8 ; =gMapManager str r1, [sp, #8] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -109563,7 +109563,7 @@ _0217ceb8: .word 0x00000d71 _0217cebc: .word 0xfffffb33 _0217cec0: .word data_027e0e58 _0217cec4: .word 0x00000733 -_0217cec8: .word data_027e0e60 +_0217cec8: .word gMapManager _0217cecc: .word data_027e0ffc _0217ced0: .word 0x00000666 _0217ced4: .word data_027e0764 @@ -109588,7 +109588,7 @@ func_ov15_0217cedc: ; 0x0217cedc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r10, #0x48] - ldr r0, _0217d008 ; =data_027e0e60 + ldr r0, _0217d008 ; =gMapManager str r1, [sp, #8] ldr r1, [r10, #0x4c] ldr r0, [r0] @@ -109650,7 +109650,7 @@ _0217cfc0: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov15_0217cedc -_0217d008: .word data_027e0e60 +_0217d008: .word gMapManager _0217d00c: .word data_027e0e58 _0217d010: .word 0x000009ec _0217d014: .word data_027e0ffc @@ -110238,7 +110238,7 @@ _0217d79c: str r1, [sp, #4] str r0, [sp] _0217d7b0: - ldr r0, _0217d860 ; =data_027e0e60 + ldr r0, _0217d860 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082504Ev mov r1, r0 @@ -110285,7 +110285,7 @@ _0217d82c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_0217d740 -_0217d860: .word data_027e0e60 +_0217d860: .word gMapManager _0217d864: .word 0xffffda66 _0217d868: .word data_027e0f68 @@ -110624,7 +110624,7 @@ func_ov15_0217dc4c: ; 0x0217dc4c ldrsh r2, [r3, r2] blx func_01ff8214 ldr r1, [r4, #0x48] - ldr r0, _0217dd0c ; =data_027e0e60 + ldr r0, _0217dd0c ; =gMapManager str r1, [sp, #0xc] ldr r1, [r4, #0x4c] mov r2, #0 @@ -110655,7 +110655,7 @@ func_ov15_0217dc4c: ; 0x0217dc4c .align 2, 0 arm_func_end func_ov15_0217dc4c _0217dd08: .word data_02050f54 -_0217dd0c: .word data_027e0e60 +_0217dd0c: .word gMapManager .global func_ov15_0217dd10 arm_func_start func_ov15_0217dd10 @@ -113042,7 +113042,7 @@ func_ov15_0217fc40: ; 0x0217fc40 stmdb sp!, {r4, lr} ldr r1, _0217fd58 ; =data_ov15_0218e8e8 mov r4, r0 - ldr r0, _0217fd5c ; =data_027e0e60 + ldr r0, _0217fd5c ; =gMapManager str r1, [r4] add r1, r4, #0x4c ldr r0, [r0] @@ -113113,7 +113113,7 @@ _0217fc94: .align 2, 0 arm_func_end func_ov15_0217fc40 _0217fd58: .word data_ov15_0218e8e8 -_0217fd5c: .word data_027e0e60 +_0217fd5c: .word gMapManager _0217fd60: .word data_027e10a4 .global func_ov15_0217fd64 @@ -113122,7 +113122,7 @@ func_ov15_0217fd64: ; 0x0217fd64 stmdb sp!, {r4, lr} ldr r1, _0217fe84 ; =data_ov15_0218e8e8 mov r4, r0 - ldr r0, _0217fe88 ; =data_027e0e60 + ldr r0, _0217fe88 ; =gMapManager str r1, [r4] add r1, r4, #0x4c ldr r0, [r0] @@ -113195,7 +113195,7 @@ _0217fdb8: .align 2, 0 arm_func_end func_ov15_0217fd64 _0217fe84: .word data_ov15_0218e8e8 -_0217fe88: .word data_027e0e60 +_0217fe88: .word gMapManager _0217fe8c: .word data_027e10a4 .global func_ov15_0217fe90 @@ -113494,7 +113494,7 @@ _021802a4: b _021802e8 _021802c4: mov r1, #0x1000 - ldr r0, _0218034c ; =data_027e0e60 + ldr r0, _0218034c ; =gMapManager str r1, [r4, #0x37c] add r1, r4, #0x4c ldr r0, [r0] @@ -113531,7 +113531,7 @@ _0218033c: .word 0xcccccccd _02180340: .word 0x00000708 _02180344: .word data_027e0fe8 _02180348: .word 0x4852434e -_0218034c: .word data_027e0e60 +_0218034c: .word gMapManager _02180350: .word 0x0000ffff .global func_ov15_02180354 @@ -114101,7 +114101,7 @@ _02180b9c: bge _02180bd4 cmp r0, #0 beq _02180bf8 - ldr r0, _02180c50 ; =data_027e0e60 + ldr r0, _02180c50 ; =gMapManager add r1, r5, #0x4c ldr r0, [r0] add r1, r1, #0x400 @@ -114112,7 +114112,7 @@ _02180b9c: _02180bd4: cmp r0, #0 bne _02180bf8 - ldr r0, _02180c50 ; =data_027e0e60 + ldr r0, _02180c50 ; =gMapManager add r1, r5, #0x4c ldr r0, [r0] add r1, r1, #0x400 @@ -114145,7 +114145,7 @@ _02180c1c: .align 2, 0 arm_func_end func_ov15_02180af0 _02180c4c: .word 0x0000ffff -_02180c50: .word data_027e0e60 +_02180c50: .word gMapManager _02180c54: .word data_ov15_0218e8c8 _02180c58: .word data_ov15_0218e8d4 _02180c5c: .word data_ov15_02190458 @@ -114832,7 +114832,7 @@ func_ov15_021815b0: ; 0x021815b0 ldr r0, [r1] add r1, r5, #0x36c bl _ZN12ActorManager8GetActorEP8ActorRef - ldr r2, _02181610 ; =data_027e0e60 + ldr r2, _02181610 ; =gMapManager mov r4, r0 ldr r0, [r2] ldrh r1, [r5, #0x26] @@ -114852,7 +114852,7 @@ func_ov15_021815b0: ; 0x021815b0 .align 2, 0 arm_func_end func_ov15_021815b0 _0218160c: .word data_027e0fe4 -_02181610: .word data_027e0e60 +_02181610: .word gMapManager _02181614: .word data_027e0f94 .global func_ov15_02181618 @@ -115634,7 +115634,7 @@ _0218212c: ; jump table b _021824dc ; case 3 b _0218251c ; case 4 _02182140: - ldr r0, _0218257c ; =data_027e0e60 + ldr r0, _0218257c ; =gMapManager ldrh r1, [r4, #0x26] ldr r0, [r0] mov r2, #0 @@ -115912,7 +115912,7 @@ _02182548: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov15_02182110 -_0218257c: .word data_027e0e60 +_0218257c: .word gMapManager _02182580: .word data_027e0f94 _02182584: .word data_027e0f64 _02182588: .word gAdventureFlags @@ -116038,7 +116038,7 @@ func_ov15_021826ac: ; 0x021826ac mov r0, r5 mov r2, r5 bl func_01ff9bc4 - ldr r3, _02182808 ; =data_027e0e60 + ldr r3, _02182808 ; =gMapManager add r7, sp, #0xc ldmia r5, {r0, r1, r2} stmia r7, {r0, r1, r2} @@ -116090,7 +116090,7 @@ _021827f8: .word 0x00001770 _021827fc: .word data_027e0fac _02182800: .word 0x000008a4 _02182804: .word 0xfffffae1 -_02182808: .word data_027e0e60 +_02182808: .word gMapManager _0218280c: .word 0x00001333 .global func_ov15_02182810 @@ -116121,7 +116121,7 @@ func_ov15_02182810: ; 0x02182810 str r1, [r4, #0x334] ldrsh ip, [r0, #0x98] ldrsh r3, [r0, #0x9a] - ldr r2, _021829e4 ; =data_027e0e60 + ldr r2, _021829e4 ; =gMapManager add r1, sp, #0x20 add r3, ip, r3 strh r3, [r0, #0x98] @@ -116218,7 +116218,7 @@ _0218291c: .align 2, 0 arm_func_end func_ov15_02182810 _021829e0: .word 0x00000133 -_021829e4: .word data_027e0e60 +_021829e4: .word gMapManager _021829e8: .word data_027e10a4 _021829ec: .word data_027e0f64 @@ -116758,7 +116758,7 @@ _02182ff0: ldr r0, [sp, #0x28] ldr r1, [sp, #0x24] str r0, [sp, #0x1c] - ldr r0, _02183248 ; =data_027e0e60 + ldr r0, _02183248 ; =gMapManager str r1, [sp, #0x18] ldr r1, [sp, #0x2c] ldr r0, [r0] @@ -116878,7 +116878,7 @@ _021831d4: arm_func_end func_ov15_02182fc0 _02183240: .word data_027e0f64 _02183244: .word data_027e0f94 -_02183248: .word data_027e0e60 +_02183248: .word gMapManager _0218324c: .word data_02050f54 .global func_ov15_02183250 @@ -118300,7 +118300,7 @@ func_ov15_02184540: ; 0x02184540 bl func_ov00_020a5e9c cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _021845e4 ; =data_027e0e60 + ldr r0, _021845e4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev ldrb r1, [r4, #0x54] @@ -118328,7 +118328,7 @@ _021845b4: strb r0, [r4, #0x55] mvn r1, #0x80000000 str r1, [r4, #0x48] - ldr r0, _021845e4 ; =data_027e0e60 + ldr r0, _021845e4 ; =gMapManager str r1, [r4, #0x3c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev @@ -118337,7 +118337,7 @@ _021845b4: .align 2, 0 arm_func_end func_ov15_02184540 _021845e0: .word data_027e0d38 -_021845e4: .word data_027e0e60 +_021845e4: .word gMapManager .global func_ov15_021845e8 arm_func_start func_ov15_021845e8 @@ -118350,7 +118350,7 @@ func_ov15_021845e8: ; 0x021845e8 bl func_ov00_020a5e9c cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _02184640 ; =data_027e0e60 + ldr r0, _02184640 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev ldrb r1, [r4, #0x64] @@ -118366,7 +118366,7 @@ func_ov15_021845e8: ; 0x021845e8 .align 2, 0 arm_func_end func_ov15_021845e8 _0218463c: .word data_027e0d38 -_02184640: .word data_027e0e60 +_02184640: .word gMapManager .global func_ov15_02184644 arm_func_start func_ov15_02184644 @@ -118379,7 +118379,7 @@ func_ov15_02184644: ; 0x02184644 bl func_ov00_020a5e9c cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _021846f4 ; =data_027e0e60 + ldr r0, _021846f4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev ldrb r1, [r4, #0xc3] @@ -118419,7 +118419,7 @@ _021846c8: .align 2, 0 arm_func_end func_ov15_02184644 _021846f0: .word data_027e0d38 -_021846f4: .word data_027e0e60 +_021846f4: .word gMapManager .global func_ov15_021846f8 arm_func_start func_ov15_021846f8 diff --git a/asm/ov17.inc b/asm/ov17.inc index 5506da16..d717b493 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -90,7 +90,7 @@ .extern data_027e0d38 .extern data_027e0d3c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov17.s b/asm/ov17.s index 0a7e68c5..25a4180f 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -768,7 +768,7 @@ func_ov17_0215bbd4: ; 0x0215bbd4 sub sp, sp, #0x1c mov r6, r2 mov r7, r1 - ldr r2, _0215bd28 ; =data_027e0e60 + ldr r2, _0215bd28 ; =gMapManager mov r8, r0 ldrb r1, [r6, #1] ldr r0, [r2] @@ -780,7 +780,7 @@ func_ov17_0215bbd4: ; 0x0215bbd4 mov r1, r6 ldr r2, [r2, #0x60] blx r2 - ldr r1, _0215bd28 ; =data_027e0e60 + ldr r1, _0215bd28 ; =gMapManager mov r9, r0 ldr r0, [r1] ldrb r1, [r6] @@ -858,7 +858,7 @@ _0215bd1c: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov17_0215bbd4 -_0215bd28: .word data_027e0e60 +_0215bd28: .word gMapManager _0215bd2c: .word data_027e0f68 .global func_ov17_0215bd30 @@ -1139,7 +1139,7 @@ func_ov17_0215bf8c: ; 0x0215bf8c sub r0, r0, #4 str r0, [r4, #0x18] ldr r1, [r4, #0x20] - ldr r0, _0215c0fc ; =data_027e0e60 + ldr r0, _0215c0fc ; =gMapManager sub r1, r1, #4 str r1, [r4, #0x20] ldrsh r1, [r4, #0x34] @@ -1164,7 +1164,7 @@ _0215c0e4: .align 2, 0 arm_func_end func_ov17_0215bf8c _0215c0f8: .word 0x00001333 -_0215c0fc: .word data_027e0e60 +_0215c0fc: .word gMapManager .global func_ov17_0215c100 arm_func_start func_ov17_0215c100 @@ -1324,7 +1324,7 @@ _0215c2f4: mov r0, #0x1f strb r0, [r5, #0xd1] ldr r1, [r5, #4] - ldr r0, _0215c654 ; =data_027e0e60 + ldr r0, _0215c654 ; =gMapManager orr r1, r1, #0x14 str r1, [r5, #4] ldr r0, [r0] @@ -1500,7 +1500,7 @@ _0215c598: bic r0, r0, #4 str r0, [r5, #4] strb r1, [r5, #0x3c] - ldr r0, _0215c654 ; =data_027e0e60 + ldr r0, _0215c654 ; =gMapManager add r1, r5, #0x38 ldr r0, [r0] mov r2, #1 @@ -1535,7 +1535,7 @@ _0215c5fc: mov r2, #1 bl func_ov00_0208ba08 _0215c634: - ldr r0, _0215c654 ; =data_027e0e60 + ldr r0, _0215c654 ; =gMapManager ldrsh r1, [r5, #0x34] ldr r0, [r0] mov r2, #1 @@ -1546,7 +1546,7 @@ _0215c648: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov17_0215c2bc -_0215c654: .word data_027e0e60 +_0215c654: .word gMapManager _0215c658: .word gAdventureFlags _0215c65c: .word data_027e0e58 _0215c660: .word data_027e0ffc @@ -1821,7 +1821,7 @@ func_ov17_0215c940: ; 0x0215c940 cmp r0, #1 bne _0215c9c4 ldr r0, [r4, #0x18] - ldr r1, _0215ca64 ; =data_027e0e60 + ldr r1, _0215ca64 ; =gMapManager add r0, r0, #0x3fc add r0, r0, #0x400 str r0, [r4, #0x18] @@ -1834,7 +1834,7 @@ func_ov17_0215c940: ; 0x0215c940 strb r3, [sp, #5] bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r2, [sp, #4] - ldr r0, _0215ca64 ; =data_027e0e60 + ldr r0, _0215ca64 ; =gMapManager add r1, sp, #4 add r3, r2, #1 ldr r0, [r0] @@ -1884,7 +1884,7 @@ _0215c9c4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_0215c940 -_0215ca64: .word data_027e0e60 +_0215ca64: .word gMapManager _0215ca68: .word data_027e0f68 _0215ca6c: .word 0x000004cd @@ -1897,7 +1897,7 @@ func_ov17_0215ca70: ; 0x0215ca70 ldrh r0, [r4, #0x24] cmp r0, #1 bne _0215cabc - ldr r0, _0215cba0 ; =data_027e0e60 + ldr r0, _0215cba0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -1965,7 +1965,7 @@ _0215cb6c: mov r2, #1 blx r3 _0215cb84: - ldr r0, _0215cba0 ; =data_027e0e60 + ldr r0, _0215cba0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -1974,7 +1974,7 @@ _0215cb84: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_0215ca70 -_0215cba0: .word data_027e0e60 +_0215cba0: .word gMapManager _0215cba4: .word data_027e0fe4 .global func_ov17_0215cba8 @@ -2216,7 +2216,7 @@ func_ov17_0215ce24: ; 0x0215ce24 movne r0, #0 ldmneia sp!, {r4, r5, pc} ldr r1, [sp, #4] - ldr r0, _0215cee8 ; =data_027e0e60 + ldr r0, _0215cee8 ; =gMapManager str r1, [r4] ldr r1, [r0] add r0, sp, #0 @@ -2236,7 +2236,7 @@ func_ov17_0215ce24: ; 0x0215ce24 arm_func_end func_ov17_0215ce24 _0215cee0: .word data_027e0fe4 _0215cee4: .word 0x43525953 -_0215cee8: .word data_027e0e60 +_0215cee8: .word gMapManager .global func_ov17_0215ceec arm_func_start func_ov17_0215ceec @@ -2488,7 +2488,7 @@ _0215d1ec: mov r2, r0 bl func_01ff9bc4 ldr r3, _0215d478 ; =data_027e0d0c - ldr r1, _0215d47c ; =data_027e0e60 + ldr r1, _0215d47c ; =gMapManager ldr r2, [r3] add r0, sp, #0 str r2, [r4, #0x208] @@ -2653,7 +2653,7 @@ _0215d46c: .word 0x0000019a _0215d470: .word 0xfffffe3d _0215d474: .word 0x000001c3 _0215d478: .word data_027e0d0c -_0215d47c: .word data_027e0e60 +_0215d47c: .word gMapManager _0215d480: .word data_027e0ffc .global func_ov17_0215d484 @@ -2926,7 +2926,7 @@ func_ov17_0215d7bc: ; 0x0215d7bc mov lr, #4 str r1, [sp, #0x24] ldr r1, [r4, #0x50] - ldr ip, _0215d8b0 ; =data_027e0e60 + ldr ip, _0215d8b0 ; =gMapManager str r1, [sp, #0x28] ldr r2, [r4, #0x48] add r1, sp, #0x2c @@ -2960,7 +2960,7 @@ func_ov17_0215d7bc: ; 0x0215d7bc .align 2, 0 arm_func_end func_ov17_0215d7bc _0215d8ac: .word 0x0000ffff -_0215d8b0: .word data_027e0e60 +_0215d8b0: .word gMapManager _0215d8b4: .word data_ov17_0216bc64 .global func_ov17_0215d8b8 @@ -3501,7 +3501,7 @@ _0215dfec: .word func_01ff9bc4 func_ov17_0215dff0: ; 0x0215dff0 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #8 - ldr r2, _0215e1b4 ; =data_027e0e60 + ldr r2, _0215e1b4 ; =gMapManager mov r11, r1 ldr r1, [r2] mov r10, r0 @@ -3509,7 +3509,7 @@ func_ov17_0215dff0: ; 0x0215dff0 mov r2, r11 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r7, #0 - ldr r4, _0215e1b4 ; =data_027e0e60 + ldr r4, _0215e1b4 ; =gMapManager str r7, [r10, #0x1ec] add r6, sp, #4 _0215e024: @@ -3618,7 +3618,7 @@ _0215e090: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov17_0215dff0 -_0215e1b4: .word data_027e0e60 +_0215e1b4: .word gMapManager _0215e1b8: .word data_ov17_0216bc64 _0215e1bc: .word data_027e0e58 @@ -3744,7 +3744,7 @@ _0215e334: .word func_ov00_020b7d74 arm_func_start func_ov17_0215e338 func_ov17_0215e338: ; 0x0215e338 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr} - ldr r2, _0215e460 ; =data_027e0e60 + ldr r2, _0215e460 ; =gMapManager mov r11, r1 ldr r1, [r2] mov r10, r0 @@ -3752,7 +3752,7 @@ func_ov17_0215e338: ; 0x0215e338 mov r2, r11 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mov r7, #0 - ldr r4, _0215e460 ; =data_027e0e60 + ldr r4, _0215e460 ; =gMapManager str r7, [r10, #0x250] add r6, sp, #0 _0215e368: @@ -3823,7 +3823,7 @@ _0215e3e4: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov17_0215e338 -_0215e460: .word data_027e0e60 +_0215e460: .word gMapManager .global func_ov17_0215e464 arm_func_start func_ov17_0215e464 @@ -4848,12 +4848,12 @@ func_ov17_0215f16c: ; 0x0215f16c bl func_ov17_0215f874 b _0215f2b8 _0215f25c: - ldr r1, _0215f2e0 ; =data_027e0e60 + ldr r1, _0215f2e0 ; =gMapManager add r0, sp, #0 ldr r1, [r1] add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _0215f2e0 ; =data_027e0e60 + ldr r0, _0215f2e0 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -4885,7 +4885,7 @@ _0215f2d0: .word gItemManager _0215f2d4: .word data_027e0fc4 _0215f2d8: .word 0x00000733 _0215f2dc: .word data_ov17_0216b0d0 -_0215f2e0: .word data_027e0e60 +_0215f2e0: .word gMapManager .global func_ov17_0215f2e4 arm_func_start func_ov17_0215f2e4 @@ -5302,12 +5302,12 @@ func_ov17_0215f874: ; 0x0215f874 mov r1, #2 mov r4, r0 bl func_ov17_0215f2e4 - ldr r1, _0215f904 ; =data_027e0e60 + ldr r1, _0215f904 ; =gMapManager add r0, sp, #0 ldr r1, [r1] mov r2, r5 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _0215f904 ; =data_027e0e60 + ldr r0, _0215f904 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -5335,7 +5335,7 @@ func_ov17_0215f874: ; 0x0215f874 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_0215f874 -_0215f904: .word data_027e0e60 +_0215f904: .word gMapManager .global func_ov17_0215f908 arm_func_start func_ov17_0215f908 @@ -5397,7 +5397,7 @@ func_ov17_0215f9a0: ; 0x0215f9a0 cmp r0, #2 bne _0215fa00 ldr r1, [r4, #0x48] - ldr r0, _0215fa20 ; =data_027e0e60 + ldr r0, _0215fa20 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -5425,7 +5425,7 @@ _0215fa00: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov17_0215f9a0 -_0215fa20: .word data_027e0e60 +_0215fa20: .word gMapManager .global func_ov17_0215fa24 arm_func_start func_ov17_0215fa24 @@ -5582,7 +5582,7 @@ _0215fb50: cmp r4, r0 bgt _0215fb88 _0215fb5e: - ldr r0, _0215fba4 ; =data_027e0e60 + ldr r0, _0215fba4 ; =gMapManager ldr r7, [r0] add r0, r4, #0 blx func_ov03_020f8068 @@ -5621,7 +5621,7 @@ _0215fb96: pop {r3, r4, r5, r6, r7, pc} nop thumb_func_end func_ov17_0215faf0 -_0215fba4: .word data_027e0e60 +_0215fba4: .word gMapManager .global func_ov17_0215fba8 arm_func_start func_ov17_0215fba8 @@ -5655,7 +5655,7 @@ func_ov17_0215fbd8: ; 0x0215fbd8 mov r1, #0 movge r6, #6 bl func_ov17_02160274 - ldr r11, _0215fcd0 ; =data_027e0e60 + ldr r11, _0215fcd0 ; =gMapManager mov r4, r7 add r5, r7, #4 mov r9, #0 @@ -5711,7 +5711,7 @@ _0215fcb4: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov17_0215fbd8 -_0215fcd0: .word data_027e0e60 +_0215fcd0: .word gMapManager .global func_ov17_0215fcd4 arm_func_start func_ov17_0215fcd4 @@ -5745,7 +5745,7 @@ _0215fd1c: cmp r7, r6 bgt _0215fd7c _0215fd3c: - ldr r0, _0215ff20 ; =data_027e0e60 + ldr r0, _0215ff20 ; =gMapManager ldr r8, [r0] mov r0, r7 bl func_ov03_020f8068 @@ -5879,7 +5879,7 @@ _0215ff14: .align 2, 0 arm_func_end func_ov17_0215fcd4 _0215ff1c: .word 0x0001869f -_0215ff20: .word data_027e0e60 +_0215ff20: .word gMapManager _0215ff24: .word data_027e1054 _0215ff28: .word data_ov00_020eec9c _0215ff2c: .word data_027e077c @@ -5930,7 +5930,7 @@ _0215ffcc: mov r0, r10 mov r1, r5 bl func_ov17_02160274 - ldr r1, _021600e8 ; =data_027e0e60 + ldr r1, _021600e8 ; =gMapManager mov r4, r0 ldr r6, [r1] bl func_ov03_020f8068 @@ -6002,7 +6002,7 @@ _02160098: arm_func_end func_ov17_0215ff30 _021600e0: .word data_027e0618 _021600e4: .word data_ov17_0216bfb4 -_021600e8: .word data_027e0e60 +_021600e8: .word gMapManager _021600ec: .word data_027e077c .global func_ov17_021600f0 @@ -6724,7 +6724,7 @@ _021608d4: add r1, r4, #0x1b8 bl func_ov00_020c522c ldr r1, [r4, #0x1b8] - ldr r0, _02160950 ; =data_027e0e60 + ldr r0, _02160950 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x1bc] ldr r0, [r0] @@ -6755,7 +6755,7 @@ _02160934: arm_func_end func_ov17_021607b8 _02160948: .word data_027e0fec _0216094c: .word 0x00000333 -_02160950: .word data_027e0e60 +_02160950: .word gMapManager .global func_ov17_02160954 arm_func_start func_ov17_02160954 @@ -6931,7 +6931,7 @@ _02160b10: addeq sp, sp, #0x20 ldmeqia sp!, {r3, r4, r5, pc} ldr r1, [r5, #0x48] - ldr r0, _02160e5c ; =data_027e0e60 + ldr r0, _02160e5c ; =gMapManager str r1, [sp, #0x14] ldr r2, [r5, #0x4c] ldr r1, [r0] @@ -7003,7 +7003,7 @@ _02160c28: cmp r0, #0 beq _02160d68 ldr r1, [r5, #0x48] - ldr r0, _02160e5c ; =data_027e0e60 + ldr r0, _02160e5c ; =gMapManager str r1, [sp, #8] ldr r2, [r5, #0x4c] ldr r1, [r0] @@ -7139,7 +7139,7 @@ _02160e54: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_02160a78 -_02160e5c: .word data_027e0e60 +_02160e5c: .word gMapManager _02160e60: .word data_027e0ffc _02160e64: .word 0x000001ab _02160e68: .word 0xfffffe66 @@ -7607,14 +7607,14 @@ _02161404: cmpne r0, #1 mov r2, #0 bne _02161468 - ldr r0, _021614f0 ; =data_027e0e60 + ldr r0, _021614f0 ; =gMapManager add r1, r5, #0x18 ldr r0, [r0] mov r3, #2 bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _021614dc _02161468: - ldr r0, _021614f0 ; =data_027e0e60 + ldr r0, _021614f0 ; =gMapManager add r1, r5, #0x18 ldr r0, [r0] mov r3, #1 @@ -7638,7 +7638,7 @@ _021614a8: mov r0, r5 mov r2, r1 bl func_ov00_0208ba08 - ldr r0, _021614f0 ; =data_027e0e60 + ldr r0, _021614f0 ; =gMapManager ldrh r1, [r5, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083840Ei @@ -7655,7 +7655,7 @@ _021614dc: arm_func_end func_ov17_021612b0 _021614e8: .word data_ov17_0216b0d8 _021614ec: .word gAdventureFlags -_021614f0: .word data_027e0e60 +_021614f0: .word gMapManager .global func_ov17_021614f4 arm_func_start func_ov17_021614f4 @@ -7746,7 +7746,7 @@ func_ov17_0216161c: ; 0x0216161c cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} - ldr r0, _02161678 ; =data_027e0e60 + ldr r0, _02161678 ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 @@ -7766,7 +7766,7 @@ _02161670: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_0216161c -_02161678: .word data_027e0e60 +_02161678: .word gMapManager _0216167c: .word data_027e0fe4 .global func_ov17_02161680 @@ -7774,7 +7774,7 @@ _0216167c: .word data_027e0fe4 func_ov17_02161680: ; 0x02161680 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _021616e8 ; =data_027e0e60 + ldr r0, _021616e8 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -7792,7 +7792,7 @@ func_ov17_02161680: ; 0x02161680 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _021616e8 ; =data_027e0e60 + ldr r0, _021616e8 ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083840Ei @@ -7800,14 +7800,14 @@ func_ov17_02161680: ; 0x02161680 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02161680 -_021616e8: .word data_027e0e60 +_021616e8: .word gMapManager .global func_ov17_021616ec arm_func_start func_ov17_021616ec func_ov17_021616ec: ; 0x021616ec stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _0216179c ; =data_027e0e60 + ldr r0, _0216179c ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -7835,7 +7835,7 @@ func_ov17_021616ec: ; 0x021616ec cmp r1, r0 movne r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0216179c ; =data_027e0e60 + ldr r0, _0216179c ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 @@ -7843,7 +7843,7 @@ func_ov17_021616ec: ; 0x021616ec cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0216179c ; =data_027e0e60 + ldr r0, _0216179c ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083790Ei @@ -7851,7 +7851,7 @@ func_ov17_021616ec: ; 0x021616ec ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_021616ec -_0216179c: .word data_027e0e60 +_0216179c: .word gMapManager _021617a0: .word data_027e0d38 _021617a4: .word data_027e077c @@ -9449,7 +9449,7 @@ func_ov17_02162afc: ; 0x02162afc ldr ip, [ip, #0x10] add r1, sp, #8 blx ip - ldr r0, _02162bec ; =data_027e0e60 + ldr r0, _02162bec ; =gMapManager ldr r1, [r0] ldrb r1, [r1, #8] strb r1, [r4, #0x60] @@ -9475,7 +9475,7 @@ _02162bd0: .align 2, 0 arm_func_end func_ov17_02162afc _02162be8: .word 0x00001333 -_02162bec: .word data_027e0e60 +_02162bec: .word gMapManager .global func_ov17_02162bf0 arm_func_start func_ov17_02162bf0 @@ -9494,7 +9494,7 @@ func_ov17_02162bf0: ; 0x02162bf0 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} ldr r1, [r5, #0x64] - ldr r0, _02162cf4 ; =data_027e0e60 + ldr r0, _02162cf4 ; =gMapManager add r1, r1, #1 str r1, [r5, #0x64] ldr r1, [r5, #0x68] @@ -9520,7 +9520,7 @@ _02162c78: mov r2, #0 blx r3 _02162c88: - ldr r1, _02162cf4 ; =data_027e0e60 + ldr r1, _02162cf4 ; =gMapManager ldr r0, _02162cf8 ; =data_027e0f64 ldr r2, [r1] add r1, sp, #0 @@ -9550,7 +9550,7 @@ _02162ce0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_02162bf0 -_02162cf4: .word data_027e0e60 +_02162cf4: .word gMapManager _02162cf8: .word data_027e0f64 _02162cfc: .word data_027e0e58 @@ -9628,7 +9628,7 @@ func_ov17_02162dd0: ; 0x02162dd0 cmp r0, #0x19 movlt r0, #1 ldmltia sp!, {r4, pc} - ldr r0, _02162e78 ; =data_027e0e60 + ldr r0, _02162e78 ; =gMapManager mov r3, #0 ldr r1, [r0] add r2, r4, #0x18 @@ -9642,7 +9642,7 @@ func_ov17_02162dd0: ; 0x02162dd0 ldr r1, _02162e80 ; =0x000001a9 str r3, [r4, #0x68] bl func_ov00_020ceacc - ldr r0, _02162e78 ; =data_027e0e60 + ldr r0, _02162e78 ; =gMapManager ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 @@ -9664,7 +9664,7 @@ _02162e70: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02162dd0 -_02162e78: .word data_027e0e60 +_02162e78: .word gMapManager _02162e7c: .word data_027e0ffc _02162e80: .word 0x000001a9 @@ -10926,10 +10926,10 @@ func_ov17_02163e24: ; 0x02163e24 ldrb r0, [r0, #0x71] cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r0, _02163ecc ; =data_027e0e60 + ldr r0, _02163ecc ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev - ldr r1, _02163ecc ; =data_027e0e60 + ldr r1, _02163ecc ; =gMapManager mov r11, r0 ldr r0, [r1] bl _ZN10MapManager17Get_MapData_Unk2aEv @@ -10937,7 +10937,7 @@ func_ov17_02163e24: ; 0x02163e24 mov r9, #0 cmp r11, #0 ldmleia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r4, _02163ecc ; =data_027e0e60 + ldr r4, _02163ecc ; =gMapManager add r6, sp, #0 _02163e68: mov r10, #0 @@ -10970,7 +10970,7 @@ _02163ebc: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov17_02163e24 -_02163ecc: .word data_027e0e60 +_02163ecc: .word gMapManager .global func_ov17_02163ed0 arm_func_start func_ov17_02163ed0 @@ -11050,7 +11050,7 @@ _02163fbc: strb r0, [r4, #0x3c] mov r2, #0 str r2, [r4, #0x68] - ldr r0, _02164084 ; =data_027e0e60 + ldr r0, _02164084 ; =gMapManager str r2, [r4, #0x6c] ldr r0, [r0] add r1, r4, #0x38 @@ -11061,7 +11061,7 @@ _02163fe4: strb r0, [r4, #0x3c] ldr r1, _02164088 ; =0xfffff666 str r0, [r4, #0x68] - ldr r0, _02164084 ; =data_027e0e60 + ldr r0, _02164084 ; =gMapManager str r1, [r4, #0x6c] ldr r0, [r0] add r1, r4, #0x38 @@ -11072,7 +11072,7 @@ _02164010: mov r0, #1 strb r0, [r4, #0x3c] mov r2, #0 - ldr r0, _02164084 ; =data_027e0e60 + ldr r0, _02164084 ; =gMapManager str r2, [r4, #0x68] ldr r0, [r0] add r1, r4, #0x38 @@ -11086,7 +11086,7 @@ _02164010: _02164048: mov r1, #0 strb r1, [r4, #0x3c] - ldr r0, _02164084 ; =data_027e0e60 + ldr r0, _02164084 ; =gMapManager str r1, [r4, #0x68] ldr r0, [r0] add r1, r4, #0x38 @@ -11102,7 +11102,7 @@ _0216407c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_02163f90 -_02164084: .word data_027e0e60 +_02164084: .word gMapManager _02164088: .word 0xfffff666 .global func_ov17_0216408c @@ -11119,7 +11119,7 @@ func_ov17_0216408c: ; 0x0216408c beq _021640d4 cmp r3, #1 bne _021640d4 - ldr ip, _021640fc ; =data_027e0e60 + ldr ip, _021640fc ; =gMapManager mov r3, #0xc ldr ip, [ip] ldrb ip, [ip, #8] @@ -11127,7 +11127,7 @@ func_ov17_0216408c: ; 0x0216408c movne r1, #0x36 b _021640ec _021640d4: - ldr ip, _021640fc ; =data_027e0e60 + ldr ip, _021640fc ; =gMapManager mov r3, #0xb ldr ip, [ip] ldrb ip, [ip, #8] @@ -11140,7 +11140,7 @@ _021640ec: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov17_0216408c -_021640fc: .word data_027e0e60 +_021640fc: .word gMapManager .global func_ov17_02164100 arm_func_start func_ov17_02164100 @@ -11166,7 +11166,7 @@ func_ov17_02164120: ; 0x02164120 beq _02164178 cmp r1, #1 ldmneia sp!, {r3, pc} - ldr r1, _02164280 ; =data_027e0e60 + ldr r1, _02164280 ; =gMapManager ldr r3, [r0] ldr r1, [r1] ldrb r1, [r1, #8] @@ -11182,7 +11182,7 @@ _02164168: blx r3 ldmia sp!, {r3, pc} _02164178: - ldr r1, _02164280 ; =data_027e0e60 + ldr r1, _02164280 ; =gMapManager ldr r3, [r0] ldr r1, [r1] ldrb r1, [r1, #8] @@ -11202,7 +11202,7 @@ _021641b0: beq _02164220 cmp r1, #1 ldmneia sp!, {r3, pc} - ldr r1, _02164280 ; =data_027e0e60 + ldr r1, _02164280 ; =gMapManager ldr r1, [r1] ldrb r1, [r1, #8] cmp r1, #0 @@ -11228,7 +11228,7 @@ _021641fc: blx r3 ldmia sp!, {r3, pc} _02164220: - ldr r1, _02164280 ; =data_027e0e60 + ldr r1, _02164280 ; =gMapManager ldr r1, [r1] ldrb r1, [r1, #8] cmp r1, #0 @@ -11255,7 +11255,7 @@ _0216425c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov17_02164120 -_02164280: .word data_027e0e60 +_02164280: .word gMapManager .global func_ov17_02164284 arm_func_start func_ov17_02164284 @@ -11268,7 +11268,7 @@ func_ov17_02164284: ; 0x02164284 addne sp, sp, #0x10 ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} ldrb r0, [r10, #0x14] - ldr r1, _02164474 ; =data_027e0e60 + ldr r1, _02164474 ; =gMapManager str r0, [sp, #4] ldrb r0, [r10, #0x15] str r0, [sp] @@ -11282,17 +11282,17 @@ func_ov17_02164284: ; 0x02164284 ldr r1, [sp, #8] cmp r1, r0 blt _021642ec - ldr r0, _02164474 ; =data_027e0e60 + ldr r0, _02164474 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #8] _021642ec: - ldr r0, _02164474 ; =data_027e0e60 + ldr r0, _02164474 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv cmp r7, r0 blt _02164310 - ldr r0, _02164474 ; =data_027e0e60 + ldr r0, _02164474 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv mov r7, r0 @@ -11301,7 +11301,7 @@ _02164310: mov r0, r8 cmp r0, r7 bge _0216438c - ldr r9, _02164474 ; =data_027e0e60 + ldr r9, _02164474 ; =gMapManager mov r4, #0 add r6, sp, #0xe _0216432c: @@ -11354,7 +11354,7 @@ _021643b4: ldr r0, [sp, #4] and r6, r0, #0xff _021643e0: - ldr r0, _02164474 ; =data_027e0e60 + ldr r0, _02164474 ; =gMapManager mov r1, r11 ldr r0, [r0] strb r6, [sp, #0xc] @@ -11397,7 +11397,7 @@ _02164464: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov17_02164284 -_02164474: .word data_027e0e60 +_02164474: .word gMapManager .global func_ov17_02164478 arm_func_start func_ov17_02164478 @@ -12425,10 +12425,10 @@ _021651b0: movne r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} _021651c0: - ldr r0, _02165280 ; =data_027e0e60 + ldr r0, _02165280 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev - ldr r1, _02165280 ; =data_027e0e60 + ldr r1, _02165280 ; =gMapManager and r11, r0, #0xff ldr r0, [r1] bl _ZN10MapManager17Get_MapData_Unk2aEv @@ -12438,7 +12438,7 @@ _021651c0: cmp r11, #0 and r7, r0, #0xff bls _02165278 - ldr r4, _02165280 ; =data_027e0e60 + ldr r4, _02165280 ; =gMapManager add r6, sp, #0 _021651fc: mov r9, #0 @@ -12480,7 +12480,7 @@ _02165278: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov17_0216517c -_02165280: .word data_027e0e60 +_02165280: .word gMapManager .global func_ov17_02165284 arm_func_start func_ov17_02165284 @@ -13051,7 +13051,7 @@ _02165770: add sp, #8 pop {r4, pc} _0216577e: - ldr r0, _021657b8 ; =data_027e0e60 + ldr r0, _021657b8 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager21GetCourseData_Unk_25dEv cmp r0, #0 @@ -13080,7 +13080,7 @@ _021657b0: .align 2, 0 thumb_func_end func_ov17_02165700 _021657b4: .word data_027e0e58 -_021657b8: .word data_027e0e60 +_021657b8: .word gMapManager .global func_ov17_021657bc arm_func_start func_ov17_021657bc @@ -13508,7 +13508,7 @@ _02165d80: ldr r0, [r4, #0x15c] cmp r0, #1 bne _02165de8 - ldr r0, _02165e44 ; =data_027e0e60 + ldr r0, _02165e44 ; =gMapManager mov r1, #1 ldr r0, [r0] bl _ZN10MapManager21SetCourseData_Unk_25cEc @@ -13549,7 +13549,7 @@ _02165e2c: _02165e38: .word data_027e0f6c _02165e3c: .word data_027e0e58 _02165e40: .word gAdventureFlags -_02165e44: .word data_027e0e60 +_02165e44: .word gMapManager .global func_ov17_02165e48 arm_func_start func_ov17_02165e48 @@ -13728,12 +13728,12 @@ _02166080: ; jump table b _0216614c ; case 2 b _0216614c ; case 3 _02166090: - ldr r0, _021661e0 ; =data_027e0e60 + ldr r0, _021661e0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager21GetCourseData_Unk_25dEv ldmia sp!, {r4, pc} _021660a0: - ldr r0, _021661e0 ; =data_027e0e60 + ldr r0, _021661e0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager21GetCourseData_Unk_25dEv cmp r0, #0 @@ -13824,7 +13824,7 @@ _021661d8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02166068 -_021661e0: .word data_027e0e60 +_021661e0: .word gMapManager _021661e4: .word gAdventureFlags .global func_ov17_021661e8 @@ -14366,7 +14366,7 @@ func_ov17_02166878: ; 0x02166878 sub sp, sp, #0x54 mov r9, r0 ldr r1, [r9, #4] - ldr r0, _02166a54 ; =data_027e0e60 + ldr r0, _02166a54 ; =gMapManager orr r1, r1, #0x810 str r1, [r9, #4] ldr r5, [r0] @@ -14450,7 +14450,7 @@ func_ov17_02166878: ; 0x02166878 add r0, r7, #2 cmp r7, r0 bge _02166a38 - ldr r10, _02166a54 ; =data_027e0e60 + ldr r10, _02166a54 ; =gMapManager add r5, sp, #4 mov r4, #1 _021669e4: @@ -14478,7 +14478,7 @@ _02166a24: cmp r7, r0 blt _021669e4 _02166a38: - ldr r0, _02166a54 ; =data_027e0e60 + ldr r0, _02166a54 ; =gMapManager ldrh r2, [r9, #0x2a] ldr r0, [r0] add r1, r9, #0x64 @@ -14487,7 +14487,7 @@ _02166a38: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov17_02166878 -_02166a54: .word data_027e0e60 +_02166a54: .word gMapManager .global func_ov17_02166a58 arm_func_start func_ov17_02166a58 @@ -14676,7 +14676,7 @@ _02166cc4: strh r0, [r4, #0x78] cmp r5, #0 bne _02166cec - ldr r0, _02166df4 ; =data_027e0e60 + ldr r0, _02166df4 ; =gMapManager ldr r1, [r4, #0x74] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej @@ -14690,7 +14690,7 @@ _02166cec: mov r1, #0 bl func_ov17_021676ac ldr r1, [r4, #4] - ldr r0, _02166df4 ; =data_027e0e60 + ldr r0, _02166df4 ; =gMapManager bic r1, r1, #0x10 str r1, [r4, #4] ldr r0, [r0] @@ -14705,7 +14705,7 @@ _02166d28: ldreqh r0, [r4, #0x24] cmpeq r0, #1 bne _02166d5c - ldr r0, _02166df4 ; =data_027e0e60 + ldr r0, _02166df4 ; =gMapManager add r1, r4, #0x18 ldr r0, [r0] mov r2, #1 @@ -14736,7 +14736,7 @@ _02166d8c: mov r1, #1 bl func_ov17_021676ac ldr r1, [r4, #4] - ldr r0, _02166df4 ; =data_027e0e60 + ldr r0, _02166df4 ; =gMapManager orr r1, r1, #0x10 str r1, [r4, #4] ldr r0, [r0] @@ -14745,7 +14745,7 @@ _02166d8c: bl _ZN10MapManager18func_ov00_020843ecEPi b _02166de8 _02166dd4: - ldr r0, _02166df4 ; =data_027e0e60 + ldr r0, _02166df4 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -14756,7 +14756,7 @@ _02166de8: .align 2, 0 arm_func_end func_ov17_02166c74 _02166df0: .word data_027e0ffc -_02166df4: .word data_027e0e60 +_02166df4: .word gMapManager _02166df8: .word 0x00003f4a .global func_ov17_02166dfc @@ -15312,7 +15312,7 @@ _021675cc: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldrb r1, [r10, #0x7a] - ldr r0, _021676a8 ; =data_027e0e60 + ldr r0, _021676a8 ; =gMapManager ldr r2, [sp, #8] sub r1, r1, #1 sub r1, r2, r1, lsl #11 @@ -15324,7 +15324,7 @@ _021675cc: sub r2, r3, r2, lsl #11 str r2, [sp, #0x10] bl _ZN10MapManager18func_ov00_020839d4Ev - ldr r1, _021676a8 ; =data_027e0e60 + ldr r1, _021676a8 ; =gMapManager mov r5, r0 ldr r0, [r1] ldr r1, [sp, #0x10] @@ -15335,7 +15335,7 @@ _021675cc: cmp r1, #0 addle sp, sp, #0x14 ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r4, _021676a8 ; =data_027e0e60 + ldr r4, _021676a8 ; =gMapManager mov r11, #0x14 _02167644: mov r8, #0 @@ -15369,7 +15369,7 @@ _02167690: .align 2, 0 arm_func_end func_ov17_021674e8 _021676a4: .word data_027e0f6c -_021676a8: .word data_027e0e60 +_021676a8: .word gMapManager .global func_ov17_021676ac arm_func_start func_ov17_021676ac @@ -16330,7 +16330,7 @@ _02168398: add r0, r9, #2 cmp r9, r0 bge _02168428 - ldr r4, _0216845c ; =data_027e0e60 + ldr r4, _0216845c ; =gMapManager and r7, r8, #0xff _021683b0: ldr r0, [r4] @@ -16382,7 +16382,7 @@ _0216843c: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov17_0216826c -_0216845c: .word data_027e0e60 +_0216845c: .word gMapManager .global func_ov17_02168460 arm_func_start func_ov17_02168460 @@ -16487,11 +16487,11 @@ func_ov17_0216857c: ; 0x0216857c stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldrh r4, [r5, #0x2a] - ldr r0, _021685b4 ; =data_027e0e60 + ldr r0, _021685b4 ; =gMapManager ldr r0, [r0] mov r1, r4 bl _ZN10MapManager18func_ov00_020823d4Ei - ldr r1, _021685b4 ; =data_027e0e60 + ldr r1, _021685b4 ; =gMapManager str r0, [r5, #0x6c] ldr r0, [r1] mov r1, r4 @@ -16500,7 +16500,7 @@ func_ov17_0216857c: ; 0x0216857c ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_0216857c -_021685b4: .word data_027e0e60 +_021685b4: .word gMapManager .global func_ov17_021685b8 arm_func_start func_ov17_021685b8 @@ -16522,7 +16522,7 @@ func_ov17_021685b8: ; 0x021685b8 ldr r1, _02168650 ; =data_ov17_0216b1b0 mov r0, r5 bl func_0201933c - ldr r0, _02168654 ; =data_027e0e60 + ldr r0, _02168654 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_b4Ev mov r4, r0 @@ -16546,7 +16546,7 @@ func_ov17_021685b8: ; 0x021685b8 arm_func_end func_ov17_021685b8 _0216864c: .word data_ov17_0216b19c _02168650: .word data_ov17_0216b1b0 -_02168654: .word data_027e0e60 +_02168654: .word gMapManager .global func_ov17_02168658 arm_func_start func_ov17_02168658 @@ -17303,7 +17303,7 @@ _02168ef8: ; jump table b _02168f70 ; case 2 b _02168f9c ; case 3 _02168f08: - ldr r0, _02169180 ; =data_027e0e60 + ldr r0, _02169180 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev sub r0, r0, #2 @@ -17343,7 +17343,7 @@ _02168f70: str r0, [r6, #0x18] b _02168fd4 _02168f9c: - ldr r0, _02169180 ; =data_027e0e60 + ldr r0, _02169180 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv sub r0, r0, #2 @@ -17468,7 +17468,7 @@ _02169160: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov17_02168ed0 -_02169180: .word data_027e0e60 +_02169180: .word gMapManager _02169184: .word 0x00001333 _02169188: .word data_027e0d38 _0216918c: .word data_027e0fe8 @@ -17554,7 +17554,7 @@ func_ov17_02169278: ; 0x02169278 cmp r1, #2 b _02169338 _0216929c: - ldr r0, _02169340 ; =data_027e0e60 + ldr r0, _02169340 ; =gMapManager add r1, r4, #0x64 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -17575,7 +17575,7 @@ _021692cc: bl func_ov00_02094884 b _02169338 _021692e8: - ldr r0, _02169340 ; =data_027e0e60 + ldr r0, _02169340 ; =gMapManager add r1, r4, #0x64 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -17601,7 +17601,7 @@ _02169338: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_02169278 -_02169340: .word data_027e0e60 +_02169340: .word gMapManager .global func_ov17_02169344 arm_func_start func_ov17_02169344 @@ -17886,7 +17886,7 @@ _021696a8: ; jump table b _02169808 ; case 3 _021696b8: ldr r1, [sp, #0x54] - ldr r0, _021698fc ; =data_027e0e60 + ldr r0, _021698fc ; =gMapManager sub r1, r1, #0x1000 str r1, [sp, #0x54] ldrb r1, [r4, #0x14] @@ -17903,7 +17903,7 @@ _021696b8: bne _02169874 ldrb r2, [r4, #0x15] ldrb r1, [r4, #0x14] - ldr r0, _021698fc ; =data_027e0e60 + ldr r0, _021698fc ; =gMapManager add ip, r2, #1 sub r3, r1, #1 ldr r0, [r0] @@ -17915,7 +17915,7 @@ _021696b8: b _02169874 _02169728: ldr r1, [sp, #0x48] - ldr r0, _021698fc ; =data_027e0e60 + ldr r0, _021698fc ; =gMapManager add r1, r1, #0x1000 str r1, [sp, #0x48] ldrb r1, [r4, #0x14] @@ -17932,7 +17932,7 @@ _02169728: bne _02169874 ldrb r2, [r4, #0x15] ldrb r1, [r4, #0x14] - ldr r0, _021698fc ; =data_027e0e60 + ldr r0, _021698fc ; =gMapManager add ip, r2, #1 add r3, r1, #1 ldr r0, [r0] @@ -17944,7 +17944,7 @@ _02169728: b _02169874 _02169798: ldr r1, [sp, #0x50] - ldr r0, _021698fc ; =data_027e0e60 + ldr r0, _021698fc ; =gMapManager add r1, r1, #0x1000 str r1, [sp, #0x50] ldrb r1, [r4, #0x15] @@ -17961,7 +17961,7 @@ _02169798: bne _02169874 ldrb r2, [r4, #0x15] ldrb r1, [r4, #0x14] - ldr r0, _021698fc ; =data_027e0e60 + ldr r0, _021698fc ; =gMapManager add ip, r2, #1 add r3, r1, #1 ldr r0, [r0] @@ -17973,7 +17973,7 @@ _02169798: b _02169874 _02169808: ldr r1, [sp, #0x5c] - ldr r0, _021698fc ; =data_027e0e60 + ldr r0, _021698fc ; =gMapManager sub r1, r1, #0x1000 str r1, [sp, #0x5c] ldrb r1, [r4, #0x15] @@ -17990,7 +17990,7 @@ _02169808: bne _02169874 ldrb r2, [r4, #0x15] ldrb r1, [r4, #0x14] - ldr r0, _021698fc ; =data_027e0e60 + ldr r0, _021698fc ; =gMapManager sub ip, r2, #1 add r3, r1, #1 ldr r0, [r0] @@ -18036,7 +18036,7 @@ _02169874: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02169598 -_021698fc: .word data_027e0e60 +_021698fc: .word gMapManager .global func_ov17_02169900 arm_func_start func_ov17_02169900 @@ -18069,7 +18069,7 @@ _02169940: b _021699d4 _02169960: mov r1, #0x4000 - ldr r0, _02169a54 ; =data_027e0e60 + ldr r0, _02169a54 ; =gMapManager strh r1, [r4, #0xc] ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk28Ev @@ -18081,7 +18081,7 @@ _02169960: b _021699d4 _0216998c: mov r1, #0 - ldr r0, _02169a54 ; =data_027e0e60 + ldr r0, _02169a54 ; =gMapManager strh r1, [r4, #0xc] ldr r0, [r0] bl _ZN10MapManager17Get_MapData_Unk2aEv @@ -18124,7 +18124,7 @@ _02169a0c: blo _02169a0c ldrh r2, [r4, #0x26] add r1, sp, #8 - ldr r0, _02169a54 ; =data_027e0e60 + ldr r0, _02169a54 ; =gMapManager strh r2, [sp, #0xa] str r1, [sp] ldrsh r3, [r4, #0xc] @@ -18136,7 +18136,7 @@ _02169a0c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov17_02169900 -_02169a54: .word data_027e0e60 +_02169a54: .word gMapManager .global func_ov17_02169a58 arm_func_start func_ov17_02169a58 @@ -18794,14 +18794,14 @@ _0216a250: cmpne r0, #1 mov r2, #0 bne _0216a2b4 - ldr r0, _0216a344 ; =data_027e0e60 + ldr r0, _0216a344 ; =gMapManager add r1, r5, #0x18 ldr r0, [r0] mov r3, #2 bl _ZN10MapManager8SpawnNPCEP5Vec3pii b _0216a330 _0216a2b4: - ldr r0, _0216a344 ; =data_027e0e60 + ldr r0, _0216a344 ; =gMapManager add r1, r5, #0x18 ldr r0, [r0] mov r3, #1 @@ -18827,7 +18827,7 @@ _0216a2fc: mov r0, r5 mov r2, r1 bl func_ov00_0208ba08 - ldr r0, _0216a344 ; =data_027e0e60 + ldr r0, _0216a344 ; =gMapManager ldrh r1, [r5, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083840Ei @@ -18844,7 +18844,7 @@ _0216a330: arm_func_end func_ov17_0216a0fc _0216a33c: .word data_ov17_0216b1f8 _0216a340: .word gAdventureFlags -_0216a344: .word data_027e0e60 +_0216a344: .word gMapManager .global func_ov17_0216a348 arm_func_start func_ov17_0216a348 @@ -18858,7 +18858,7 @@ func_ov17_0216a348: ; 0x0216a348 cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} - ldr r0, _0216a3e0 ; =data_027e0e60 + ldr r0, _0216a3e0 ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 @@ -18891,7 +18891,7 @@ _0216a3d8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_0216a348 -_0216a3e0: .word data_027e0e60 +_0216a3e0: .word gMapManager _0216a3e4: .word data_027e0fe4 .global func_ov17_0216a3e8 @@ -18914,7 +18914,7 @@ func_ov17_0216a3e8: ; 0x0216a3e8 mov r0, #1 ldmia sp!, {r4, pc} _0216a428: - ldr r0, _0216a4a4 ; =data_027e0e60 + ldr r0, _0216a4a4 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -18932,7 +18932,7 @@ _0216a444: cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0216a4a4 ; =data_027e0e60 + ldr r0, _0216a4a4 ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083840Ei @@ -18949,7 +18949,7 @@ _0216a484: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_0216a3e8 -_0216a4a4: .word data_027e0e60 +_0216a4a4: .word gMapManager _0216a4a8: .word data_027e0fe4 .global func_ov17_0216a4ac @@ -18979,7 +18979,7 @@ func_ov17_0216a4ac: ; 0x0216a4ac mov r0, #0 ldmia sp!, {r4, pc} _0216a508: - ldr r0, _0216a5b0 ; =data_027e0e60 + ldr r0, _0216a5b0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -19007,7 +19007,7 @@ _0216a550: moveq r0, #0 ldmeqia sp!, {r4, pc} _0216a56c: - ldr r0, _0216a5b0 ; =data_027e0e60 + ldr r0, _0216a5b0 ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 @@ -19015,7 +19015,7 @@ _0216a56c: cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0216a5b0 ; =data_027e0e60 + ldr r0, _0216a5b0 ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083790Ei @@ -19027,7 +19027,7 @@ _0216a5a4: .align 2, 0 arm_func_end func_ov17_0216a4ac _0216a5ac: .word data_027e077c -_0216a5b0: .word data_027e0e60 +_0216a5b0: .word gMapManager _0216a5b4: .word data_027e0fe4 .global func_ov17_0216a5b8 @@ -19386,7 +19386,7 @@ func_ov17_0216a9fc: ; 0x0216a9fc str r1, [r4, #4] strb r0, [r4, #0x12] ldr r0, [r4, #0x18] - ldr r2, _0216abf8 ; =data_027e0e60 + ldr r2, _0216abf8 ; =gMapManager add r0, r0, #0x3fc add r0, r0, #0x400 str r0, [r4, #0x18] @@ -19447,7 +19447,7 @@ func_ov17_0216a9fc: ; 0x0216a9fc ldr ip, [ip, #0x14] add r1, sp, #0x20 blx ip - ldr r0, _0216abf8 ; =data_027e0e60 + ldr r0, _0216abf8 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -19492,7 +19492,7 @@ _0216abd0: arm_func_end func_ov17_0216a9fc _0216abf0: .word data_ov17_0216b20c _0216abf4: .word data_027e0f68 -_0216abf8: .word data_027e0e60 +_0216abf8: .word gMapManager .global func_ov17_0216abfc arm_func_start func_ov17_0216abfc @@ -19707,7 +19707,7 @@ _0216aedc: mov r1, #0 mov r2, #1 bl func_ov00_0208ba08 - ldr r0, _0216af40 ; =data_027e0e60 + ldr r0, _0216af40 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -19732,7 +19732,7 @@ _0216af30: .word data_027e0e58 _0216af34: .word data_027e0ffc _0216af38: .word data_ov17_0216b230 _0216af3c: .word data_ov17_0216b224 -_0216af40: .word data_027e0e60 +_0216af40: .word gMapManager .global func_ov17_0216af44 arm_func_start func_ov17_0216af44 diff --git a/asm/ov18.inc b/asm/ov18.inc index c223374b..613fb30f 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -90,7 +90,7 @@ .extern data_027e0dbc .extern data_027e0e28 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov18.s b/asm/ov18.s index a029a7a4..00896037 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -301,7 +301,7 @@ func_ov18_0215b86c: ; 0x0215b86c mov r8, r3 str r4, [sp, #4] blx func_ov04_0210c1f8 - ldr r0, _0215bd68 ; =data_027e0e60 + ldr r0, _0215bd68 ; =gMapManager add r1, r9, #0x1b0 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -319,18 +319,18 @@ func_ov18_0215b86c: ; 0x0215b86c mov r1, r4, lsr #0xc orr r1, r1, r0, lsl #20 str r1, [r9, #0x1b4] - ldr r0, _0215bd68 ; =data_027e0e60 + ldr r0, _0215bd68 ; =gMapManager add r1, sp, #0x64 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p - ldr r0, _0215bd68 ; =data_027e0e60 + ldr r0, _0215bd68 ; =gMapManager add r1, sp, #0x58 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p - ldr r0, _0215bd68 ; =data_027e0e60 + ldr r0, _0215bd68 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083374Ev - ldr r1, _0215bd68 ; =data_027e0e60 + ldr r1, _0215bd68 ; =gMapManager mov r5, r0 ldr r0, [r1] bl _ZN10MapManager18func_ov00_02083384Ev @@ -630,7 +630,7 @@ _0215bd54: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov18_0215b86c -_0215bd68: .word data_027e0e60 +_0215bd68: .word gMapManager _0215bd6c: .word 0x00001333 _0215bd70: .word 0xffffd99a _0215bd74: .word data_027e0ce0 @@ -691,7 +691,7 @@ _0215be0c: movne r0, #1 strneb r0, [r9, #0x1cc] bne _0215be5c - ldr r0, _0215beb0 ; =data_027e0e60 + ldr r0, _0215beb0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 @@ -726,7 +726,7 @@ _0215bea8: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov18_0215bd84 -_0215beb0: .word data_027e0e60 +_0215beb0: .word gMapManager _0215beb4: .word func_ov18_0215ca24 .global func_ov18_0215beb8 @@ -813,7 +813,7 @@ func_ov18_0215bfc8: ; 0x0215bfc8 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x10 ldr r2, _0215c12c ; =data_027e0f94 - ldr r1, _0215c130 ; =data_027e0e60 + ldr r1, _0215c130 ; =gMapManager ldr r4, [r2] ldr r3, [r2, #4] str r4, [sp, #4] @@ -909,7 +909,7 @@ _0215c108: .align 2, 0 arm_func_end func_ov18_0215bfc8 _0215c12c: .word data_027e0f94 -_0215c130: .word data_027e0e60 +_0215c130: .word gMapManager _0215c134: .word 0x0000019a _0215c138: .word data_ov18_0216b43c _0215c13c: .word data_ov18_0216b44c @@ -1214,13 +1214,13 @@ func_ov18_0215c460: ; 0x0215c460 sub sp, sp, #0x1c mov r5, r2 mov r6, r1 - ldr r2, _0215c5bc ; =data_027e0e60 + ldr r2, _0215c5bc ; =gMapManager mov r7, r0 ldrb r1, [r5, #1] ldr r0, [r2] mov r4, r3 bl _ZN10MapManager18func_ov00_02083c50Ei - ldr r2, _0215c5bc ; =data_027e0e60 + ldr r2, _0215c5bc ; =gMapManager mov r8, r0 ldrb r1, [r5] ldr r0, [r2] @@ -1306,7 +1306,7 @@ _0215c5b0: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov18_0215c460 -_0215c5bc: .word data_027e0e60 +_0215c5bc: .word gMapManager _0215c5c0: .word data_027e0f68 .global func_ov18_0215c5c4 @@ -3210,7 +3210,7 @@ func_ov18_0215dec0: ; 0x0215dec0 func_ov18_0215dee4: ; 0x0215dee4 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _0215df18 ; =data_027e0e60 + ldr r0, _0215df18 ; =gMapManager ldrb r1, [r4, #0x15c] ldr r0, [r0] add r2, r4, #0x1cc @@ -3223,7 +3223,7 @@ func_ov18_0215dee4: ; 0x0215dee4 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov18_0215dee4 -_0215df18: .word data_027e0e60 +_0215df18: .word gMapManager .global func_ov18_0215df1c arm_func_start func_ov18_0215df1c @@ -3534,13 +3534,13 @@ _0215e300: bl func_ov00_0208edd8 b _0215e3d8 _0215e324: - ldr r1, _0215e49c ; =data_027e0e60 + ldr r1, _0215e49c ; =gMapManager add r0, sp, #4 ldr r1, [r1] add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r2, [sp, #4] - ldr r0, _0215e49c ; =data_027e0e60 + ldr r0, _0215e49c ; =gMapManager ldrb r1, [sp, #5] add r3, r2, #2 ldr r0, [r0] @@ -3637,7 +3637,7 @@ _0215e480: .align 2, 0 arm_func_end func_ov18_0215e274 _0215e498: .word data_027e0d38 -_0215e49c: .word data_027e0e60 +_0215e49c: .word gMapManager _0215e4a0: .word 0x000013ae _0215e4a4: .word data_027e0f6c @@ -4300,7 +4300,7 @@ _0215ed70: ldr r0, [sp, #4] add r10, r0, r1 bge _0215ee18 - ldr r5, _0215ee8c ; =data_027e0e60 + ldr r5, _0215ee8c ; =gMapManager add r7, sp, #0xc mov r6, #1 _0215edd0: @@ -4357,7 +4357,7 @@ _0215ee7c: .word data_ov18_0216c3a8 _0215ee80: .word data_ov18_0216c3ce _0215ee84: .word data_ov18_0216c3a9 _0215ee88: .word data_ov18_0216c3cf -_0215ee8c: .word data_027e0e60 +_0215ee8c: .word gMapManager .global func_ov18_0215ee90 arm_func_start func_ov18_0215ee90 @@ -5268,7 +5268,7 @@ _0215f9b0: mov r1, #3 str r2, [r4, #4] bl func_ov00_02094884 - ldr r0, _0215fa24 ; =data_027e0e60 + ldr r0, _0215fa24 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -5283,7 +5283,7 @@ _0215f9e8: mov r1, #1 str r2, [r4, #4] bl func_ov00_02094884 - ldr r0, _0215fa24 ; =data_027e0e60 + ldr r0, _0215fa24 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 @@ -5295,7 +5295,7 @@ _0215fa1c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov18_0215f990 -_0215fa24: .word data_027e0e60 +_0215fa24: .word gMapManager .global func_ov18_0215fa28 arm_func_start func_ov18_0215fa28 @@ -6411,7 +6411,7 @@ _02160774: ldr r0, [sp, #4] add r10, r0, #3 bgt _021607ec - ldr r4, _0216081c ; =data_027e0e60 + ldr r4, _0216081c ; =gMapManager add r6, sp, #0xc mov r5, #1 _021607a4: @@ -6450,7 +6450,7 @@ _0216080c: .word data_027e0fe8 _02160810: .word 0x48534b42 _02160814: .word data_027e0fe4 _02160818: .word 0x0000099a -_0216081c: .word data_027e0e60 +_0216081c: .word gMapManager .global func_ov18_02160820 arm_func_start func_ov18_02160820 @@ -6609,7 +6609,7 @@ _021609c0: strh r2, [sp, #8] strh r0, [sp, #0xa] str r1, [sp] - ldr r0, _02160a0c ; =data_027e0e60 + ldr r0, _02160a0c ; =gMapManager add r2, sp, #4 ldr r0, [r0] mov r1, #0x30 @@ -6618,7 +6618,7 @@ _021609c0: ldmia sp!, {pc} .align 2, 0 arm_func_end func_ov18_02160968 -_02160a0c: .word data_027e0e60 +_02160a0c: .word gMapManager .global func_ov18_02160a10 arm_func_start func_ov18_02160a10 @@ -6837,7 +6837,7 @@ _02160c5c: cmp r8, r0 bge _02160c9c _02160c80: - ldr r0, _02160ffc ; =data_027e0e60 + ldr r0, _02160ffc ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, r11 @@ -6912,7 +6912,7 @@ _02160d6c: cmp r8, r0 bge _02160dac _02160d90: - ldr r0, _02160ffc ; =data_027e0e60 + ldr r0, _02160ffc ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, r11 @@ -6987,7 +6987,7 @@ _02160e7c: cmp r8, r0 bge _02160ebc _02160ea0: - ldr r0, _02160ffc ; =data_027e0e60 + ldr r0, _02160ffc ; =gMapManager mov r1, r5 ldr r0, [r0] mov r2, r11 @@ -7082,7 +7082,7 @@ _02160fb0: .align 2, 0 arm_func_end func_ov18_02160b6c _02160ff8: .word data_027e0f68 -_02160ffc: .word data_027e0e60 +_02160ffc: .word gMapManager .global func_ov18_02161000 arm_func_start func_ov18_02161000 @@ -9039,7 +9039,7 @@ _0216283c: ; jump table b _02162c20 ; case 6 b _02162bac ; case 7 _0216285c: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084c94Ei @@ -9101,14 +9101,14 @@ _0216285c: add r3, sp, #0x118 bl func_ov00_020c4048 _02162950: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084c7cEi b _02162c90 _02162968: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084c94Ei @@ -9167,14 +9167,14 @@ _02162a00: add r3, sp, #0xec bl func_ov00_020c4048 _02162a48: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084c7cEi b _02162c90 _02162a60: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084c94Ei @@ -9196,14 +9196,14 @@ _02162a60: add r3, sp, #0xb4 bl func_ov00_020c4048 _02162ab4: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084c7cEi b _02162c90 _02162acc: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084c94Ei @@ -9225,14 +9225,14 @@ _02162acc: add r3, sp, #0x88 bl func_ov00_020c4048 _02162b20: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084c7cEi b _02162c90 _02162b38: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -9256,14 +9256,14 @@ _02162b38: add r3, sp, #0x5c bl func_ov00_020c4048 _02162b94: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084cb0Ei b _02162c90 _02162bac: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -9287,14 +9287,14 @@ _02162bac: add r3, sp, #0x30 bl func_ov00_020c4048 _02162c08: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084cb0Ei b _02162c90 _02162c20: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -9318,7 +9318,7 @@ _02162c20: add r3, sp, #4 bl func_ov00_020c4048 _02162c7c: - ldr r0, _02162ca0 ; =data_027e0e60 + ldr r0, _02162ca0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -9330,7 +9330,7 @@ _02162c90: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov18_021627dc -_02162ca0: .word data_027e0e60 +_02162ca0: .word gMapManager _02162ca4: .word data_027e0fe8 _02162ca8: .word 0x48415254 _02162cac: .word 0x42454548 @@ -17119,7 +17119,7 @@ func_ov18_02169378: ; 0x02169378 func_ov18_021693b0: ; 0x021693b0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x1c - ldr r2, _02169418 ; =data_027e0e60 + ldr r2, _02169418 ; =gMapManager mov r6, r0 ldr r5, [r2] mov r0, r5 @@ -17145,7 +17145,7 @@ func_ov18_021693b0: ; 0x021693b0 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov18_021693b0 -_02169418: .word data_027e0e60 +_02169418: .word gMapManager .global func_ov18_0216941c arm_func_start func_ov18_0216941c @@ -18333,7 +18333,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8 ldr r0, _0216a5b0 ; =data_ov18_0216b6f4 mov r1, r1, lsl #0x1 ldrh r2, [r0, r1] - ldr r1, _0216a5b4 ; =data_027e0e60 + ldr r1, _0216a5b4 ; =gMapManager add r0, sp, #0x14 strh r2, [r4, #0x10] ldrb r2, [r4, #0x15] @@ -18342,7 +18342,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8 ldrb lr, [r4, #0x16] ldrb ip, [r4, #0x17] ldrb r1, [sp, #0x15] - ldr r0, _0216a5b4 ; =data_027e0e60 + ldr r0, _0216a5b4 ; =gMapManager strb lr, [sp, #0x12] str r1, [sp] ldr r0, [r0] @@ -18354,7 +18354,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8 add r1, sp, #0x18 strb ip, [sp, #0x13] bl _ZN10MapManager18func_ov00_02083ce8Ecccci - ldr r0, _0216a5b4 ; =data_027e0e60 + ldr r0, _0216a5b4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager21GetCourseData_Unk_25cEv cmp r0, #0 @@ -18372,7 +18372,7 @@ func_ov18_0216a3c8: ; 0x0216a3c8 bl func_ov00_02079470 b _0216a4a4 _0216a47c: - ldr r0, _0216a5b4 ; =data_027e0e60 + ldr r0, _0216a5b4 ; =gMapManager ldrb lr, [r4, #0x17] ldrb ip, [r4, #0x16] ldr r0, [r0] @@ -18383,12 +18383,12 @@ _0216a47c: strb lr, [sp, #0x11] bl _ZN10MapManager18func_ov00_02082d84Ev _0216a4a4: - ldr r0, _0216a5b4 ; =data_027e0e60 + ldr r0, _0216a5b4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager20GetCourseData_Unk_86Ev cmp r0, #2 bge _0216a4cc - ldr r0, _0216a5b4 ; =data_027e0e60 + ldr r0, _0216a5b4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager20GetCourseData_Unk_87Ev cmp r0, #2 @@ -18461,7 +18461,7 @@ _0216a5a8: .align 2, 0 arm_func_end func_ov18_0216a3c8 _0216a5b0: .word data_ov18_0216b6f4 -_0216a5b4: .word data_027e0e60 +_0216a5b4: .word gMapManager _0216a5b8: .word data_027e0d3c _0216a5bc: .word data_ov18_0216b710 _0216a5c0: .word data_ov18_0216b748 @@ -18506,7 +18506,7 @@ _0216a63c: cmp r2, #2 cmpne r2, #3 ldmneia sp!, {r4, pc} - ldr r0, _0216a6b0 ; =data_027e0e60 + ldr r0, _0216a6b0 ; =gMapManager ldrb r1, [r4, #0x19] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084be0Eii @@ -18521,7 +18521,7 @@ _0216a674: cmp r2, #2 cmpne r2, #3 ldmneia sp!, {r4, pc} - ldr r0, _0216a6b0 ; =data_027e0e60 + ldr r0, _0216a6b0 ; =gMapManager ldrb r1, [r4, #0x19] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084be0Eii @@ -18534,7 +18534,7 @@ _0216a674: .align 2, 0 arm_func_end func_ov18_0216a5c4 _0216a6ac: .word gAdventureFlags -_0216a6b0: .word data_027e0e60 +_0216a6b0: .word gMapManager .global func_ov18_0216a6b4 arm_func_start func_ov18_0216a6b4 @@ -18545,7 +18545,7 @@ func_ov18_0216a6b4: ; 0x0216a6b4 mov r6, r1 cmp r0, #0 ldmeqia sp!, {r4, r5, r6, pc} - ldr r0, _0216a77c ; =data_027e0e60 + ldr r0, _0216a77c ; =gMapManager ldrb r5, [r4, #0x15] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev @@ -18598,7 +18598,7 @@ _0216a770: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov18_0216a6b4 -_0216a77c: .word data_027e0e60 +_0216a77c: .word gMapManager .global func_ov18_0216a780 arm_func_start func_ov18_0216a780 @@ -19094,12 +19094,12 @@ func_ov18_0216adcc: ; 0x0216adcc addhi sp, sp, #8 movhi r0, #0 ldmhiia sp!, {r3, r4, r5, pc} - ldr r0, _0216aed4 ; =data_027e0e60 + ldr r0, _0216aed4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager21GetCourseData_Unk_25cEv cmp r0, #0 beq _0216ae24 - ldr r0, _0216aed4 ; =data_027e0e60 + ldr r0, _0216aed4 ; =gMapManager ldrb r1, [r5, #4] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083318Ei @@ -19108,7 +19108,7 @@ func_ov18_0216adcc: ; 0x0216adcc moveq r0, #1 ldmeqia sp!, {r3, r4, r5, pc} _0216ae24: - ldr r0, _0216aed4 ; =data_027e0e60 + ldr r0, _0216aed4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020849c0Ev cmp r0, #0 @@ -19157,7 +19157,7 @@ _0216aec8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov18_0216adcc -_0216aed4: .word data_027e0e60 +_0216aed4: .word gMapManager _0216aed8: .word data_027e0ce0 .global func_ov18_0216aedc diff --git a/asm/ov19.inc b/asm/ov19.inc index 9ff48dc4..7d8152e9 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -112,7 +112,7 @@ .extern data_027e0d44 .extern data_027e0db0 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov19.s b/asm/ov19.s index ed10a3fb..627744b2 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -3464,7 +3464,7 @@ _021703a4: ldmia r0, {r0, r1, r2} stmia ip, {r0, r1, r2} ldr r2, [sp, #0x30] - ldr r3, _02170564 ; =data_027e0e60 + ldr r3, _02170564 ; =gMapManager ldr r1, [sp, #0x34] str r2, [sp, #0x18] ldr r2, [sp, #0x38] @@ -3557,7 +3557,7 @@ _02170554: .word data_027e0c54 _02170558: .word func_ov05_02102a80 _0217055c: .word data_027e0db0 _02170560: .word data_027e0f90 -_02170564: .word data_027e0e60 +_02170564: .word gMapManager _02170568: .word data_027e0f64 _0217056c: .word 0x00001555 _02170570: .word data_027e0ffc @@ -5453,7 +5453,7 @@ func_ov19_02171e64: ; 0x02171e64 stmdb sp!, {r3, lr} sub sp, sp, #0x10 ldr r2, [r0, #0x48] - ldr r1, _02171eb8 ; =data_027e0e60 + ldr r1, _02171eb8 ; =gMapManager str r2, [sp, #4] ldr r2, [r0, #0x4c] ldr r1, [r1] @@ -5473,7 +5473,7 @@ func_ov19_02171e64: ; 0x02171e64 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov19_02171e64 -_02171eb8: .word data_027e0e60 +_02171eb8: .word gMapManager .global func_ov19_02171ebc arm_func_start func_ov19_02171ebc @@ -6434,7 +6434,7 @@ _02172adc: .word data_027e0f78 func_ov19_02172ae0: ; 0x02172ae0 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _02172b1c ; =data_027e0e60 + ldr r0, _02172b1c ; =gMapManager ldrb r1, [r4, #0x15a] ldr r0, [r0] mov r2, #0 @@ -6449,7 +6449,7 @@ func_ov19_02172ae0: ; 0x02172ae0 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov19_02172ae0 -_02172b1c: .word data_027e0e60 +_02172b1c: .word gMapManager .global func_ov19_02172b20 arm_func_start func_ov19_02172b20 @@ -7832,7 +7832,7 @@ func_ov19_02173d54: ; 0x02173d54 add r0, r7, #2 cmp r7, r0 bge _02173e1c - ldr r4, _02173ee8 ; =data_027e0e60 + ldr r4, _02173ee8 ; =gMapManager add r5, sp, #2 mov r11, #1 _02173d80: @@ -7934,7 +7934,7 @@ _02173ea0: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov19_02173d54 -_02173ee8: .word data_027e0e60 +_02173ee8: .word gMapManager _02173eec: .word data_027e0f6c .global func_ov19_02173ef0 @@ -8410,7 +8410,7 @@ _0217448c: ldmneia sp!, {r3, r4, pc} _021744b8: ldr r1, [r4, #0x48] - ldr r0, _0217454c ; =data_027e0e60 + ldr r0, _0217454c ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -8448,7 +8448,7 @@ _021744b8: .align 2, 0 arm_func_end func_ov19_02174454 _02174548: .word gAdventureFlags -_0217454c: .word data_027e0e60 +_0217454c: .word gMapManager _02174550: .word data_ov19_02176b88 .global func_ov19_02174554 @@ -8585,7 +8585,7 @@ _02174710: ldr r3, [r4] ldr r2, [r4, #4] ldr r1, [r4, #8] - ldr r0, _02174798 ; =data_027e0e60 + ldr r0, _02174798 ; =gMapManager str r2, [sp, #0xc] str r3, [sp, #8] str r1, [sp, #0x10] @@ -8616,7 +8616,7 @@ _02174788: .word 0x424f4d42 _0217478c: .word data_027e0f94 _02174790: .word data_027e0fa0 _02174794: .word 0x0000019a -_02174798: .word data_027e0e60 +_02174798: .word gMapManager .global func_ov19_0217479c arm_func_start func_ov19_0217479c @@ -9138,7 +9138,7 @@ _02174e5c: b _021754d0 _02174eb4: ldr r1, [r4, #0x48] - ldr r0, _02175588 ; =data_027e0e60 + ldr r0, _02175588 ; =gMapManager str r1, [sp, #0x14] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -9603,7 +9603,7 @@ _02175574: arm_func_end func_ov19_02174d7c _02175580: .word data_027e0ffc _02175584: .word 0x0000024a -_02175588: .word data_027e0e60 +_02175588: .word gMapManager _0217558c: .word data_027e0f90 _02175590: .word 0x00000333 _02175594: .word data_027e0fc8 @@ -9892,7 +9892,7 @@ func_ov19_021758c8: ; 0x021758c8 mov r0, r5 bl _ZN5Actor20IncreaseActiveFramesEv ldr r1, [r5, #0x48] - ldr r0, _02175958 ; =data_027e0e60 + ldr r0, _02175958 ; =gMapManager str r1, [sp] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -9921,7 +9921,7 @@ _02175940: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov19_021758c8 -_02175958: .word data_027e0e60 +_02175958: .word gMapManager .global func_ov19_0217595c arm_func_start func_ov19_0217595c @@ -10071,7 +10071,7 @@ _02175af8: ldrsh r0, [r4, #0x10] cmp r0, #0 bgt _02175be8 - ldr r1, _02175c34 ; =data_027e0e60 + ldr r1, _02175c34 ; =gMapManager mov r0, r4 ldr r5, [r1] bl _ZN13LinkStateBase12GetPlayerPosEv @@ -10139,7 +10139,7 @@ _02175be8: _02175c28: .word data_027e0fb8 _02175c2c: .word 0xb60b60b7 _02175c30: .word data_ov00_020eec9c -_02175c34: .word data_027e0e60 +_02175c34: .word gMapManager _02175c38: .word data_ov19_02175ee0 _02175c3c: .word data_027e0d0c diff --git a/asm/ov20.inc b/asm/ov20.inc index 26c18122..5f5a1e50 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -89,7 +89,7 @@ .extern data_027e0d78 .extern data_027e0de4 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f84 diff --git a/asm/ov20.s b/asm/ov20.s index 5bed0c78..43e594fa 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -830,7 +830,7 @@ _0216e120: add r0, r4, #0x3000 bl func_01ff9e64 ldr r1, [r7, #0xa8c] - ldr r0, _0216e550 ; =data_027e0e60 + ldr r0, _0216e550 ; =gMapManager str r1, [sp, #0x20] ldr r2, [r7, #0xa90] ldr r0, [r0] @@ -846,7 +846,7 @@ _0216e120: cmp r0, #0 addeq sp, sp, #0x124 ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} - ldr r0, _0216e550 ; =data_027e0e60 + ldr r0, _0216e550 ; =gMapManager add r2, sp, #0x44 ldr r0, [r0] mov r1, #2 @@ -1030,7 +1030,7 @@ _0216e540: .word data_027e0ffc _0216e544: .word data_027e0f94 _0216e548: .word data_027e0764 _0216e54c: .word 0x00008001 -_0216e550: .word data_027e0e60 +_0216e550: .word gMapManager _0216e554: .word data_027e0f90 _0216e558: .word data_027e0f64 _0216e55c: .word 0x00001555 @@ -5045,7 +5045,7 @@ _02171ac0: add r3, sp, #0x10 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02171bf8 ; =data_027e0e60 + ldr r0, _02171bf8 ; =gMapManager ldr lr, [sp, #0x10] ldr ip, [sp, #0x14] ldr r3, [sp, #0x18] @@ -5126,7 +5126,7 @@ _02171bd8: arm_func_end func_ov20_021719dc _02171bf0: .word data_027e0ffc _02171bf4: .word 0x00000272 -_02171bf8: .word data_027e0e60 +_02171bf8: .word gMapManager .global func_ov20_02171bfc arm_func_start func_ov20_02171bfc @@ -5364,7 +5364,7 @@ _02171e20: ldr r0, [sp, #0x20] ldr r1, [sp, #0x1c] str r0, [sp, #0x14] - ldr r0, _0217209c ; =data_027e0e60 + ldr r0, _0217209c ; =gMapManager str r1, [sp, #0x10] ldr r1, [sp, #0x24] ldr r0, [r0] @@ -5470,7 +5470,7 @@ _0217208c: .word data_027e0764 _02172090: .word data_02050f54 _02172094: .word data_027e0e58 _02172098: .word 0x00000263 -_0217209c: .word data_027e0e60 +_0217209c: .word gMapManager _021720a0: .word data_027e0ffc _021720a4: .word 0x00000243 _021720a8: .word data_027e0f64 @@ -7621,7 +7621,7 @@ func_ov20_02173ce4: ; 0x02173ce4 mov ip, #5 str r0, [sp, #0x38] ldr r1, [r6, #0x48] - ldr r0, _02173e30 ; =data_027e0e60 + ldr r0, _02173e30 ; =gMapManager str r1, [sp, #0x24] ldr r2, [r6, #0x4c] add r1, sp, #0x48 @@ -7683,7 +7683,7 @@ _02173e20: .align 2, 0 arm_func_end func_ov20_02173ce4 _02173e2c: .word 0x0000ffff -_02173e30: .word data_027e0e60 +_02173e30: .word gMapManager _02173e34: .word data_027e0f94 .global func_ov20_02173e38 @@ -8656,7 +8656,7 @@ _02174a20: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r6, #0x48] - ldr r0, _02174ba0 ; =data_027e0e60 + ldr r0, _02174ba0 ; =gMapManager str r1, [sp, #4] ldr r1, [r6, #0x4c] ldr r0, [r0] @@ -8752,7 +8752,7 @@ _02174b88: _02174b94: .word gItemManager _02174b98: .word 0x000008a4 _02174b9c: .word 0x00000733 -_02174ba0: .word data_027e0e60 +_02174ba0: .word gMapManager _02174ba4: .word data_027e0f94 .global func_ov20_02174ba8 @@ -9874,7 +9874,7 @@ _021759e8: ldr r3, [sp, #0xe0] ldr r2, [sp, #0xe4] ldr r1, [sp, #0xe8] - ldr r0, _02175f14 ; =data_027e0e60 + ldr r0, _02175f14 ; =gMapManager str r2, [sp, #0x40] str r3, [sp, #0x3c] str r1, [sp, #0x44] @@ -10010,7 +10010,7 @@ _02175bf4: beq _02175eb8 b _02175ec8 _02175c00: - ldr r0, _02175f14 ; =data_027e0e60 + ldr r0, _02175f14 ; =gMapManager ldr ip, _02175f30 ; =0xfffffe66 ldr r0, [r0] add ip, r2, ip @@ -10037,7 +10037,7 @@ _02175c00: b _02175ec8 _02175c64: ldr r0, _02175f3c ; =0xfffff333 - ldr ip, _02175f14 ; =data_027e0e60 + ldr ip, _02175f14 ; =gMapManager add r5, r2, r0 add r1, r1, #0x33 add lr, r1, #0x300 @@ -10063,7 +10063,7 @@ _02175c64: bl func_ov00_020c4048 b _02175ec8 _02175ccc: - ldr r0, _02175f14 ; =data_027e0e60 + ldr r0, _02175f14 ; =gMapManager ldr ip, _02175f30 ; =0xfffffe66 ldr r0, [r0] add lr, r2, ip @@ -10089,7 +10089,7 @@ _02175ccc: bl func_ov00_020c4048 b _02175ec8 _02175d30: - ldr r0, _02175f14 ; =data_027e0e60 + ldr r0, _02175f14 ; =gMapManager ldr ip, _02175f3c ; =0xfffff333 ldr r0, [r0] add lr, r2, ip @@ -10218,7 +10218,7 @@ _02175ec8: .align 2, 0 arm_func_end func_ov20_02175978 _02175f10: .word data_027e0f94 -_02175f14: .word data_027e0e60 +_02175f14: .word gMapManager _02175f18: .word data_027e077c _02175f1c: .word gAdventureFlags _02175f20: .word data_027e0ffc @@ -11631,7 +11631,7 @@ func_ov20_02176fe8: ; 0x02176fe8 str r0, [r4, #0x84] str r0, [r4, #0x88] ldr r1, [r4, #0x7c] - ldr r0, _0217705c ; =data_027e0e60 + ldr r0, _0217705c ; =gMapManager str r1, [r4, #0x8c] ldr r1, [r4, #0x80] str r1, [r4, #0x90] @@ -11643,7 +11643,7 @@ func_ov20_02176fe8: ; 0x02176fe8 bl _ZN10MapManager18Get_MapData_Unk_d0Ev ldr r1, _02177060 ; =0xffffd99a str r0, [r4, #0x48] - ldr r0, _0217705c ; =data_027e0e60 + ldr r0, _0217705c ; =gMapManager str r1, [r4, #0x4c] ldr r0, [r0] bl _ZN10MapManager18Get_MapData_Unk_d8Ev @@ -11653,7 +11653,7 @@ func_ov20_02176fe8: ; 0x02176fe8 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov20_02176fe8 -_0217705c: .word data_027e0e60 +_0217705c: .word gMapManager _02177060: .word 0xffffd99a .global func_ov20_02177064 @@ -11898,7 +11898,7 @@ func_ov20_02177300: ; 0x02177300 str r1, [r0, #8] mov r0, r4 bl _ZN13LinkStateBase12GetPlayerPosEv - ldr r1, _021773e0 ; =data_027e0e60 + ldr r1, _021773e0 ; =gMapManager add r3, sp, #0x10 ldr r5, [r1] ldmia r0, {r0, r1, r2} @@ -11944,7 +11944,7 @@ func_ov20_02177300: ; 0x02177300 ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov20_02177300 -_021773e0: .word data_027e0e60 +_021773e0: .word gMapManager _021773e4: .word 0x0000012a _021773e8: .word data_027e0e58 _021773ec: .word data_027e0ffc @@ -11958,7 +11958,7 @@ func_ov20_021773f4: ; 0x021773f4 mov r4, r0 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev mov r2, r0 - ldr r1, _021774dc ; =data_027e0e60 + ldr r1, _021774dc ; =gMapManager add r0, sp, #0 ldr r1, [r1] add r2, r2, #0x20 @@ -12014,7 +12014,7 @@ _021774c4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov20_021773f4 -_021774dc: .word data_027e0e60 +_021774dc: .word gMapManager _021774e0: .word 0xfffff99a _021774e4: .word data_ov20_021793bc @@ -12024,7 +12024,7 @@ func_ov20_021774e8: ; 0x021774e8 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x24 - ldr r0, _021775cc ; =data_027e0e60 + ldr r0, _021775cc ; =gMapManager ldrb r1, [sp, #0x4c] ldr r0, [r0] sub r3, sp, #4 @@ -12035,7 +12035,7 @@ func_ov20_021774e8: ; 0x021774e8 ldr r2, [r3] bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r8, #0 - ldr r4, _021775cc ; =data_027e0e60 + ldr r4, _021775cc ; =gMapManager mov r9, r8 add r5, sp, #0xc mov r7, r8 @@ -12083,7 +12083,7 @@ _021775a8: bx lr .align 2, 0 arm_func_end func_ov20_021774e8 -_021775cc: .word data_027e0e60 +_021775cc: .word gMapManager .global func_ov20_021775d0 arm_func_start func_ov20_021775d0 diff --git a/asm/ov21.inc b/asm/ov21.inc index 1794998b..198d1eea 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -73,7 +73,7 @@ .extern data_027e077c .extern data_027e0d3c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f68 .extern data_027e0f6c .extern data_027e0f84 diff --git a/asm/ov21.s b/asm/ov21.s index 2f150d18..0b89e000 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -514,7 +514,7 @@ _0216dcb0: .word data_027e0f94 .global func_ov21_0216dcb4 arm_func_start func_ov21_0216dcb4 func_ov21_0216dcb4: ; 0x0216dcb4 - ldr r2, _0216dccc ; =data_027e0e60 + ldr r2, _0216dccc ; =gMapManager ldr ip, _0216dcd0 ; =_ZN10MapManager18func_ov00_020836dcEii ldrh r1, [r0, #0x22] ldr r0, [r2] @@ -522,7 +522,7 @@ func_ov21_0216dcb4: ; 0x0216dcb4 bx ip .align 2, 0 arm_func_end func_ov21_0216dcb4 -_0216dccc: .word data_027e0e60 +_0216dccc: .word gMapManager _0216dcd0: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov21_0216dcd4 @@ -922,7 +922,7 @@ _0216e204: .word data_ov21_021710a0 func_ov21_0216e208: ; 0x0216e208 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _0216e238 ; =data_027e0e60 + ldr r0, _0216e238 ; =gMapManager ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 @@ -934,7 +934,7 @@ func_ov21_0216e208: ; 0x0216e208 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov21_0216e208 -_0216e238: .word data_027e0e60 +_0216e238: .word gMapManager .global func_ov21_0216e23c arm_func_start func_ov21_0216e23c @@ -2772,7 +2772,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8 ldmia r0, {r0, r1, r2} stmia r4, {r0, r1, r2} ldr r1, [r10, #0x98] - ldr r0, _0216fb84 ; =data_027e0e60 + ldr r0, _0216fb84 ; =gMapManager str r1, [sp, #0x54] ldr r2, [r10, #0x48] add r1, sp, #0xb8 @@ -2874,7 +2874,7 @@ _0216f9c0: add r0, r0, #0x9a add r0, r0, #0x900 ldr r9, _0216fb90 ; =data_ov21_02171750 - ldr r4, _0216fb84 ; =data_027e0e60 + ldr r4, _0216fb84 ; =gMapManager str r1, [sp, #0x3c] str r0, [sp, #0x40] str r2, [sp, #0x44] @@ -2971,7 +2971,7 @@ _0216fb74: .align 2, 0 arm_func_end func_ov21_0216f7c8 _0216fb80: .word 0x0000ffff -_0216fb84: .word data_027e0e60 +_0216fb84: .word gMapManager _0216fb88: .word data_ov21_02171bb4 _0216fb8c: .word data_ov21_02171750 _0216fb90: .word data_ov21_02171750 @@ -3328,7 +3328,7 @@ func_ov21_02170050: ; 0x02170050 str r3, [sp, #0xc] bl func_ov00_020793b8 ldr r1, [r11, #0x48] - ldr r0, _021701a8 ; =data_027e0e60 + ldr r0, _021701a8 ; =gMapManager str r1, [sp, #0x10] ldr r1, [r11, #0x4c] ldr r0, [r0] @@ -3408,7 +3408,7 @@ _0217018c: .align 2, 0 arm_func_end func_ov21_02170050 _021701a4: .word data_027e0d3c -_021701a8: .word data_027e0e60 +_021701a8: .word gMapManager _021701ac: .word data_027e103c .global func_ov21_021701b0 @@ -3429,7 +3429,7 @@ func_ov21_021701b0: ; 0x021701b0 str r3, [sp] bl func_ov00_020793b8 ldr r1, [r10, #0x48] - ldr r0, _0217032c ; =data_027e0e60 + ldr r0, _0217032c ; =gMapManager str r1, [sp, #0x10] ldr r1, [r10, #0x4c] ldr r0, [r0] @@ -3518,13 +3518,13 @@ _02170310: .align 2, 0 arm_func_end func_ov21_021701b0 _02170328: .word data_027e0d3c -_0217032c: .word data_027e0e60 +_0217032c: .word gMapManager _02170330: .word data_027e103c .global func_ov21_02170334 arm_func_start func_ov21_02170334 func_ov21_02170334: ; 0x02170334 - ldr r1, _02170380 ; =data_027e0e60 + ldr r1, _02170380 ; =gMapManager ldrh r2, [r0, #0x20] ldr r1, [r1] ldrh r0, [r0, #0x22] @@ -3547,7 +3547,7 @@ _02170378: bx lr .align 2, 0 arm_func_end func_ov21_02170334 -_02170380: .word data_027e0e60 +_02170380: .word gMapManager .global func_ov21_02170384 arm_func_start func_ov21_02170384 @@ -3564,12 +3564,12 @@ func_ov21_02170388: ; 0x02170388 add r2, sp, #4 ldr r0, [r0] bl func_ov00_020793b8 - ldr r1, _021703fc ; =data_027e0e60 + ldr r1, _021703fc ; =gMapManager add r0, sp, #0 ldr r1, [r1] add r2, sp, #4 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _021703fc ; =data_027e0e60 + ldr r0, _021703fc ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_60Ev @@ -3577,7 +3577,7 @@ func_ov21_02170388: ; 0x02170388 addgt sp, sp, #0x10 movgt r0, #0 ldmgtia sp!, {r3, pc} - ldr r0, _021703fc ; =data_027e0e60 + ldr r0, _021703fc ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_54Ev @@ -3589,7 +3589,7 @@ func_ov21_02170388: ; 0x02170388 .align 2, 0 arm_func_end func_ov21_02170388 _021703f8: .word data_027e0d3c -_021703fc: .word data_027e0e60 +_021703fc: .word gMapManager .global func_ov21_02170400 arm_func_start func_ov21_02170400 diff --git a/asm/ov22.inc b/asm/ov22.inc index 4f01808f..c97233e2 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -107,7 +107,7 @@ .extern data_027e0d0c .extern data_027e0d38 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov22.s b/asm/ov22.s index d6d92658..a61ee8f5 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -481,7 +481,7 @@ _0216dc98: .word data_027e0f78 func_ov22_0216dc9c: ; 0x0216dc9c stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _0216dcd8 ; =data_027e0e60 + ldr r0, _0216dcd8 ; =gMapManager ldrb r1, [r4, #0x15a] ldr r0, [r0] mov r2, #0 @@ -496,7 +496,7 @@ func_ov22_0216dc9c: ; 0x0216dc9c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov22_0216dc9c -_0216dcd8: .word data_027e0e60 +_0216dcd8: .word gMapManager .global func_ov22_0216dcdc arm_func_start func_ov22_0216dcdc @@ -1056,7 +1056,7 @@ _0216e494: mov r7, #0 cmp r0, #0 ble _0216e52c - ldr r4, _0216e584 ; =data_027e0e60 + ldr r4, _0216e584 ; =gMapManager _0216e4a8: cmp r6, #0 cmpeq r7, #0 @@ -1119,7 +1119,7 @@ _0216e56c: .align 2, 0 arm_func_end func_ov22_0216e2a8 _0216e580: .word 0x00001334 -_0216e584: .word data_027e0e60 +_0216e584: .word gMapManager .global func_ov22_0216e588 arm_func_start func_ov22_0216e588 @@ -1363,7 +1363,7 @@ _0216e8bc: cmpeq r10, #0 beq _0216e938 ldrb r2, [r4, #0x14] - ldr r0, _0216ec8c ; =data_027e0e60 + ldr r0, _0216ec8c ; =gMapManager mov r1, r8 add r2, r9, r2 strb r2, [sp, #0xa] @@ -1423,11 +1423,11 @@ _0216e958: mvn r0, #0 cmp r1, r0 beq _0216e9bc - ldr r0, _0216ec8c ; =data_027e0e60 + ldr r0, _0216ec8c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej _0216e9bc: - ldr r0, _0216ec8c ; =data_027e0e60 + ldr r0, _0216ec8c ; =gMapManager add r1, sp, #0x1c ldr r0, [r0] mov r2, #1 @@ -1528,7 +1528,7 @@ _0216eb28: cmpeq r10, #0 beq _0216eba4 ldrb r2, [r4, #0x14] - ldr r0, _0216ec8c ; =data_027e0e60 + ldr r0, _0216ec8c ; =gMapManager mov r1, r8 add r2, r9, r2 strb r2, [sp, #8] @@ -1588,11 +1588,11 @@ _0216ebc4: mvn r0, #0 cmp r1, r0 beq _0216ec28 - ldr r0, _0216ec8c ; =data_027e0e60 + ldr r0, _0216ec8c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084ac4Ej _0216ec28: - ldr r0, _0216ec8c ; =data_027e0e60 + ldr r0, _0216ec8c ; =gMapManager add r1, sp, #0x10 ldr r0, [r0] mov r2, #1 @@ -1621,7 +1621,7 @@ _0216ec74: .align 2, 0 arm_func_end func_ov22_0216e778 _0216ec88: .word gAdventureFlags -_0216ec8c: .word data_027e0e60 +_0216ec8c: .word gMapManager _0216ec90: .word data_027e0ffc _0216ec94: .word 0x00000335 _0216ec98: .word data_027e0e58 @@ -1823,7 +1823,7 @@ _0216eed0: mov r0, #0x4000 strh r0, [r4, #0xc] ldrb r2, [r4, #0x15] - ldr r0, _0216f0b0 ; =data_027e0e60 + ldr r0, _0216f0b0 ; =gMapManager ldrb r1, [r4, #0x14] ldr r0, [r0] sub r2, r2, #1 @@ -1833,7 +1833,7 @@ _0216eef4: mov r0, #0 strh r0, [r4, #0xc] ldrb r1, [r4, #0x14] - ldr r0, _0216f0b0 ; =data_027e0e60 + ldr r0, _0216f0b0 ; =gMapManager ldrb r2, [r4, #0x15] ldr r0, [r0] sub r1, r1, #1 @@ -1883,7 +1883,7 @@ _0216efa0: cmp r0, r1 bge _0216f050 mov r7, #1 - ldr r5, _0216f0b0 ; =data_027e0e60 + ldr r5, _0216f0b0 ; =gMapManager add r8, sp, #6 add r6, sp, #4 mov r11, r7 @@ -1950,7 +1950,7 @@ _0216f050: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov22_0216ee88 -_0216f0b0: .word data_027e0e60 +_0216f0b0: .word gMapManager _0216f0b4: .word 0x0000099a .global func_ov22_0216f0b8 @@ -3085,7 +3085,7 @@ _0216ff6c: str r0, [r6, #0x698] cmp r0, #0x2d bne _0216ffdc - ldr r0, _021701e4 ; =data_027e0e60 + ldr r0, _021701e4 ; =gMapManager mov r8, #0 ldr r0, [r0] sub r7, r8, #2 @@ -3255,7 +3255,7 @@ _021701d4: .word data_027e0e58 _021701d8: .word data_027e0ffc _021701dc: .word 0x00000297 _021701e0: .word 0x00000295 -_021701e4: .word data_027e0e60 +_021701e4: .word gMapManager _021701e8: .word data_027e0d38 _021701ec: .word 0xfffffccd _021701f0: .word data_ov22_021785b8 @@ -4914,7 +4914,7 @@ func_ov22_02171770: ; 0x02171770 tst r0, #0xff beq _021717d8 ldr r1, [r4, #0x48] - ldr r0, _02171930 ; =data_027e0e60 + ldr r0, _02171930 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -5026,7 +5026,7 @@ _0217190c: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov22_02171770 -_02171930: .word data_027e0e60 +_02171930: .word gMapManager _02171934: .word data_027e0f94 _02171938: .word 0x0000071c _0217193c: .word data_02050f54 @@ -5446,7 +5446,7 @@ func_ov22_02171dfc: ; 0x02171dfc mov ip, #4 str r1, [sp, #0x28] ldr r1, [r4, #0x54] - ldr r3, _02171fec ; =data_027e0e60 + ldr r3, _02171fec ; =gMapManager str r1, [sp, #0x14] ldr r2, [r4, #0x58] add r1, sp, #0x2c @@ -5535,7 +5535,7 @@ _02171fd8: arm_func_end func_ov22_02171dfc _02171fe4: .word 0x00000b33 _02171fe8: .word 0x0000ffff -_02171fec: .word data_027e0e60 +_02171fec: .word gMapManager .global func_ov22_02171ff0 arm_func_start func_ov22_02171ff0 @@ -5887,7 +5887,7 @@ func_ov22_02172438: ; 0x02172438 tst r0, #0xff beq _021724a4 ldr r1, [r4, #0x48] - ldr r0, _0217250c ; =data_027e0e60 + ldr r0, _0217250c ; =gMapManager str r1, [sp, #4] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -5936,7 +5936,7 @@ _021724a4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov22_02172438 -_0217250c: .word data_027e0e60 +_0217250c: .word gMapManager _02172510: .word data_ov22_02179430 .global func_ov22_02172514 @@ -6089,7 +6089,7 @@ func_ov22_021726e8: ; 0x021726e8 tst r0, #0xff beq _02172754 ldr r1, [r4, #0x48] - ldr r0, _021727ec ; =data_027e0e60 + ldr r0, _021727ec ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -6150,7 +6150,7 @@ _02172754: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov22_021726e8 -_021727ec: .word data_027e0e60 +_021727ec: .word gMapManager _021727f0: .word data_027e0764 _021727f4: .word data_ov22_02179430 @@ -6187,7 +6187,7 @@ func_ov22_0217283c: ; 0x0217283c tst r0, #0xff beq _021728b0 ldr r1, [r4, #0x48] - ldr r0, _02172954 ; =data_027e0e60 + ldr r0, _02172954 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -6254,7 +6254,7 @@ _0217290c: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov22_0217283c -_02172954: .word data_027e0e60 +_02172954: .word gMapManager _02172958: .word data_027e0764 _0217295c: .word data_ov22_02179430 @@ -8052,7 +8052,7 @@ _021740a4: bl func_0202b154 cmp r0, #0 beq _02174134 - ldr r0, _0217460c ; =data_027e0e60 + ldr r0, _0217460c ; =gMapManager ldrh r1, [r5, #0x20] ldr r0, [r0] ldr r2, [r5, #8] @@ -8421,7 +8421,7 @@ _02174604: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov22_0217406c -_0217460c: .word data_027e0e60 +_0217460c: .word gMapManager _02174610: .word data_027e0764 _02174614: .word data_02050f54 _02174618: .word data_027e0f94 @@ -8802,7 +8802,7 @@ func_ov22_02174a80: ; 0x02174a80 cmp r3, #0 beq _02174ae8 ldr r1, [r3, #0x48] - ldr r0, _02174b38 ; =data_027e0e60 + ldr r0, _02174b38 ; =gMapManager str r1, [r4, #0x48] ldr r2, [r3, #0x4c] add r1, sp, #0 @@ -8847,7 +8847,7 @@ _02174b2c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov22_02174a80 -_02174b38: .word data_027e0e60 +_02174b38: .word gMapManager .global func_ov22_02174b3c arm_func_start func_ov22_02174b3c @@ -8989,7 +8989,7 @@ func_ov22_02174cb0: ; 0x02174cb0 mov r1, r1, lsl #0x2 ldrsh r1, [r0, r1] ldr r2, [sp, #0x24] - ldr lr, _02174db0 ; =data_027e0e60 + ldr lr, _02174db0 ; =gMapManager smulbb r1, r1, ip add r1, r1, #0x800 add r3, r2, r1, asr #12 @@ -9038,7 +9038,7 @@ func_ov22_02174cb0: ; 0x02174cb0 arm_func_end func_ov22_02174cb0 _02174da8: .word data_02050f54 _02174dac: .word 0x00000266 -_02174db0: .word data_027e0e60 +_02174db0: .word gMapManager _02174db4: .word 0x0000059a _02174db8: .word data_ov00_020e9370 @@ -9191,7 +9191,7 @@ _02174f74: strb r0, [sp, #8] cmp r4, r1 bge _02175038 - ldr r7, _0217505c ; =data_027e0e60 + ldr r7, _0217505c ; =gMapManager ldr r6, _02175060 ; =data_027e0764 sub r8, sp, #4 mov r11, #5 @@ -9248,7 +9248,7 @@ _02175038: .align 2, 0 arm_func_end func_ov22_02174f00 _02175058: .word data_027e0f64 -_0217505c: .word data_027e0e60 +_0217505c: .word gMapManager _02175060: .word data_027e0764 _02175064: .word data_027e0e58 @@ -9878,7 +9878,7 @@ func_ov22_021757c0: ; 0x021757c0 ldr r3, [r5, #0x298] str r3, [sp, #0x18] bl func_01ff9bf8 - ldr r1, _0217590c ; =data_027e0e60 + ldr r1, _0217590c ; =gMapManager add r0, sp, #0 ldr r5, [r1] add r2, sp, #0x1c @@ -9940,7 +9940,7 @@ func_ov22_021757c0: ; 0x021757c0 .align 2, 0 arm_func_end func_ov22_021757c0 _02175908: .word data_027e0f64 -_0217590c: .word data_027e0e60 +_0217590c: .word gMapManager .global func_ov22_02175910 arm_func_start func_ov22_02175910 @@ -10225,7 +10225,7 @@ func_ov22_02175c44: ; 0x02175c44 str r1, [r9, #0x44] add r1, r2, #0x7800 str r1, [r9, #0x48] - ldr r0, _02175cfc ; =data_027e0e60 + ldr r0, _02175cfc ; =gMapManager add r1, r9, #0x18 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -10234,7 +10234,7 @@ func_ov22_02175c44: ; 0x02175c44 cmp r7, r0 addge sp, sp, #4 ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} - ldr r10, _02175cfc ; =data_027e0e60 + ldr r10, _02175cfc ; =gMapManager add r5, sp, #0 mov r4, #1 _02175ca0: @@ -10265,7 +10265,7 @@ _02175ce0: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov22_02175c44 -_02175cfc: .word data_027e0e60 +_02175cfc: .word gMapManager .global func_ov22_02175d00 arm_func_start func_ov22_02175d00 @@ -10584,7 +10584,7 @@ _021760b8: cmp r6, r0 addge sp, sp, #0xc ldmgeia sp!, {r3, r4, r5, r6, r7, r8, pc} - ldr r8, _02176174 ; =data_027e0e60 + ldr r8, _02176174 ; =gMapManager mov r5, #0x45 _0217611c: ldrb r7, [r4, #0x15] @@ -10613,7 +10613,7 @@ _02176154: .align 2, 0 arm_func_end func_ov22_02176000 _02176170: .word data_027e0f6c -_02176174: .word data_027e0e60 +_02176174: .word gMapManager .global func_ov22_02176178 arm_func_start func_ov22_02176178 @@ -11543,7 +11543,7 @@ func_ov22_02176d6c: ; 0x02176d6c stmdb sp!, {r4, lr} sub sp, sp, #0x48 mov r4, r0 - ldr r0, _02176f78 ; =data_027e0e60 + ldr r0, _02176f78 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] add r2, sp, #0x30 @@ -11585,13 +11585,13 @@ func_ov22_02176d6c: ; 0x02176d6c mov r0, #4 str r1, [r4, #0x2bc] strb r0, [r4, #0x124] - ldr r0, _02176f78 ; =data_027e0e60 + ldr r0, _02176f78 ; =gMapManager strb r2, [r4, #0x125] ldr r0, [r0] add r1, sp, #0x18 bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p ldr r1, [sp, #0x18] - ldr r0, _02176f78 ; =data_027e0e60 + ldr r0, _02176f78 ; =gMapManager str r1, [r4, #0x48] ldr r1, [sp, #0x1c] str r1, [r4, #0x4c] @@ -11673,7 +11673,7 @@ func_ov22_02176d6c: ; 0x02176d6c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov22_02176d6c -_02176f78: .word data_027e0e60 +_02176f78: .word gMapManager _02176f7c: .word 0x00000ccd _02176f80: .word data_027e0f6c _02176f84: .word data_ov22_021788f4 diff --git a/asm/ov23.inc b/asm/ov23.inc index 9f4779f2..114655f7 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -142,7 +142,7 @@ .extern data_027e0db0 .extern data_027e0e2c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov23.s b/asm/ov23.s index 6357275b..1d821bf2 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -702,7 +702,7 @@ _0216df74: ldreq r0, [r4, #0x480] cmpeq r0, #1 ldmneia sp!, {r3, r4, r5, pc} - ldr r1, _0216e00c ; =data_027e0e60 + ldr r1, _0216e00c ; =gMapManager add r0, sp, #0 ldr r5, [r1] add r2, r4, #0x48 @@ -727,7 +727,7 @@ _0216df74: arm_func_end func_ov23_0216df28 _0216e004: .word data_ov00_020e8b08 _0216e008: .word 0x47524e43 -_0216e00c: .word data_027e0e60 +_0216e00c: .word gMapManager .global func_ov23_0216e010 arm_func_start func_ov23_0216e010 @@ -2277,7 +2277,7 @@ func_ov23_0216f2a4: ; 0x0216f2a4 add r1, r4, #0x48 bl func_ov00_020c5330 ldr r1, [r4, #0x48] - ldr r0, _0216f3ec ; =data_027e0e60 + ldr r0, _0216f3ec ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -2337,7 +2337,7 @@ _0216f39c: arm_func_end func_ov23_0216f2a4 _0216f3e4: .word data_ov23_0217a030 _0216f3e8: .word 0x0000059a -_0216f3ec: .word data_027e0e60 +_0216f3ec: .word gMapManager _0216f3f0: .word data_ov23_0217ac20 _0216f3f4: .word data_ov23_0217a0b8 _0216f3f8: .word data_ov23_0217ac5c @@ -2378,7 +2378,7 @@ func_ov23_0216f428: ; 0x0216f428 add r1, sp, #0xbc add r0, r5, #0x3a8 bl func_ov00_020c5330 - ldr r0, _0216f878 ; =data_027e0e60 + ldr r0, _0216f878 ; =gMapManager ldr r1, [sp, #0xbc] ldr r2, [sp, #0xc0] ldr r3, [sp, #0xc4] @@ -2393,7 +2393,7 @@ func_ov23_0216f428: ; 0x0216f428 ldr r0, [sp, #0xd0] ldr r1, [sp, #0xc8] str r0, [sp, #0x70] - ldr r0, _0216f878 ; =data_027e0e60 + ldr r0, _0216f878 ; =gMapManager str r1, [sp, #0x68] ldr r1, [sp, #0xcc] ldr r0, [r0] @@ -2442,7 +2442,7 @@ func_ov23_0216f428: ; 0x0216f428 str r3, [sp, #0x58] str r2, [sp] ldr r1, [r5, #8] - ldr r4, _0216f878 ; =data_027e0e60 + ldr r4, _0216f878 ; =gMapManager str r1, [sp, #4] ldrh r3, [r5, #0x9c] add r1, sp, #0x19c @@ -2535,7 +2535,7 @@ _0216f630: moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc} _0216f6bc: - ldr r0, _0216f878 ; =data_027e0e60 + ldr r0, _0216f878 ; =gMapManager mov r1, r6 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -2654,7 +2654,7 @@ _0216f86c: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov23_0216f428 -_0216f878: .word data_027e0e60 +_0216f878: .word gMapManager _0216f87c: .word 0x0000ffff _0216f880: .word 0x00000733 _0216f884: .word data_027e0fe4 @@ -2834,7 +2834,7 @@ _0216fac8: add r1, r7, #0x39c bl func_ov00_020c5330 ldr r1, [r7, #0x39c] - ldr r0, _0216fb1c ; =data_027e0e60 + ldr r0, _0216fb1c ; =gMapManager str r1, [sp, #4] ldr r1, [r7, #0x3a0] ldr r0, [r0] @@ -2852,7 +2852,7 @@ _0216fac8: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov23_0216f898 -_0216fb1c: .word data_027e0e60 +_0216fb1c: .word gMapManager .global func_ov23_0216fb20 arm_func_start func_ov23_0216fb20 @@ -2976,7 +2976,7 @@ func_ov23_0216fc10: ; 0x0216fc10 add r3, sp, #0x20 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0216fd84 ; =data_027e0e60 + ldr r0, _0216fd84 ; =gMapManager ldr lr, [sp, #0x20] ldr ip, [sp, #0x24] ldr r3, [sp, #0x28] @@ -3012,7 +3012,7 @@ func_ov23_0216fc10: ; 0x0216fc10 strb r2, [r4, #0x3a9] bl func_ov00_020c5330 ldr r1, [r4, #0x48] - ldr r0, _0216fd84 ; =data_027e0e60 + ldr r0, _0216fd84 ; =gMapManager str r1, [sp, #8] ldr r2, [r4, #0x4c] ldr r0, [r0] @@ -3030,7 +3030,7 @@ func_ov23_0216fc10: ; 0x0216fc10 .align 2, 0 arm_func_end func_ov23_0216fc10 _0216fd80: .word 0x66666667 -_0216fd84: .word data_027e0e60 +_0216fd84: .word gMapManager _0216fd88: .word data_027e0e58 _0216fd8c: .word 0x000001a9 _0216fd90: .word data_027e0ffc @@ -3068,7 +3068,7 @@ func_ov23_0216fda0: ; 0x0216fda0 func_ov23_0216fddc: ; 0x0216fddc stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 - ldr r1, _0216fea4 ; =data_027e0e60 + ldr r1, _0216fea4 ; =gMapManager mov r2, r0 ldr r1, [r1] add r0, sp, #2 @@ -3076,7 +3076,7 @@ func_ov23_0216fddc: ; 0x0216fddc bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p mvn r4, #0 _0216fe00: - ldr r6, _0216fea4 ; =data_027e0e60 + ldr r6, _0216fea4 ; =gMapManager mvn r5, #0 add r7, sp, #0 _0216fe0c: @@ -3123,7 +3123,7 @@ _0216fe84: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov23_0216fddc -_0216fea4: .word data_027e0e60 +_0216fea4: .word gMapManager .global func_ov23_0216fea8 arm_func_start func_ov23_0216fea8 @@ -3454,7 +3454,7 @@ _021702d0: add r1, r5, #0x48 bl func_ov00_020c5330 ldr r1, [r5, #0x48] - ldr r0, _02170670 ; =data_027e0e60 + ldr r0, _02170670 ; =gMapManager str r1, [sp, #0x20] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -3621,7 +3621,7 @@ _02170524: strb r2, [r5, #0x3ab] bl func_ov00_020c5330 ldr r1, [r5, #0x39c] - ldr r0, _02170670 ; =data_027e0e60 + ldr r0, _02170670 ; =gMapManager str r1, [sp, #0x14] ldr r1, [r5, #0x3a0] ldr r0, [r0] @@ -3690,7 +3690,7 @@ _02170658: _02170664: .word data_027e0f94 _02170668: .word data_027e0fe4 _0217066c: .word 0x50534241 -_02170670: .word data_027e0e60 +_02170670: .word gMapManager _02170674: .word data_027e0ffc _02170678: .word 0x00000332 _0217067c: .word 0x00000333 @@ -5842,23 +5842,23 @@ func_ov23_021722d0: ; 0x021722d0 addeq sp, sp, #0x10 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _021723c0 ; =data_027e0e60 + ldr r1, _021723c0 ; =gMapManager add r0, sp, #0 ldr r1, [r1] add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _021723c0 ; =data_027e0e60 + ldr r0, _021723c0 ; =gMapManager ldrb r1, [sp] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c24Ei str r0, [r4, #0x48] - ldr r0, _021723c0 ; =data_027e0e60 + ldr r0, _021723c0 ; =gMapManager ldrb r1, [sp, #1] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083c50Ei str r0, [r4, #0x50] ldr r1, [r4, #0x48] - ldr r0, _021723c0 ; =data_027e0e60 + ldr r0, _021723c0 ; =gMapManager str r1, [sp, #4] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -5896,7 +5896,7 @@ func_ov23_021722d0: ; 0x021722d0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov23_021722d0 -_021723c0: .word data_027e0e60 +_021723c0: .word gMapManager .global func_ov23_021723c4 arm_func_start func_ov23_021723c4 @@ -6189,7 +6189,7 @@ _02172794: bl func_ov23_02172cac b _021727e0 _021727a0: - ldr r0, _021727f0 ; =data_027e0e60 + ldr r0, _021727f0 ; =gMapManager mov r1, #1 ldr r0, [r0] mov r3, r1 @@ -6213,7 +6213,7 @@ _021727e0: arm_func_end func_ov23_02172700 _021727e8: .word data_ov23_0217a3e0 _021727ec: .word 0x00000333 -_021727f0: .word data_027e0e60 +_021727f0: .word gMapManager .global func_ov23_021727f4 arm_func_start func_ov23_021727f4 @@ -6453,7 +6453,7 @@ _02172a44: strb r2, [sp, #3] bl func_ov00_020c5374 mvn r7, #0 - ldr r9, _02172b14 ; =data_027e0e60 + ldr r9, _02172b14 ; =gMapManager mov r6, r7 add r10, sp, #0x1c add r5, sp, #0 @@ -6502,7 +6502,7 @@ _02172ae4: _02172b08: .word data_027e0fe4 _02172b0c: .word 0x00000666 _02172b10: .word 0x424f4d42 -_02172b14: .word data_027e0e60 +_02172b14: .word gMapManager .global func_ov23_02172b18 arm_func_start func_ov23_02172b18 @@ -7119,7 +7119,7 @@ _02173364: _02173388: ldrb r1, [sp, #0x13] ldrb r2, [sp, #0x12] - ldr r0, _021734e0 ; =data_027e0e60 + ldr r0, _021734e0 ; =gMapManager add r1, r1, r5 add r2, r2, r4 strb r1, [sp, #0x11] @@ -7206,7 +7206,7 @@ _021734d0: .word _ZTV11FilterActor _021734d4: .word 0x424f4d42 _021734d8: .word data_027e0fe4 _021734dc: .word 0x00000733 -_021734e0: .word data_027e0e60 +_021734e0: .word gMapManager .global func_ov23_021734e4 arm_func_start func_ov23_021734e4 @@ -7660,11 +7660,11 @@ _02173b48: ldr r0, _021741a8 ; =data_ov00_020eec68 mov r1, #0xf bl func_ov00_020d716c - ldr r0, _021741ac ; =data_027e0e60 + ldr r0, _021741ac ; =gMapManager mov r1, #1 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083790Ei - ldr r0, _021741ac ; =data_027e0e60 + ldr r0, _021741ac ; =gMapManager mov r1, #1 ldr r0, [r0] mov r2, #2 @@ -8077,7 +8077,7 @@ _02174120: mov r0, r4 mov r2, r1 bl _ZN5Actor18func_ov00_020c1c20Eiii - ldr r0, _021741ac ; =data_027e0e60 + ldr r0, _021741ac ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 @@ -8085,11 +8085,11 @@ _02174120: mov r2, #0 mov r3, #0x7f bl func_ov00_020d70a4 - ldr r0, _021741ac ; =data_027e0e60 + ldr r0, _021741ac ; =gMapManager mov r1, #1 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083840Ei - ldr r0, _021741ac ; =data_027e0e60 + ldr r0, _021741ac ; =gMapManager mov r1, #1 ldr r0, [r0] mov r2, #2 @@ -8102,7 +8102,7 @@ _0217419c: .align 2, 0 arm_func_end func_ov23_021738c0 _021741a8: .word data_ov00_020eec68 -_021741ac: .word data_027e0e60 +_021741ac: .word gMapManager _021741b0: .word data_027e0e58 _021741b4: .word data_027e0ffc _021741b8: .word data_027e103c @@ -10301,7 +10301,7 @@ func_ov23_02175d3c: ; 0x02175d3c str r3, [sp, #8] blx ip ldrb r1, [r4, #0x14] - ldr r0, _02175f08 ; =data_027e0e60 + ldr r0, _02175f08 ; =gMapManager ldrb r4, [r4, #0x15] add r3, r1, #1 ldr r0, [r0] @@ -10318,7 +10318,7 @@ _02175ef8: .word 0x000007fc _02175efc: .word data_ov23_0217966c _02175f00: .word data_027e0f68 _02175f04: .word 0x000002cd -_02175f08: .word data_027e0e60 +_02175f08: .word gMapManager .global func_ov23_02175f0c arm_func_start func_ov23_02175f0c @@ -11642,7 +11642,7 @@ func_ov23_02177020: ; 0x02177020 sub sp, sp, #4 mov r9, r0 ldr r1, [r9, #0x18] - ldr r0, _021770e8 ; =data_027e0e60 + ldr r0, _021770e8 ; =gMapManager str r1, [r9, #0x38] ldr r2, [r9, #0x1c] add r1, r9, #0x18 @@ -11662,7 +11662,7 @@ func_ov23_02177020: ; 0x02177020 cmp r7, r0 addge sp, sp, #4 ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} - ldr r10, _021770e8 ; =data_027e0e60 + ldr r10, _021770e8 ; =gMapManager add r5, sp, #0 mov r4, #1 _0217708c: @@ -11693,7 +11693,7 @@ _021770cc: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov23_02177020 -_021770e8: .word data_027e0e60 +_021770e8: .word gMapManager .global func_ov23_021770ec arm_func_start func_ov23_021770ec @@ -12254,7 +12254,7 @@ _0217781c: cmp r6, r0 addge sp, sp, #0xc ldmgeia sp!, {r3, r4, r5, r6, r7, r8, pc} - ldr r8, _021778d8 ; =data_027e0e60 + ldr r8, _021778d8 ; =gMapManager mov r5, #0x15 _02177880: ldrb r7, [r4, #0x15] @@ -12283,7 +12283,7 @@ _021778b8: .align 2, 0 arm_func_end func_ov23_02177754 _021778d4: .word data_027e0f6c -_021778d8: .word data_027e0e60 +_021778d8: .word gMapManager .global func_ov23_021778dc arm_func_start func_ov23_021778dc @@ -12575,7 +12575,7 @@ func_ov23_02177ba0: ; 0x02177ba0 add r2, r6, #0x2c mov r1, r0, lsl #0x1 add r3, r2, r0, lsl #1 - ldr r0, _02177e10 ; =data_027e0e60 + ldr r0, _02177e10 ; =gMapManager ldrb r2, [r2, r1] ldrb r1, [r3, #1] ldr r0, [r0] @@ -12681,7 +12681,7 @@ _02177d24: ldr r0, [sp, #0x74] cmp r0, #0x5000 bge _02177df0 - ldr r0, _02177e10 ; =data_027e0e60 + ldr r0, _02177e10 ; =gMapManager mov r3, #0xff ldr r0, [r0] mov r2, #0 @@ -12701,7 +12701,7 @@ _02177da8: ldr r0, [sp, #0x74] cmp r0, #0x5000 blt _02177df0 - ldr r0, _02177e10 ; =data_027e0e60 + ldr r0, _02177e10 ; =gMapManager mov r4, #0xff ldr r0, [r0] mov r3, #0 @@ -12727,7 +12727,7 @@ _02177df0: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov23_02177ba0 -_02177e10: .word data_027e0e60 +_02177e10: .word gMapManager _02177e14: .word data_027e0fe4 _02177e18: .word 0x504c444d _02177e1c: .word 0x50574253 @@ -12797,7 +12797,7 @@ func_ov23_02177e90: ; 0x02177e90 bl func_ov23_02177e7c mov r6, r0 bl func_ov23_02177e84 - ldr r2, _02178040 ; =data_027e0e60 + ldr r2, _02178040 ; =gMapManager ldr r1, _02178044 ; =data_027e0f94 ldr r8, [r2] mov r5, r0 @@ -12906,7 +12906,7 @@ _02178030: .align 2, 0 arm_func_end func_ov23_02177e90 _0217803c: .word data_027e0d38 -_02178040: .word data_027e0e60 +_02178040: .word gMapManager _02178044: .word data_027e0f94 _02178048: .word data_027e0fa0 _0217804c: .word data_027e0ffc @@ -13052,14 +13052,14 @@ _02178218: strh r1, [r0, #0x18] cmp r3, #2 blo _02178218 - ldr r0, _02178318 ; =data_027e0e60 + ldr r0, _02178318 ; =gMapManager add r2, sp, #0xc ldr r0, [r0] mov r1, #0x5b bl _ZN10MapManager18func_ov00_02083918EiPi cmp r0, #0 beq _02178298 - ldr r0, _02178318 ; =data_027e0e60 + ldr r0, _02178318 ; =gMapManager ldrb r1, [sp, #0x10] ldr r0, [r0] mov r2, #0 @@ -13071,7 +13071,7 @@ _02178218: bl func_ov00_0208726c b _02178298 _02178274: - ldr r0, _02178318 ; =data_027e0e60 + ldr r0, _02178318 ; =gMapManager mov r1, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083958Ei @@ -13115,7 +13115,7 @@ _02178308: .word data_027e0fe4 _0217830c: .word 0x504c444d _02178310: .word data_027e0f94 _02178314: .word data_027e0fac -_02178318: .word data_027e0e60 +_02178318: .word gMapManager _0217831c: .word data_027e0f64 _02178320: .word data_027e0fcc _02178324: .word data_027e0fd4 @@ -13530,7 +13530,7 @@ _02178880: _021788b8: bl _ZN13LinkStateBase12GetPlayerPosEv ldr r2, [r0] - ldr r1, _021789f8 ; =data_027e0e60 + ldr r1, _021789f8 ; =gMapManager str r2, [sp, #0xc] ldr r2, [r0, #4] ldr r6, [r1] @@ -13614,7 +13614,7 @@ _021789e8: .word data_ov23_0217ab40 _021789ec: .word data_ov00_020eec9c _021789f0: .word data_027e0e58 _021789f4: .word 0x000001a7 -_021789f8: .word data_027e0e60 +_021789f8: .word gMapManager .global func_ov23_021789fc arm_func_start func_ov23_021789fc @@ -13631,7 +13631,7 @@ func_ov23_021789fc: ; 0x021789fc str r1, [r0, #8] mov r0, r5 bl _ZN13LinkStateBase12GetPlayerPosEv - ldr r1, _02178aa4 ; =data_027e0e60 + ldr r1, _02178aa4 ; =gMapManager add r3, sp, #8 ldr r4, [r1] ldmia r0, {r0, r1, r2} @@ -13663,7 +13663,7 @@ func_ov23_021789fc: ; 0x021789fc ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov23_021789fc -_02178aa4: .word data_027e0e60 +_02178aa4: .word gMapManager _02178aa8: .word data_027e0e58 _02178aac: .word data_027e0ffc @@ -13675,7 +13675,7 @@ func_ov23_02178ab0: ; 0x02178ab0 mov r10, r0 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev mov r2, r0 - ldr r1, _02179014 ; =data_027e0e60 + ldr r1, _02179014 ; =gMapManager add r0, sp, #8 ldr r4, [r1] add r2, r2, #0x20 @@ -13742,7 +13742,7 @@ _02178b10: mov r0, r4 str r3, [sp, #0x34] bl func_01ff9bc4 - ldr r0, _02179014 ; =data_027e0e60 + ldr r0, _02179014 ; =gMapManager mov r2, r4 ldr r9, [r0] add r0, sp, #6 @@ -13751,7 +13751,7 @@ _02178b10: mov r0, r9 add r1, sp, #6 bl _ZN10MapManager16MapData_vfunc_60Ev - ldr r1, _02179014 ; =data_027e0e60 + ldr r1, _02179014 ; =gMapManager str r0, [sp, #0x30] ldr r1, [r1] add r0, sp, #0x10 @@ -13888,7 +13888,7 @@ _02178dcc: sublt r0, r0, #0x800 strlt r0, [sp, #0x20] _02178de8: - ldr r1, _02179014 ; =data_027e0e60 + ldr r1, _02179014 ; =gMapManager add r0, sp, #4 ldr r4, [r1] add r2, sp, #0x20 @@ -13897,7 +13897,7 @@ _02178de8: add r1, sp, #4 mov r0, r4 bl _ZN10MapManager16MapData_vfunc_60Ev - ldr r1, _02179014 ; =data_027e0e60 + ldr r1, _02179014 ; =gMapManager str r0, [sp, #0x24] ldr r1, [r1] add r0, sp, #0xc @@ -14037,7 +14037,7 @@ _02178fd8: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov23_02178ab0 -_02179014: .word data_027e0e60 +_02179014: .word gMapManager _02179018: .word data_02050f54 _0217901c: .word 0x00000333 _02179020: .word data_027e0d38 diff --git a/asm/ov24.inc b/asm/ov24.inc index 4ebd7900..9d81e869 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -84,7 +84,7 @@ .extern data_027e0c68 .extern data_027e0d0c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov24.s b/asm/ov24.s index cbd37605..7db058c7 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -164,7 +164,7 @@ _0216d878: add r0, r9, r4 cmp r9, r0 bge _0216d914 - ldr r6, _0216da24 ; =data_027e0e60 + ldr r6, _0216da24 ; =gMapManager add r8, sp, #4 mov r7, #1 _0216d8b4: @@ -265,7 +265,7 @@ _0216d914: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov24_0216d824 -_0216da24: .word data_027e0e60 +_0216da24: .word gMapManager _0216da28: .word data_027e0f6c .global func_ov24_0216da2c @@ -492,7 +492,7 @@ func_ov24_0216dcac: ; 0x0216dcac func_ov24_0216dcbc: ; 0x0216dcbc stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x18 - ldr r1, _0216dd58 ; =data_027e0e60 + ldr r1, _0216dd58 ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager18func_ov00_0208412cEv @@ -517,7 +517,7 @@ _0216dd0c: add r1, sp, #0 ldr r2, [r2, #0x2c] blx r2 - ldr r0, _0216dd58 ; =data_027e0e60 + ldr r0, _0216dd58 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208412cEv sub r1, r0, #0x800 @@ -533,7 +533,7 @@ _0216dd0c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov24_0216dcbc -_0216dd58: .word data_027e0e60 +_0216dd58: .word gMapManager _0216dd5c: .word 0xfffff667 .global func_ov24_0216dd60 @@ -703,7 +703,7 @@ _0216df44: str r0, [r4, #0x84] str r0, [r4, #0x88] ldr r1, [r4, #0x7c] - ldr r0, _0216dffc ; =data_027e0e60 + ldr r0, _0216dffc ; =gMapManager str r1, [r4, #0x8c] ldr r1, [r4, #0x80] str r1, [r4, #0x90] @@ -715,7 +715,7 @@ _0216df44: bl _ZN10MapManager18Get_MapData_Unk_d0Ev str r0, [r4, #0x228] mov r1, #0 - ldr r0, _0216dffc ; =data_027e0e60 + ldr r0, _0216dffc ; =gMapManager str r1, [r4, #0x22c] ldr r0, [r0] bl _ZN10MapManager18Get_MapData_Unk_d8Ev @@ -731,7 +731,7 @@ _0216dfec: .word data_ov24_02179224 _0216dff0: .word data_027e0fec _0216dff4: .word data_ov24_02179f04 _0216dff8: .word data_ov24_02179204 -_0216dffc: .word data_027e0e60 +_0216dffc: .word gMapManager .global func_ov24_0216e000 arm_func_start func_ov24_0216e000 @@ -917,7 +917,7 @@ _0216e258: ldr r2, [r0, r2, lsl #2] add r0, r4, #0x16c bl Approach_thunk - ldr r0, _0216e4b0 ; =data_027e0e60 + ldr r0, _0216e4b0 ; =gMapManager ldr r1, [r4, #0x16c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208413cEi @@ -995,7 +995,7 @@ _0216e378: ldr r2, [r0, r2, lsl #2] add r0, r4, #0x16c bl Approach_thunk - ldr r0, _0216e4b0 ; =data_027e0e60 + ldr r0, _0216e4b0 ; =gMapManager ldr r1, [r4, #0x16c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208413cEi @@ -1074,7 +1074,7 @@ _0216e4a0: .word data_027e0f64 _0216e4a4: .word data_027e0ffc _0216e4a8: .word 0x00000355 _0216e4ac: .word data_ov24_021791e4 -_0216e4b0: .word data_027e0e60 +_0216e4b0: .word gMapManager _0216e4b4: .word data_ov24_021791ec _0216e4b8: .word data_ov24_021791fc _0216e4bc: .word 0x00000356 @@ -1103,7 +1103,7 @@ _0216e4f4: mov r1, #1 str r2, [r4, #0x16c] bl func_ov24_0216e740 - ldr r0, _0216e6f0 ; =data_027e0e60 + ldr r0, _0216e6f0 ; =gMapManager ldr r1, [r4, #0x16c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208413cEi @@ -1130,7 +1130,7 @@ _0216e558: mov r1, #0 str r2, [r4, #0x16c] bl func_ov24_0216e740 - ldr r0, _0216e6f0 ; =data_027e0e60 + ldr r0, _0216e6f0 ; =gMapManager ldr r1, [r4, #0x16c] ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208413cEi @@ -1236,7 +1236,7 @@ _0216e6e4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov24_0216e4c8 -_0216e6f0: .word data_027e0e60 +_0216e6f0: .word gMapManager _0216e6f4: .word gAdventureFlags .global func_ov24_0216e6f8 @@ -1332,7 +1332,7 @@ _0216e810: strh r1, [r0, #0x18] cmp r3, #2 blo _0216e810 - ldr r0, _0216e87c ; =data_027e0e60 + ldr r0, _0216e87c ; =gMapManager ldrb r1, [r5, #0x159] ldr r0, [r0] add r2, sp, #0x18 @@ -1357,7 +1357,7 @@ _0216e860: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov24_0216e7b8 -_0216e87c: .word data_027e0e60 +_0216e87c: .word gMapManager .global func_ov24_0216e880 arm_func_start func_ov24_0216e880 @@ -1373,13 +1373,13 @@ func_ov24_0216e880: ; 0x0216e880 movne r0, #0 ldmia sp!, {r3, pc} _0216e8a8: - ldr r0, _0216e8b8 ; =data_027e0e60 + ldr r0, _0216e8b8 ; =gMapManager ldr r0, [r0] ldrb r0, [r0, #9] ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov24_0216e880 -_0216e8b8: .word data_027e0e60 +_0216e8b8: .word gMapManager .global func_ov24_0216e8bc arm_func_start func_ov24_0216e8bc @@ -1392,7 +1392,7 @@ func_ov24_0216e8bc: ; 0x0216e8bc bl _ZN5Actor18func_Ov00_020c1bfcEi ldmia sp!, {r3, pc} _0216e8d8: - ldr r0, _0216e8f4 ; =data_027e0e60 + ldr r0, _0216e8f4 ; =gMapManager ldr r0, [r0] ldrb r0, [r0, #9] cmp r0, #0 @@ -1401,7 +1401,7 @@ _0216e8d8: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov24_0216e8bc -_0216e8f4: .word data_027e0e60 +_0216e8f4: .word gMapManager .global func_ov24_0216e8f8 arm_func_start func_ov24_0216e8f8 @@ -1692,7 +1692,7 @@ _0216ec38: cmp r1, r0 bne _0216ed20 ldr r0, [r4, #0x48] - ldr r3, _0216eddc ; =data_027e0e60 + ldr r3, _0216eddc ; =gMapManager str r0, [r4, #0x478] ldr r0, [r4, #0x4c] mov r1, #2 @@ -1782,7 +1782,7 @@ _0216edcc: .word data_ov24_0217922c _0216edd0: .word data_ov24_0217a00c _0216edd4: .word data_ov24_0217a010 _0216edd8: .word func_ov24_0216e960 -_0216eddc: .word data_027e0e60 +_0216eddc: .word gMapManager .global func_ov24_0216ede0 arm_func_start func_ov24_0216ede0 @@ -1874,7 +1874,7 @@ _0216eee4: bne _0216ef1c mov r0, #0 strb r0, [r5, #0x487] - ldr r0, _0216ef28 ; =data_027e0e60 + ldr r0, _0216ef28 ; =gMapManager ldrb r1, [r5, #0x2a] ldr r0, [r0] mov r2, #3 @@ -1886,7 +1886,7 @@ _0216ef1c: .align 2, 0 arm_func_end func_ov24_0216ee88 _0216ef24: .word 0x4d55544f -_0216ef28: .word data_027e0e60 +_0216ef28: .word gMapManager .global func_ov24_0216ef2c arm_func_start func_ov24_0216ef2c @@ -2606,7 +2606,7 @@ func_ov24_0216f79c: ; 0x0216f79c ldr ip, [ip, #0x10] add r1, sp, #8 blx ip - ldr r0, _0216f888 ; =data_027e0e60 + ldr r0, _0216f888 ; =gMapManager ldr r1, [r0] ldrb r1, [r1, #9] strb r1, [r4, #0x60] @@ -2632,7 +2632,7 @@ _0216f86c: .align 2, 0 arm_func_end func_ov24_0216f79c _0216f884: .word 0x00001333 -_0216f888: .word data_027e0e60 +_0216f888: .word gMapManager .global func_ov24_0216f88c arm_func_start func_ov24_0216f88c @@ -2662,7 +2662,7 @@ func_ov24_0216f88c: ; 0x0216f88c str r1, [r4, #0x70] ldrsh ip, [r4, #0x74] mov r2, #0 - ldr r1, _0216f9b0 ; =data_027e0e60 + ldr r1, _0216f9b0 ; =gMapManager add ip, ip, #0x3e8 strh ip, [r4, #0x74] ldrh ip, [r4, #0x74] @@ -2704,7 +2704,7 @@ _0216f974: ldr r3, [r3, #0x80] blx r3 _0216f990: - ldr r0, _0216f9b0 ; =data_027e0e60 + ldr r0, _0216f9b0 ; =gMapManager ldr r0, [r0] ldrb r0, [r0, #9] strb r0, [r4, #0x60] @@ -2714,7 +2714,7 @@ _0216f990: _0216f9a4: .word 0x00001555 _0216f9a8: .word data_02050f54 _0216f9ac: .word 0x00000333 -_0216f9b0: .word data_027e0e60 +_0216f9b0: .word gMapManager .global func_ov24_0216f9b4 arm_func_start func_ov24_0216f9b4 @@ -2830,13 +2830,13 @@ func_ov24_0216fa3c: ; 0x0216fa3c cmp r0, #0 ldrneh r1, [r4, #0x24] strneb r1, [r0, #0x159] - ldr r0, _0216fbd0 ; =data_027e0e60 + ldr r0, _0216fbd0 ; =gMapManager ldr r1, [r0] ldrb r0, [r1, #9] cmp r0, #0 moveq r2, #1 movne r2, #0 - ldr r0, _0216fbd0 ; =data_027e0e60 + ldr r0, _0216fbd0 ; =gMapManager strb r2, [r1, #9] ldr r0, [r0] ldrb r0, [r0, #9] @@ -2867,7 +2867,7 @@ _0216fbc0: .word data_027e0fc8 _0216fbc4: .word gAdventureFlags _0216fbc8: .word data_027e0fe4 _0216fbcc: .word 0x574c4354 -_0216fbd0: .word data_027e0e60 +_0216fbd0: .word gMapManager .global func_ov24_0216fbd4 arm_func_start func_ov24_0216fbd4 @@ -5251,7 +5251,7 @@ _02171950: _02171994: ldrh r1, [r4, #0x22] ldr r2, [r4, #0x48] - ldr r0, _02171e54 ; =data_027e0e60 + ldr r0, _02171e54 ; =gMapManager add r6, r2, r1, lsl #12 str r6, [sp, #0x14] ldrh r1, [r4, #0x24] @@ -5579,7 +5579,7 @@ _02171e40: _02171e48: .word data_027e0fe4 _02171e4c: .word data_027e0e58 _02171e50: .word 0x000001b3 -_02171e54: .word data_027e0e60 +_02171e54: .word gMapManager _02171e58: .word data_027e0764 _02171e5c: .word data_027e0ffc _02171e60: .word 0x0000027d @@ -8619,7 +8619,7 @@ _021745e8: _02174630: ldrh r1, [r4, #0x22] ldr r2, [r4, #0x48] - ldr r0, _02174bb4 ; =data_027e0e60 + ldr r0, _02174bb4 ; =gMapManager add r6, r2, r1, lsl #12 str r6, [sp, #0x14] ldrh r1, [r4, #0x24] @@ -8996,7 +8996,7 @@ _02174ba0: _02174ba8: .word data_027e0fe4 _02174bac: .word data_027e0e58 _02174bb0: .word 0x000001b3 -_02174bb4: .word data_027e0e60 +_02174bb4: .word gMapManager _02174bb8: .word data_027e0764 _02174bbc: .word data_027e0ffc _02174bc0: .word 0x0000027d @@ -9504,7 +9504,7 @@ _021752ac: ; jump table b _021752c4 ; case 4 b _021752c4 ; case 5 _021752c4: - ldr r0, _02175eb8 ; =data_027e0e60 + ldr r0, _02175eb8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208412cEv ldr r1, [r4, #0x4c] @@ -9514,7 +9514,7 @@ _021752c4: mov r0, #1 ldmia sp!, {r4, r5, r6, r7, pc} _021752e8: - ldr r0, _02175eb8 ; =data_027e0e60 + ldr r0, _02175eb8 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_0208412cEv ldr r1, [r4, #0x4c] @@ -9829,7 +9829,7 @@ _021756e8: mov r0, #4 str r0, [sp, #8] str r2, [sp, #0xc] - ldr r0, _02175eb8 ; =data_027e0e60 + ldr r0, _02175eb8 ; =gMapManager str r2, [sp, #0x10] add r3, r4, #0x2a8 add r2, r3, #0x400 @@ -10327,7 +10327,7 @@ _02175eac: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov24_02175290 -_02175eb8: .word data_027e0e60 +_02175eb8: .word gMapManager _02175ebc: .word data_027e0fe4 _02175ec0: .word data_ov24_021792e4 _02175ec4: .word 0x00000b33 @@ -13357,11 +13357,11 @@ _021783f8: str r0, [sp, #0x64] b _0217852c _02178504: - ldr r0, _0217869c ; =data_027e0e60 + ldr r0, _0217869c ; =gMapManager add r1, sp, #0x5c ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p - ldr r0, _0217869c ; =data_027e0e60 + ldr r0, _0217869c ; =gMapManager add r1, sp, #0x5c ldr r0, [r0] mov r2, #0 @@ -13463,7 +13463,7 @@ _0217866c: _02178690: .word data_027e0fe4 _02178694: .word data_027e0f64 _02178698: .word 0x57534253 -_0217869c: .word data_027e0e60 +_0217869c: .word gMapManager .global func_ov24_021786a0 arm_func_start func_ov24_021786a0 @@ -14062,7 +14062,7 @@ func_ov24_02178e20: ; 0x02178e20 add r0, r7, #2 cmp r7, r0 bge _02178ee8 - ldr r4, _02179010 ; =data_027e0e60 + ldr r4, _02179010 ; =gMapManager add r5, sp, #2 mov r11, #1 _02178e4c: @@ -14187,7 +14187,7 @@ _02178fa4: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov24_02178e20 -_02179010: .word data_027e0e60 +_02179010: .word gMapManager _02179014: .word data_027e0f6c .global func_ov24_02179018 diff --git a/asm/ov25.inc b/asm/ov25.inc index 763cbcbc..73781d8b 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -108,7 +108,7 @@ .extern data_027e0d38 .extern data_027e0db0 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov25.s b/asm/ov25.s index 2284a809..89154597 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -395,7 +395,7 @@ _0216db80: ldrh r2, [r4, #0x24] ldrh r1, [r4, #0x26] ldr r3, _0216dccc ; =data_027e0f94 - ldr r0, _0216dcd0 ; =data_027e0e60 + ldr r0, _0216dcd0 ; =gMapManager strh r1, [sp, #0x22] strh r2, [sp, #0x20] ldrh r6, [r4, #0x28] @@ -456,7 +456,7 @@ _0216db80: arm_func_end func_ov25_0216daa4 _0216dcc8: .word data_027e0fe8 _0216dccc: .word data_027e0f94 -_0216dcd0: .word data_027e0e60 +_0216dcd0: .word gMapManager _0216dcd4: .word data_027e0fac .global func_ov25_0216dcd8 @@ -611,7 +611,7 @@ _0216de80: strh r2, [r0, #0x22] str ip, [r4, #0x674] str r1, [r4, #0x678] - ldr r0, _0216dff0 ; =data_027e0e60 + ldr r0, _0216dff0 ; =gMapManager add r2, sp, #0 ldr r0, [r0] mov r1, #1 @@ -687,7 +687,7 @@ _0216dfd0: arm_func_end func_ov25_0216de38 _0216dfe8: .word gAdventureFlags _0216dfec: .word data_ov25_02179be0 -_0216dff0: .word data_027e0e60 +_0216dff0: .word gMapManager .global func_ov25_0216dff4 arm_func_start func_ov25_0216dff4 @@ -4558,7 +4558,7 @@ _02171504: .word 0x43425333 func_ov25_02171508: ; 0x02171508 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x38 - ldr r2, _021715dc ; =data_027e0e60 + ldr r2, _021715dc ; =gMapManager mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -4611,7 +4611,7 @@ func_ov25_02171508: ; 0x02171508 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov25_02171508 -_021715dc: .word data_027e0e60 +_021715dc: .word gMapManager _021715e0: .word data_027e0fe8 _021715e4: .word 0x4e4b4559 _021715e8: .word data_027e0fe4 @@ -7971,7 +7971,7 @@ _021741f4: cmpne r0, #0xa bne _02174248 ldr r1, [r4, #0x48] - ldr r0, _0217507c ; =data_027e0e60 + ldr r0, _0217507c ; =gMapManager str r1, [sp, #0xe8] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -8057,7 +8057,7 @@ _02174328: strb r2, [sp, #0x10] strb r2, [sp, #0x11] bl func_ov00_020c5374 - ldr r0, _0217507c ; =data_027e0e60 + ldr r0, _0217507c ; =gMapManager add r1, sp, #0x10 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -8078,7 +8078,7 @@ _02174374: strb r2, [sp, #0xe] strb r2, [sp, #0xf] bl func_ov00_020c5374 - ldr r0, _0217507c ; =data_027e0e60 + ldr r0, _0217507c ; =gMapManager add r1, sp, #0xe ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -8239,7 +8239,7 @@ _021745a8: bl func_ov25_021732fc _021745e0: ldr r1, _02175088 ; =data_027e0f94 - ldr r0, _0217507c ; =data_027e0e60 + ldr r0, _0217507c ; =gMapManager ldr r3, [r1] ldr r2, [r1, #4] str r3, [sp, #0xdc] @@ -8306,7 +8306,7 @@ _021746a8: mov r2, #0x7b bl func_ov25_021732fc ldr r1, _02175088 ; =data_027e0f94 - ldr r0, _0217507c ; =data_027e0e60 + ldr r0, _0217507c ; =gMapManager ldr r3, [r1] ldr r2, [r1, #4] str r3, [sp, #0xc4] @@ -8398,7 +8398,7 @@ _0217480c: mov r0, r4 bl func_ov25_02173250 ldr r1, _02175088 ; =data_027e0f94 - ldr r0, _0217507c ; =data_027e0e60 + ldr r0, _0217507c ; =gMapManager ldr r3, [r1] ldr r2, [r1, #4] str r3, [sp, #0xac] @@ -8857,7 +8857,7 @@ _02174ee8: ldrh r0, [r4, #0x20] cmp r0, #3 bne _02174f80 - ldr r0, _0217507c ; =data_027e0e60 + ldr r0, _0217507c ; =gMapManager mov r6, #0 sub r3, r6, #2 mov r7, #0x47 @@ -8953,7 +8953,7 @@ _0217503c: arm_func_end func_ov25_02174100 _02175074: .word gAdventureFlags _02175078: .word 0x00000152 -_0217507c: .word data_027e0e60 +_0217507c: .word gMapManager _02175080: .word 0xb60b60b7 _02175084: .word 0x00000171 _02175088: .word data_027e0f94 @@ -9107,7 +9107,7 @@ _02175278: strb r2, [sp, #0xc] strb r2, [sp, #0xd] bl func_ov00_020c5374 - ldr r0, _0217507c ; =data_027e0e60 + ldr r0, _0217507c ; =gMapManager add r1, sp, #0xc ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084164Ev @@ -9866,7 +9866,7 @@ func_ov25_02175c54: ; 0x02175c54 ldrsh r1, [r0, #0x78] add r0, sp, #0x18 bl func_ov00_020c5a5c - ldr r0, _02175d18 ; =data_027e0e60 + ldr r0, _02175d18 ; =gMapManager add r2, sp, #0 ldr r0, [r0] mov r1, #1 @@ -9911,7 +9911,7 @@ _02175cb0: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov25_02175c54 -_02175d18: .word data_027e0e60 +_02175d18: .word gMapManager .global func_ov25_02175d1c arm_func_start func_ov25_02175d1c @@ -10444,7 +10444,7 @@ _021763e4: str r0, [r4, #0x1cc] cmp r0, #0x384 blt _0217641c - ldr r0, _02176954 ; =data_027e0e60 + ldr r0, _02176954 ; =gMapManager mov r2, #1 ldr r0, [r0] mov r3, r2 @@ -10822,7 +10822,7 @@ _0217694c: ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 arm_func_end func_ov25_021763a4 -_02176954: .word data_027e0e60 +_02176954: .word gMapManager _02176958: .word gAdventureFlags _0217695c: .word data_027e0c68 _02176960: .word data_027e0fe4 @@ -11624,7 +11624,7 @@ func_ov25_021772ec: ; 0x021772ec addne sp, sp, #8 movne r0, #0 ldmneia sp!, {r4, pc} - ldr r1, _02177368 ; =data_027e0e60 + ldr r1, _02177368 ; =gMapManager add r0, sp, #4 ldr r1, [r1] add r2, r2, #0x48 @@ -11647,7 +11647,7 @@ func_ov25_021772ec: ; 0x021772ec ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov25_021772ec -_02177368: .word data_027e0e60 +_02177368: .word gMapManager .global func_ov25_0217736c arm_func_start func_ov25_0217736c @@ -11925,7 +11925,7 @@ _021775e8: ldr r0, [r0] bl func_ov00_020c47cc ldr r1, [r0, #4] - ldr r3, _021777d8 ; =data_027e0e60 + ldr r3, _021777d8 ; =gMapManager str r1, [r4, #0x48] ldr r2, [r0, #8] add r1, sp, #0 @@ -12023,7 +12023,7 @@ _021777c8: arm_func_end func_ov25_021775a4 _021777d0: .word data_ov00_020e8398 _021777d4: .word data_027e0ff0 -_021777d8: .word data_027e0e60 +_021777d8: .word gMapManager _021777dc: .word data_027e0ffc _021777e0: .word 0x00000251 @@ -12859,7 +12859,7 @@ _0217831c: add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02178500 ; =data_027e0e60 + ldr r0, _02178500 ; =gMapManager ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -12986,7 +12986,7 @@ _021784e8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov25_02178218 -_02178500: .word data_027e0e60 +_02178500: .word gMapManager _02178504: .word gItemManager _02178508: .word 0x66666667 @@ -13313,7 +13313,7 @@ func_ov25_021788a4: ; 0x021788a4 str r0, [r4, #0x84] str r0, [r4, #0x88] ldr r1, [r4, #0x7c] - ldr r0, _021789b8 ; =data_027e0e60 + ldr r0, _021789b8 ; =gMapManager str r1, [r4, #0x8c] ldr r2, [r4, #0x80] add r1, sp, #0xc @@ -13379,7 +13379,7 @@ _021789ac: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov25_021788a4 -_021789b8: .word data_027e0e60 +_021789b8: .word gMapManager _021789bc: .word data_027e0f68 .global func_ov25_021789c0 diff --git a/asm/ov26.inc b/asm/ov26.inc index 3499120c..bc9c7cc3 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -94,7 +94,7 @@ .extern data_027e0d3c .extern data_027e0d78 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov26.s b/asm/ov26.s index 9adcc77e..3d28077e 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -1036,7 +1036,7 @@ func_ov26_0216e11c: ; 0x0216e11c ldrb r2, [r9, #0x15] cmp r0, #0 sub r1, r0, #1 - ldr r0, _0216e320 ; =data_027e0e60 + ldr r0, _0216e320 ; =gMapManager moveq r1, #5 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02083e34Ecci @@ -1045,7 +1045,7 @@ func_ov26_0216e11c: ; 0x0216e11c add r0, r7, #5 cmp r7, r0 bge _0216e1e4 - ldr r10, _0216e320 ; =data_027e0e60 + ldr r10, _0216e320 ; =gMapManager add r5, sp, #4 mov r4, #1 _0216e190: @@ -1155,7 +1155,7 @@ _0216e308: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov26_0216e11c -_0216e320: .word data_027e0e60 +_0216e320: .word gMapManager _0216e324: .word data_027e0f6c .global func_ov26_0216e328 @@ -1937,7 +1937,7 @@ _0216ebe8: _0216ebec: cmp r0, #0 bne _0216ec8c - ldr r0, _0216ec9c ; =data_027e0e60 + ldr r0, _0216ec9c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084a50Ev cmp r0, #0 @@ -1983,7 +1983,7 @@ _0216ec94: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov26_0216ebc0 -_0216ec9c: .word data_027e0e60 +_0216ec9c: .word gMapManager _0216eca0: .word data_027e0c68 _0216eca4: .word gAdventureFlags _0216eca8: .word data_027e071c @@ -2278,7 +2278,7 @@ _0216f024: mov r6, #1 cmpne r0, #2 beq _0216f0d4 - ldr r0, _0216f200 ; =data_027e0e60 + ldr r0, _0216f200 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084a50Ev cmp r0, #0 @@ -2385,7 +2385,7 @@ _0216f0d4: arm_func_end func_ov26_0216efb4 _0216f1f8: .word data_027e0c38 _0216f1fc: .word data_027e0618 -_0216f200: .word data_027e0e60 +_0216f200: .word gMapManager _0216f204: .word data_027e0fd4 _0216f208: .word data_ov26_0217933c @@ -2491,7 +2491,7 @@ _0216f368: bne _0216f38c cmp r0, #0x1e ble _0216f38c - ldr r0, _0216f39c ; =data_027e0e60 + ldr r0, _0216f39c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084a50Ev cmp r0, #0 @@ -2504,7 +2504,7 @@ _0216f394: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_0216f334 -_0216f39c: .word data_027e0e60 +_0216f39c: .word gMapManager .global func_ov26_0216f3a0 arm_func_start func_ov26_0216f3a0 @@ -2830,7 +2830,7 @@ func_ov26_0216f7c4: ; 0x0216f7c4 sub sp, sp, #0xc mov r4, r0 ldr r1, [r4, #0x14] - ldr r0, _0216f820 ; =data_027e0e60 + ldr r0, _0216f820 ; =gMapManager str r1, [r4, #0x48] ldr r2, [r4, #0x18] add r1, sp, #0 @@ -2851,7 +2851,7 @@ func_ov26_0216f7c4: ; 0x0216f7c4 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov26_0216f7c4 -_0216f820: .word data_027e0e60 +_0216f820: .word gMapManager .global func_ov26_0216f824 arm_func_start func_ov26_0216f824 @@ -2866,7 +2866,7 @@ func_ov26_0216f828: ; 0x0216f828 sub sp, sp, #0xc mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _0216f8b4 ; =data_027e0e60 + ldr r0, _0216f8b4 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -2900,7 +2900,7 @@ _0216f88c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov26_0216f828 -_0216f8b4: .word data_027e0e60 +_0216f8b4: .word gMapManager .global func_ov26_0216f8b8 arm_func_start func_ov26_0216f8b8 @@ -2909,7 +2909,7 @@ func_ov26_0216f8b8: ; 0x0216f8b8 sub sp, sp, #0xc mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _0216f910 ; =data_027e0e60 + ldr r0, _0216f910 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -2929,7 +2929,7 @@ func_ov26_0216f8b8: ; 0x0216f8b8 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov26_0216f8b8 -_0216f910: .word data_027e0e60 +_0216f910: .word gMapManager .global func_ov26_0216f914 arm_func_start func_ov26_0216f914 @@ -2946,7 +2946,7 @@ func_ov26_0216f920: ; 0x0216f920 sub sp, sp, #0x24 mov r4, r0 ldr lr, [r4, #0x48] - ldr r0, _0216f9f4 ; =data_027e0e60 + ldr r0, _0216f9f4 ; =gMapManager str lr, [sp, #0x18] ldr ip, [r4, #0x4c] ldr r0, [r0] @@ -2998,7 +2998,7 @@ _0216f9d8: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov26_0216f920 -_0216f9f4: .word data_027e0e60 +_0216f9f4: .word gMapManager .global func_ov26_0216f9f8 arm_func_start func_ov26_0216f9f8 @@ -3059,7 +3059,7 @@ _0216fa94: strb r2, [sp] strb r2, [sp, #1] bl func_ov00_020c5374 - ldr r0, _0216fb18 ; =data_027e0e60 + ldr r0, _0216fb18 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084164Ev @@ -3083,7 +3083,7 @@ _0216fa94: arm_func_end func_ov26_0216fa04 _0216fb10: .word data_027e0f94 _0216fb14: .word 0x000004cd -_0216fb18: .word data_027e0e60 +_0216fb18: .word gMapManager .global func_ov26_0216fb1c arm_func_start func_ov26_0216fb1c @@ -3234,7 +3234,7 @@ _0216fc2c: add r0, r5, #0x48 add r1, sp, #0 bl func_ov00_020c5374 - ldr r0, _0216fd94 ; =data_027e0e60 + ldr r0, _0216fd94 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084164Ev @@ -3261,7 +3261,7 @@ _0216fd84: .word data_027e0764 _0216fd88: .word 0x00008001 _0216fd8c: .word data_02050f54 _0216fd90: .word data_027e0d0c -_0216fd94: .word data_027e0e60 +_0216fd94: .word gMapManager .global func_ov26_0216fd98 arm_func_start func_ov26_0216fd98 @@ -3295,7 +3295,7 @@ func_ov26_0216fdb0: ; 0x0216fdb0 str r3, [sp, #0x10] bl func_0202da8c ldr r1, [sp, #0xc] - ldr r0, _0216fe84 ; =data_027e0e60 + ldr r0, _0216fe84 ; =gMapManager str r1, [r4, #0x60] ldr r2, [sp, #0x10] add r1, sp, #0 @@ -3333,7 +3333,7 @@ _0216fe68: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov26_0216fdb0 -_0216fe84: .word data_027e0e60 +_0216fe84: .word gMapManager .global func_ov26_0216fe88 arm_func_start func_ov26_0216fe88 @@ -3405,7 +3405,7 @@ func_ov26_0216ff14: ; 0x0216ff14 mov r0, #0xff strh r0, [r4, #0x9c] ldr r1, [r4, #0x48] - ldr r0, _0216ff68 ; =data_027e0e60 + ldr r0, _0216ff68 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -3422,7 +3422,7 @@ func_ov26_0216ff14: ; 0x0216ff14 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov26_0216ff14 -_0216ff68: .word data_027e0e60 +_0216ff68: .word gMapManager .global func_ov26_0216ff6c arm_func_start func_ov26_0216ff6c @@ -3456,7 +3456,7 @@ func_ov26_0216ffb8: ; 0x0216ffb8 sub sp, sp, #0xc mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _02170010 ; =data_027e0e60 + ldr r0, _02170010 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -3476,7 +3476,7 @@ func_ov26_0216ffb8: ; 0x0216ffb8 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov26_0216ffb8 -_02170010: .word data_027e0e60 +_02170010: .word gMapManager .global func_ov26_02170014 arm_func_start func_ov26_02170014 @@ -3543,7 +3543,7 @@ func_ov26_02170088: ; 0x02170088 mov r1, #0x148 bl func_0202da8c ldr r1, [r4, #0x48] - ldr r0, _02170130 ; =data_027e0e60 + ldr r0, _02170130 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -3574,7 +3574,7 @@ _02170114: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov26_02170088 -_02170130: .word data_027e0e60 +_02170130: .word gMapManager .global func_ov26_02170134 arm_func_start func_ov26_02170134 @@ -3653,7 +3653,7 @@ func_ov26_02170194: ; 0x02170194 add r1, sp, #0 add r0, r4, #0x48 bl func_ov00_020c5374 - ldr r0, _02170260 ; =data_027e0e60 + ldr r0, _02170260 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084164Ev @@ -3677,7 +3677,7 @@ func_ov26_02170194: ; 0x02170194 arm_func_end func_ov26_02170194 _02170258: .word data_027e0f94 _0217025c: .word 0x000004cd -_02170260: .word data_027e0e60 +_02170260: .word gMapManager .global func_ov26_02170264 arm_func_start func_ov26_02170264 @@ -3869,7 +3869,7 @@ func_ov26_02170320: ; 0x02170320 strb r2, [sp, #4] strb r2, [sp, #5] bl func_ov00_020c5374 - ldr r0, _0217058c ; =data_027e0e60 + ldr r0, _0217058c ; =gMapManager add r1, sp, #4 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084164Ev @@ -3897,7 +3897,7 @@ _0217057c: .word data_02050f54 _02170580: .word 0x0000019a _02170584: .word data_027e0f94 _02170588: .word data_027e0fa0 -_0217058c: .word data_027e0e60 +_0217058c: .word gMapManager .global func_ov26_02170590 arm_func_start func_ov26_02170590 @@ -4020,7 +4020,7 @@ func_ov26_02170704: ; 0x02170704 add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0217078c ; =data_027e0e60 + ldr r0, _0217078c ; =gMapManager ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -4050,7 +4050,7 @@ _02170780: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02170704 -_0217078c: .word data_027e0e60 +_0217078c: .word gMapManager _02170790: .word data_027e0f94 .global func_ov26_02170794 @@ -5722,7 +5722,7 @@ func_ov26_02171e4c: ; 0x02171e4c cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} - ldr r0, _02171e94 ; =data_027e0e60 + ldr r0, _02171e94 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -5731,7 +5731,7 @@ func_ov26_02171e4c: ; 0x02171e4c arm_func_end func_ov26_02171e4c _02171e8c: .word gAdventureFlags _02171e90: .word data_ov26_0217944c -_02171e94: .word data_027e0e60 +_02171e94: .word gMapManager .global func_ov26_02171e98 arm_func_start func_ov26_02171e98 @@ -6146,7 +6146,7 @@ func_ov26_021723d4: ; 0x021723d4 cmp r0, #1 bne _02172454 ldr r0, [r4, #0x18] - ldr r1, _021725a0 ; =data_027e0e60 + ldr r1, _021725a0 ; =gMapManager add r0, r0, #0x3fc add r0, r0, #0x400 str r0, [r4, #0x18] @@ -6159,7 +6159,7 @@ func_ov26_021723d4: ; 0x021723d4 strb r3, [sp, #5] bl _ZN10MapManager18func_ov00_020826a0Eiii ldrb r2, [sp, #4] - ldr r0, _021725a0 ; =data_027e0e60 + ldr r0, _021725a0 ; =gMapManager add r1, sp, #4 add r3, r2, #1 ldr r0, [r0] @@ -6231,7 +6231,7 @@ _02172454: mov r3, #6 str ip, [sp] bl func_02018c90 - ldr r0, _021725a0 ; =data_027e0e60 + ldr r0, _021725a0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -6253,7 +6253,7 @@ _0217258c: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov26_021723d4 -_021725a0: .word data_027e0e60 +_021725a0: .word gMapManager _021725a4: .word data_ov26_02179468 _021725a8: .word func_ov26_021728f8 @@ -6396,7 +6396,7 @@ _0217273c: mov r2, #1 bl func_ov00_0208ba08 _02172788: - ldr r0, _021727b0 ; =data_027e0e60 + ldr r0, _021727b0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -6409,7 +6409,7 @@ _0217279c: arm_func_end func_ov26_02172648 _021727a8: .word gAdventureFlags _021727ac: .word 0xfffff666 -_021727b0: .word data_027e0e60 +_021727b0: .word gMapManager .global func_ov26_021727b4 arm_func_start func_ov26_021727b4 @@ -7919,14 +7919,14 @@ func_ov26_02173b3c: ; 0x02173b3c movne r0, #1 ldmneia sp!, {r4, pc} _02173b64: - ldr r0, _02173b78 ; =data_027e0e60 + ldr r0, _02173b78 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02173b3c -_02173b78: .word data_027e0e60 +_02173b78: .word gMapManager .global func_ov26_02173b7c thumb_func_start func_ov26_02173b7c @@ -12275,7 +12275,7 @@ func_ov26_02176b44: ; 0x02176b44 mov r2, #4 str r3, [sp, #4] blx ip - ldr r0, _02176cb0 ; =data_027e0e60 + ldr r0, _02176cb0 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -12299,7 +12299,7 @@ _02176c94: .align 2, 0 arm_func_end func_ov26_02176b44 _02176cac: .word 0x0000059a -_02176cb0: .word data_027e0e60 +_02176cb0: .word gMapManager .global func_ov26_02176cb4 arm_func_start func_ov26_02176cb4 @@ -12343,7 +12343,7 @@ _02176d0c: mov r0, r4 mov r2, r1 bl func_ov00_0208ba08 - ldr r0, _02176d88 ; =data_027e0e60 + ldr r0, _02176d88 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] mov r2, #1 @@ -12362,7 +12362,7 @@ _02176d7c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02176cb4 -_02176d88: .word data_027e0e60 +_02176d88: .word gMapManager .global func_ov26_02176d8c arm_func_start func_ov26_02176d8c @@ -12541,22 +12541,22 @@ func_ov26_02176fc8: ; 0x02176fc8 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldrh r4, [r6, #0x28] - ldr r0, _0217702c ; =data_027e0e60 + ldr r0, _0217702c ; =gMapManager ldrh r5, [r6, #0x2a] ldr r0, [r0] mov r1, r4 bl _ZN10MapManager18func_ov00_020823d4Ei - ldr r1, _0217702c ; =data_027e0e60 + ldr r1, _0217702c ; =gMapManager str r0, [r6, #0xd4] ldr r0, [r1] mov r1, r4 bl _ZN10MapManager18func_ov00_020823e4Ei - ldr r1, _0217702c ; =data_027e0e60 + ldr r1, _0217702c ; =gMapManager str r0, [r6, #0xd8] ldr r0, [r1] mov r1, r5 bl _ZN10MapManager18func_ov00_020823d4Ei - ldr r1, _0217702c ; =data_027e0e60 + ldr r1, _0217702c ; =gMapManager str r0, [r6, #0xdc] ldr r0, [r1] mov r1, r5 @@ -12565,7 +12565,7 @@ func_ov26_02176fc8: ; 0x02176fc8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov26_02176fc8 -_0217702c: .word data_027e0e60 +_0217702c: .word gMapManager .global func_ov26_02177030 arm_func_start func_ov26_02177030 @@ -12588,7 +12588,7 @@ func_ov26_02177030: ; 0x02177030 mov r0, r5 ldr r1, _021770fc ; =data_ov26_021795a0 bl func_0201933c - ldr r0, _02177100 ; =data_027e0e60 + ldr r0, _02177100 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_b4Ev mov r4, r0 @@ -12624,7 +12624,7 @@ _021770f0: .word data_ov26_02179564 _021770f4: .word data_ov26_02179578 _021770f8: .word data_ov26_0217958c _021770fc: .word data_ov26_021795a0 -_02177100: .word data_027e0e60 +_02177100: .word gMapManager .global func_ov26_02177104 arm_func_start func_ov26_02177104 @@ -13237,7 +13237,7 @@ func_ov26_02177878: ; 0x02177878 func_ov26_02177880: ; 0x02177880 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x80 - ldr r5, _021778e0 ; =data_027e0e60 + ldr r5, _021778e0 ; =gMapManager ldr r4, _021778e4 ; =data_027e0d3c mvn r7, #0 mov r8, #0 @@ -13263,7 +13263,7 @@ _021778d4: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov26_02177880 -_021778e0: .word data_027e0e60 +_021778e0: .word gMapManager _021778e4: .word data_027e0d3c .global func_ov26_021778e8 @@ -13686,7 +13686,7 @@ func_ov26_02177e14: ; 0x02177e14 mov r2, #0x10000 str r0, [r7, #0x90] ldr r0, [r7, #0x84] - ldr r1, _02177f60 ; =data_027e0e60 + ldr r1, _02177f60 ; =gMapManager str r0, [r7, #0x94] ldr r4, [r7, #0x88] add r0, sp, #4 @@ -13699,7 +13699,7 @@ func_ov26_02177e14: ; 0x02177e14 add r2, r7, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldr r4, _02177f64 ; =data_ov26_0217af64 - ldr r6, _02177f60 ; =data_027e0e60 + ldr r6, _02177f60 ; =gMapManager add r9, sp, #2 mov r8, #1 _02177e90: @@ -13720,7 +13720,7 @@ _02177e90: cmp r5, #0x12 blo _02177e90 mov r0, #0 - ldr r8, _02177f60 ; =data_027e0e60 + ldr r8, _02177f60 ; =gMapManager strb r0, [sp] strb r0, [sp, #1] mov r6, #6 @@ -13759,7 +13759,7 @@ _02177ef4: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov26_02177e14 -_02177f60: .word data_027e0e60 +_02177f60: .word gMapManager _02177f64: .word data_ov26_0217af64 _02177f68: .word 0xffffeccd @@ -14004,7 +14004,7 @@ _02178224: .word data_027e103c .global func_ov26_02178228 arm_func_start func_ov26_02178228 func_ov26_02178228: ; 0x02178228 - ldr r1, _02178244 ; =data_027e0e60 + ldr r1, _02178244 ; =gMapManager mov r2, r0 ldr r0, [r1] ldr r1, [r2, #0x15c] @@ -14013,7 +14013,7 @@ func_ov26_02178228: ; 0x02178228 bx ip .align 2, 0 arm_func_end func_ov26_02178228 -_02178244: .word data_027e0e60 +_02178244: .word gMapManager _02178248: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov26_0217824c @@ -14130,7 +14130,7 @@ _02178354: bl func_ov00_020d7180 cmp r0, #0 bne _02178384 - ldr r0, _021783b4 ; =data_027e0e60 + ldr r0, _021783b4 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 @@ -14153,7 +14153,7 @@ _02178384: _021783a8: .word data_027e0f64 _021783ac: .word data_ov26_0217968c _021783b0: .word data_ov00_020eec68 -_021783b4: .word data_027e0e60 +_021783b4: .word gMapManager .global func_ov26_021783b8 arm_func_start func_ov26_021783b8 @@ -14307,14 +14307,14 @@ func_ov26_0217855c: ; 0x0217855c sub sp, sp, #0x20 mov r10, r0 ldrb r2, [r10, #0x15] - ldr r0, _021786d4 ; =data_027e0e60 + ldr r0, _021786d4 ; =gMapManager ldrb r1, [r10, #0x14] ldr r0, [r0] sub r2, r2, #1 bl _ZN10MapManager18func_ov00_02083e34Ecci str r0, [r10, #0x1c] ldr r1, [r10, #0x18] - ldr r0, _021786d4 ; =data_027e0e60 + ldr r0, _021786d4 ; =gMapManager add r1, r1, #0x800 str r1, [r10, #0x18] str r1, [r10, #0x50] @@ -14363,7 +14363,7 @@ _02178620: cmp r11, r0 add r9, r1, #0xc bge _0217868c - ldr r4, _021786d4 ; =data_027e0e60 + ldr r4, _021786d4 ; =gMapManager add r6, sp, #4 mov r5, #1 _02178648: @@ -14407,7 +14407,7 @@ _0217868c: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov26_0217855c -_021786d4: .word data_027e0e60 +_021786d4: .word gMapManager .global func_ov26_021786d8 arm_func_start func_ov26_021786d8 diff --git a/asm/ov27.inc b/asm/ov27.inc index 191418e7..619f9277 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -93,7 +93,7 @@ .extern data_027e0d38 .extern data_027e0dbc .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f84 diff --git a/asm/ov27.s b/asm/ov27.s index e593923c..62c89b51 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -357,7 +357,7 @@ _0216db58: add r0, r0, #0x800 str r0, [r5, #0x48] ldr r1, [r5, #0x4c] - ldr r0, _0216e91c ; =data_027e0e60 + ldr r0, _0216e91c ; =gMapManager add r1, r1, #0x2800 str r1, [r5, #0x4c] ldr r3, [r5, #0x50] @@ -1262,7 +1262,7 @@ _0216e8fc: arm_func_end func_ov27_0216da38 _0216e914: .word 0x00000ccd _0216e918: .word data_027e0d0c -_0216e91c: .word data_027e0e60 +_0216e91c: .word gMapManager _0216e920: .word data_027e0c68 _0216e924: .word 0x00060003 _0216e928: .word gAdventureFlags @@ -1414,7 +1414,7 @@ _0216eadc: bne _0216eb48 mov r1, #2 strb r1, [r4, #0x4ad] - ldr r0, _0216ed44 ; =data_027e0e60 + ldr r0, _0216ed44 ; =gMapManager add r1, sp, #0xc ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -1462,7 +1462,7 @@ _0216eb54: strb r2, [sp, #0x94] ldr r0, [r0, #4] bl func_ov00_02087d34 - ldr r0, _0216ed44 ; =data_027e0e60 + ldr r0, _0216ed44 ; =gMapManager ldr r2, _0216ed4c ; =0x00001333 mov r3, #0xc000 ldr r0, [r0] @@ -1564,7 +1564,7 @@ _0216ed38: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov27_0216eabc -_0216ed44: .word data_027e0e60 +_0216ed44: .word gMapManager _0216ed48: .word data_027e0f64 _0216ed4c: .word 0x00001333 _0216ed50: .word gAdventureFlags @@ -2094,7 +2094,7 @@ _0216f43c: cmp r0, #4 cmpne r0, #7 bne _0216f4b0 - ldr r0, _0216f574 ; =data_027e0e60 + ldr r0, _0216f574 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -2163,7 +2163,7 @@ _0216f544: _0216f568: .word data_ov00_020eec68 _0216f56c: .word data_027e0f64 _0216f570: .word data_ov27_02178e20 -_0216f574: .word data_027e0e60 +_0216f574: .word gMapManager _0216f578: .word data_027e0ff8 .global func_ov27_0216f57c @@ -2193,7 +2193,7 @@ func_ov27_0216f57c: ; 0x0216f57c func_ov27_0216f5c0: ; 0x0216f5c0 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _0216f604 ; =data_027e0e60 + ldr r0, _0216f604 ; =gMapManager ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 @@ -2210,7 +2210,7 @@ func_ov27_0216f5c0: ; 0x0216f5c0 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov27_0216f5c0 -_0216f604: .word data_027e0e60 +_0216f604: .word gMapManager .global func_ov27_0216f608 arm_func_start func_ov27_0216f608 @@ -2252,7 +2252,7 @@ func_ov27_0216f608: ; 0x0216f608 str r2, [r4, #0x64] str r1, [r4, #0x68] ldr r1, [r4, #0x48] - ldr r0, _0216f8e8 ; =data_027e0e60 + ldr r0, _0216f8e8 ; =gMapManager str r1, [sp, #4] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -2406,7 +2406,7 @@ _0216f8a8: arm_func_end func_ov27_0216f608 _0216f8e0: .word data_02050f54 _0216f8e4: .word 0x00000133 -_0216f8e8: .word data_027e0e60 +_0216f8e8: .word gMapManager _0216f8ec: .word 0x00000171 _0216f8f0: .word 0x0000071c _0216f8f4: .word 0x00000333 @@ -3155,7 +3155,7 @@ _021702d0: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r1, [r4, #0x48] - ldr r0, _02170470 ; =data_027e0e60 + ldr r0, _02170470 ; =gMapManager str r1, [sp, #8] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -3261,7 +3261,7 @@ _02170444: _02170464: .word 0x00000e39 _02170468: .word 0x0000019a _0217046c: .word 0x000004cd -_02170470: .word data_027e0e60 +_02170470: .word gMapManager _02170474: .word data_027e0e58 _02170478: .word 0x00000163 _0217047c: .word data_027e0764 @@ -4000,7 +4000,7 @@ func_ov27_02170e24: ; 0x02170e24 mov r0, #0x3000 str r0, [r4, #0x4c] ldr r1, [r4, #0x48] - ldr r0, _02170f84 ; =data_027e0e60 + ldr r0, _02170f84 ; =gMapManager str r1, [sp, #0xc] ldr r2, [r4, #0x4c] ldr r0, [r0] @@ -4034,7 +4034,7 @@ _02170f5c: _02170f78: .word 0x0000071c _02170f7c: .word data_02050f54 _02170f80: .word 0x00000266 -_02170f84: .word data_027e0e60 +_02170f84: .word gMapManager .global func_ov27_02170f88 arm_func_start func_ov27_02170f88 @@ -4914,7 +4914,7 @@ func_ov27_02171b14: ; 0x02171b14 mov ip, #1 str r0, [sp, #0x28] ldr r1, [r6, #0x54] - ldr r0, _02171c9c ; =data_027e0e60 + ldr r0, _02171c9c ; =gMapManager str r1, [sp, #0x14] ldr r2, [r6, #0x58] add r1, r6, #0xb8 @@ -4976,7 +4976,7 @@ _02171c90: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov27_02171b14 -_02171c9c: .word data_027e0e60 +_02171c9c: .word gMapManager .global func_ov27_02171ca0 arm_func_start func_ov27_02171ca0 @@ -5421,7 +5421,7 @@ _02172284: cmp r0, #0 bne _021722d0 ldr r1, [r6, #0x48] - ldr r0, _02172484 ; =data_027e0e60 + ldr r0, _02172484 ; =gMapManager str r1, [sp, #0x18] ldr r1, [r6, #0x4c] ldr r0, [r0] @@ -5456,7 +5456,7 @@ _021722d0: add r0, r6, #0x300 ldrsh r1, [r0, #0x96] mov r2, #0 - ldr r0, _02172484 ; =data_027e0e60 + ldr r0, _02172484 ; =gMapManager add r1, r1, #0x4000 strh r1, [r6, #0x78] str r2, [r6, #0x6c] @@ -5552,7 +5552,7 @@ _0217245c: _02172478: .word gAdventureFlags _0217247c: .word data_02050f54 _02172480: .word 0x0000019a -_02172484: .word data_027e0e60 +_02172484: .word gMapManager _02172488: .word 0x00000b33 _0217248c: .word 0xffff699a _02172490: .word data_027e0d0c @@ -5774,7 +5774,7 @@ func_ov27_02172598: ; 0x02172598 ldr r0, [sp, #0x28] ldr r1, [sp, #0x24] str r0, [sp, #0x1c] - ldr r0, _02172838 ; =data_027e0e60 + ldr r0, _02172838 ; =gMapManager str r1, [sp, #0x18] ldr r1, [sp, #0x2c] ldr r0, [r0] @@ -5811,7 +5811,7 @@ func_ov27_02172598: ; 0x02172598 _0217282c: .word data_02050f54 _02172830: .word 0xfffff99a _02172834: .word 0xfffffa66 -_02172838: .word data_027e0e60 +_02172838: .word gMapManager _0217283c: .word 0x00000a8f _02172840: .word data_ov00_020e9370 @@ -5962,7 +5962,7 @@ func_ov27_0217296c: ; 0x0217296c str r2, [sp, #8] add r1, sp, #0x14 str r1, [sp, #0xc] - ldr r1, _02172aa0 ; =data_027e0e60 + ldr r1, _02172aa0 ; =gMapManager str r0, [sp, #0x10] ldr r0, [r1] add r1, sp, #0x40 @@ -5977,7 +5977,7 @@ func_ov27_0217296c: ; 0x0217296c arm_func_end func_ov27_0217296c _02172a98: .word 0x0000ffff _02172a9c: .word data_ov27_021796d4 -_02172aa0: .word data_027e0e60 +_02172aa0: .word gMapManager .global func_ov27_02172aa4 arm_func_start func_ov27_02172aa4 @@ -6640,7 +6640,7 @@ func_ov27_02173330: ; 0x02173330 ldreqb r0, [r4, #0x5af] cmpeq r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _021733a8 ; =data_027e0e60 + ldr r0, _021733a8 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -6665,7 +6665,7 @@ func_ov27_02173330: ; 0x02173330 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov27_02173330 -_021733a8: .word data_027e0e60 +_021733a8: .word gMapManager _021733ac: .word data_027e0c68 _021733b0: .word 0x00060007 @@ -7017,7 +7017,7 @@ func_ov27_02173830: ; 0x02173830 cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _021738d8 ; =data_027e0e60 + ldr r0, _021738d8 ; =gMapManager mov lr, #0 ldr r0, [r0] sub ip, lr, #2 @@ -7050,7 +7050,7 @@ func_ov27_02173830: ; 0x02173830 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov27_02173830 -_021738d8: .word data_027e0e60 +_021738d8: .word gMapManager _021738dc: .word data_027e0d38 .global func_ov27_021738e0 @@ -7442,7 +7442,7 @@ func_ov27_02173d78: ; 0x02173d78 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r2, [sp, #0x24] - ldr r0, _02173e30 ; =data_027e0e60 + ldr r0, _02173e30 ; =gMapManager ldr r1, [sp, #0x28] str r2, [sp, #0x18] ldr r2, [sp, #0x2c] @@ -7470,7 +7470,7 @@ func_ov27_02173d78: ; 0x02173d78 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov27_02173d78 -_02173e30: .word data_027e0e60 +_02173e30: .word gMapManager _02173e34: .word 0x0000099a _02173e38: .word data_ov00_020e9370 @@ -7965,7 +7965,7 @@ func_ov27_0217440c: ; 0x0217440c bl _ZN5Actor18func_Ov00_020c1bfcEi cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02174450 ; =data_027e0e60 + ldr r0, _02174450 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -7978,7 +7978,7 @@ func_ov27_0217440c: ; 0x0217440c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov27_0217440c -_02174450: .word data_027e0e60 +_02174450: .word gMapManager .global func_ov27_02174454 arm_func_start func_ov27_02174454 @@ -8033,7 +8033,7 @@ func_ov27_02174454: ; 0x02174454 strb r1, [r4, #0x1c1] bl _ZN5Actor10SetUnk_11cEc ldr r1, [r4, #0x48] - ldr r0, _021746f8 ; =data_027e0e60 + ldr r0, _021746f8 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -8154,7 +8154,7 @@ _021746e8: .word data_027e0fac _021746ec: .word data_02050f54 _021746f0: .word data_027e0c68 _021746f4: .word 0x00060015 -_021746f8: .word data_027e0e60 +_021746f8: .word gMapManager _021746fc: .word data_027e0f64 _02174700: .word gAdventureFlags @@ -8200,7 +8200,7 @@ func_ov27_02174748: ; 0x02174748 mov r0, #0x2000 str r0, [r4, #0x4c] ldr r1, [r4, #0x48] - ldr r0, _021747d0 ; =data_027e0e60 + ldr r0, _021747d0 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -8219,7 +8219,7 @@ func_ov27_02174748: ; 0x02174748 .align 2, 0 arm_func_end func_ov27_02174748 _021747cc: .word data_027e0d0c -_021747d0: .word data_027e0e60 +_021747d0: .word gMapManager .global func_ov27_021747d4 arm_func_start func_ov27_021747d4 @@ -8228,7 +8228,7 @@ func_ov27_021747d4: ; 0x021747d4 sub sp, sp, #0xc mov r5, r0 ldr r1, [r5, #0x48] - ldr r0, _021748d4 ; =data_027e0e60 + ldr r0, _021748d4 ; =gMapManager str r1, [sp] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -8293,7 +8293,7 @@ _021748c8: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov27_021747d4 -_021748d4: .word data_027e0e60 +_021748d4: .word gMapManager _021748d8: .word 0x00000222 _021748dc: .word gAdventureFlags _021748e0: .word 0x00000266 @@ -9142,7 +9142,7 @@ func_ov27_021752a8: ; 0x021752a8 bic r0, r0, #0x1f orr r0, r0, #9 str r0, [sp, #4] - ldr r0, _021753d4 ; =data_027e0e60 + ldr r0, _021753d4 ; =gMapManager str ip, [sp, #8] str r3, [sp, #0xc] ldr r1, [r1, #8] @@ -9177,7 +9177,7 @@ _021753c4: .word func_ov27_02174f08 _021753c8: .word data_ov27_0217903c _021753cc: .word func_ov27_02175048 _021753d0: .word data_027e0d0c -_021753d4: .word data_027e0e60 +_021753d4: .word gMapManager .global func_ov27_021753d8 arm_func_start func_ov27_021753d8 @@ -9236,7 +9236,7 @@ _02175454: mov r2, r1 bl _ZN5Actor18func_ov00_020c243cEiPi _021754a4: - ldr r0, _02175554 ; =data_027e0e60 + ldr r0, _02175554 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -9286,7 +9286,7 @@ _02175538: .align 2, 0 arm_func_end func_ov27_021753d8 _02175550: .word data_027e0cbc -_02175554: .word data_027e0e60 +_02175554: .word gMapManager _02175558: .word data_027e0fc8 _0217555c: .word data_027e0f6c @@ -9377,7 +9377,7 @@ func_ov27_02175660: ; 0x02175660 ldrb r0, [r4, #0x285] cmp r0, #0 bne _021757e4 - ldr r0, _02175810 ; =data_027e0e60 + ldr r0, _02175810 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -9484,7 +9484,7 @@ _021757e4: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov27_02175660 -_02175810: .word data_027e0e60 +_02175810: .word gMapManager _02175814: .word 0x0000038e _02175818: .word 0x00000e39 _0217581c: .word 0x000078e4 diff --git a/asm/ov28.inc b/asm/ov28.inc index f465f63a..4f9adee9 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -102,7 +102,7 @@ .extern data_027e0c68 .extern data_027e0ce0 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov28.s b/asm/ov28.s index 05f4f70e..6a48332b 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -3512,7 +3512,7 @@ func_ov28_021704b0: ; 0x021704b0 bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02170524 - ldr r0, _02170630 ; =data_027e0e60 + ldr r0, _02170630 ; =gMapManager mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -3532,7 +3532,7 @@ _02170524: bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02170570 - ldr r0, _02170630 ; =data_027e0e60 + ldr r0, _02170630 ; =gMapManager mov r2, #1 ldr r0, [r0] mov r3, r2 @@ -3552,7 +3552,7 @@ _02170570: bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _021705bc - ldr r0, _02170630 ; =data_027e0e60 + ldr r0, _02170630 ; =gMapManager mov r2, #1 ldr r0, [r0] mov r3, r2 @@ -3572,7 +3572,7 @@ _021705bc: bl _ZN14AdventureFlags3GetEj cmp r0, #0 beq _02170604 - ldr r0, _02170630 ; =data_027e0e60 + ldr r0, _02170630 ; =gMapManager mov r2, #1 ldr r0, [r0] mov r3, r2 @@ -3593,7 +3593,7 @@ _02170618: _02170624: .word gAdventureFlags _02170628: .word 0x00000126 _0217062c: .word 0x0000012a -_02170630: .word data_027e0e60 +_02170630: .word gMapManager _02170634: .word 0x00000127 _02170638: .word 0x0000012b _0217063c: .word 0x00000129 @@ -3941,7 +3941,7 @@ _021709a4: mov r2, #0 strb r2, [r4, #0x48d] ldr r1, [r4, #0x48] - ldr r0, _02170a94 ; =data_027e0e60 + ldr r0, _02170a94 ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r6, [r0] @@ -3981,7 +3981,7 @@ _02170a84: .align 2, 0 arm_func_end func_ov28_02170930 _02170a90: .word data_ov28_0217827c -_02170a94: .word data_027e0e60 +_02170a94: .word gMapManager _02170a98: .word 0xffffec78 .global func_ov28_02170a9c @@ -5545,7 +5545,7 @@ func_ov28_02171d10: ; 0x02171d10 add r0, r7, #2 cmp r7, r0 bge _02171f28 - ldr r10, _02171f74 ; =data_027e0e60 + ldr r10, _02171f74 ; =gMapManager add r5, sp, #4 mov r4, #1 _02171ed4: @@ -5595,7 +5595,7 @@ _02171f58: .align 2, 0 arm_func_end func_ov28_02171d10 _02171f70: .word data_027e0f6c -_02171f74: .word data_027e0e60 +_02171f74: .word gMapManager .global func_ov28_02171f78 arm_func_start func_ov28_02171f78 @@ -5660,7 +5660,7 @@ _02172008: add r0, r4, #0x70 mov r1, #3 bl func_ov00_02094884 - ldr r0, _021720d0 ; =data_027e0e60 + ldr r0, _021720d0 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -5685,7 +5685,7 @@ _02172068: add r0, r4, #0x70 mov r1, #1 bl func_ov00_02094884 - ldr r0, _021720d0 ; =data_027e0e60 + ldr r0, _021720d0 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 @@ -5698,7 +5698,7 @@ _021720c4: .align 2, 0 arm_func_end func_ov28_02171fe8 _021720cc: .word data_027e0f68 -_021720d0: .word data_027e0e60 +_021720d0: .word gMapManager .global func_ov28_021720d4 arm_func_start func_ov28_021720d4 @@ -5927,7 +5927,7 @@ func_ov28_02172280: ; 0x02172280 add r0, r7, #2 cmp r7, r0 bge _02172404 - ldr r10, _02172450 ; =data_027e0e60 + ldr r10, _02172450 ; =gMapManager add r5, sp, #4 mov r4, #1 _021723b0: @@ -5977,7 +5977,7 @@ _02172434: .align 2, 0 arm_func_end func_ov28_02172280 _0217244c: .word 0x0000059a -_02172450: .word data_027e0e60 +_02172450: .word gMapManager .global func_ov28_02172454 arm_func_start func_ov28_02172454 @@ -6061,7 +6061,7 @@ _02172528: add r0, r4, #0x38 mov r1, #0 bl func_ov00_02094884 - ldr r0, _021725e4 ; =data_027e0e60 + ldr r0, _021725e4 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #0 @@ -6084,7 +6084,7 @@ _02172580: add r0, r4, #0x38 mov r1, #3 bl func_ov00_02094884 - ldr r0, _021725e4 ; =data_027e0e60 + ldr r0, _021725e4 ; =gMapManager add r1, r4, #0x38 ldr r0, [r0] mov r2, #1 @@ -6099,7 +6099,7 @@ _021725d8: .align 2, 0 arm_func_end func_ov28_02172508 _021725e0: .word data_027e0f68 -_021725e4: .word data_027e0e60 +_021725e4: .word gMapManager .global func_ov28_021725e8 arm_func_start func_ov28_021725e8 @@ -6536,7 +6536,7 @@ _02172af4: .word data_ov28_02179274 func_ov28_02172af8: ; 0x02172af8 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _02172b3c ; =data_027e0e60 + ldr r0, _02172b3c ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -6553,7 +6553,7 @@ func_ov28_02172af8: ; 0x02172af8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_02172af8 -_02172b3c: .word data_027e0e60 +_02172b3c: .word gMapManager .global func_ov28_02172b40 arm_func_start func_ov28_02172b40 @@ -6611,7 +6611,7 @@ _02172bc4: .word data_ov28_02179274 func_ov28_02172bc8: ; 0x02172bc8 stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _02172c24 ; =data_027e0e60 + ldr r0, _02172c24 ; =gMapManager ldrh r1, [r4, #0x22] ldr r0, [r0] mov r2, #0 @@ -6634,7 +6634,7 @@ func_ov28_02172bc8: ; 0x02172bc8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_02172bc8 -_02172c24: .word data_027e0e60 +_02172c24: .word gMapManager .global func_ov28_02172c28 arm_func_start func_ov28_02172c28 @@ -8451,7 +8451,7 @@ func_ov28_021742b0: ; 0x021742b0 strb r2, [sp, #0x10] strb r2, [sp, #0x16] bl _ZN14AdventureFlags18func_Ov00_02097810Ei - ldr r1, _02174384 ; =data_027e0e60 + ldr r1, _02174384 ; =gMapManager str r0, [r4, #0x228] ldr r0, [r1] add r1, r4, #0x48 @@ -8467,7 +8467,7 @@ func_ov28_021742b0: ; 0x021742b0 _02174378: .word 0x00000666 _0217437c: .word data_ov28_021794e4 _02174380: .word gAdventureFlags -_02174384: .word data_027e0e60 +_02174384: .word gMapManager .global func_ov28_02174388 arm_func_start func_ov28_02174388 @@ -8947,7 +8947,7 @@ func_ov28_02174958: ; 0x02174958 func_ov28_0217496c: ; 0x0217496c stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x18 - ldr r1, _02174a0c ; =data_027e0e60 + ldr r1, _02174a0c ; =gMapManager mov lr, #0 mov r4, r0 ldr r0, [r1] @@ -8970,7 +8970,7 @@ func_ov28_0217496c: ; 0x0217496c ldr r2, _02174a14 ; =0x00000004 mov r1, #2 blx _ZN14OverlayManager15LoadIfNotLoadedEjj - ldr r0, _02174a0c ; =data_027e0e60 + ldr r0, _02174a0c ; =gMapManager mov r2, #1 ldr r0, [r0] add r1, sp, #0 @@ -8987,7 +8987,7 @@ func_ov28_0217496c: ; 0x0217496c ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov28_0217496c -_02174a0c: .word data_027e0e60 +_02174a0c: .word gMapManager _02174a10: .word gOverlayManager _02174a14: .word 0x00000004 _02174a18: .word 0x00000005 @@ -9501,7 +9501,7 @@ _0217504c: bl func_ov28_02174948 ldrb ip, [r4, #0x2a] ldrsb r3, [r0, #0xb] - ldr r1, _0217509c ; =data_027e0e60 + ldr r1, _0217509c ; =gMapManager ldrb r2, [r4, #0x28] ldr r0, [r1] add r1, ip, r3 @@ -9520,7 +9520,7 @@ _0217504c: .align 2, 0 arm_func_end func_ov28_02175028 _02175098: .word data_027e0e58 -_0217509c: .word data_027e0e60 +_0217509c: .word gMapManager _021750a0: .word data_ov28_02179684 .global func_ov28_021750a4 @@ -9617,7 +9617,7 @@ _02175184: bl func_ov28_02174948 ldrsb r1, [r0, #0xb] ldrb r3, [r4, #0x2a] - ldr r0, _0217525c ; =data_027e0e60 + ldr r0, _0217525c ; =gMapManager ldrb r2, [r4, #0x28] add r1, r3, r1 ldr r0, [r0] @@ -9662,7 +9662,7 @@ _0217524c: .word 0x000001bd _02175250: .word data_027e0ffc _02175254: .word 0x000001a9 _02175258: .word data_ov28_02178348 -_0217525c: .word data_027e0e60 +_0217525c: .word gMapManager _02175260: .word data_ov28_02179684 _02175264: .word data_ov00_020eec68 _02175268: .word data_027e0c68 @@ -9728,7 +9728,7 @@ _02175308: ldr r0, [r2, #0x44] cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _021753dc ; =data_027e0e60 + ldr r0, _021753dc ; =gMapManager ldrb r2, [r4, #0x29] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084be0Eii @@ -9743,7 +9743,7 @@ _02175364: bl func_ov28_02174948 ldrb ip, [r4, #0x2a] ldrsb r3, [r0, #0xb] - ldr r1, _021753dc ; =data_027e0e60 + ldr r1, _021753dc ; =gMapManager ldrb r2, [r4, #0x28] ldr r0, [r1] add r1, ip, r3 @@ -9774,7 +9774,7 @@ _021753c0: .align 2, 0 arm_func_end func_ov28_02175274 _021753d8: .word data_027e0c68 -_021753dc: .word data_027e0e60 +_021753dc: .word gMapManager _021753e0: .word data_ov00_020eec9c _021753e4: .word 0x00000403 _021753e8: .word 0x00000404 @@ -9790,7 +9790,7 @@ func_ov28_021753f0: ; 0x021753f0 bl func_ov28_02174948 ldrb ip, [r4, #0x2a] ldrsb r3, [r0, #0xb] - ldr r1, _02175464 ; =data_027e0e60 + ldr r1, _02175464 ; =gMapManager ldrb r2, [r4, #0x28] ldr r0, [r1] add r1, ip, r3 @@ -9814,7 +9814,7 @@ func_ov28_021753f0: ; 0x021753f0 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_021753f0 -_02175464: .word data_027e0e60 +_02175464: .word gMapManager _02175468: .word data_ov28_02178348 _0217546c: .word data_ov28_02179684 @@ -12080,7 +12080,7 @@ _021772a0: ; jump table b _02177300 ; case 2 b _021773f8 ; case 3 _021772b0: - ldr r0, _02177478 ; =data_027e0e60 + ldr r0, _02177478 ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -12206,7 +12206,7 @@ _02177458: _0217746c: .word data_027e0e58 _02177470: .word data_ov00_020eec9c _02177474: .word 0x0000042a -_02177478: .word data_027e0e60 +_02177478: .word gMapManager _0217747c: .word 0x00000ccd _02177480: .word data_027e0ffc _02177484: .word 0x00000429 diff --git a/asm/ov29.inc b/asm/ov29.inc index cbfe9681..034dcacf 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -90,7 +90,7 @@ .extern data_027e0d38 .extern data_027e0db0 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov29.s b/asm/ov29.s index 4f8aad75..cea23880 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -1502,7 +1502,7 @@ func_ov29_0216ea08: ; 0x0216ea08 ldr r0, [r4, #0x4dc] cmp r0, #2 ldmneia sp!, {r4, pc} - ldr r0, _0216ea68 ; =data_027e0e60 + ldr r0, _0216ea68 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #0xd @@ -1522,7 +1522,7 @@ _0216ea58: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov29_0216ea08 -_0216ea68: .word data_027e0e60 +_0216ea68: .word gMapManager .global func_ov29_0216ea6c arm_func_start func_ov29_0216ea6c @@ -2282,13 +2282,13 @@ _0216f4b0: _0216f4bc: cmp r3, #2 blo _0216f4b0 - ldr r0, _0216f6a4 ; =data_027e0e60 + ldr r0, _0216f6a4 ; =gMapManager add r1, sp, #4 ldr r0, [r0] mov r2, #0 bl _ZN10MapManager18func_ov00_02083928EPci ldrb r1, [sp, #8] - ldr r0, _0216f6a4 ; =data_027e0e60 + ldr r0, _0216f6a4 ; =gMapManager add r2, r4, #0x1f0 strb r1, [r4, #0x1c7] ldrh r1, [r4, #0x22] @@ -2298,12 +2298,12 @@ _0216f4bc: and r5, r3, #0xff mov r6, #1 bl _ZN10MapManager18func_ov00_02083908EcPi - ldr r0, _0216f6a4 ; =data_027e0e60 + ldr r0, _0216f6a4 ; =gMapManager mov r1, r5 ldr r0, [r0] add r2, r4, #0x20c bl _ZN10MapManager18func_ov00_02083908EcPi - ldr r0, _0216f6a4 ; =data_027e0e60 + ldr r0, _0216f6a4 ; =gMapManager mov r1, r6 ldr r0, [r0] add r2, r4, #0x228 @@ -2404,7 +2404,7 @@ _0216f4bc: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov29_0216f470 -_0216f6a4: .word data_027e0e60 +_0216f6a4: .word gMapManager _0216f6a8: .word data_02052f54 _0216f6ac: .word data_027e0f68 _0216f6b0: .word data_ov29_0217933c @@ -2645,14 +2645,14 @@ _0216f9a0: mov r3, #0 bl func_ov00_02087400 _0216f9b0: - ldr r0, _0216fbf8 ; =data_027e0e60 + ldr r0, _0216fbf8 ; =gMapManager ldrb r5, [r4, #0x22c] ldr r0, [r0] mov r1, #0 bl _ZN10MapManager18func_ov00_02083938Ei cmp r0, r5 beq _0216fbe8 - ldr r0, _0216fbf8 ; =data_027e0e60 + ldr r0, _0216fbf8 ; =gMapManager ldrb r1, [r4, #0x22c] ldr r0, [r0] mov r2, #0 @@ -2679,14 +2679,14 @@ _0216fa1c: mov r3, #0 bl func_ov00_02087400 _0216fa2c: - ldr r0, _0216fbf8 ; =data_027e0e60 + ldr r0, _0216fbf8 ; =gMapManager ldrb r5, [r4, #0x1f4] ldr r0, [r0] mov r1, #0 bl _ZN10MapManager18func_ov00_02083938Ei cmp r0, r5 beq _0216fbe8 - ldr r0, _0216fbf8 ; =data_027e0e60 + ldr r0, _0216fbf8 ; =gMapManager ldrb r1, [r4, #0x1f4] ldr r0, [r0] mov r2, #0 @@ -2713,14 +2713,14 @@ _0216fa98: mov r3, #0 bl func_ov00_02087400 _0216faa8: - ldr r0, _0216fbf8 ; =data_027e0e60 + ldr r0, _0216fbf8 ; =gMapManager ldrb r5, [r4, #0x210] ldr r0, [r0] mov r1, #0 bl _ZN10MapManager18func_ov00_02083938Ei cmp r0, r5 beq _0216fbe8 - ldr r0, _0216fbf8 ; =data_027e0e60 + ldr r0, _0216fbf8 ; =gMapManager ldrb r1, [r4, #0x210] ldr r0, [r0] mov r2, #0 @@ -2802,7 +2802,7 @@ _0216fbe8: .align 2, 0 arm_func_end func_ov29_0216f918 _0216fbf4: .word data_027e0f64 -_0216fbf8: .word data_027e0e60 +_0216fbf8: .word gMapManager _0216fbfc: .word data_027e0f6c _0216fc00: .word data_027e0e58 _0216fc04: .word data_ov00_020eec9c @@ -2887,7 +2887,7 @@ func_ov29_0216fc94: ; 0x0216fc94 func_ov29_0216fcd4: ; 0x0216fcd4 stmdb sp!, {lr} sub sp, sp, #0x1c - ldr r2, _0216fd78 ; =data_027e0e60 + ldr r2, _0216fd78 ; =gMapManager ldrb r1, [r0, #0x1c6] ldr r0, [r2] mov r2, #0 @@ -2895,7 +2895,7 @@ func_ov29_0216fcd4: ; 0x0216fcd4 cmp r0, #0 beq _0216fd6c ldr r1, _0216fd7c ; =data_027e0f94 - ldr r0, _0216fd78 ; =data_027e0e60 + ldr r0, _0216fd78 ; =gMapManager ldr r3, [r1] ldr r2, [r1, #4] str r3, [sp, #0x10] @@ -2930,7 +2930,7 @@ _0216fd6c: ldmia sp!, {pc} .align 2, 0 arm_func_end func_ov29_0216fcd4 -_0216fd78: .word data_027e0e60 +_0216fd78: .word gMapManager _0216fd7c: .word data_027e0f94 .global func_ov29_0216fd80 @@ -10598,7 +10598,7 @@ func_ov29_021765f0: ; 0x021765f0 add r0, r7, #2 cmp r7, r0 bge _021766b8 - ldr r4, _02176784 ; =data_027e0e60 + ldr r4, _02176784 ; =gMapManager add r5, sp, #2 mov r11, #1 _0217661c: @@ -10700,7 +10700,7 @@ _0217673c: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov29_021765f0 -_02176784: .word data_027e0e60 +_02176784: .word gMapManager _02176788: .word data_027e0f6c .global func_ov29_0217678c diff --git a/asm/ov30.inc b/asm/ov30.inc index 213798db..4913a1a2 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -84,7 +84,7 @@ .extern data_027e0d38 .extern data_027e0d3c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f90 diff --git a/asm/ov30.s b/asm/ov30.s index ed90ab1e..d903a630 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -229,7 +229,7 @@ _0217c050: stmia sp, {r0, r6} mov r0, #0 str r0, [sp, #8] - ldr r0, _0217c104 ; =data_027e0e60 + ldr r0, _0217c104 ; =gMapManager mov r3, r7 ldr r0, [r0] add r1, sp, #0x18 @@ -251,7 +251,7 @@ _0217c0f4: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov30_0217c020 -_0217c104: .word data_027e0e60 +_0217c104: .word gMapManager .global func_ov30_0217c108 arm_func_start func_ov30_0217c108 @@ -1558,7 +1558,7 @@ func_ov30_0217d09c: ; 0x0217d09c addeq sp, sp, #0x58 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} - ldr r0, _0217d390 ; =data_027e0e60 + ldr r0, _0217d390 ; =gMapManager ldr lr, [r4] ldr ip, [r4, #4] ldr r3, [r4, #8] @@ -1722,7 +1722,7 @@ _0217d2cc: str r0, [sp, #4] add r1, sp, #0xc str r1, [sp, #8] - ldr r0, _0217d390 ; =data_027e0e60 + ldr r0, _0217d390 ; =gMapManager add r1, sp, #0x1c ldr r0, [r0] add r2, sp, #0x10 @@ -1745,7 +1745,7 @@ _0217d37c: arm_func_end func_ov30_0217d09c _0217d388: .word data_027e0f90 _0217d38c: .word data_027e0f94 -_0217d390: .word data_027e0e60 +_0217d390: .word gMapManager _0217d394: .word 0xffff8001 _0217d398: .word 0x00002aaa _0217d39c: .word 0x00005555 @@ -1777,7 +1777,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8 addeq sp, sp, #0x20 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0217d4e0 ; =data_027e0e60 + ldr r0, _0217d4e0 ; =gMapManager ldr lr, [r4] ldr ip, [r4, #4] ldr r3, [r4, #8] @@ -1840,7 +1840,7 @@ func_ov30_0217d3b8: ; 0x0217d3b8 arm_func_end func_ov30_0217d3b8 _0217d4d8: .word data_027e0f90 _0217d4dc: .word data_027e0f94 -_0217d4e0: .word data_027e0e60 +_0217d4e0: .word gMapManager _0217d4e4: .word 0x0000019a .global func_ov30_0217d4e8 @@ -1857,7 +1857,7 @@ func_ov30_0217d4e8: ; 0x0217d4e8 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} ldr r1, [r4] - ldr r0, _0217d684 ; =data_027e0e60 + ldr r0, _0217d684 ; =gMapManager str r1, [sp] ldr r1, [r4, #4] ldr r0, [r0] @@ -1956,7 +1956,7 @@ _0217d664: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov30_0217d4e8 -_0217d684: .word data_027e0e60 +_0217d684: .word gMapManager _0217d688: .word 0xffff8001 _0217d68c: .word 0x00002aaa @@ -1973,7 +1973,7 @@ func_ov30_0217d690: ; 0x0217d690 addne sp, sp, #0x48 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} - ldr r0, _0217d7d0 ; =data_027e0e60 + ldr r0, _0217d7d0 ; =gMapManager ldr ip, [r4] ldr r6, [r4, #4] ldr r3, [r4, #8] @@ -2028,7 +2028,7 @@ func_ov30_0217d690: ; 0x0217d690 mov r0, #6 str r0, [sp] ldrh r2, [r5, #0x9c] - ldr r0, _0217d7d0 ; =data_027e0e60 + ldr r0, _0217d7d0 ; =gMapManager add r1, sp, #0x18 str r2, [sp, #4] ldr r3, [r5, #0xa0] @@ -2045,7 +2045,7 @@ func_ov30_0217d690: ; 0x0217d690 .align 2, 0 arm_func_end func_ov30_0217d690 _0217d7cc: .word data_027e0f94 -_0217d7d0: .word data_027e0e60 +_0217d7d0: .word gMapManager _0217d7d4: .word 0x00000333 .global func_ov30_0217d7d8 @@ -2057,7 +2057,7 @@ func_ov30_0217d7d8: ; 0x0217d7d8 mov r11, #0 ldr r5, [r3] ldr r4, [r3, #4] - ldr r2, _0217d98c ; =data_027e0e60 + ldr r2, _0217d98c ; =gMapManager mov r10, r0 ldr r0, [r2] str r1, [sp] @@ -2086,7 +2086,7 @@ func_ov30_0217d7d8: ; 0x0217d7d8 mov r4, r2, lsl #0x10 _0217d85c: ldr r0, [sp, #4] - ldr r5, _0217d98c ; =data_027e0e60 + ldr r5, _0217d98c ; =gMapManager mov r0, r0, lsl #0x10 mov r8, #0 mov r7, r0, asr #0x10 @@ -2154,7 +2154,7 @@ _0217d934: blt _0217d85c cmp r11, #0 beq _0217d97c - ldr r0, _0217d98c ; =data_027e0e60 + ldr r0, _0217d98c ; =gMapManager ldr r2, [sp] ldr r0, [r0] add r1, sp, #0x10 @@ -2166,7 +2166,7 @@ _0217d97c: .align 2, 0 arm_func_end func_ov30_0217d7d8 _0217d988: .word data_027e0f94 -_0217d98c: .word data_027e0e60 +_0217d98c: .word gMapManager .global func_ov30_0217d990 arm_func_start func_ov30_0217d990 @@ -4030,7 +4030,7 @@ _0217f250: add r3, sp, #0x5c ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0217f548 ; =data_027e0e60 + ldr r0, _0217f548 ; =gMapManager ldr r2, [sp, #0x5c] ldr r4, [sp, #0x60] ldr r3, [sp, #0x64] @@ -4090,7 +4090,7 @@ _0217f2f4: ldr r0, [r0] bl func_ov00_020c47cc ldr r6, [r0, #4] - ldr r2, _0217f548 ; =data_027e0e60 + ldr r2, _0217f548 ; =gMapManager str r6, [sp, #0x50] ldr r4, [r0, #8] add r1, sp, #8 @@ -4214,7 +4214,7 @@ _0217f53c: .align 2, 0 arm_func_end func_ov30_0217f1c4 _0217f544: .word gAdventureFlags -_0217f548: .word data_027e0e60 +_0217f548: .word gMapManager _0217f54c: .word data_027e0ffc _0217f550: .word data_ov00_020e8398 _0217f554: .word data_027e0ff0 @@ -4296,7 +4296,7 @@ _0217f5f8: add r1, sp, #0x24 ldr r0, [r0] bl func_ov00_020c47cc - ldr r1, _0217f750 ; =data_027e0e60 + ldr r1, _0217f750 ; =gMapManager ldr r5, [r0, #4] ldr r3, [r0, #8] ldr r7, [r0, #0xc] @@ -4360,7 +4360,7 @@ _0217f730: _0217f744: .word data_ov00_020e8398 _0217f748: .word data_027e0ff0 _0217f74c: .word data_027e0f94 -_0217f750: .word data_027e0e60 +_0217f750: .word gMapManager _0217f754: .word data_027e0f64 .global func_ov30_0217f758 @@ -4467,7 +4467,7 @@ _0217f880: add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0217faa0 ; =data_027e0e60 + ldr r0, _0217faa0 ; =gMapManager ldr r2, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -4596,7 +4596,7 @@ _0217fa98: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov30_0217f77c -_0217faa0: .word data_027e0e60 +_0217faa0: .word gMapManager _0217faa4: .word data_027e0ffc _0217faa8: .word data_027e10b4 @@ -4701,7 +4701,7 @@ _0217fbb4: add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0217fd3c ; =data_027e0e60 + ldr r0, _0217fd3c ; =gMapManager ldr r2, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -4788,7 +4788,7 @@ _0217fcf8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov30_0217fb7c -_0217fd3c: .word data_027e0e60 +_0217fd3c: .word gMapManager _0217fd40: .word data_027e0ffc .global func_ov30_0217fd44 @@ -5410,7 +5410,7 @@ func_ov30_02180548: ; 0x02180548 bl func_ov00_020a5e9c cmp r0, #0x25 bne _02180594 - ldr r0, _021805a0 ; =data_027e0e60 + ldr r0, _021805a0 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #7 @@ -5428,7 +5428,7 @@ _02180594: .align 2, 0 arm_func_end func_ov30_02180548 _0218059c: .word data_027e0d38 -_021805a0: .word data_027e0e60 +_021805a0: .word gMapManager _021805a4: .word gAdventureFlags _021805a8: .word data_ov30_021887ac @@ -5442,7 +5442,7 @@ func_ov30_021805ac: ; 0x021805ac bl func_ov00_020a5e9c cmp r0, #0x25 bne _021805f8 - ldr r0, _02180604 ; =data_027e0e60 + ldr r0, _02180604 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082d08Ev cmp r0, #7 @@ -5460,7 +5460,7 @@ _021805f8: .align 2, 0 arm_func_end func_ov30_021805ac _02180600: .word data_027e0d38 -_02180604: .word data_027e0e60 +_02180604: .word gMapManager _02180608: .word gAdventureFlags _0218060c: .word data_ov30_021887b4 @@ -8261,7 +8261,7 @@ func_ov30_021824cc: ; 0x021824cc str r2, [sp, #4] str r1, [sp, #8] str r0, [sp, #0xc] - ldr r0, _02182628 ; =data_027e0e60 + ldr r0, _02182628 ; =gMapManager str r3, [sp, #0x10] add r2, r4, #0x860 ldr r0, [r0] @@ -8315,7 +8315,7 @@ _02182618: .align 2, 0 arm_func_end func_ov30_021824cc _02182624: .word 0x0000ffff -_02182628: .word data_027e0e60 +_02182628: .word gMapManager _0218262c: .word data_027e0fe4 _02182630: .word 0x424f4d42 @@ -8356,7 +8356,7 @@ func_ov30_02182634: ; 0x02182634 str r0, [sp, #8] str r2, [sp, #0xc] str r2, [sp, #0x10] - ldr r0, _02182ab8 ; =data_027e0e60 + ldr r0, _02182ab8 ; =gMapManager add r2, r4, #0x860 ldr r0, [r0] add r1, sp, #0x13c @@ -8618,7 +8618,7 @@ _02182960: .align 2, 0 arm_func_end func_ov30_02182634 _02182ab4: .word 0x0000ffff -_02182ab8: .word data_027e0e60 +_02182ab8: .word gMapManager _02182abc: .word _ZTV11FilterActor _02182ac0: .word 0x424f4d42 _02182ac4: .word data_027e0fe4 @@ -10040,7 +10040,7 @@ func_ov30_02183ca8: ; 0x02183ca8 ldr r2, [r2, #0x8c] ldr r1, [r0] ldr r4, [r2, #0x98] - ldr r2, _02183d7c ; =data_027e0e60 + ldr r2, _02183d7c ; =gMapManager str r1, [sp, #0x30] ldr r3, [r0, #4] add r1, sp, #0x30 @@ -10051,7 +10051,7 @@ func_ov30_02183ca8: ; 0x02183ca8 mov r2, #1 bl _ZN10MapManager16MapData_vfunc_68Ev ldr r2, [r7] - ldr r1, _02183d7c ; =data_027e0e60 + ldr r1, _02183d7c ; =gMapManager str r2, [sp, #0x24] ldr r2, [r7, #4] add r5, r4, r0 @@ -10076,7 +10076,7 @@ func_ov30_02183ca8: ; 0x02183ca8 str r1, [sp] str r0, [sp, #4] ldr r1, [r2, #0xa0] - ldr r0, _02183d7c ; =data_027e0e60 + ldr r0, _02183d7c ; =gMapManager str r1, [sp, #8] ldr r0, [r0] add r1, sp, #0x18 @@ -10088,7 +10088,7 @@ func_ov30_02183ca8: ; 0x02183ca8 .align 2, 0 arm_func_end func_ov30_02183ca8 _02183d78: .word data_ov30_021894a0 -_02183d7c: .word data_027e0e60 +_02183d7c: .word gMapManager .global func_ov30_02183d80 arm_func_start func_ov30_02183d80 @@ -10516,7 +10516,7 @@ _021841ec: ldr r0, _02184304 ; =data_ov00_020eec68 mov r1, #0xf bl func_ov00_020d716c - ldr r0, _02184308 ; =data_027e0e60 + ldr r0, _02184308 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 @@ -10524,7 +10524,7 @@ _021841ec: mov r2, #0 mov r3, #0x7f bl func_ov00_020d70a4 - ldr r0, _02184308 ; =data_027e0e60 + ldr r0, _02184308 ; =gMapManager mov r1, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084924Ej @@ -10545,7 +10545,7 @@ _0218424c: mov r2, #0 mov r3, #0x7f bl func_ov00_020d70a4 - ldr r0, _02184308 ; =data_027e0e60 + ldr r0, _02184308 ; =gMapManager mov r1, #1 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084924Ej @@ -10581,7 +10581,7 @@ _021842d4: _021842fc: .word data_027e0fc8 _02184300: .word data_027e0fe4 _02184304: .word data_ov00_020eec68 -_02184308: .word data_027e0e60 +_02184308: .word gMapManager _0218430c: .word data_ov00_020eec9c .global func_ov30_02184310 @@ -11340,7 +11340,7 @@ _021848f4: ldrh r10, [r4, #0x20] ble _021849cc ldr r9, [sp, #0x18] - ldr r11, _02185254 ; =data_027e0e60 + ldr r11, _02185254 ; =gMapManager ldr r5, _02185250 ; =data_027e0fe4 _02184940: ldr r1, [sp, #0x530] @@ -11428,7 +11428,7 @@ _02184a34: ldrh r10, [r4, #0x20] ble _02184b10 ldr r9, [sp, #0x14] - ldr r11, _02185254 ; =data_027e0e60 + ldr r11, _02185254 ; =gMapManager ldr r5, _02185250 ; =data_027e0fe4 _02184a84: ldr r1, [sp, #0x4a4] @@ -11528,7 +11528,7 @@ _02184ba8: ldrh r10, [r4, #0x20] ble _02184c84 ldr r9, [sp, #0x10] - ldr r11, _02185254 ; =data_027e0e60 + ldr r11, _02185254 ; =gMapManager ldr r5, _02185250 ; =data_027e0fe4 _02184bf8: ldr r1, [sp, #0x3d0] @@ -11626,7 +11626,7 @@ _02184d18: ldrh r10, [r4, #0x20] ble _02184df0 ldr r9, [sp, #0xc] - ldr r11, _02185254 ; =data_027e0e60 + ldr r11, _02185254 ; =gMapManager ldr r5, _02185250 ; =data_027e0fe4 _02184d64: ldr r1, [sp, #0x2fc] @@ -11724,7 +11724,7 @@ _02184e84: ldrh r10, [r4, #0x20] ble _02184f50 ldr r9, [sp, #8] - ldr r5, _02185254 ; =data_027e0e60 + ldr r5, _02185254 ; =gMapManager ldr r6, _02185250 ; =data_027e0fe4 mov r11, r7 _02184ed4: @@ -11819,7 +11819,7 @@ _02184fe4: ldrh r10, [r4, #0x20] ble _021850b0 ldr r9, [sp, #4] - ldr r5, _02185254 ; =data_027e0e60 + ldr r5, _02185254 ; =gMapManager ldr r6, _02185250 ; =data_027e0fe4 mov r11, r7 _02185034: @@ -11914,7 +11914,7 @@ _02185144: ldrh r10, [r4, #0x20] ble _02185210 ldr r9, [sp] - ldr r5, _02185254 ; =data_027e0e60 + ldr r5, _02185254 ; =gMapManager ldr r6, _02185250 ; =data_027e0fe4 mov r11, r7 _02185194: @@ -11973,7 +11973,7 @@ _02185240: arm_func_end func_ov30_02184868 _0218524c: .word data_ov30_02188b08 _02185250: .word data_027e0fe4 -_02185254: .word data_027e0e60 +_02185254: .word gMapManager _02185258: .word _ZTV11FilterActor _0218525c: .word 0x57544352 _02185260: .word 0x43485352 @@ -14280,7 +14280,7 @@ func_ov30_021872c4: ; 0x021872c4 stmdb sp!, {lr} sub sp, sp, #0xc ldr r2, [r1] - ldr r3, _02187300 ; =data_027e0e60 + ldr r3, _02187300 ; =gMapManager str r2, [sp] ldr ip, [r1, #4] mov r2, r0 @@ -14294,12 +14294,12 @@ func_ov30_021872c4: ; 0x021872c4 ldmia sp!, {pc} .align 2, 0 arm_func_end func_ov30_021872c4 -_02187300: .word data_027e0e60 +_02187300: .word gMapManager .global func_ov30_02187304 arm_func_start func_ov30_02187304 func_ov30_02187304: ; 0x02187304 - ldr r2, _02187320 ; =data_027e0e60 + ldr r2, _02187320 ; =gMapManager mov r3, r0 ldr r0, [r2] mov r2, r1 @@ -14308,7 +14308,7 @@ func_ov30_02187304: ; 0x02187304 bx ip .align 2, 0 arm_func_end func_ov30_02187304 -_02187320: .word data_027e0e60 +_02187320: .word gMapManager _02187324: .word _ZN10MapManager18func_ov00_0208439cEv .global func_ov30_02187328 @@ -14373,7 +14373,7 @@ func_ov30_02187388: ; 0x02187388 func_ov30_021873bc: ; 0x021873bc stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 - ldr r2, _02187568 ; =data_027e0e60 + ldr r2, _02187568 ; =gMapManager mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -14465,13 +14465,13 @@ _021874e8: sub r0, r0, #1 strh r0, [sp, #2] _02187524: - ldr r0, _02187568 ; =data_027e0e60 + ldr r0, _02187568 ; =gMapManager add r1, sp, #4 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_a4Ev cmp r0, #0 beq _0218755c - ldr r0, _02187568 ; =data_027e0e60 + ldr r0, _02187568 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_a4Ev @@ -14485,7 +14485,7 @@ _0218755c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov30_021873bc -_02187568: .word data_027e0e60 +_02187568: .word gMapManager .global func_ov30_0218756c arm_func_start func_ov30_0218756c @@ -14522,14 +14522,14 @@ _021875d0: .word 0x000016a1 .global func_ov30_021875d4 arm_func_start func_ov30_021875d4 func_ov30_021875d4: ; 0x021875d4 - ldr r2, _021875e8 ; =data_027e0e60 + ldr r2, _021875e8 ; =gMapManager ldr ip, _021875ec ; =_ZN10MapManager16MapData_vfunc_a4Ev mov r1, r0 ldr r0, [r2] bx ip .align 2, 0 arm_func_end func_ov30_021875d4 -_021875e8: .word data_027e0e60 +_021875e8: .word gMapManager _021875ec: .word _ZN10MapManager16MapData_vfunc_a4Ev .global func_ov30_021875f0 @@ -15178,7 +15178,7 @@ func_ov30_02187e18: ; 0x02187e18 mov r7, r3 ldr r6, [sp, #0x60] bl func_ov30_02187dfc - ldr r11, _02187eec ; =data_027e0e60 + ldr r11, _02187eec ; =gMapManager add r5, sp, #0x24 mov r4, #6 _02187e44: @@ -15231,7 +15231,7 @@ func_ov30_02187ee4: ; 0x02187ee4 ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov30_02187ee4 -_02187eec: .word data_027e0e60 +_02187eec: .word gMapManager .global func_ov30_02187ef0 arm_func_start func_ov30_02187ef0 diff --git a/asm/ov31.inc b/asm/ov31.inc index 5fbd45ca..cc14b422 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -72,7 +72,7 @@ .extern data_027e0d78 .extern data_027e0dbc .extern data_027e0e28 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f94 .extern data_027e0fc8 diff --git a/asm/ov31.s b/asm/ov31.s index 02be17e1..a230104c 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -269,7 +269,7 @@ _0217c040: mov r2, ip mov r1, #0x44 bl func_ov00_02087338 - ldr r0, _0217c218 ; =data_027e0e60 + ldr r0, _0217c218 ; =gMapManager mov r1, #0x45 ldr r0, [r0] add r2, sp, #0x50 @@ -362,7 +362,7 @@ _0217c184: .align 2, 0 arm_func_end func_ov31_0217bfb4 _0217c214: .word data_027e0f64 -_0217c218: .word data_027e0e60 +_0217c218: .word gMapManager _0217c21c: .word 0x0000ffff _0217c220: .word data_027e0fc8 diff --git a/asm/ov32.inc b/asm/ov32.inc index 054d383a..cfd6bb1b 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -90,7 +90,7 @@ .extern data_027e0d78 .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov32.s b/asm/ov32.s index c826e628..b13b71aa 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -1366,7 +1366,7 @@ func_ov32_0217cdd8: ; 0x0217cdd8 bl func_ov32_0217d354 cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0217ce1c ; =data_027e0e60 + ldr r0, _0217ce1c ; =gMapManager ldrh r1, [r4, #0x24] ldr r0, [r0] mov r2, #0 @@ -1380,7 +1380,7 @@ func_ov32_0217cdd8: ; 0x0217cdd8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov32_0217cdd8 -_0217ce1c: .word data_027e0e60 +_0217ce1c: .word gMapManager .global func_ov32_0217ce20 arm_func_start func_ov32_0217ce20 @@ -1525,7 +1525,7 @@ _0217cfc4: bl func_ov00_020cca50 cmp r0, #0 beq _0217d030 - ldr r0, _0217d174 ; =data_027e0e60 + ldr r0, _0217d174 ; =gMapManager ldrh r1, [r5, #0x24] ldr r0, [r0] mov r2, #0 @@ -1625,7 +1625,7 @@ _0217d0f8: .align 2, 0 arm_func_end func_ov32_0217cfa4 _0217d170: .word data_027e0f90 -_0217d174: .word data_027e0e60 +_0217d174: .word gMapManager _0217d178: .word 0x0000071c _0217d17c: .word data_027e0764 _0217d180: .word 0x0000038e @@ -1929,7 +1929,7 @@ _0217d500: cmpne r0, #1 bne _0217d570 ldr r1, [r5, #0x48] - ldr r0, _0217d750 ; =data_027e0e60 + ldr r0, _0217d750 ; =gMapManager str r1, [sp, #0x10] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -2074,7 +2074,7 @@ _0217d744: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov32_0217d478 -_0217d750: .word data_027e0e60 +_0217d750: .word gMapManager _0217d754: .word func_ov32_0217c850 _0217d758: .word data_027e0e58 _0217d75c: .word 0x00000239 @@ -3065,7 +3065,7 @@ _0217e3e4: bl func_ov00_020cca50 cmp r0, #0 beq _0217e448 - ldr r0, _0217e590 ; =data_027e0e60 + ldr r0, _0217e590 ; =gMapManager ldrh r1, [r5, #0x24] ldr r0, [r0] mov r2, #0 @@ -3166,7 +3166,7 @@ _0217e514: .align 2, 0 arm_func_end func_ov32_0217e3c4 _0217e58c: .word data_027e0f90 -_0217e590: .word data_027e0e60 +_0217e590: .word gMapManager _0217e594: .word 0x0000071c _0217e598: .word data_027e0764 _0217e59c: .word 0x0000038e @@ -5190,7 +5190,7 @@ func_ov32_0217feac: ; 0x0217feac cmp r0, #0 beq _0217ff6c ldr r1, _02180048 ; =data_027e0f94 - ldr r0, _0218004c ; =data_027e0e60 + ldr r0, _0218004c ; =gMapManager ldr r3, [r1] ldr r2, [r1, #4] str r3, [sp, #8] @@ -5274,7 +5274,7 @@ _0217ffd0: arm_func_end func_ov32_0217feac _02180044: .word data_027e0f90 _02180048: .word data_027e0f94 -_0218004c: .word data_027e0e60 +_0218004c: .word gMapManager _02180050: .word data_027e0764 _02180054: .word 0x0000ffff _02180058: .word data_02050f54 @@ -6827,7 +6827,7 @@ _0218158c: blx r3 ldmia sp!, {r4, pc} _021815b8: - ldr r0, _02181624 ; =data_027e0e60 + ldr r0, _02181624 ; =gMapManager ldrsh r1, [r4, #0x34] ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084cc8Ei @@ -6858,7 +6858,7 @@ _02181614: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov32_02181558 -_02181624: .word data_027e0e60 +_02181624: .word gMapManager .global func_ov32_02181628 arm_func_start func_ov32_02181628 @@ -7977,7 +7977,7 @@ func_ov32_0218252c: ; 0x0218252c add r1, r4, #0x78 mov r2, r0 bl func_01ff9bc4 - ldr r1, _0218269c ; =data_027e0e60 + ldr r1, _0218269c ; =gMapManager mov r0, r4 ldr r5, [r1] bl func_ov00_0208b9cc @@ -8039,7 +8039,7 @@ _02182670: arm_func_end func_ov32_0218252c _02182694: .word 0x0000ffff _02182698: .word data_ov32_02185c24 -_0218269c: .word data_027e0e60 +_0218269c: .word gMapManager _021826a0: .word 0x0000019a _021826a4: .word data_027e0e58 _021826a8: .word data_027e0ffc @@ -8063,14 +8063,14 @@ func_ov32_021826c4: ; 0x021826c4 cmp r1, #0 moveq r0, #1 ldmeqia sp!, {r3, pc} - ldr r0, _021826ec ; =data_027e0e60 + ldr r0, _021826ec ; =gMapManager mov r2, #3 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084be0Eii ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov32_021826c4 -_021826ec: .word data_027e0e60 +_021826ec: .word gMapManager .global func_ov32_021826f0 arm_func_start func_ov32_021826f0 @@ -8992,7 +8992,7 @@ func_ov32_0218318c: ; 0x0218318c mov r6, r2, lsr #0xc orr r6, r6, r0, lsl #20 ldr r0, [r4, #0x50] - ldr r5, _02183344 ; =data_027e0e60 + ldr r5, _02183344 ; =gMapManager add r0, r0, r6 str r0, [r4, #0x238] ldr r0, [r5] @@ -9037,7 +9037,7 @@ _02183334: .word 0x00000e39 _02183338: .word 0xfffff8e4 _0218333c: .word 0x00001801 _02183340: .word data_02050f54 -_02183344: .word data_027e0e60 +_02183344: .word gMapManager .global func_ov32_02183348 arm_func_start func_ov32_02183348 @@ -9098,7 +9098,7 @@ _02183414: ldr r5, [lr] str r0, [sp, #0xc] ldr r0, [r4, #0x4c] - ldr ip, _0218353c ; =data_027e0e60 + ldr ip, _0218353c ; =gMapManager str r0, [sp, #0x10] ldr r6, [r4, #0x50] ldr r0, [lr, #4] @@ -9132,7 +9132,7 @@ _02183498: ldr r5, [lr] str r0, [sp] ldr r0, [r4, #0x4c] - ldr ip, _0218353c ; =data_027e0e60 + ldr ip, _0218353c ; =gMapManager str r0, [sp, #4] ldr r6, [r4, #0x50] ldr r0, [lr, #4] @@ -9172,7 +9172,7 @@ _02183518: arm_func_end func_ov32_02183348 _02183534: .word data_027e0764 _02183538: .word 0x00002001 -_0218353c: .word data_027e0e60 +_0218353c: .word gMapManager .global func_ov32_02183540 arm_func_start func_ov32_02183540 @@ -9384,7 +9384,7 @@ func_ov32_02183818: ; 0x02183818 mov r4, r0 ldmia r1, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _021838cc ; =data_027e0e60 + ldr r0, _021838cc ; =gMapManager ldr lr, [sp, #0x18] ldr ip, [sp, #0x1c] ldr r3, [sp, #0x20] @@ -9424,7 +9424,7 @@ func_ov32_02183818: ; 0x02183818 .align 2, 0 arm_func_end func_ov32_02183818 _021838c8: .word data_027e0f94 -_021838cc: .word data_027e0e60 +_021838cc: .word gMapManager _021838d0: .word 0x00000333 .global func_ov32_021838d4 @@ -10633,7 +10633,7 @@ func_ov32_02184890: ; 0x02184890 cmp r3, #0 beq _021848f8 ldr r1, [r3, #0x48] - ldr r0, _02184948 ; =data_027e0e60 + ldr r0, _02184948 ; =gMapManager str r1, [r4, #0x48] ldr r2, [r3, #0x4c] add r1, sp, #0 @@ -10678,7 +10678,7 @@ _0218493c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov32_02184890 -_02184948: .word data_027e0e60 +_02184948: .word gMapManager .global func_ov32_0218494c arm_func_start func_ov32_0218494c @@ -10810,7 +10810,7 @@ func_ov32_02184a9c: ; 0x02184a9c mov r1, r1, lsl #0x2 ldrsh r1, [r0, r1] ldr r2, [sp, #0x24] - ldr lr, _02184b9c ; =data_027e0e60 + ldr lr, _02184b9c ; =gMapManager smulbb r1, r1, ip add r1, r1, #0x800 add r3, r2, r1, asr #12 @@ -10859,7 +10859,7 @@ func_ov32_02184a9c: ; 0x02184a9c arm_func_end func_ov32_02184a9c _02184b94: .word data_02050f54 _02184b98: .word 0x00000266 -_02184b9c: .word data_027e0e60 +_02184b9c: .word gMapManager _02184ba0: .word 0x0000059a _02184ba4: .word data_ov00_020e9370 diff --git a/asm/ov33.inc b/asm/ov33.inc index 65302e14..7170596b 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -68,7 +68,7 @@ .extern data_027e0c68 .extern data_027e0e28 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c diff --git a/asm/ov33.s b/asm/ov33.s index 3da5cb2e..313e96de 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -846,7 +846,7 @@ func_ov33_0217c808: ; 0x0217c808 sub sp, sp, #0xc mov r4, r0 ldr r1, [r4, #0x48] - ldr r0, _0217c8ec ; =data_027e0e60 + ldr r0, _0217c8ec ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -901,7 +901,7 @@ func_ov33_0217c808: ; 0x0217c808 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov33_0217c808 -_0217c8ec: .word data_027e0e60 +_0217c8ec: .word gMapManager _0217c8f0: .word data_02050f54 _0217c8f4: .word 0x00000666 _0217c8f8: .word data_027e0ffc @@ -917,7 +917,7 @@ func_ov33_0217c8fc: ; 0x0217c8fc mov r3, #0 str r0, [sp, #0x18] ldr r1, [r4, #0x4c] - ldr r0, _0217c988 ; =data_027e0e60 + ldr r0, _0217c988 ; =gMapManager str r1, [sp, #0x1c] ldr r2, [r4, #0x50] add r1, sp, #0x18 @@ -947,7 +947,7 @@ _0217c97c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov33_0217c8fc -_0217c988: .word data_027e0e60 +_0217c988: .word gMapManager .global func_ov33_0217c98c arm_func_start func_ov33_0217c98c @@ -1126,7 +1126,7 @@ _0217cb94: ; jump table b _0217cc8c ; case 3 b _0217ccc8 ; case 4 _0217cba8: - ldr r0, _0217cf20 ; =data_027e0e60 + ldr r0, _0217cf20 ; =gMapManager ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 @@ -1162,7 +1162,7 @@ _0217cc24: mov r0, r5 bl func_ov33_0217c98c ldr r1, [r5, #0x48] - ldr r0, _0217cf20 ; =data_027e0e60 + ldr r0, _0217cf20 ; =gMapManager str r1, [sp, #0x1c] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -1276,7 +1276,7 @@ _0217cdbc: ; jump table b _0217ceb4 ; case 3 b _0217cef0 ; case 4 _0217cdd0: - ldr r0, _0217cf20 ; =data_027e0e60 + ldr r0, _0217cf20 ; =gMapManager ldrh r1, [r5, #0x22] ldr r0, [r0] mov r2, #0 @@ -1312,7 +1312,7 @@ _0217ce4c: mov r0, r5 bl func_ov33_0217c98c ldr r1, [r5, #0x48] - ldr r0, _0217cf20 ; =data_027e0e60 + ldr r0, _0217cf20 ; =gMapManager str r1, [sp, #0x10] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -1368,7 +1368,7 @@ _0217cf08: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov33_0217ca88 -_0217cf20: .word data_027e0e60 +_0217cf20: .word gMapManager _0217cf24: .word data_027e0ffc _0217cf28: .word 0x000001fb diff --git a/asm/ov34.inc b/asm/ov34.inc index a46e2160..bda56769 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -71,7 +71,7 @@ .extern data_027e0764 .extern data_027e0d0c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f94 diff --git a/asm/ov34.s b/asm/ov34.s index b6428dd7..0e2e4280 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -1321,7 +1321,7 @@ func_ov34_0217ceb0: ; 0x0217ceb0 func_ov34_0217cf74: ; 0x0217cf74 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x1c - ldr r0, _0217d008 ; =data_027e0e60 + ldr r0, _0217d008 ; =gMapManager mov r3, #0 mov r1, #0xff strb r1, [sp, #4] @@ -1359,7 +1359,7 @@ _0217cfa4: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov34_0217cf74 -_0217d008: .word data_027e0e60 +_0217d008: .word gMapManager _0217d00c: .word data_027e0f64 .global func_ov34_0217d010 @@ -1367,7 +1367,7 @@ _0217d00c: .word data_027e0f64 func_ov34_0217d010: ; 0x0217d010 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x1c - ldr r0, _0217d0a4 ; =data_027e0e60 + ldr r0, _0217d0a4 ; =gMapManager mov r3, #0 mov r1, #0xff strb r1, [sp, #4] @@ -1405,7 +1405,7 @@ _0217d040: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov34_0217d010 -_0217d0a4: .word data_027e0e60 +_0217d0a4: .word gMapManager _0217d0a8: .word data_027e0f64 .global func_ov34_0217d0ac @@ -1413,7 +1413,7 @@ _0217d0a8: .word data_027e0f64 func_ov34_0217d0ac: ; 0x0217d0ac stmdb sp!, {r3, r4, lr} sub sp, sp, #0x1c - ldr r0, _0217d140 ; =data_027e0e60 + ldr r0, _0217d140 ; =gMapManager mov r3, #0 mov r1, #0xff strb r1, [sp, #4] @@ -1451,7 +1451,7 @@ _0217d0dc: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov34_0217d0ac -_0217d140: .word data_027e0e60 +_0217d140: .word gMapManager _0217d144: .word data_027e0f64 .global func_ov34_0217d148 @@ -2223,7 +2223,7 @@ _0217db48: ldr r0, [r0] ldr r1, _0217decc ; =0x000b00df bl func_ov00_020cfc70 - ldr r0, _0217ded0 ; =data_027e0e60 + ldr r0, _0217ded0 ; =gMapManager mov r1, #1 ldr r0, [r0] mov r2, #0 @@ -2386,7 +2386,7 @@ _0217dec0: .word data_ov34_02186308 _0217dec4: .word data_ov34_02186320 _0217dec8: .word data_027e103c _0217decc: .word 0x000b00df -_0217ded0: .word data_027e0e60 +_0217ded0: .word gMapManager .global func_ov34_0217ded4 arm_func_start func_ov34_0217ded4 @@ -6619,7 +6619,7 @@ _02181b50: add r2, r6, #0x1000 ldrh r4, [r0, #0x86] ldr r3, [r2, #0xd04] - ldr r1, _02181d00 ; =data_027e0e60 + ldr r1, _02181d00 ; =gMapManager str r3, [sp, #0xc] ldr r3, [r2, #0xd08] ldr r0, [r1] @@ -6722,7 +6722,7 @@ _02181c8c: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov34_02181a00 -_02181d00: .word data_027e0e60 +_02181d00: .word gMapManager _02181d04: .word data_02050f54 _02181d08: .word data_027e0ffc _02181d0c: .word 0x000002fa @@ -10712,13 +10712,13 @@ _021853d8: .word func_ov00_020b7d74 func_ov34_021853dc: ; 0x021853dc stmdb sp!, {r4, lr} sub sp, sp, #0x30 - ldr r1, _02185580 ; =data_027e0e60 + ldr r1, _02185580 ; =gMapManager mov r4, r0 ldr r1, [r1] add r0, sp, #8 add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p - ldr r0, _02185580 ; =data_027e0e60 + ldr r0, _02185580 ; =gMapManager add r1, sp, #8 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_54Ev @@ -10821,7 +10821,7 @@ _02185568: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov34_021853dc -_02185580: .word data_027e0e60 +_02185580: .word gMapManager _02185584: .word data_027e0fec _02185588: .word data_027e0f6c _0218558c: .word data_027e0e58 diff --git a/asm/ov35.inc b/asm/ov35.inc index cd99a8fb..ae55a040 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -90,7 +90,7 @@ .extern data_027e0c68 .extern data_027e0d0c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov35.s b/asm/ov35.s index 94f2f5b6..be34b773 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -2798,7 +2798,7 @@ func_ov35_0217e320: ; 0x0217e320 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldr r2, [sp, #0x24] - ldr r0, _0217e3d4 ; =data_027e0e60 + ldr r0, _0217e3d4 ; =gMapManager ldr r1, [sp, #0x28] str r2, [sp, #0x18] ldr r2, [sp, #0x2c] @@ -2826,7 +2826,7 @@ func_ov35_0217e320: ; 0x0217e320 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov35_0217e320 -_0217e3d4: .word data_027e0e60 +_0217e3d4: .word gMapManager _0217e3d8: .word data_ov00_020e9370 .global func_ov35_0217e3dc @@ -8082,7 +8082,7 @@ _02182d70: str r1, [sp, #0xac] str r0, [sp, #0xb4] _02182d84: - ldr r0, _02182f94 ; =data_027e0e60 + ldr r0, _02182f94 ; =gMapManager add r2, sp, #0x94 ldr r0, [r0] mov r1, #1 @@ -8177,7 +8177,7 @@ _02182e40: str r8, [sp, #0xc] mov r1, #1 str r1, [sp, #0x10] - ldr r0, _02182f94 ; =data_027e0e60 + ldr r0, _02182f94 ; =gMapManager add r1, sp, #0xb8 ldr r0, [r0] add r2, sp, #0x28 @@ -8217,7 +8217,7 @@ _02182e40: _02182f88: .word data_027e0f64 _02182f8c: .word data_027e0f94 _02182f90: .word data_027e0764 -_02182f94: .word data_027e0e60 +_02182f94: .word gMapManager _02182f98: .word 0x0000ffff _02182f9c: .word 0x0000099a _02182fa0: .word data_027e0fe8 @@ -9242,7 +9242,7 @@ _02183d8c: adc r0, r0, #0 mov r1, r1, lsr #0xc ldr r2, [sp, #0x24] - ldr lr, _02183e90 ; =data_027e0e60 + ldr lr, _02183e90 ; =gMapManager adds r8, ip, #0x800 orr r1, r1, r0, lsl #20 add ip, r2, r1 @@ -9293,7 +9293,7 @@ _02183e80: .word 0x0000019a _02183e84: .word 0x00000ccd _02183e88: .word 0x00000555 _02183e8c: .word data_02050f54 -_02183e90: .word data_027e0e60 +_02183e90: .word gMapManager _02183e94: .word data_ov00_020e9370 .global func_ov35_02183e98 diff --git a/asm/ov36.inc b/asm/ov36.inc index 0721fdc4..69cbd0f8 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -76,7 +76,7 @@ .extern data_027e0d0c .extern data_027e0d3c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f90 diff --git a/asm/ov36.s b/asm/ov36.s index f9c3ec74..57175a4b 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -1824,13 +1824,13 @@ _0217d56c: ldr r1, [r1, #0x28] add r0, r0, #0x1800 bl func_ov17_02168660 - ldr r0, _0217d6b0 ; =data_027e0e60 + ldr r0, _0217d6b0 ; =gMapManager mov r1, #3 ldr r0, [r0] mov r2, r1 mov r3, #0 bl _ZN10MapManager18func_ov00_02084b38Eiii - ldr r0, _0217d6b0 ; =data_027e0e60 + ldr r0, _0217d6b0 ; =gMapManager mov r1, #4 ldr r0, [r0] mov r2, #3 @@ -1871,7 +1871,7 @@ _0217d6a0: .word data_ov36_0218683e _0217d6a4: .word 0x00000333 _0217d6a8: .word 0x00001610 _0217d6ac: .word data_027e0fec -_0217d6b0: .word data_027e0e60 +_0217d6b0: .word gMapManager _0217d6b4: .word 0x0000011e _0217d6b8: .word 0x0000011f @@ -2371,7 +2371,7 @@ func_ov36_0217dd98: ; 0x0217dd98 moveq r0, #0 streq r0, [r4, #0x138] ldmeqia sp!, {r4, pc} - ldr r0, _0217ddfc ; =data_027e0e60 + ldr r0, _0217ddfc ; =gMapManager ldrh r1, [r4, #0x20] ldr r0, [r0] mov r2, #0 @@ -2391,7 +2391,7 @@ _0217ddf0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov36_0217dd98 -_0217ddfc: .word data_027e0e60 +_0217ddfc: .word gMapManager .global func_ov36_0217de00 arm_func_start func_ov36_0217de00 @@ -3203,7 +3203,7 @@ _0217e970: str r0, [r6, #0x88] _0217e978: ldr r1, [r6, #0x48] - ldr r0, _0217eb4c ; =data_027e0e60 + ldr r0, _0217eb4c ; =gMapManager str r1, [sp, #0xc] ldr r1, [r6, #0x4c] ldr r0, [r0] @@ -3323,7 +3323,7 @@ _0217eb3c: .word data_027e0fc8 _0217eb40: .word data_027e0fe4 _0217eb44: .word 0x504c444d _0217eb48: .word 0x0000219a -_0217eb4c: .word data_027e0e60 +_0217eb4c: .word gMapManager _0217eb50: .word data_02050f54 _0217eb54: .word data_027e0e58 @@ -3510,7 +3510,7 @@ func_ov36_0217ed50: ; 0x0217ed50 b _0217eef8 _0217ede8: ldr r1, [r4, #0x48] - ldr r0, _0217ef0c ; =data_027e0e60 + ldr r0, _0217ef0c ; =gMapManager str r1, [sp] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -3525,21 +3525,21 @@ _0217ede8: movne r0, #0 cmp r0, #0 beq _0217eee8 - ldr r0, _0217ef0c ; =data_027e0e60 + ldr r0, _0217ef0c ; =gMapManager ldr r1, [r4, #0x54] ldr r0, [r0] bl _ZN10MapManager18func_ov00_020839d4Ev - ldr r1, _0217ef0c ; =data_027e0e60 + ldr r1, _0217ef0c ; =gMapManager mov r6, r0 ldr r0, [r1] ldr r1, [r4, #0x5c] bl _ZN10MapManager18func_ov00_020839f8Ev - ldr r1, _0217ef0c ; =data_027e0e60 + ldr r1, _0217ef0c ; =gMapManager mov r7, r0 ldr r0, [r1] ldr r1, [r4, #0x48] bl _ZN10MapManager18func_ov00_020839d4Ev - ldr r1, _0217ef0c ; =data_027e0e60 + ldr r1, _0217ef0c ; =gMapManager mov r5, r0 ldr r0, [r1] ldr r1, [r4, #0x50] @@ -3589,7 +3589,7 @@ _0217eef8: arm_func_end func_ov36_0217ed50 _0217ef04: .word data_ov36_02186c9c _0217ef08: .word data_027e0d0c -_0217ef0c: .word data_027e0e60 +_0217ef0c: .word gMapManager .global func_ov36_0217ef10 arm_func_start func_ov36_0217ef10 @@ -5422,7 +5422,7 @@ _02180774: str r0, [sp, #0x14] ldr r0, [r7, #8] stmia sp, {r0, r9, r11} - ldr r0, _02180994 ; =data_027e0e60 + ldr r0, _02180994 ; =gMapManager ldr r0, [r0] bl func_01ffe1cc cmp r0, #0 @@ -5518,7 +5518,7 @@ _02180984: .word data_ov36_02186cd4 _02180988: .word data_ov36_02186838 _0218098c: .word data_02050f54 _02180990: .word 0x000004cd -_02180994: .word data_027e0e60 +_02180994: .word gMapManager _02180998: .word data_027e0f64 _0218099c: .word gAdventureFlags _021809a0: .word data_027e0c68 @@ -6914,7 +6914,7 @@ _02181dc8: bl func_0202d7ac cmp r0, #0 bne _02181e34 - ldr r0, _02181f30 ; =data_027e0e60 + ldr r0, _02181f30 ; =gMapManager mov r1, #2 ldr r0, [r0] mov r2, #1 @@ -6969,7 +6969,7 @@ _02181e34: str r0, [r4, #0x66c] ldr r0, _02181f34 ; =0x0000011e bl func_ov19_0216e7b0 - ldr r0, _02181f30 ; =data_027e0e60 + ldr r0, _02181f30 ; =gMapManager mov r1, #3 ldr r0, [r0] mov r2, r1 @@ -6977,13 +6977,13 @@ _02181e34: cmp r0, #0 addne sp, sp, #0x14 ldmneia sp!, {r3, r4, pc} - ldr r0, _02181f30 ; =data_027e0e60 + ldr r0, _02181f30 ; =gMapManager mov r1, #3 ldr r0, [r0] mov r2, r1 mov r3, #1 bl _ZN10MapManager18func_ov00_02084b38Eiii - ldr r0, _02181f30 ; =data_027e0e60 + ldr r0, _02181f30 ; =gMapManager mov r1, #4 ldr r0, [r0] mov r2, #3 @@ -7003,7 +7003,7 @@ _02181f20: .word data_ov36_02186ce4 _02181f24: .word data_027e0e58 _02181f28: .word 0x000002c7 _02181f2c: .word data_027e071c -_02181f30: .word data_027e0e60 +_02181f30: .word gMapManager _02181f34: .word 0x0000011e _02181f38: .word data_027e0f90 @@ -7016,12 +7016,12 @@ func_ov36_02181f3c: ; 0x02181f3c mov r1, #3 orr r2, r0, #0x100000 str r2, [r4, #0x878] - ldr r0, _02181fc8 ; =data_027e0e60 + ldr r0, _02181fc8 ; =gMapManager mov r2, r1 ldr r0, [r0] mov r3, #0 bl _ZN10MapManager18func_ov00_02084b38Eiii - ldr r0, _02181fc8 ; =data_027e0e60 + ldr r0, _02181fc8 ; =gMapManager mov r1, #4 ldr r0, [r0] mov r2, #3 @@ -7047,7 +7047,7 @@ func_ov36_02181f3c: ; 0x02181f3c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov36_02181f3c -_02181fc8: .word data_027e0e60 +_02181fc8: .word gMapManager _02181fcc: .word data_027e0f64 .global func_ov36_02181fd0 @@ -7658,14 +7658,14 @@ _021828dc: strh r1, [r0, #0x18] cmp r3, #2 blo _021828dc - ldr r0, _0218298c ; =data_027e0e60 + ldr r0, _0218298c ; =gMapManager add r2, sp, #0x2c ldr r0, [r0] mov r1, #0x5b bl _ZN10MapManager18func_ov00_02083918EiPi cmp r0, #0 beq _02182934 - ldr r0, _0218298c ; =data_027e0e60 + ldr r0, _0218298c ; =gMapManager ldrb r1, [sp, #0x30] ldr r0, [r0] mov r2, #0 @@ -7701,14 +7701,14 @@ _0218297c: .word 0x0000199a _02182980: .word 0x00001003 _02182984: .word 0x000002c2 _02182988: .word 0x000002cd -_0218298c: .word data_027e0e60 +_0218298c: .word gMapManager .global func_ov36_02182990 arm_func_start func_ov36_02182990 func_ov36_02182990: ; 0x02182990 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr} sub sp, sp, #0x124 - ldr r1, _02182c64 ; =data_027e0e60 + ldr r1, _02182c64 ; =gMapManager mov r4, r0 ldr r0, [r1] mov r1, #0 @@ -7892,7 +7892,7 @@ _02182a7c: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov36_02182990 -_02182c64: .word data_027e0e60 +_02182c64: .word gMapManager _02182c68: .word data_027e0f64 _02182c6c: .word data_027e0ffc _02182c70: .word data_027e0fc8 @@ -10044,13 +10044,13 @@ _02184a9c: add r1, sp, #0 bl func_ov00_02087d34 mov r1, #0 - ldr r0, _02184de0 ; =data_027e0e60 + ldr r0, _02184de0 ; =gMapManager str r1, [sp, #0x1c] ldr r0, [r0] str r1, [sp, #0x20] str r1, [sp, #0x24] bl _ZN10MapManager18Get_MapData_Unk_d8Ev - ldr r1, _02184de0 ; =data_027e0e60 + ldr r1, _02184de0 ; =gMapManager mov r4, r0 ldr r0, [r1] bl _ZN10MapManager18Get_MapData_Unk_d0Ev @@ -10245,7 +10245,7 @@ _02184dc8: arm_func_end func_ov36_02184a64 _02184dd8: .word gAdventureFlags _02184ddc: .word data_027e0f64 -_02184de0: .word data_027e0e60 +_02184de0: .word gMapManager _02184de4: .word 0x0000038e _02184de8: .word 0x00001e84 @@ -10366,7 +10366,7 @@ func_ov36_02184f44: ; 0x02184f44 mov r4, r0 _02184f6c: ldr r1, [r6, #0x48] - ldr r0, _0218504c ; =data_027e0e60 + ldr r0, _0218504c ; =gMapManager str r1, [sp] ldr r1, [r6, #0x4c] ldr r0, [r0] @@ -10429,7 +10429,7 @@ _02185040: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov36_02184f44 -_0218504c: .word data_027e0e60 +_0218504c: .word gMapManager .global func_ov36_02185050 arm_func_start func_ov36_02185050 diff --git a/asm/ov37.inc b/asm/ov37.inc index d5dd88aa..f4f14ea5 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -79,7 +79,7 @@ .extern data_027e0c54 .extern data_027e0d0c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f90 diff --git a/asm/ov37.s b/asm/ov37.s index d8afdba0..ce4eff94 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -3058,14 +3058,14 @@ _0217e78c: strh r1, [r0, #0x18] cmp r3, #2 blo _0217e78c - ldr r0, _0217f0f4 ; =data_027e0e60 + ldr r0, _0217f0f4 ; =gMapManager add r2, sp, #0x7c ldr r0, [r0] mov r1, #3 bl _ZN10MapManager18func_ov00_02083908EcPi cmp r0, #0 beq _0217e7ec - ldr r0, _0217f0f4 ; =data_027e0e60 + ldr r0, _0217f0f4 ; =gMapManager mov r1, #3 ldr r0, [r0] mov r2, #0 @@ -3171,14 +3171,14 @@ _0217e93c: strh r1, [r0, #0x18] cmp r3, #2 blo _0217e93c - ldr r0, _0217f0f4 ; =data_027e0e60 + ldr r0, _0217f0f4 ; =gMapManager add r2, sp, #0x54 ldr r0, [r0] mov r1, #1 bl _ZN10MapManager18func_ov00_02083908EcPi cmp r0, #0 beq _0217e99c - ldr r0, _0217f0f4 ; =data_027e0e60 + ldr r0, _0217f0f4 ; =gMapManager mov r1, #1 ldr r0, [r0] mov r2, #0 @@ -3675,7 +3675,7 @@ _0217f0e8: add sp, sp, #0x400 ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_0217f0f4: .word data_027e0e60 +_0217f0f4: .word gMapManager _0217f0f8: .word data_027e0e58 _0217f0fc: .word 0x00001020 _0217f100: .word 0x00001021 @@ -3929,7 +3929,7 @@ func_ov37_0217f468: ; 0x0217f468 add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0217f4d0 ; =data_027e0e60 + ldr r0, _0217f4d0 ; =gMapManager ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -3948,7 +3948,7 @@ func_ov37_0217f468: ; 0x0217f468 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov37_0217f468 -_0217f4d0: .word data_027e0e60 +_0217f4d0: .word gMapManager .global func_ov37_0217f4d4 arm_func_start func_ov37_0217f4d4 @@ -3962,7 +3962,7 @@ func_ov37_0217f4d4: ; 0x0217f4d4 add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0217f53c ; =data_027e0e60 + ldr r0, _0217f53c ; =gMapManager ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -3981,7 +3981,7 @@ func_ov37_0217f4d4: ; 0x0217f4d4 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov37_0217f4d4 -_0217f53c: .word data_027e0e60 +_0217f53c: .word gMapManager .global func_ov37_0217f540 arm_func_start func_ov37_0217f540 @@ -3993,7 +3993,7 @@ func_ov37_0217f540: ; 0x0217f540 mov r5, r0 ldmia r4, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0217f650 ; =data_027e0e60 + ldr r0, _0217f650 ; =gMapManager ldr lr, [sp, #0x20] ldr ip, [sp, #0x24] ldr r3, [sp, #0x28] @@ -4056,7 +4056,7 @@ func_ov37_0217f540: ; 0x0217f540 ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov37_0217f540 -_0217f650: .word data_027e0e60 +_0217f650: .word gMapManager _0217f654: .word data_027e0e58 _0217f658: .word 0x00001013 _0217f65c: .word 0x00001014 @@ -6741,7 +6741,7 @@ _02181b64: add r3, sp, #0x224 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02181f34 ; =data_027e0e60 + ldr r0, _02181f34 ; =gMapManager ldr r6, [sp, #0x224] ldr r4, [sp, #0x228] ldr r3, [sp, #0x22c] @@ -6795,7 +6795,7 @@ _02181c30: add r3, sp, #0x218 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02181f34 ; =data_027e0e60 + ldr r0, _02181f34 ; =gMapManager ldr r6, [sp, #0x218] ldr r4, [sp, #0x21c] ldr r3, [sp, #0x220] @@ -6928,7 +6928,7 @@ _02181e2c: add r3, sp, #0x1f4 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02181f34 ; =data_027e0e60 + ldr r0, _02181f34 ; =gMapManager ldr r2, [sp, #0x1f4] ldr r6, [sp, #0x1f8] ldr r3, [sp, #0x1fc] @@ -6984,7 +6984,7 @@ _02181f24: .word 0x0000100f _02181f28: .word 0x00001010 _02181f2c: .word data_ov37_0218801c _02181f30: .word 0x00001011 -_02181f34: .word data_027e0e60 +_02181f34: .word gMapManager _02181f38: .word 0x00000153 _02181f3c: .word data_ov37_02188028 _02181f40: .word 0x000002ae @@ -7157,7 +7157,7 @@ _0218219c: add r3, sp, #0x1b8 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02181f34 ; =data_027e0e60 + ldr r0, _02181f34 ; =gMapManager ldr r2, [sp, #0x1b8] ldr r6, [sp, #0x1bc] ldr r3, [sp, #0x1c0] @@ -7276,7 +7276,7 @@ _02182368: add r3, sp, #0x194 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02181f34 ; =data_027e0e60 + ldr r0, _02181f34 ; =gMapManager ldr r6, [sp, #0x194] ldr r4, [sp, #0x198] ldr r3, [sp, #0x19c] @@ -7331,7 +7331,7 @@ _02182438: add r3, sp, #0x188 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02181f34 ; =data_027e0e60 + ldr r0, _02181f34 ; =gMapManager ldr r6, [sp, #0x188] ldr r4, [sp, #0x18c] ldr r3, [sp, #0x190] @@ -12114,7 +12114,7 @@ func_ov37_02186458: ; 0x02186458 add r1, r4, #0x48 bl func_ov00_020c5330 ldr r1, [r4, #0x48] - ldr r0, _02186670 ; =data_027e0e60 + ldr r0, _02186670 ; =gMapManager str r1, [sp, #8] ldr r2, [r4, #0x4c] ldr r0, [r0] @@ -12153,7 +12153,7 @@ _02186660: .word data_027e0f6c _02186664: .word data_027e0fe8 _02186668: .word 0x57534243 _0218666c: .word data_027e0fe4 -_02186670: .word data_027e0e60 +_02186670: .word gMapManager .global func_ov37_02186674 arm_func_start func_ov37_02186674 @@ -12286,7 +12286,7 @@ func_ov37_02186720: ; 0x02186720 str r1, [sp, #4] str r0, [sp, #8] str r5, [sp, #0xc] - ldr r0, _02186858 ; =data_027e0e60 + ldr r0, _02186858 ; =gMapManager str r5, [sp, #0x10] ldr r0, [r0] add r1, sp, #0x44 @@ -12302,7 +12302,7 @@ func_ov37_02186720: ; 0x02186720 arm_func_end func_ov37_02186720 _02186850: .word data_027e0fe4 _02186854: .word 0x0000ffff -_02186858: .word data_027e0e60 +_02186858: .word gMapManager .global func_ov37_0218685c arm_func_start func_ov37_0218685c @@ -12593,7 +12593,7 @@ func_ov37_02186b68: ; 0x02186b68 add r3, sp, #0x14 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02186cac ; =data_027e0e60 + ldr r0, _02186cac ; =gMapManager ldr lr, [sp, #0x14] ldr ip, [sp, #0x18] ldr r3, [sp, #0x1c] @@ -12632,7 +12632,7 @@ func_ov37_02186b68: ; 0x02186b68 .align 2, 0 arm_func_end func_ov37_02186b68 _02186ca8: .word 0x66666667 -_02186cac: .word data_027e0e60 +_02186cac: .word gMapManager _02186cb0: .word data_027e0e58 _02186cb4: .word 0x000001a9 _02186cb8: .word data_027e0ffc @@ -13254,7 +13254,7 @@ _021874d8: add r3, sp, #0x20 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02187770 ; =data_027e0e60 + ldr r0, _02187770 ; =gMapManager ldr ip, [sp, #0x20] ldr r4, [sp, #0x24] ldr r3, [sp, #0x28] @@ -13422,7 +13422,7 @@ _02187760: .word 0x000002b9 _02187764: .word 0x00000191 _02187768: .word data_ov00_020eec68 _0218776c: .word 0x00000333 -_02187770: .word data_027e0e60 +_02187770: .word gMapManager _02187774: .word data_027e0e58 _02187778: .word 0x00001011 _0218777c: .word 0x000002ba diff --git a/asm/ov38.inc b/asm/ov38.inc index 3d36c5ae..72eaa4fb 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -75,7 +75,7 @@ .extern data_027e0d0c .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f94 diff --git a/asm/ov38.s b/asm/ov38.s index d3dbb24a..3c3f2290 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -10962,7 +10962,7 @@ _02185790: ldr r0, [r2, #0x78] cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _02185828 ; =data_027e0e60 + ldr r0, _02185828 ; =gMapManager mov r1, #3 ldr r0, [r0] mov r2, #1 @@ -11002,7 +11002,7 @@ _02185818: .align 2, 0 arm_func_end func_ov38_02185720 _02185824: .word 0x00000708 -_02185828: .word data_027e0e60 +_02185828: .word gMapManager _0218582c: .word data_ov29_0217a4ac .global func_ov38_02185830 @@ -11045,7 +11045,7 @@ _021858ac: ldr r0, [r4, #0x2d8] cmp r0, #0x10 ldmneia sp!, {r4, pc} - ldr r0, _02185a64 ; =data_027e0e60 + ldr r0, _02185a64 ; =gMapManager mov r1, #3 ldr r0, [r0] mov r2, #1 @@ -11060,14 +11060,14 @@ _021858ac: bl func_ov29_021772f8 ldmia sp!, {r4, pc} _021858f0: - ldr r0, _02185a64 ; =data_027e0e60 + ldr r0, _02185a64 ; =gMapManager mov r1, #6 ldr r0, [r0] mov r2, #1 bl _ZN10MapManager18func_ov00_02084be0Eii cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02185a64 ; =data_027e0e60 + ldr r0, _02185a64 ; =gMapManager mov r1, #6 ldr r0, [r0] mov r2, #1 @@ -11100,7 +11100,7 @@ _02185968: bl func_ov38_02185720 ldmia sp!, {r4, pc} _02185984: - ldr r0, _02185a64 ; =data_027e0e60 + ldr r0, _02185a64 ; =gMapManager mov r1, #5 ldr r0, [r0] mov r2, #1 @@ -11113,7 +11113,7 @@ _02185984: ldmneia sp!, {r4, pc} mov r1, #0 bl func_ov29_021772f8 - ldr r0, _02185a64 ; =data_027e0e60 + ldr r0, _02185a64 ; =gMapManager mov r1, #5 ldr r0, [r0] mov r2, #1 @@ -11143,7 +11143,7 @@ _021859e4: mov r1, #5 mov r2, #1 bl func_ov38_0217bf0c - ldr r0, _02185a64 ; =data_027e0e60 + ldr r0, _02185a64 ; =gMapManager mov r2, #1 ldr r0, [r0] mov r3, r2 @@ -11160,7 +11160,7 @@ _02185a58: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov38_02185830 -_02185a64: .word data_027e0e60 +_02185a64: .word gMapManager _02185a68: .word data_ov29_0217a4ac _02185a6c: .word gItemManager @@ -11493,7 +11493,7 @@ _02185ef8: str r0, [r1, #0x210] cmp r0, #0x82 ble _02185f3c - ldr r0, _02186a14 ; =data_027e0e60 + ldr r0, _02186a14 ; =gMapManager mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -11738,7 +11738,7 @@ _02186268: add sp, sp, #0x154 ldmia sp!, {r4, r5, pc} _021862c8: - ldr r0, _02186a14 ; =data_027e0e60 + ldr r0, _02186a14 ; =gMapManager mov r1, #2 ldr r0, [r0] mov r2, #1 @@ -12220,7 +12220,7 @@ _021869dc: .align 2, 0 arm_func_end func_ov38_02185ebc _02186a10: .word data_ov38_021891e0 -_02186a14: .word data_027e0e60 +_02186a14: .word gMapManager _02186a18: .word 0x00000ccd _02186a1c: .word data_027e0f94 _02186a20: .word data_027e0fc8 diff --git a/asm/ov39.inc b/asm/ov39.inc index f4ad32fc..67243319 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -80,7 +80,7 @@ .extern data_027e0c54 .extern data_027e0c68 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov39.s b/asm/ov39.s index 448fce53..f76adc68 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -1767,7 +1767,7 @@ func_ov39_0217d534: ; 0x0217d534 sub sp, sp, #0x14 mov r4, r0 ldr r1, [r4, #0x4c] - ldr r0, _0217d5c4 ; =data_027e0e60 + ldr r0, _0217d5c4 ; =gMapManager add r1, r1, #0x3000 str r1, [r4, #0x4c] ldr r1, [r4, #0x48] @@ -1801,7 +1801,7 @@ func_ov39_0217d534: ; 0x0217d534 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov39_0217d534 -_0217d5c4: .word data_027e0e60 +_0217d5c4: .word gMapManager _0217d5c8: .word data_027e0f94 _0217d5cc: .word data_027e0fe4 _0217d5d0: .word 0x4e415649 @@ -3453,7 +3453,7 @@ func_ov39_0217ec34: ; 0x0217ec34 ldr r0, _0217ec88 ; =data_027e0c68 add r1, r5, #0xc60 bl func_02036ce4 - ldr r0, _0217ec8c ; =data_027e0e60 + ldr r0, _0217ec8c ; =gMapManager mov r1, r4 ldr r0, [r0] mov r2, #1 @@ -3463,7 +3463,7 @@ func_ov39_0217ec34: ; 0x0217ec34 .align 2, 0 arm_func_end func_ov39_0217ec34 _0217ec88: .word data_027e0c68 -_0217ec8c: .word data_027e0e60 +_0217ec8c: .word gMapManager .global func_ov39_0217ec90 arm_func_start func_ov39_0217ec90 @@ -3989,7 +3989,7 @@ _0217f3b8: orr r0, r0, #4 str r0, [r4, #0x158] _0217f3c4: - ldr r0, _0217f47c ; =data_027e0e60 + ldr r0, _0217f47c ; =gMapManager mov r1, #3 ldr r0, [r0] mov r2, #1 @@ -4000,7 +4000,7 @@ _0217f3c4: ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0217f47c ; =data_027e0e60 + ldr r0, _0217f47c ; =gMapManager mov r1, #3 ldr r0, [r0] mov r2, #1 @@ -4038,7 +4038,7 @@ _0217f40c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov39_0217f32c -_0217f47c: .word data_027e0e60 +_0217f47c: .word gMapManager _0217f480: .word data_ov29_0217bd28 _0217f484: .word gItemManager @@ -7582,13 +7582,13 @@ func_ov39_021825e8: ; 0x021825e8 add r0, r4, #0x3ec add r0, r0, #0x400 bl func_ov39_0217ca2c - ldr r0, _02182670 ; =data_027e0e60 + ldr r0, _02182670 ; =gMapManager mov r1, #1 ldr r0, [r0] mov r2, r1 mov r3, #0 bl _ZN10MapManager18func_ov00_02084b38Eiii - ldr r0, _02182670 ; =data_027e0e60 + ldr r0, _02182670 ; =gMapManager mov r1, #2 ldr r0, [r0] mov r2, #1 @@ -7607,7 +7607,7 @@ func_ov39_021825e8: ; 0x021825e8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov39_021825e8 -_02182670: .word data_027e0e60 +_02182670: .word gMapManager .global func_ov39_02182674 arm_func_start func_ov39_02182674 diff --git a/asm/ov40.inc b/asm/ov40.inc index 506138a7..6bf49085 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -89,7 +89,7 @@ .extern data_027e0de4 .extern data_027e0e2c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f78 diff --git a/asm/ov40.s b/asm/ov40.s index f27ddffc..324d5c94 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -4789,7 +4789,7 @@ func_ov40_0217fa44: ; 0x0217fa44 bne _0217fb0c strb r1, [r5, #0xd6] strb r1, [r5, #0xd7] - ldr r0, _0217fbb4 ; =data_027e0e60 + ldr r0, _0217fbb4 ; =gMapManager add r1, sp, #0x70 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -4849,7 +4849,7 @@ _0217fb0c: ldr r1, [r5, #0xdc] cmp r1, r0 bne _0217fb98 - ldr r0, _0217fbb4 ; =data_027e0e60 + ldr r0, _0217fbb4 ; =gMapManager add r1, sp, #0x38 ldr r0, [r0] bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p @@ -4878,7 +4878,7 @@ _0217fb98: .align 2, 0 arm_func_end func_ov40_0217fa44 _0217fbb0: .word 0x444d4348 -_0217fbb4: .word data_027e0e60 +_0217fbb4: .word gMapManager _0217fbb8: .word 0x444d5452 _0217fbbc: .word 0x444d4b53 _0217fbc0: .word 0x444d5350 @@ -8485,7 +8485,7 @@ func_ov40_02182694: ; 0x02182694 mov r3, #0x47 sub r2, r3, #0x49 mov r1, #0xff - ldr r0, _021827ac ; =data_027e0e60 + ldr r0, _021827ac ; =gMapManager str r2, [sp, #0xc] str r3, [sp] str r4, [sp, #4] @@ -8512,7 +8512,7 @@ _02182798: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov40_02182694 -_021827ac: .word data_027e0e60 +_021827ac: .word gMapManager .global func_ov40_021827b0 arm_func_start func_ov40_021827b0 @@ -11718,7 +11718,7 @@ func_ov40_02184fb4: ; 0x02184fb4 str r0, [r4, #0x84] str r0, [r4, #0x88] ldr r1, [r4, #0x7c] - ldr r0, _02185028 ; =data_027e0e60 + ldr r0, _02185028 ; =gMapManager str r1, [r4, #0x8c] ldr r2, [r4, #0x80] add r1, sp, #0xc @@ -11740,7 +11740,7 @@ func_ov40_02184fb4: ; 0x02184fb4 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov40_02184fb4 -_02185028: .word data_027e0e60 +_02185028: .word gMapManager .global func_ov40_0218502c arm_func_start func_ov40_0218502c @@ -12505,7 +12505,7 @@ func_ov40_02185878: ; 0x02185878 beq _02185b10 b _02185b38 _021858c8: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev sub r0, r0, #0xd @@ -12518,7 +12518,7 @@ _021858e4: ; jump table b _02185994 ; case 2 b _02185994 ; case 3 _021858f4: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0xd @@ -12542,52 +12542,52 @@ _02185924: ; jump table b _0218594c ; case 8 b _02185964 ; case 9 _0218594c: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0x2b bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185964: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0x2c bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _0218597c: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0x1d bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185994: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0xf bl _ZN10MapManager18func_ov00_02082650Eiii - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #4 bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _021859c0: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #6 bl _ZN10MapManager18func_ov00_02082650Eiii - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #4 bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _021859ec: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev sub r0, r0, #0xd @@ -12600,7 +12600,7 @@ _02185a08: ; jump table b _02185ab8 ; case 2 b _02185ab8 ; case 3 _02185a18: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0xe @@ -12624,57 +12624,57 @@ _02185a48: ; jump table b _02185a70 ; case 8 b _02185a88 ; case 9 _02185a70: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0x25 bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185a88: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0x2d bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185aa0: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0x25 bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185ab8: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0x10 bl _ZN10MapManager18func_ov00_02082650Eiii - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #2 bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185ae4: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #2 bl _ZN10MapManager18func_ov00_02082650Eiii - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #2 bl _ZN10MapManager18func_ov00_02082660Eii b _02185b38 _02185b10: - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_020846a4Ev cmp r0, #0xe bne _02185b38 - ldr r0, _02185b40 ; =data_027e0e60 + ldr r0, _02185b40 ; =gMapManager mov r2, r5 ldr r0, [r0] mov r1, #0xe @@ -12684,7 +12684,7 @@ _02185b38: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov40_02185878 -_02185b40: .word data_027e0e60 +_02185b40: .word gMapManager _02185b44: .word gAdventureFlags .global func_ov40_02185b48 diff --git a/asm/ov41.inc b/asm/ov41.inc index ac3991a3..c4f6c7ce 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -79,7 +79,7 @@ .extern data_027e0d04 .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f68 .extern data_027e0f6c .extern data_027e0f78 diff --git a/asm/ov41.s b/asm/ov41.s index afa97125..d4fa1d52 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -3833,7 +3833,7 @@ _0218c668: str r1, [sp, #0x24] str r0, [sp, #0x1c] _0218c680: - ldr r1, _0218c71c ; =data_027e0e60 + ldr r1, _0218c71c ; =gMapManager add r0, sp, #4 ldr r1, [r1] add r2, sp, #0x1c @@ -3862,7 +3862,7 @@ _0218c6cc: blo _0218c6cc add r1, sp, #8 str r1, [sp] - ldr r0, _0218c71c ; =data_027e0e60 + ldr r0, _0218c71c ; =gMapManager add r2, sp, #4 ldr r0, [r0] mov r1, #2 @@ -3876,7 +3876,7 @@ _0218c6cc: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov41_0218c5e0 -_0218c71c: .word data_027e0e60 +_0218c71c: .word gMapManager .global func_ov41_0218c720 arm_func_start func_ov41_0218c720 @@ -4010,7 +4010,7 @@ func_ov41_0218c834: ; 0x0218c834 add r1, r1, #0x400 ldr r0, [r0] bl _ZN12ActorManager8GetActorEP8ActorRef - ldr r1, _0218cbec ; =data_027e0e60 + ldr r1, _0218cbec ; =gMapManager mov r4, r0 ldr r0, [r1] mov r1, r5 @@ -4222,7 +4222,7 @@ _0218cbdc: .word data_027e0f68 _0218cbe0: .word gAdventureFlags _0218cbe4: .word data_027e0fc8 _0218cbe8: .word data_027e0fe4 -_0218cbec: .word data_027e0e60 +_0218cbec: .word gMapManager _0218cbf0: .word data_02050f54 _0218cbf4: .word 0x4b4f4b4f @@ -4742,7 +4742,7 @@ func_ov41_0218d210: ; 0x0218d210 ldr r3, [sp, #0xc] ldr r2, [sp, #0x10] ldr r1, [sp, #0x14] - ldr r0, _0218d31c ; =data_027e0e60 + ldr r0, _0218d31c ; =gMapManager str r2, [sp, #4] str r3, [sp] str r1, [sp, #8] @@ -4781,7 +4781,7 @@ _0218d2fc: _0218d310: .word data_027e0f94 _0218d314: .word data_027e0f90 _0218d318: .word data_027e0fac -_0218d31c: .word data_027e0e60 +_0218d31c: .word gMapManager _0218d320: .word 0xffff8001 .global func_ov41_0218d324 @@ -4921,7 +4921,7 @@ _0218d438: ldr r0, [r0] bl func_ov00_020c47cc ldr r1, [r0, #4] - ldr r3, _0218d618 ; =data_027e0e60 + ldr r3, _0218d618 ; =gMapManager str r1, [r4, #0x48] ldr r2, [r0, #8] add r1, sp, #0 @@ -5006,7 +5006,7 @@ _0218d608: arm_func_end func_ov41_0218d3e0 _0218d610: .word data_ov00_020e8398 _0218d614: .word data_027e0ff0 -_0218d618: .word data_027e0e60 +_0218d618: .word gMapManager .global func_ov41_0218d61c arm_func_start func_ov41_0218d61c @@ -5134,7 +5134,7 @@ _0218d790: b _0218d970 _0218d7c0: ldr r1, [r4, #0x48] - ldr r0, _0218d97c ; =data_027e0e60 + ldr r0, _0218d97c ; =gMapManager str r1, [sp, #4] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -5253,7 +5253,7 @@ _0218d970: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov41_0218d668 -_0218d97c: .word data_027e0e60 +_0218d97c: .word gMapManager _0218d980: .word data_027e0ffc _0218d984: .word 0x00000309 _0218d988: .word data_027e103c diff --git a/asm/ov42.inc b/asm/ov42.inc index 73871b88..63708d77 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -62,7 +62,7 @@ .extern data_027e0d44 .extern data_027e0de4 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f78 .extern data_027e0f94 diff --git a/asm/ov42.s b/asm/ov42.s index f7fa334e..ff2f3570 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -293,7 +293,7 @@ _02189894: strh r1, [r0, #0x18] cmp r3, #2 blo _02189894 - ldr r0, _02189af4 ; =data_027e0e60 + ldr r0, _02189af4 ; =gMapManager add r2, sp, #0x48 ldr r0, [r0] mov r1, #0x42 @@ -308,7 +308,7 @@ _02189894: mov r3, r2 bl func_ov00_02087400 _021898e0: - ldr r0, _02189af4 ; =data_027e0e60 + ldr r0, _02189af4 ; =gMapManager add r2, sp, #0x64 ldr r0, [r0] mov r1, #0x43 @@ -447,7 +447,7 @@ _02189a74: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 arm_func_end func_ov42_02189834 -_02189af4: .word data_027e0e60 +_02189af4: .word gMapManager _02189af8: .word data_027e0f64 _02189afc: .word gItemManager _02189b00: .word data_027e0fc8 diff --git a/asm/ov43.inc b/asm/ov43.inc index 2cada26d..7b5ae442 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -62,7 +62,7 @@ .extern data_027e0c68 .extern data_027e0d0c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f90 diff --git a/asm/ov43.s b/asm/ov43.s index b3380421..0539e50f 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -2995,7 +2995,7 @@ _0218bcfc: str r0, [r4, #0x3d4] b _0218c970 _0218bd3c: - ldr r0, _0218c98c ; =data_027e0e60 + ldr r0, _0218c98c ; =gMapManager ldrh r1, [r4, #0x26] ldr r0, [r0] mov r2, #0 @@ -3811,7 +3811,7 @@ _0218c920: ldrh r0, [r4, #0x20] cmp r0, #5 bne _0218c950 - ldr r0, _0218c98c ; =data_027e0e60 + ldr r0, _0218c98c ; =gMapManager ldrh r1, [r4, #0x26] ldr r0, [r0] mov r2, #0 @@ -3839,7 +3839,7 @@ _0218c97c: .word data_027e0fe4 _0218c980: .word 0x0000ffff _0218c984: .word data_027e0fe8 _0218c988: .word 0x50425a4b -_0218c98c: .word data_027e0e60 +_0218c98c: .word gMapManager _0218c990: .word data_027e0d0c _0218c994: .word data_027e0c68 _0218c998: .word 0x00690330 @@ -4213,7 +4213,7 @@ _0218ceac: ldrb r2, [r10, #0x3e6] cmp r2, #0 beq _0218cf04 - ldr r0, _0218cf8c ; =data_027e0e60 + ldr r0, _0218cf8c ; =gMapManager str r11, [sp, #0xc] str r4, [sp, #0x10] str r5, [sp, #0x14] @@ -4230,7 +4230,7 @@ _0218ceac: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} _0218cf04: - ldr r2, _0218cf8c ; =data_027e0e60 + ldr r2, _0218cf8c ; =gMapManager str r0, [sp] ldr r0, [r2] str r3, [sp, #8] @@ -4269,7 +4269,7 @@ _0218cf78: arm_func_end func_ov43_0218cd7c _0218cf84: .word data_027e0fc8 _0218cf88: .word data_027e0f94 -_0218cf8c: .word data_027e0e60 +_0218cf8c: .word gMapManager .global func_ov43_0218cf90 arm_func_start func_ov43_0218cf90 diff --git a/asm/ov44.inc b/asm/ov44.inc index 1f952648..080ba9c4 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -68,7 +68,7 @@ .extern data_027e0194 .extern data_027e0764 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f94 .extern data_027e0fe0 .extern data_027e0fe4 diff --git a/asm/ov44.s b/asm/ov44.s index 9bcdc00f..1157f439 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -6537,7 +6537,7 @@ _0218e49c: .word 0xfffff852 func_ov44_0218e4a0: ; 0x0218e4a0 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x4c - ldr r1, _0218e588 ; =data_027e0e60 + ldr r1, _0218e588 ; =gMapManager mov r4, r0 ldr r5, [r1] add r0, sp, #0 @@ -6596,7 +6596,7 @@ _0218e4ec: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov44_0218e4a0 -_0218e588: .word data_027e0e60 +_0218e588: .word gMapManager _0218e58c: .word _ZTV11FilterActor _0218e590: .word 0x5053424c _0218e594: .word data_027e0fe4 diff --git a/asm/ov46.inc b/asm/ov46.inc index f37cdc73..1b7585b9 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -69,7 +69,7 @@ .extern data_027e0d38 .extern data_027e0dbc .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f6c .extern data_027e0f94 .extern data_027e0fc8 diff --git a/asm/ov46.s b/asm/ov46.s index 98ddf8c9..832bdb2e 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -27,7 +27,7 @@ _02190070: .word 0x000004dc func_ov46_02190074: ; 0x02190074 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x14 - ldr r1, _021901cc ; =data_027e0e60 + ldr r1, _021901cc ; =gMapManager mov r6, r0 ldr r5, [r1] add r0, sp, #0 @@ -129,7 +129,7 @@ _021901b4: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov46_02190074 -_021901cc: .word data_027e0e60 +_021901cc: .word gMapManager _021901d0: .word 0x0000036d _021901d4: .word 0x0000036e _021901d8: .word 0x0000036f @@ -750,7 +750,7 @@ _021909a8: .word 0x000004d8 func_ov46_021909ac: ; 0x021909ac stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x14 - ldr r1, _02190b04 ; =data_027e0e60 + ldr r1, _02190b04 ; =gMapManager mov r6, r0 ldr r5, [r1] add r0, sp, #0 @@ -852,7 +852,7 @@ _02190aec: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov46_021909ac -_02190b04: .word data_027e0e60 +_02190b04: .word gMapManager _02190b08: .word 0x0000036d _02190b0c: .word 0x0000036e _02190b10: .word 0x0000036f diff --git a/asm/ov47.inc b/asm/ov47.inc index 66cd2b79..5fff50a1 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -6,7 +6,7 @@ .extern data_02050f54 .extern data_027e0764 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f6c .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov47.s b/asm/ov47.s index c2aa8c03..3e0b40d6 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -1181,7 +1181,7 @@ _02190fdc: str r1, [sp] cmp r0, #0 beq _02191060 - ldr r0, _021910ec ; =data_027e0e60 + ldr r0, _021910ec ; =gMapManager add r1, r5, #0x108 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -1235,7 +1235,7 @@ _021910cc: arm_func_end func_ov47_02190f58 _021910e4: .word data_027e0ffc _021910e8: .word 0x00000397 -_021910ec: .word data_027e0e60 +_021910ec: .word gMapManager _021910f0: .word data_027e0f6c _021910f4: .word data_ov00_020eec9c _021910f8: .word 0x00000393 @@ -1596,7 +1596,7 @@ _02191578: add r1, r4, #0x21c bl func_ov00_020cb140 ldr r1, [r4, #0x14] - ldr r0, _021916c8 ; =data_027e0e60 + ldr r0, _021916c8 ; =gMapManager str r1, [r4, #0x338] ldr r2, [r4, #0x18] add r1, sp, #0 @@ -1668,7 +1668,7 @@ _021916b8: .align 2, 0 arm_func_end func_ov47_02191548 _021916c4: .word data_ov47_021946d8 -_021916c8: .word data_027e0e60 +_021916c8: .word gMapManager .global func_ov47_021916cc arm_func_start func_ov47_021916cc @@ -2795,7 +2795,7 @@ _02192408: mov r4, #4 str r1, [sp, #0x34] ldr r1, [r6, #0x54] - ldr r3, _02192f7c ; =data_027e0e60 + ldr r3, _02192f7c ; =gMapManager str r1, [sp, #0x20] ldr r2, [r6, #0x58] add r1, sp, #0xe8 @@ -2888,7 +2888,7 @@ _021925ec: cmp r0, #1 bne _02192ecc _0219260c: - ldr r0, _02192f7c ; =data_027e0e60 + ldr r0, _02192f7c ; =gMapManager ldrh r1, [r6, #0x22] ldr r0, [r0] mov r2, #0 @@ -3487,7 +3487,7 @@ _02192e70: bl func_ov47_02191a1c cmp r0, #0 beq _02192eb4 - ldr r0, _02192f7c ; =data_027e0e60 + ldr r0, _02192f7c ; =gMapManager ldr r0, [r0] bl _ZN10MapManager18func_ov00_02084740Ev mov r1, r0 @@ -3508,7 +3508,7 @@ _02192ecc: cmpne r0, #2 cmpne r0, #6 bne _02192f68 - ldr r0, _02192f7c ; =data_027e0e60 + ldr r0, _02192f7c ; =gMapManager ldr r4, [r6, #0x48] ldr r8, [r0] ldr r3, [r6, #0x4c] @@ -3550,7 +3550,7 @@ _02192f68: arm_func_end func_ov47_02192350 _02192f74: .word 0x55555556 _02192f78: .word 0x0000ffff -_02192f7c: .word data_027e0e60 +_02192f7c: .word gMapManager _02192f80: .word data_ov00_020eec68 _02192f84: .word 0x0000019a _02192f88: .word data_027e0764 @@ -4701,7 +4701,7 @@ func_ov47_02193e80: ; 0x02193e80 add r3, sp, #0x14 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02193f40 ; =data_027e0e60 + ldr r0, _02193f40 ; =gMapManager ldr lr, [sp, #0x14] ldr ip, [sp, #0x18] ldr r3, [sp, #0x1c] @@ -4744,7 +4744,7 @@ _02193f20: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov47_02193e80 -_02193f40: .word data_027e0e60 +_02193f40: .word gMapManager _02193f44: .word func_ov47_02193e68 _02193f48: .word data_027e0e58 _02193f4c: .word func_ov47_02193e18 diff --git a/asm/ov48.inc b/asm/ov48.inc index 597d90be..509ffce0 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -73,7 +73,7 @@ .extern data_027e0d38 .extern data_027e0e58 .extern data_027e0e5c -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac diff --git a/asm/ov48.s b/asm/ov48.s index d1f2425c..e0ffa4b0 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -2035,7 +2035,7 @@ _021917c4: ldr r0, _02191c1c ; =data_ov48_02195468 add r1, sp, #0xb4 str r0, [sp, #0xc] - ldr r0, _02191c30 ; =data_027e0e60 + ldr r0, _02191c30 ; =gMapManager str r6, [sp, #0x10] ldr r0, [r0] add r2, sp, #0x20 @@ -2296,7 +2296,7 @@ _02191c20: .word func_ov48_02191c60 _02191c24: .word data_ov48_0219545c _02191c28: .word 0x0000ffff _02191c2c: .word 0x00000333 -_02191c30: .word data_027e0e60 +_02191c30: .word gMapManager _02191c34: .word gItemManager _02191c38: .word data_027e0f90 _02191c3c: .word data_027e0fac diff --git a/asm/ov49.inc b/asm/ov49.inc index 25cf5249..5d574b61 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -76,7 +76,7 @@ .extern data_02052f54 .extern data_027e0764 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov49.s b/asm/ov49.s index 60b0c659..88f35b27 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -454,7 +454,7 @@ func_ov49_02195930: ; 0x02195930 mov r2, #0 str r0, [r4, #0x570] ldr r1, [sp, #0x20] - ldr r0, _02195b78 ; =data_027e0e60 + ldr r0, _02195b78 ; =gMapManager str r1, [r4, #0x574] ldr r3, [sp, #0x24] add r1, r4, #0x168 @@ -477,7 +477,7 @@ _02195b68: .word data_ov49_021986e8 _02195b6c: .word data_ov00_020e2f04 _02195b70: .word data_ov00_020e2dd8 _02195b74: .word 0xfffff666 -_02195b78: .word data_027e0e60 +_02195b78: .word gMapManager .global func_ov49_02195b7c arm_func_start func_ov49_02195b7c @@ -495,7 +495,7 @@ func_ov49_02195b7c: ; 0x02195b7c func_ov49_02195b94: ; 0x02195b94 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x38 - ldr r2, _02195cb4 ; =data_027e0e60 + ldr r2, _02195cb4 ; =gMapManager mov r4, r0 add r1, r4, #0x168 ldr r0, [r2] @@ -572,7 +572,7 @@ _02195c84: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov49_02195b94 -_02195cb4: .word data_027e0e60 +_02195cb4: .word gMapManager _02195cb8: .word data_027e0fe8 _02195cbc: .word 0x4e534844 @@ -2528,7 +2528,7 @@ func_ov49_021976bc: ; 0x021976bc b _021977b8 _02197764: ldr r1, [r4, #0x48] - ldr r0, _021977d0 ; =data_027e0e60 + ldr r0, _021977d0 ; =gMapManager str r1, [r4, #0x15c] ldr r2, [r4, #0x4c] add r1, sp, #0 @@ -2557,7 +2557,7 @@ _021977b8: .align 2, 0 arm_func_end func_ov49_021976bc _021977cc: .word 0x000005f3 -_021977d0: .word data_027e0e60 +_021977d0: .word gMapManager .global func_ov49_021977d4 arm_func_start func_ov49_021977d4 @@ -2652,7 +2652,7 @@ _021978a8: cmp r0, #0 beq _021979e0 ldr r1, [r5, #0x48] - ldr r0, _02197b10 ; =data_027e0e60 + ldr r0, _02197b10 ; =gMapManager str r1, [sp, #4] ldr r2, [r5, #0x4c] ldr r1, [r0] @@ -2805,7 +2805,7 @@ _02197b08: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov49_02197860 -_02197b10: .word data_027e0e60 +_02197b10: .word gMapManager _02197b14: .word data_027e0ffc _02197b18: .word 0x000001ab _02197b1c: .word 0xfffffe66 @@ -3316,7 +3316,7 @@ _02198160: .word 0x0000048e .global func_ov49_02198164 arm_func_start func_ov49_02198164 func_ov49_02198164: ; 0x02198164 - ldr r2, _0219817c ; =data_027e0e60 + ldr r2, _0219817c ; =gMapManager ldr ip, _02198180 ; =_ZN10MapManager18func_ov00_020836dcEii ldrb r1, [r0, #0x15c] ldr r0, [r2] @@ -3324,7 +3324,7 @@ func_ov49_02198164: ; 0x02198164 bx ip .align 2, 0 arm_func_end func_ov49_02198164 -_0219817c: .word data_027e0e60 +_0219817c: .word gMapManager _02198180: .word _ZN10MapManager18func_ov00_020836dcEii .global func_ov49_02198184 diff --git a/asm/ov50.inc b/asm/ov50.inc index f33f91cf..39f3d162 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -77,7 +77,7 @@ .extern data_027e0194 .extern data_027e0764 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f90 diff --git a/asm/ov50.s b/asm/ov50.s index e7a20a55..af947e52 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -396,7 +396,7 @@ _02195a34: str r1, [sp, #0x1c] cmp r0, #0 beq _02195a84 - ldr r0, _02195cac ; =data_027e0e60 + ldr r0, _02195cac ; =gMapManager add r1, r6, #0x108 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -563,7 +563,7 @@ _02195c90: .align 2, 0 arm_func_end func_ov50_02195950 _02195ca8: .word data_ov50_021989d0 -_02195cac: .word data_027e0e60 +_02195cac: .word gMapManager _02195cb0: .word data_027e0f6c _02195cb4: .word data_027e0e58 _02195cb8: .word 0x000001a5 @@ -920,7 +920,7 @@ _02196168: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} _02196184: ldr r1, [r5, #0x48] - ldr r0, _021963e4 ; =data_027e0e60 + ldr r0, _021963e4 ; =gMapManager str r1, [sp] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -1084,7 +1084,7 @@ _021963d4: arm_func_end func_ov50_021960c8 _021963dc: .word data_027e0ffc _021963e0: .word 0x00000396 -_021963e4: .word data_027e0e60 +_021963e4: .word gMapManager _021963e8: .word data_027e0fc8 _021963ec: .word gAdventureFlags @@ -1341,13 +1341,13 @@ func_ov50_02196698: ; 0x02196698 str r3, [sp, #0x10] str ip, [sp, #0x14] bl func_01ff9bc4 - ldr r1, _0219683c ; =data_027e0e60 + ldr r1, _0219683c ; =gMapManager add r0, sp, #8 ldr r1, [r1] add r2, r4, #0x48 bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p ldrb r1, [sp, #8] - ldr r0, _0219683c ; =data_027e0e60 + ldr r0, _0219683c ; =gMapManager ldrb r2, [sp, #9] sub r3, r1, #1 ldr r0, [r0] @@ -1361,7 +1361,7 @@ func_ov50_02196698: ; 0x02196698 subeq r0, r0, #0x800 streq r0, [sp, #0x48] add r3, r1, #1 - ldr r0, _0219683c ; =data_027e0e60 + ldr r0, _0219683c ; =gMapManager ldrb r2, [sp, #9] ldr r0, [r0] add r1, sp, #4 @@ -1374,7 +1374,7 @@ func_ov50_02196698: ; 0x02196698 addeq r0, r0, #0x800 streq r0, [sp, #0x3c] sub r2, r1, #1 - ldr r0, _0219683c ; =data_027e0e60 + ldr r0, _0219683c ; =gMapManager ldrb r3, [sp, #8] ldr r0, [r0] add r1, sp, #2 @@ -1387,7 +1387,7 @@ func_ov50_02196698: ; 0x02196698 subeq r0, r0, #0x800 streq r0, [sp, #0x50] add r2, r1, #1 - ldr r0, _0219683c ; =data_027e0e60 + ldr r0, _0219683c ; =gMapManager ldrb r3, [sp, #8] ldr r0, [r0] add r1, sp, #0 @@ -1415,7 +1415,7 @@ func_ov50_02196698: ; 0x02196698 ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov50_02196698 -_0219683c: .word data_027e0e60 +_0219683c: .word gMapManager .global func_ov50_02196840 arm_func_start func_ov50_02196840 @@ -3024,7 +3024,7 @@ func_ov50_02197d04: ; 0x02197d04 strb r2, [sp] strb r2, [sp, #1] bl func_ov00_020c5374 - ldr r0, _02197dc0 ; =data_027e0e60 + ldr r0, _02197dc0 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -3059,7 +3059,7 @@ _02197da0: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov50_02197d04 -_02197dc0: .word data_027e0e60 +_02197dc0: .word gMapManager .global func_ov50_02197dc4 arm_func_start func_ov50_02197dc4 diff --git a/asm/ov51.inc b/asm/ov51.inc index 52c2e0b7..61aea627 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -5,7 +5,7 @@ .extern data_02050f54 .extern data_027e0764 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f6c .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov51.s b/asm/ov51.s index b6995fb9..c620ed3a 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -692,7 +692,7 @@ _02195db4: add r3, sp, #0xc ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02195e9c ; =data_027e0e60 + ldr r0, _02195e9c ; =gMapManager ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -751,7 +751,7 @@ _02195e80: .align 2, 0 arm_func_end func_ov51_02195c80 _02195e98: .word data_027e0fe4 -_02195e9c: .word data_027e0e60 +_02195e9c: .word gMapManager .global func_ov51_02195ea0 arm_func_start func_ov51_02195ea0 @@ -1993,7 +1993,7 @@ func_ov51_02196e18: ; 0x02196e18 ldmia r1, {r0, r1, r2} mov r9, #0 stmia r8, {r0, r1, r2} - ldr r4, _02196f04 ; =data_027e0e60 + ldr r4, _02196f04 ; =gMapManager mov r5, r9 mov r7, #0xa000 mov r6, #0x800 @@ -2048,7 +2048,7 @@ _02196ee0: .align 2, 0 arm_func_end func_ov51_02196e18 _02196f00: .word data_027e0f94 -_02196f04: .word data_027e0e60 +_02196f04: .word gMapManager .global func_ov51_02196f08 arm_func_start func_ov51_02196f08 @@ -2542,7 +2542,7 @@ _02197588: add r1, r4, #0x100 ldrsh ip, [r1, #0xd0] ldrsh r3, [r1, #0xd2] - ldr r2, _02197634 ; =data_027e0e60 + ldr r2, _02197634 ; =gMapManager add r0, sp, #0xc add r3, ip, r3 strh r3, [r1, #0xd0] @@ -2584,7 +2584,7 @@ _02197588: arm_func_end func_ov51_02197314 _0219762c: .word 0x0000099a _02197630: .word data_ov51_02198280 -_02197634: .word data_027e0e60 +_02197634: .word gMapManager _02197638: .word 0x000007ae _0219763c: .word data_027e0ff8 diff --git a/asm/ov52.inc b/asm/ov52.inc index d0373366..31f5743a 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -73,7 +73,7 @@ .extern data_027e0ce0 .extern data_027e0d3c .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f68 .extern data_027e0f78 .extern data_027e0fa0 diff --git a/asm/ov52.s b/asm/ov52.s index 96528400..70ca8253 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -397,13 +397,13 @@ func_ov52_02195908: ; 0x02195908 mov r2, #1 strb r2, [r4, #0x13] mov r3, #0 - ldr r0, _02195a08 ; =data_027e0e60 + ldr r0, _02195a08 ; =gMapManager strb r3, [r4, #0xc] ldr r0, [r0] mov r1, #0x1e bl _ZN10MapManager18func_ov00_02084b38Eiii mov r1, #0 - ldr r0, _02195a08 ; =data_027e0e60 + ldr r0, _02195a08 ; =gMapManager str r1, [sp, #4] str r1, [sp, #8] strh r1, [sp, #0x10] @@ -424,7 +424,7 @@ func_ov52_02195908: ; 0x02195908 ldr r2, _02195a10 ; =0x00000004 mov r1, #2 blx _ZN14OverlayManager15LoadIfNotLoadedEjj - ldr r0, _02195a08 ; =data_027e0e60 + ldr r0, _02195a08 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082b3cEi @@ -450,7 +450,7 @@ func_ov52_02195908: ; 0x02195908 .align 2, 0 arm_func_end func_ov52_02195908 _02195a04: .word gAdventureFlags -_02195a08: .word data_027e0e60 +_02195a08: .word gMapManager _02195a0c: .word gOverlayManager _02195a10: .word 0x00000004 _02195a14: .word 0x00000005 @@ -480,7 +480,7 @@ _02195a60: mov r4, #0 strb r4, [r5, #0x13] mov lr, #0x47 - ldr r0, _02195b38 ; =data_027e0e60 + ldr r0, _02195b38 ; =gMapManager sub ip, lr, #0x49 mov r3, #0xff ldr r0, [r0] @@ -500,7 +500,7 @@ _02195a60: ldr r2, _02195b40 ; =0x00000004 mov r1, #2 blx _ZN14OverlayManager15LoadIfNotLoadedEjj - ldr r0, _02195b38 ; =data_027e0e60 + ldr r0, _02195b38 ; =gMapManager add r1, sp, #0 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02082b3cEi @@ -533,7 +533,7 @@ _02195a60: .align 2, 0 arm_func_end func_ov52_02195a20 _02195b34: .word data_ov52_02197c40 -_02195b38: .word data_027e0e60 +_02195b38: .word gMapManager _02195b3c: .word gOverlayManager _02195b40: .word 0x00000004 _02195b44: .word 0x00000005 @@ -547,14 +547,14 @@ _02195b58: .word data_027e103c arm_func_start func_ov52_02195b5c func_ov52_02195b5c: ; 0x02195b5c stmdb sp!, {r4, lr} - ldr r1, _02195ba8 ; =data_027e0e60 + ldr r1, _02195ba8 ; =gMapManager mov r4, r0 ldr r0, [r1] mov r1, #0x1f mov r2, #1 mov r3, #0 bl _ZN10MapManager18func_ov00_02084b38Eiii - ldr r0, _02195ba8 ; =data_027e0e60 + ldr r0, _02195ba8 ; =gMapManager mov r1, #0x1e ldr r0, [r0] mov r2, #1 @@ -567,7 +567,7 @@ func_ov52_02195b5c: ; 0x02195b5c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov52_02195b5c -_02195ba8: .word data_027e0e60 +_02195ba8: .word gMapManager _02195bac: .word data_ov09_0211f5b4 .global func_ov52_02195bb0 @@ -594,7 +594,7 @@ _02195be0: ldr r0, _02195d18 ; =data_ov00_020eec9c ldr r1, _02195d1c ; =0x000003fd bl func_ov00_020d77e4 - ldr r0, _02195d20 ; =data_027e0e60 + ldr r0, _02195d20 ; =gMapManager mov r2, #1 ldr r0, [r0] mov r3, r2 @@ -604,7 +604,7 @@ _02195be0: strb r0, [r4, #0xc] b _02195ca4 _02195c20: - ldr r0, _02195d20 ; =data_027e0e60 + ldr r0, _02195d20 ; =gMapManager mov r1, #5 ldr r0, [r0] mov r2, #0 @@ -629,7 +629,7 @@ _02195c5c: bl _ZN14AdventureFlags18func_ov00_02097738Ev cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _02195d20 ; =data_027e0e60 + ldr r0, _02195d20 ; =gMapManager mov r2, #1 ldr r0, [r0] mov r3, r2 @@ -675,7 +675,7 @@ _02195ce8: _02195d14: .word data_ov52_02197c70 _02195d18: .word data_ov00_020eec9c _02195d1c: .word 0x000003fd -_02195d20: .word data_027e0e60 +_02195d20: .word gMapManager _02195d24: .word gAdventureFlags _02195d28: .word data_ov00_020eec68 diff --git a/asm/ov53.inc b/asm/ov53.inc index bdb117c6..58bb5851 100644 --- a/asm/ov53.inc +++ b/asm/ov53.inc @@ -20,7 +20,7 @@ .extern data_02050f54 .extern data_027e0d0c .extern data_027e0de4 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f94 .extern data_027e0fb8 diff --git a/asm/ov53.s b/asm/ov53.s index 442f45b0..61dd8876 100644 --- a/asm/ov53.s +++ b/asm/ov53.s @@ -444,7 +444,7 @@ func_ov53_021991ec: ; 0x021991ec cmp r9, r0 bge _02199280 ldr r8, _02199308 ; =data_ov53_0219a5bc - ldr r4, _0219930c ; =data_027e0e60 + ldr r4, _0219930c ; =gMapManager add r6, sp, #0x20 mov r11, #2 add r7, sp, #4 @@ -514,7 +514,7 @@ _021992ec: arm_func_end func_ov53_021991ec _02199304: .word data_ov53_0219a580 _02199308: .word data_ov53_0219a5bc -_0219930c: .word data_027e0e60 +_0219930c: .word gMapManager _02199310: .word data_ov53_0219a5e4 _02199314: .word data_027e0fe4 @@ -742,7 +742,7 @@ _02199518: str r1, [sp, #0xc] mov r0, #0 str r0, [sp, #0x10] - ldr r0, _021996ec ; =data_027e0e60 + ldr r0, _021996ec ; =gMapManager add r1, sp, #0x60 ldr r0, [r0] add r2, sp, #0x44 @@ -788,7 +788,7 @@ _021996dc: .word 0x0000019f _021996e0: .word 0x0000ffff _021996e4: .word data_ov53_0219a580 _021996e8: .word data_ov53_0219a5bc -_021996ec: .word data_027e0e60 +_021996ec: .word gMapManager _021996f0: .word data_027e0fe4 _021996f4: .word data_ov53_0219a180 _021996f8: .word data_ov53_0219a5e4 @@ -1206,7 +1206,7 @@ func_ov53_02199c48: ; 0x02199c48 mov lr, #0 str r2, [sp, #0x24] ldr r2, [r0, #0x50] - ldr ip, _02199cc4 ; =data_027e0e60 + ldr ip, _02199cc4 ; =gMapManager str r2, [sp, #0x28] ldr r3, [r0, #0x54] add r2, sp, #0x20 @@ -1230,7 +1230,7 @@ func_ov53_02199c48: ; 0x02199c48 ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov53_02199c48 -_02199cc4: .word data_027e0e60 +_02199cc4: .word gMapManager .global func_ov53_02199cc8 arm_func_start func_ov53_02199cc8 @@ -1267,7 +1267,7 @@ _02199d28: str r2, [r0, #0x1c] str r2, [r0, #0x18] ldr r1, [r5, #0x48] - ldr r0, _02199f78 ; =data_027e0e60 + ldr r0, _02199f78 ; =gMapManager str r1, [sp] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -1417,7 +1417,7 @@ _02199f68: .word data_ov53_0219a680 _02199f6c: .word data_ov53_0219a15c _02199f70: .word func_ov53_02199f88 _02199f74: .word data_ov53_0219a674 -_02199f78: .word data_027e0e60 +_02199f78: .word gMapManager _02199f7c: .word data_027e0ffc _02199f80: .word 0x0000019d _02199f84: .word 0x00000555 diff --git a/asm/ov54.inc b/asm/ov54.inc index 8a7badbb..c0e3c208 100644 --- a/asm/ov54.inc +++ b/asm/ov54.inc @@ -31,7 +31,7 @@ .extern data_02054654 .extern data_027e0d38 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0fb8 .extern data_027e0fcc .extern data_027e0fd4 diff --git a/asm/ov54.s b/asm/ov54.s index a162d77e..646034ae 100644 --- a/asm/ov54.s +++ b/asm/ov54.s @@ -112,21 +112,21 @@ func_ov54_02198e04: ; 0x02198e04 .global func_ov54_02198e08 arm_func_start func_ov54_02198e08 func_ov54_02198e08: ; 0x02198e08 - ldr r0, _02198e1c ; =data_027e0e60 + ldr r0, _02198e1c ; =gMapManager 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 +_02198e1c: .word gMapManager _02198e20: .word _ZN10MapManager18func_ov00_02085a34Eii .global func_ov54_02198e24 arm_func_start func_ov54_02198e24 func_ov54_02198e24: ; 0x02198e24 stmdb sp!, {r3, lr} - ldr r0, _02198e48 ; =data_027e0e60 + ldr r0, _02198e48 ; =gMapManager mov r2, #2 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02085a34Eii @@ -136,7 +136,7 @@ func_ov54_02198e24: ; 0x02198e24 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov54_02198e24 -_02198e48: .word data_027e0e60 +_02198e48: .word gMapManager .global func_ov54_02198e4c arm_func_start func_ov54_02198e4c @@ -228,7 +228,7 @@ func_ov54_02198efc: ; 0x02198efc mov r6, r5 cmp r4, r0 beq _02198fb4 - ldr r1, _02199290 ; =data_027e0e60 + ldr r1, _02199290 ; =gMapManager add r0, sp, #0xc ldr r1, [r1] add r2, r7, #0x38 @@ -315,7 +315,7 @@ _02199050: bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList cmp r0, #0 bgt _021990c4 - ldr r0, _02199290 ; =data_027e0e60 + ldr r0, _02199290 ; =gMapManager add r1, r7, #0x38 ldr r0, [r0] bl _ZN10MapManager18func_ov00_02085594Ev @@ -446,7 +446,7 @@ _02199284: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov54_02198efc -_02199290: .word data_027e0e60 +_02199290: .word gMapManager _02199294: .word 0x00000333 _02199298: .word data_ov54_02199a00 _0219929c: .word data_027e0fe4 @@ -833,7 +833,7 @@ func_ov54_021997f0: ; 0x021997f0 bl _ZN13PlayerControl18func_ov00_020af01cEPc cmp r0, #0 beq _02199898 - ldr r0, _021998d0 ; =data_027e0e60 + ldr r0, _021998d0 ; =gMapManager ldrb r2, [sp] ldrb r1, [sp, #1] ldr r0, [r0] @@ -846,7 +846,7 @@ func_ov54_021997f0: ; 0x021997f0 cmp r4, #0 mov r4, #1 beq _02199884 - ldr r0, _021998d0 ; =data_027e0e60 + ldr r0, _021998d0 ; =gMapManager ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] ldr r2, [sp, #0x18] @@ -881,7 +881,7 @@ _02199898: .align 2, 0 arm_func_end func_ov54_021997f0 _021998cc: .word data_027e0fb8 -_021998d0: .word data_027e0e60 +_021998d0: .word gMapManager .global func_ov54_021998d4 arm_func_start func_ov54_021998d4 diff --git a/asm/ov55.inc b/asm/ov55.inc index 68653625..682fbcf7 100644 --- a/asm/ov55.inc +++ b/asm/ov55.inc @@ -25,7 +25,7 @@ .extern _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p .extern __register_global_object .extern data_027e0c54 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f90 .extern data_027e0fb8 diff --git a/asm/ov55.s b/asm/ov55.s index 2d2dad34..7c50505e 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -585,7 +585,7 @@ func_ov55_021993b8: ; 0x021993b8 mov r5, #0 cmp r0, #0 bne _021994d4 - ldr r0, _02199640 ; =data_027e0e60 + ldr r0, _02199640 ; =gMapManager ldr r9, [sp, #0x1c] ldr r7, [sp, #0x20] ldr r10, [sp, #0x18] @@ -601,7 +601,7 @@ func_ov55_021993b8: ; 0x021993b8 bl _ZN10MapManager18func_ov00_02083f44EP5Vec3p cmp r0, r8 bge _021994cc - ldr r0, _02199640 ; =data_027e0e60 + ldr r0, _02199640 ; =gMapManager ldr r10, [sp, #0x18] ldr r0, [r0] add r3, r7, #0x3000 @@ -710,7 +710,7 @@ _021994d4: arm_func_end func_ov55_021993b8 _02199638: .word data_027e0f64 _0219963c: .word data_027e0c54 -_02199640: .word data_027e0e60 +_02199640: .word gMapManager _02199644: .word 0x0000105b _02199648: .word 0x0000038e _0219964c: .word gAdventureFlags diff --git a/asm/ov57.inc b/asm/ov57.inc index fe983f15..767a9d3c 100644 --- a/asm/ov57.inc +++ b/asm/ov57.inc @@ -30,7 +30,7 @@ .extern data_027e0d0c .extern data_027e0de4 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f94 diff --git a/asm/ov57.s b/asm/ov57.s index 28163870..d0a17125 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -143,7 +143,7 @@ func_ov57_02198e80: ; 0x02198e80 beq _02198f60 b _02198fac _02198ea4: - ldr r0, _02198fb8 ; =data_027e0e60 + ldr r0, _02198fb8 ; =gMapManager add r1, r4, #0x14 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -218,7 +218,7 @@ _02198fac: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov57_02198e80 -_02198fb8: .word data_027e0e60 +_02198fb8: .word gMapManager _02198fbc: .word data_027e0fe4 .global func_ov57_02198fc0 @@ -613,7 +613,7 @@ func_ov57_02199454: ; 0x02199454 beq _02199490 b _021994b0 _02199470: - ldr r0, _021994b8 ; =data_027e0e60 + ldr r0, _021994b8 ; =gMapManager add r1, r1, #0x14 ldr r0, [r0] bl _ZN10MapManager16MapData_vfunc_78Ev @@ -635,7 +635,7 @@ _021994b0: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov57_02199454 -_021994b8: .word data_027e0e60 +_021994b8: .word gMapManager _021994bc: .word data_027e0fe4 .global func_ov57_021994c0 @@ -760,7 +760,7 @@ _021995fc: mov r1, #0 str r0, [sp, #0xc] str r1, [sp, #0x10] - ldr r0, _021996ac ; =data_027e0e60 + ldr r0, _021996ac ; =gMapManager add r1, sp, #0x48 ldr r0, [r0] add r3, sp, #0x3c @@ -774,7 +774,7 @@ _0219969c: .word 0x0000199a _021996a0: .word 0x0000ffff _021996a4: .word data_ov57_0219ab00 _021996a8: .word data_ov57_0219ab0c -_021996ac: .word data_027e0e60 +_021996ac: .word gMapManager .global func_ov57_021996b0 arm_func_start func_ov57_021996b0 @@ -1189,7 +1189,7 @@ func_ov57_02199c78: ; 0x02199c78 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x20 mov r10, r0 - ldr r11, _02199d4c ; =data_027e0e60 + ldr r11, _02199d4c ; =gMapManager mov r7, r10 add r8, r10, #0x2c add r9, r10, #0x24 @@ -1245,7 +1245,7 @@ _02199d2c: ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} .align 2, 0 arm_func_end func_ov57_02199c78 -_02199d4c: .word data_027e0e60 +_02199d4c: .word gMapManager _02199d50: .word data_027e0fe4 .global func_ov57_02199d54 @@ -1988,7 +1988,7 @@ func_ov57_0219a6b8: ; 0x0219a6b8 mov ip, #1 str r1, [sp, #0x2c] ldr r2, [r5, #0x50] - ldr r0, _0219a84c ; =data_027e0e60 + ldr r0, _0219a84c ; =gMapManager str r2, [sp, #0x30] ldr r3, [r5, #0x54] add r1, r5, #0xb8 @@ -2066,7 +2066,7 @@ _0219a830: arm_func_end func_ov57_0219a6b8 _0219a844: .word data_027e0ffc _0219a848: .word data_ov57_0219ab1c -_0219a84c: .word data_027e0e60 +_0219a84c: .word gMapManager .global func_ov57_0219a850 arm_func_start func_ov57_0219a850 diff --git a/asm/ov58.inc b/asm/ov58.inc index b1ef0054..470a005b 100644 --- a/asm/ov58.inc +++ b/asm/ov58.inc @@ -20,7 +20,7 @@ .extern data_027e0d3c .extern data_027e0d78 .extern data_027e0de4 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f6c .extern data_027e0f94 .extern data_027e0fb8 diff --git a/asm/ov58.s b/asm/ov58.s index 9b85c9cc..33b2e70a 100644 --- a/asm/ov58.s +++ b/asm/ov58.s @@ -86,7 +86,7 @@ func_ov58_02198d00: ; 0x02198d00 add r1, sp, #8 mov r2, r0 bl func_01ff9bc4 - ldr r1, _02198ef0 ; =data_027e0e60 + ldr r1, _02198ef0 ; =gMapManager add r0, sp, #4 ldr r6, [r1] add r2, sp, #0x14 @@ -97,7 +97,7 @@ func_ov58_02198d00: ; 0x02198d00 bl _ZN10MapManager18func_ov00_020840dcEv cmp r0, #0x46 bne _02198eb4 - ldr r0, _02198ef0 ; =data_027e0e60 + ldr r0, _02198ef0 ; =gMapManager add r1, sp, #0x14 ldr r0, [r0] mov r2, #0 @@ -133,7 +133,7 @@ _02198eb4: _02198ee4: .word func_ov58_02198ef4 _02198ee8: .word func_ov58_02198ef8 _02198eec: .word data_027e0f6c -_02198ef0: .word data_027e0e60 +_02198ef0: .word gMapManager .global func_ov58_02198ef4 arm_func_start func_ov58_02198ef4 @@ -592,7 +592,7 @@ _021992c0: .word data_ov58_0219afc0 arm_func_start func_ov58_021992c4 func_ov58_021992c4: ; 0x021992c4 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _021993e8 ; =data_027e0e60 + ldr r2, _021993e8 ; =gMapManager mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -676,7 +676,7 @@ _021993e0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov58_021992c4 -_021993e8: .word data_027e0e60 +_021993e8: .word gMapManager _021993ec: .word data_027e0c54 _021993f0: .word data_027e0d38 _021993f4: .word data_027e0fd4 @@ -786,7 +786,7 @@ _021994ba: mov r0, #0 pop {r4, r5, r6, r7, pc} _021994c2: - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager add r1, sp, #0x1bc ldr r0, [r0] blx _ZN10MapManager18func_ov00_0208346cEP4AABB @@ -820,7 +820,7 @@ _021994fa: mov r0, #0 pop {r4, r5, r6, r7, pc} _02199502: - ldr r1, _021997f4 ; =data_027e0e60 + ldr r1, _021997f4 ; =gMapManager add r0, sp, #0x58 ldr r1, [r1] add r0, #2 @@ -835,7 +835,7 @@ _02199502: ldr r0, [r4, #8] mov r2, sp str r0, [sp, #0x1b8] - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager ldrb r6, [r3] ldr r0, [r0] sub r2, r2, #4 @@ -882,7 +882,7 @@ _02199502: mov r0, #0 pop {r4, r5, r6, r7, pc} _02199580: - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager add r3, sp, #0x24 mov r2, sp ldrb r6, [r3, #6] @@ -946,7 +946,7 @@ _021995e2: str r0, [sp, #0x120] ldr r0, [sp, #0x1b8] str r0, [sp, #0x124] - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x1b4] @@ -1030,7 +1030,7 @@ _0219968e: ldr r1, [sp, #0x190] ldr r0, [sp, #0x14] add r0, r0, r1 - ldr r1, _021997f4 ; =data_027e0e60 + ldr r1, _021997f4 ; =gMapManager str r0, [sp, #0x1b8] ldr r1, [r1] add r0, sp, #0x58 @@ -1044,7 +1044,7 @@ _0219968e: mov r3, sp sub r3, r3, #4 strb r0, [r7, #1] - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager ldrb r2, [r7] ldr r0, [r0] add r1, sp, #0x1b0 @@ -1063,7 +1063,7 @@ _0219968e: ldr r0, [sp, #0x1b8] str r1, [sp, #0x108] str r0, [sp, #0x10c] - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager add r1, sp, #0x104 ldr r0, [r0] blx _ZN10MapManager16MapData_vfunc_68Ev @@ -1148,7 +1148,7 @@ _02199750: add r6, r0, #0 _02199796: ldr r2, [r5, #0x18] - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager sub r2, r2, #1 ldr r1, [r5, #0x1c] lsl r2, r2, #1 @@ -1158,7 +1158,7 @@ _02199796: cmp r0, #0x19 bne _021997ec ldr r1, [r5, #0x18] - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager sub r1, r1, #1 ldr r2, [r5, #0x1c] lsl r1, r1, #1 @@ -1174,7 +1174,7 @@ _02199796: ldr r0, [sp, #0x14] add r1, sp, #0xf8 str r0, [sp, #0x100] - ldr r0, _021997f4 ; =data_027e0e60 + ldr r0, _021997f4 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager16MapData_vfunc_68Ev add r6, r0, #0 @@ -1193,7 +1193,7 @@ _021997ec: .align 2, 0 thumb_func_end func_ov58_02199498 _021997f0: .word data_ov58_0219aec0 -_021997f4: .word data_027e0e60 +_021997f4: .word gMapManager _021997f8: .word data_027e0f94 _021997fc: .word 0x00000999 _02199800: .word 0x00001333 @@ -1233,7 +1233,7 @@ _0219983e: ldr r0, [sp, #0x14] add r2, sp, #0x64 str r0, [sp, #0xf4] - ldr r0, _02199b44 ; =data_027e0e60 + ldr r0, _02199b44 ; =gMapManager add r3, sp, #0x17c ldr r0, [r0] str r6, [sp, #0xf0] @@ -1283,7 +1283,7 @@ _02199872: str r0, [sp, #0xc] mov r0, #1 str r0, [sp, #0x10] - ldr r0, _02199b44 ; =data_027e0e60 + ldr r0, _02199b44 ; =gMapManager ldr r0, [r0] blx func_01ffbe78 ldr r1, _02199b4c ; =data_ov58_0219b100 @@ -1311,7 +1311,7 @@ _021998c8: str r1, [sp, #0x1b4] str r0, [sp, #0x1b8] ldr r0, [r5, #0x24] - ldr r1, _02199b44 ; =data_027e0e60 + ldr r1, _02199b44 ; =gMapManager str r0, [sp, #0x1b4] add r0, sp, #0x54 ldr r1, [r1] @@ -1362,7 +1362,7 @@ _02199932: pop {r4, r5, r6, r7, pc} _02199940: ldr r0, [sp, #0x1d4] - ldr r1, _02199b44 ; =data_027e0e60 + ldr r1, _02199b44 ; =gMapManager str r0, [sp, #0x170] ldr r0, [sp, #0x1d8] ldr r1, [r1] @@ -1396,7 +1396,7 @@ _02199940: pop {r4, r5, r6, r7, pc} _02199986: add r7, sp, #0x58 - ldr r0, _02199b44 ; =data_027e0e60 + ldr r0, _02199b44 ; =gMapManager add r7, #2 mov r3, sp ldrb r2, [r7] @@ -1488,7 +1488,7 @@ _02199a30: mov r0, #0 pop {r4, r5, r6, r7, pc} _02199a38: - ldr r1, _02199b44 ; =data_027e0e60 + ldr r1, _02199b44 ; =gMapManager add r0, sp, #0x50 ldr r1, [r1] add r0, #2 @@ -1539,7 +1539,7 @@ _02199a76: str r0, [sp, #0xc] mov r0, #1 str r0, [sp, #0x10] - ldr r0, _02199b44 ; =data_027e0e60 + ldr r0, _02199b44 ; =gMapManager add r3, sp, #0xb0 ldr r0, [r0] blx func_01ffbe78 @@ -1554,7 +1554,7 @@ _02199a76: _02199aba: cmp r0, #0 bne _02199b30 - ldr r1, _02199b44 ; =data_027e0e60 + ldr r1, _02199b44 ; =gMapManager add r0, sp, #0x50 ldr r1, [r1] add r2, sp, #0x170 @@ -1597,7 +1597,7 @@ _02199aba: mov r0, #0 pop {r4, r5, r6, r7, pc} _02199b14: - ldr r0, _02199b44 ; =data_027e0e60 + ldr r0, _02199b44 ; =gMapManager add r7, sp, #0x24 mov r3, sp ldrb r2, [r7, #4] @@ -1616,11 +1616,11 @@ _02199b30: cmp r0, #0 beq _02199bd6 ldr r0, [sp, #0x1d4] - ldr r1, _02199b44 ; =data_027e0e60 + ldr r1, _02199b44 ; =gMapManager b _02199b58 nop _02199b40: .word 0x00000999 -_02199b44: .word data_027e0e60 +_02199b44: .word gMapManager _02199b48: .word 0x0000099a _02199b4c: .word data_ov58_0219b100 _02199b50: .word data_ov58_0219b0f0 @@ -1675,7 +1675,7 @@ _02199b58: mov r0, #0 pop {r4, r5, r6, r7, pc} _02199bba: - ldr r0, _02199ee4 ; =data_027e0e60 + ldr r0, _02199ee4 ; =gMapManager add r7, sp, #0x24 mov r3, sp ldrb r2, [r7, #2] @@ -1700,7 +1700,7 @@ _02199bde: ldr r1, _02199ee8 ; =0x00000999 str r0, [sp, #0x1b0] str r0, [sp, #0xa4] - ldr r0, _02199ee4 ; =data_027e0e60 + ldr r0, _02199ee4 ; =gMapManager add r1, r3, r1 str r3, [sp, #0x1b4] ldr r0, [r0] @@ -1727,7 +1727,7 @@ _02199c18: cmp r0, #0 beq _02199cc8 ldr r0, [sp, #0x1d4] - ldr r1, _02199ee4 ; =data_027e0e60 + ldr r1, _02199ee4 ; =gMapManager str r0, [sp, #0x158] ldr r0, [sp, #0x1d8] ldr r1, [r1] @@ -1775,7 +1775,7 @@ _02199c18: mov r0, #0 pop {r4, r5, r6, r7, pc} _02199c80: - ldr r0, _02199ee4 ; =data_027e0e60 + ldr r0, _02199ee4 ; =gMapManager add r7, sp, #0x24 mov r3, sp ldrb r2, [r7] @@ -1793,7 +1793,7 @@ _02199c80: ldr r1, _02199ee8 ; =0x00000999 str r0, [sp, #0x1b0] str r0, [sp, #0x98] - ldr r0, _02199ee4 ; =data_027e0e60 + ldr r0, _02199ee4 ; =gMapManager add r1, r3, r1 str r3, [sp, #0x1b4] ldr r0, [r0] @@ -1815,7 +1815,7 @@ _02199cc8: mov r0, #0 pop {r4, r5, r6, r7, pc} _02199cd0: - ldr r0, _02199ee4 ; =data_027e0e60 + ldr r0, _02199ee4 ; =gMapManager add r2, sp, #0x1b0 ldr r7, [r0] add r0, sp, #0x48 @@ -1828,7 +1828,7 @@ _02199cd0: blx _ZN10MapManager16MapData_vfunc_54Ev cmp r0, #0x19 bne _02199d0c - ldr r0, _02199ee4 ; =data_027e0e60 + ldr r0, _02199ee4 ; =gMapManager add r2, sp, #0x1b0 ldr r7, [r0] add r0, sp, #0x48 @@ -1850,7 +1850,7 @@ _02199d0c: str r0, [sp, #0x90] ldr r0, [sp, #0x1b8] str r0, [sp, #0x94] - ldr r0, _02199ee4 ; =data_027e0e60 + ldr r0, _02199ee4 ; =gMapManager ldr r0, [r0] blx _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0x1b4] @@ -1877,7 +1877,7 @@ _02199d3e: beq _02199d50 mov r6, #0 _02199d50: - ldr r1, _02199ee4 ; =data_027e0e60 + ldr r1, _02199ee4 ; =gMapManager add r0, sp, #0x60 ldr r1, [r1] add r2, r7, #0 @@ -1901,7 +1901,7 @@ _02199d50: ldr r3, [sp, #0x140] str r0, [sp, #0x1b4] str r0, [sp, #0x84] - ldr r0, _02199ee4 ; =data_027e0e60 + ldr r0, _02199ee4 ; =gMapManager str r1, [sp, #0x1b8] str r1, [sp, #0x88] ldr r0, [r0] @@ -1915,7 +1915,7 @@ _02199d50: add r0, r0, r1 str r0, [sp, #0x1b4] ldr r0, [sp, #0x1b0] - ldr r1, _02199ee4 ; =data_027e0e60 + ldr r1, _02199ee4 ; =gMapManager str r0, [r4] ldr r0, [sp, #0x1b4] add r2, sp, #0x1b0 @@ -1983,7 +1983,7 @@ _02199e0c: blx func_ov58_0219a3b4 cmp r0, #0 beq _02199e54 - ldr r1, _02199ee4 ; =data_027e0e60 + ldr r1, _02199ee4 ; =gMapManager add r0, sp, #0x44 ldr r1, [r1] add r2, sp, #0x1b0 @@ -2005,7 +2005,7 @@ _02199e0c: b _02199e8a _02199e54: ldr r0, [sp, #0x1b0] - ldr r1, _02199ee4 ; =data_027e0e60 + ldr r1, _02199ee4 ; =gMapManager str r0, [sp, #0x74] ldr r0, [sp, #0x1b4] ldr r1, [r1] @@ -2077,7 +2077,7 @@ _02199eda: add sp, #0x38 pop {r4, r5, r6, r7, pc} .align 2, 0 -_02199ee4: .word data_027e0e60 +_02199ee4: .word gMapManager _02199ee8: .word 0x00000999 _02199eec: .word 0x00001333 @@ -2087,7 +2087,7 @@ func_ov58_02199ef0: ; 0x02199ef0 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0x24 - ldr r0, _02199fd4 ; =data_027e0e60 + ldr r0, _02199fd4 ; =gMapManager ldrb r1, [sp, #0x4c] ldr r0, [r0] sub r3, sp, #4 @@ -2098,7 +2098,7 @@ func_ov58_02199ef0: ; 0x02199ef0 ldr r2, [r3] bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r8, #0 - ldr r4, _02199fd4 ; =data_027e0e60 + ldr r4, _02199fd4 ; =gMapManager mov r9, r8 add r5, sp, #0xc mov r7, r8 @@ -2146,7 +2146,7 @@ _02199fb0: bx lr .align 2, 0 arm_func_end func_ov58_02199ef0 -_02199fd4: .word data_027e0e60 +_02199fd4: .word gMapManager .global func_ov58_02199fd8 arm_func_start func_ov58_02199fd8 @@ -2204,7 +2204,7 @@ func_ov58_0219a084: ; 0x0219a084 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} sub sp, sp, #0xcc - ldr r0, _0219a3a8 ; =data_027e0e60 + ldr r0, _0219a3a8 ; =gMapManager ldrb r1, [sp, #0xf4] ldr r0, [r0] sub r3, sp, #4 @@ -2215,7 +2215,7 @@ func_ov58_0219a084: ; 0x0219a084 ldr r2, [r3] bl _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi mov r8, #0 - ldr r4, _0219a3a8 ; =data_027e0e60 + ldr r4, _0219a3a8 ; =gMapManager add r10, sp, #0x3c mov r9, r8 mov r7, r8 @@ -2285,7 +2285,7 @@ _0219a0d8: add r1, sp, #0x6c str r0, [sp, #0xc] str r2, [sp, #0x10] - ldr r0, _0219a3a8 ; =data_027e0e60 + ldr r0, _0219a3a8 ; =gMapManager add r2, sp, #0x3c ldr r0, [r0] add r3, sp, #0x54 @@ -2306,7 +2306,7 @@ _0219a0d8: mov r1, #0 str r0, [sp, #0xc] str r1, [sp, #0x10] - ldr r0, _0219a3a8 ; =data_027e0e60 + ldr r0, _0219a3a8 ; =gMapManager add r1, sp, #0x6c ldr r0, [r0] add r2, sp, #0x48 @@ -2328,7 +2328,7 @@ _0219a0d8: mov r1, #0 str r0, [sp, #0xc] str r1, [sp, #0x10] - ldr r0, _0219a3a8 ; =data_027e0e60 + ldr r0, _0219a3a8 ; =gMapManager add r1, sp, #0x6c ldr r0, [r0] add r2, sp, #0x54 @@ -2350,7 +2350,7 @@ _0219a0d8: mov r1, #0 str r0, [sp, #0xc] str r1, [sp, #0x10] - ldr r0, _0219a3a8 ; =data_027e0e60 + ldr r0, _0219a3a8 ; =gMapManager add r1, sp, #0x6c ldr r0, [r0] add r2, sp, #0x60 @@ -2390,7 +2390,7 @@ _0219a338: add sp, sp, #0x10 bx lr _0219a368: - ldr r0, _0219a3a8 ; =data_027e0e60 + ldr r0, _0219a3a8 ; =gMapManager add r1, sp, #0x30 ldr r0, [r0] add r2, sp, #0x14 @@ -2408,7 +2408,7 @@ _0219a368: bx lr .align 2, 0 arm_func_end func_ov58_0219a084 -_0219a3a8: .word data_027e0e60 +_0219a3a8: .word gMapManager _0219a3ac: .word 0x0000ffff _0219a3b0: .word data_ov58_0219b0f0 @@ -2529,7 +2529,7 @@ func_ov58_0219a47c: ; 0x0219a47c add lr, sp, #4 ldmia r0, {r0, r1, r2} stmia lr, {r0, r1, r2} - ldr r3, _0219a5b0 ; =data_027e0e60 + ldr r3, _0219a5b0 ; =gMapManager sub ip, sp, #4 ldr r0, [r3] mov r1, lr @@ -2569,7 +2569,7 @@ _0219a59c: arm_func_end func_ov58_0219a47c _0219a5a8: .word data_027e077c _0219a5ac: .word data_027e103c -_0219a5b0: .word data_027e0e60 +_0219a5b0: .word gMapManager _0219a5b4: .word data_027e0fb8 .global func_ov58_0219a5b8 diff --git a/asm/ov59.inc b/asm/ov59.inc index 3cb7cf4e..b1008d20 100644 --- a/asm/ov59.inc +++ b/asm/ov59.inc @@ -18,7 +18,7 @@ .extern data_02050f54 .extern data_027e0d38 .extern data_027e0e58 -.extern data_027e0e60 +.extern gMapManager .extern data_027e0f94 .extern data_027e0fb8 .extern data_027e0fc8 diff --git a/asm/ov59.s b/asm/ov59.s index 55851799..894f00e9 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -212,7 +212,7 @@ func_ov59_02198f10: ; 0x02198f10 str r0, [sp, #8] ldr r0, [r5, #0x20] cmp r0, #0 - ldr r0, _02198fa4 ; =data_027e0e60 + ldr r0, _02198fa4 ; =gMapManager moveq r2, #1 ldr r0, [r0] bl _ZN10MapManager18func_ov00_020858b0Ev @@ -226,7 +226,7 @@ _02198f88: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov59_02198f10 -_02198fa4: .word data_027e0e60 +_02198fa4: .word gMapManager .global func_ov59_02198fa8 arm_func_start func_ov59_02198fa8 @@ -749,7 +749,7 @@ _02199620: mov r7, #0 str r0, [r4, #0x50] ldr r0, [r2, #4] - ldr r1, _0219a088 ; =data_027e0e60 + ldr r1, _0219a088 ; =gMapManager add r0, r0, #0x99 add r0, r0, #0x900 str r0, [r4, #0x4c] @@ -971,7 +971,7 @@ _02199968: ldr r0, [sp, #0x5c] orr ip, ip, r6, lsl #20 add r6, r0, ip - ldr r3, _0219a088 ; =data_027e0e60 + ldr r3, _0219a088 ; =gMapManager orr r5, r5, r1, lsl #20 ldr r0, [sp, #0x64] ldr r1, [r3] @@ -1089,7 +1089,7 @@ _02199bcc: bl func_ov00_020ceb24 b _02199fa4 _02199bdc: - ldr r0, _0219a088 ; =data_027e0e60 + ldr r0, _0219a088 ; =gMapManager ldr r6, [sp, #0x5c] ldr r5, [sp, #0x60] ldr r3, [sp, #0x64] @@ -1108,7 +1108,7 @@ _02199bdc: movgt r0, #0 cmp r0, #0 beq _02199f70 - ldr r0, _0219a088 ; =data_027e0e60 + ldr r0, _0219a088 ; =gMapManager ldr r6, [sp, #0x5c] ldr r5, [sp, #0x60] ldr r3, [sp, #0x64] @@ -1408,7 +1408,7 @@ _0219a078: .word data_02050f54 _0219a07c: .word data_027e0e58 _0219a080: .word data_027e0ffc _0219a084: .word 0x0000ffff -_0219a088: .word data_027e0e60 +_0219a088: .word gMapManager _0219a08c: .word 0xfffff999 _0219a090: .word 0x00000666 _0219a094: .word data_027e0fe4 @@ -1543,7 +1543,7 @@ _0219a24c: stmia r6, {r0, r1, r2} ldmia r4, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0219a9fc ; =data_027e0e60 + ldr r0, _0219a9fc ; =gMapManager ldr r4, [r10, #8] ldr r0, [r0] ldr r2, [r10, #0x98] @@ -1618,7 +1618,7 @@ _0219a24c: strh r7, [r0, #0x6e] mov r6, #0 strh r6, [r0, #0x70] - ldr r11, _0219a9fc ; =data_027e0e60 + ldr r11, _0219a9fc ; =gMapManager strb r6, [sp, #0x1ae] strb r6, [sp, #0x1af] strb r6, [sp, #0x1b0] @@ -1832,7 +1832,7 @@ _0219a668: mov r8, r3 ldmia r0, {r0, r1, r2} stmia r8, {r0, r1, r2} - ldr r0, _0219a9fc ; =data_027e0e60 + ldr r0, _0219a9fc ; =gMapManager ldr r8, [r10, #8] ldr r0, [r0] ldr r2, [r10, #0x98] @@ -1967,7 +1967,7 @@ _0219a8c8: mov ip, r3 ldmia r5, {r0, r1, r2} stmia ip, {r0, r1, r2} - ldr r0, _0219a9fc ; =data_027e0e60 + ldr r0, _0219a9fc ; =gMapManager ldr r2, [r10, #8] ldr r0, [r0] ldr ip, [r10, #0x98] @@ -2034,7 +2034,7 @@ _0219a9ec: .word data_ov59_0219b110 _0219a9f0: .word data_027e0f94 _0219a9f4: .word 0x00000666 _0219a9f8: .word data_02050f54 -_0219a9fc: .word data_027e0e60 +_0219a9fc: .word gMapManager _0219aa00: .word 0xfffff99a _0219aa04: .word 0x0000ffff @@ -2203,7 +2203,7 @@ _0219abcc: str r7, [sp, #0x3c] str r8, [sp, #0x40] ldr r1, [r5, #0x98] - ldr r0, _0219af00 ; =data_027e0e60 + ldr r0, _0219af00 ; =gMapManager str r1, [sp] ldr r2, [r5, #8] add r1, sp, #0xc8 @@ -2298,7 +2298,7 @@ _0219ad18: str lr, [sp, #0x18] str r7, [sp, #0x1c] ldr r1, [r5, #0x98] - ldr r0, _0219af00 ; =data_027e0e60 + ldr r0, _0219af00 ; =gMapManager stmia sp, {r1, ip} ldrh r7, [r5, #0x9c] add r1, sp, #0x68 @@ -2375,7 +2375,7 @@ _0219aebc: _0219aef4: .word data_027e0fd4 _0219aef8: .word data_027e0f94 _0219aefc: .word 0x0000ffff -_0219af00: .word data_027e0e60 +_0219af00: .word gMapManager _0219af04: .word data_027e0fb8 _0219af08: .word gItemManager _0219af0c: .word data_ov00_020dc7d0 diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 44defa6f..7acaf4a3 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -6,6 +6,7 @@ #include "Actor/ActorNavi.hpp" #include "Item/Item.hpp" +#include "Map/MapManager.hpp" #include "Player/EquipItem.hpp" #include "System/SysNew.hpp" #include "System/OverlayManager.hpp" diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 6e89e980..e246cd34 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -233,3 +233,5 @@ public: bool func_ov00_02086284(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, u16 param_6, Vec3p *param_7, Vec3p *param_8); bool func_ov00_02086a84(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, s32 param_6, unk32 param_7, Vec3p *param_8, Vec3p *param_9); }; + +extern MapManager *gMapManager; diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 614f9a50..a9c5ae5d 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -235,8 +235,7 @@ extern "C" unk32 func_ov00_02078b40(UnkStruct_027e0d38 *param1); extern void *data_027e10a4; extern "C" bool func_ov15_02136670(void *param1); extern unk8 data_ov29_0217a4ac[]; -extern void *data_027e0e60; -extern "C" bool func_ov00_020849f8(void *param1); +extern "C" bool _ZN10MapManager18func_ov00_020849f8Ei(void *param1); extern unk32 data_027e0fc8; extern "C" bool func_ov00_020bbd80(unk32 param1, unk32 param2); extern "C" bool _ZNK11ItemManager7HasItemEi(); @@ -254,7 +253,7 @@ ARM bool NONMATCH(ItemManager::func_ov00_020ad790)(unk32 param1) { } ItemFlag equipId = mForcedItem; - bool unk2 = !func_ov00_020849f8(data_027e0e60); + bool unk2 = !gMapManager->func_ov00_020849f8(); if ( mEquippedItem != ItemFlag_None && (unk2 || (u32) mEquippedItem - 9 <= 1) &&