mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-03 10:31:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mangle MapBase

Browse Source
This commit is contained in:
Aetias
2024-04-30 15:08:45 +02:00
parent 4e3235b2ec
commit 2e33294f89
26 changed files with 1235 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/itcm.inc
+2 -2
View File
@@ -49,8 +49,8 @@
.extern func_0202b2e8
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_0207e968
.extern func_ov00_0207e96c
.extern _ZN7MapBase18func_ov00_0207e968Ev
.extern _ZN7MapBase18func_ov00_0207e96cEv
.extern func_ov00_02081ef4
.extern _ZN10MapManager17Get_MapData_Unk28Ev
.extern _ZN10MapManager17Get_MapData_Unk2aEv
asm/itcm.s
+17 -17
View File
@@ -5622,10 +5622,10 @@ _01ffc998:
ldr r3, _01ffd1d4 ; =data_027e0e64
mov r1, r4
bl func_01ffedf4
ldr r1, _01ffd1d8 ; =func_ov00_0207e968
ldr r1, _01ffd1d8 ; =_ZN7MapBase18func_ov00_0207e968Ev
str r0, [sp, #0x2c]
str r1, [sp]
ldr r3, _01ffd1dc ; =func_ov00_0207e96c
ldr r3, _01ffd1dc ; =_ZN7MapBase18func_ov00_0207e96cEv
add r0, sp, #0x284
mov r1, #3
mov r2, #0x10
@@ -6105,7 +6105,7 @@ _01ffd18c:
ldr r0, [sp, #0x268]
str r0, [r10, #8]
_01ffd1b0:
ldr r3, _01ffd1d8 ; =func_ov00_0207e968
ldr r3, _01ffd1d8 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x284
mov r1, #3
mov r2, #0x10
@@ -6117,8 +6117,8 @@ _01ffd1b0:
arm_func_end func_01ffc118
_01ffd1d0: .word data_027e0f6c
_01ffd1d4: .word data_027e0e64
_01ffd1d8: .word func_ov00_0207e968
_01ffd1dc: .word func_ov00_0207e96c
_01ffd1d8: .word _ZN7MapBase18func_ov00_0207e968Ev
_01ffd1dc: .word _ZN7MapBase18func_ov00_0207e96cEv
.global func_01ffd1e0
arm_func_start func_01ffd1e0
@@ -6690,10 +6690,10 @@ _01ffda18:
ldr r3, _01ffe1bc ; =data_027e0e64
mov r1, r5
bl func_01ffedf4
ldr r1, _01ffe1c0 ; =func_ov00_0207e968
ldr r1, _01ffe1c0 ; =_ZN7MapBase18func_ov00_0207e968Ev
mov r7, r0
str r1, [sp]
ldr r3, _01ffe1c4 ; =func_ov00_0207e96c
ldr r3, _01ffe1c4 ; =_ZN7MapBase18func_ov00_0207e96cEv
add r0, sp, #0x2ec
mov r1, #3
mov r2, #0x10
@@ -7157,7 +7157,7 @@ _01ffe174:
ldr r0, [sp, #0x2d0]
str r0, [r10, #8]
_01ffe198:
ldr r3, _01ffe1c0 ; =func_ov00_0207e968
ldr r3, _01ffe1c0 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x2ec
mov r1, #3
mov r2, #0x10
@@ -7169,8 +7169,8 @@ _01ffe198:
arm_func_end func_01ffd1e0
_01ffe1b8: .word data_027e0f6c
_01ffe1bc: .word data_027e0e64
_01ffe1c0: .word func_ov00_0207e968
_01ffe1c4: .word func_ov00_0207e96c
_01ffe1c0: .word _ZN7MapBase18func_ov00_0207e968Ev
_01ffe1c4: .word _ZN7MapBase18func_ov00_0207e96cEv
_01ffe1c8: .word 0x00001922
.global func_01ffe1cc
@@ -8582,8 +8582,8 @@ func_01fff510: ; 0x01fff510
ldr r1, [sp, #4]
mov r0, r6
bl func_ov00_0208ee00
ldr r1, _01fffb44 ; =func_ov00_0207e968
ldr r3, _01fffb48 ; =func_ov00_0207e96c
ldr r1, _01fffb44 ; =_ZN7MapBase18func_ov00_0207e968Ev
ldr r3, _01fffb48 ; =_ZN7MapBase18func_ov00_0207e96cEv
str r1, [sp]
add r0, sp, #0x118
mov r1, #3
@@ -8769,7 +8769,7 @@ _01fff788:
cmp r0, #0
bne _01fff840
_01fff820:
ldr r3, _01fffb44 ; =func_ov00_0207e968
ldr r3, _01fffb44 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x118
mov r1, #3
mov r2, #0x10
@@ -8949,7 +8949,7 @@ _01fffa00:
cmp r0, #0
bne _01fffad4
_01fffab4:
ldr r3, _01fffb44 ; =func_ov00_0207e968
ldr r3, _01fffb44 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x118
mov r1, #3
mov r2, #0x10
@@ -8981,7 +8981,7 @@ _01fffb04:
str r0, [sp, #0x20]
bhs _01fff908
_01fffb24:
ldr r3, _01fffb44 ; =func_ov00_0207e968
ldr r3, _01fffb44 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x118
mov r1, #3
mov r2, #0x10
@@ -8991,8 +8991,8 @@ _01fffb24:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_01fff510
_01fffb44: .word func_ov00_0207e968
_01fffb48: .word func_ov00_0207e96c
_01fffb44: .word _ZN7MapBase18func_ov00_0207e968Ev
_01fffb48: .word _ZN7MapBase18func_ov00_0207e96cEv
.global func_01fffb4c
arm_func_start func_01fffb4c
asm/ov00/Map/MapManager.inc
+48 -48
View File
@@ -80,54 +80,54 @@
.extern func_ov00_020792a0
.extern func_ov00_02079898
.extern func_ov00_020798bc
.extern func_ov00_0207dd9c
.extern func_ov00_0207de68
.extern func_ov00_0207de88
.extern func_ov00_0207e08c
.extern func_ov00_0207e0f0
.extern func_ov00_0207e28c
.extern func_ov00_0207e968
.extern func_ov00_0207f38c
.extern func_ov00_0207f53c
.extern func_ov00_0207f630
.extern func_ov00_0207f694
.extern func_ov00_0207f6a0
.extern func_ov00_0207f6ac
.extern func_ov00_0207f6bc
.extern func_ov00_0207f6cc
.extern func_ov00_0207f778
.extern func_ov00_0207f7a0
.extern func_ov00_0207f7e8
.extern func_ov00_0207f844
.extern func_ov00_0207f8c0
.extern func_ov00_0207f924
.extern func_ov00_0207f934
.extern func_ov00_0207f948
.extern func_ov00_0207faac
.extern func_ov00_0207fb64
.extern func_ov00_0207fc2c
.extern func_ov00_0207fc98
.extern func_ov00_0207fd58
.extern func_ov00_0207fdd0
.extern func_ov00_0207fe80
.extern func_ov00_0207ff88
.extern func_ov00_0208005c
.extern func_ov00_0208006c
.extern func_ov00_0208007c
.extern func_ov00_0208008c
.extern func_ov00_02080140
.extern func_ov00_0208039c
.extern func_ov00_02080510
.extern func_ov00_020805d0
.extern func_ov00_02080688
.extern func_ov00_02080780
.extern func_ov00_02080824
.extern func_ov00_020808d0
.extern func_ov00_020809b8
.extern func_ov00_02080a78
.extern func_ov00_02080b24
.extern func_ov00_02080d08
.extern func_ov00_02080d80
.extern _ZN15MapManager_Unk2D1Ev
.extern _ZN7MapBase18func_ov00_0207de68Ei
.extern _ZN7MapBase18func_ov00_0207de88Ev
.extern _ZN7MapBase18func_ov00_0207e08cEii
.extern _ZN7MapBase18func_ov00_0207e0f0Ei
.extern _ZN7MapBase18func_ov00_0207e28cEi
.extern _ZN7MapBase18func_ov00_0207e968Ev
.extern _ZN7MapBase18func_ov00_0207f38cEi
.extern _ZN7MapBase18func_ov00_0207f53cEP5Vec2sPS_P5Vec3p
.extern _ZN7MapBase18func_ov00_0207f630EP5Vec2sP5Vec3p
.extern _ZN7MapBase13GetTileStartXEi
.extern _ZN7MapBase13GetTileStartZEi
.extern _ZN7MapBase11GetTileEndXEi
.extern _ZN7MapBase11GetTileEndZEi
.extern _ZN7MapBase13GetTileBoundsEP5Vec2bP4AABB
.extern _ZN7MapBase15GetClampedTileXEi
.extern _ZN7MapBase15GetClampedTileYEi
.extern _ZN7MapBase10IsInBoundsEP5Vec3p
.extern _ZN7MapBase11AddEntranceEP8Entrance
.extern _ZN7MapBase12FindEntranceEi
.extern _ZN7MapBase18func_ov00_0207f924Ei
.extern _ZN7MapBase18func_ov00_0207f934Ev
.extern _ZN7MapBase18func_ov00_0207f948Ei
.extern _ZN7MapBase21GetTriggerBoundingBoxEiP4AABB
.extern _ZN7MapBase23GetTriggerBoundingBoxesEiP4AABBi
.extern _ZN7MapBase21GetOverlappingTriggerEP5Vec3p
.extern _ZN7MapBase11FindTriggerEi
.extern _ZN7MapBase23IsTriggerTypeOverlappedEiP5Vec3p
.extern _ZN7MapBase18AnyTrigger_func_0cEi
.extern _ZN7MapBase10AddTriggerEi
.extern _ZN7MapBase18func_ov00_0207ff88Ei
.extern _ZN7MapBase18func_ov00_0208005cEiii
.extern _ZN7MapBase18func_ov00_0208006cEii
.extern _ZN7MapBase18func_ov00_0208007cEii
.extern _ZN7MapBase18func_ov00_0208008cEj
.extern _ZN7MapBase18func_ov00_02080140EP4Exit
.extern _ZN7MapBase8FindExitEiP4Exit
.extern _ZN7MapBase19FindViewpoint_Unk_4EcP15CameraViewpoint
.extern _ZN7MapBase19FindViewpoint_Unk_0EiP15CameraViewpoint
.extern _ZN7MapBase19GetCurrentViewpointEP15CameraViewpointi
.extern _ZN7MapBase26GetCurrentViewpoint_Unk_00Ei
.extern _ZN7MapBase18func_ov00_02080824Eii
.extern _ZN7MapBase10AddUnk_130Ei
.extern _ZN7MapBase18func_ov00_020809b8Ei
.extern _ZN7MapBase18func_ov00_02080a78EP5Vec3p
.extern _ZN7MapBase18func_ov00_02080b24EP5Vec2b
.extern _ZN7MapBase18func_ov00_02080d08Ei
.extern _ZN7MapBase22TriggerOfType_vfunc_10Ei
.extern func_ov00_02086cd0
.extern func_ov00_02088000
.extern func_ov00_02088130
asm/ov00/Map/MapManager.s
+96 -96
View File
@@ -210,52 +210,52 @@ _ZN10MapManager18func_ov00_02082348Ei: ; 0x02082348
.global _ZN10MapManager18func_ov00_020823a4Ei
arm_func_start _ZN10MapManager18func_ov00_020823a4Ei
_ZN10MapManager18func_ov00_020823a4Ei: ; 0x020823a4
ldr ip, _020823b0 ; =func_ov00_0207de68
ldr ip, _020823b0 ; =_ZN7MapBase18func_ov00_0207de68Ei
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020823a4Ei
_020823b0: .word func_ov00_0207de68
_020823b0: .word _ZN7MapBase18func_ov00_0207de68Ei
.global _ZN10MapManager18func_ov00_020823b4Ev
arm_func_start _ZN10MapManager18func_ov00_020823b4Ev
_ZN10MapManager18func_ov00_020823b4Ev: ; 0x020823b4
ldr ip, _020823c0 ; =func_ov00_0207de88
ldr ip, _020823c0 ; =_ZN7MapBase18func_ov00_0207de88Ev
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020823b4Ev
_020823c0: .word func_ov00_0207de88
_020823c0: .word _ZN7MapBase18func_ov00_0207de88Ev
.global _ZN10MapManager18func_ov00_020823c4EPii
arm_func_start _ZN10MapManager18func_ov00_020823c4EPii
_ZN10MapManager18func_ov00_020823c4EPii: ; 0x020823c4
ldr ip, _020823d0 ; =func_ov00_0207e08c
ldr ip, _020823d0 ; =_ZN7MapBase18func_ov00_0207e08cEii
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020823c4EPii
_020823d0: .word func_ov00_0207e08c
_020823d0: .word _ZN7MapBase18func_ov00_0207e08cEii
.global _ZN10MapManager18func_ov00_020823d4Ei
arm_func_start _ZN10MapManager18func_ov00_020823d4Ei
_ZN10MapManager18func_ov00_020823d4Ei: ; 0x020823d4
ldr ip, _020823e0 ; =func_ov00_0207e0f0
ldr ip, _020823e0 ; =_ZN7MapBase18func_ov00_0207e0f0Ei
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020823d4Ei
_020823e0: .word func_ov00_0207e0f0
_020823e0: .word _ZN7MapBase18func_ov00_0207e0f0Ei
.global _ZN10MapManager18func_ov00_020823e4Ei
arm_func_start _ZN10MapManager18func_ov00_020823e4Ei
_ZN10MapManager18func_ov00_020823e4Ei: ; 0x020823e4
ldr ip, _020823f0 ; =func_ov00_0207e28c
ldr ip, _020823f0 ; =_ZN7MapBase18func_ov00_0207e28cEi
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020823e4Ei
_020823f0: .word func_ov00_0207e28c
_020823f0: .word _ZN7MapBase18func_ov00_0207e28cEi
.global _ZN10MapManager16MapData_vfunc_b4Ev
arm_func_start _ZN10MapManager16MapData_vfunc_b4Ev
@@ -486,32 +486,32 @@ _ZN10MapManager16MapData_vfunc_b0Ev: ; 0x02082638
.global _ZN10MapManager18func_ov00_02082650Eiii
arm_func_start _ZN10MapManager18func_ov00_02082650Eiii
_ZN10MapManager18func_ov00_02082650Eiii: ; 0x02082650
ldr ip, _0208265c ; =func_ov00_0208005c
ldr ip, _0208265c ; =_ZN7MapBase18func_ov00_0208005cEiii
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02082650Eiii
_0208265c: .word func_ov00_0208005c
_0208265c: .word _ZN7MapBase18func_ov00_0208005cEiii
.global _ZN10MapManager18func_ov00_02082660Eii
arm_func_start _ZN10MapManager18func_ov00_02082660Eii
_ZN10MapManager18func_ov00_02082660Eii: ; 0x02082660
ldr ip, _0208266c ; =func_ov00_0208007c
ldr ip, _0208266c ; =_ZN7MapBase18func_ov00_0208007cEii
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02082660Eii
_0208266c: .word func_ov00_0208007c
_0208266c: .word _ZN7MapBase18func_ov00_0208007cEii
.global _ZN10MapManager18func_ov00_02082670Eii
arm_func_start _ZN10MapManager18func_ov00_02082670Eii
_ZN10MapManager18func_ov00_02082670Eii: ; 0x02082670
ldr ip, _0208267c ; =func_ov00_0208006c
ldr ip, _0208267c ; =_ZN7MapBase18func_ov00_0208006cEii
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02082670Eii
_0208267c: .word func_ov00_0208006c
_0208267c: .word _ZN7MapBase18func_ov00_0208006cEii
.global _ZN10MapManager18func_ov00_02082680Eii
arm_func_start _ZN10MapManager18func_ov00_02082680Eii
@@ -729,12 +729,12 @@ _ZN10MapManager16MapData_vfunc_84Ev: ; 0x020828e0
.global _ZN10MapManager18func_ov00_020828f8EPi
arm_func_start _ZN10MapManager18func_ov00_020828f8EPi
_ZN10MapManager18func_ov00_020828f8EPi: ; 0x020828f8
ldr ip, _02082904 ; =func_ov00_0207f38c
ldr ip, _02082904 ; =_ZN7MapBase18func_ov00_0207f38cEi
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020828f8EPi
_02082904: .word func_ov00_0207f38c
_02082904: .word _ZN7MapBase18func_ov00_0207f38cEi
.global _ZN10MapManager20GetCourseData_Unk_b0Ev
arm_func_start _ZN10MapManager20GetCourseData_Unk_b0Ev
@@ -777,7 +777,7 @@ _02082948:
ldr r0, [r4, #0x10]
str r0, [sp, #0x30]
ldr r0, [r9, #4]
bl func_ov00_0207f844
bl _ZN7MapBase11AddEntranceEP8Entrance
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_02082990:
@@ -863,7 +863,7 @@ _02082a90:
str r0, [sp, #0x14]
ldr r0, [r9, #4]
add r1, sp, #0xc
bl func_ov00_0207f844
bl _ZN7MapBase11AddEntranceEP8Entrance
_02082ac0:
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
@@ -1891,7 +1891,7 @@ _ZN10MapManager14GetEntrancePosEP5Vec3pi: ; 0x02083624
ldr r0, [r0, #4]
mov r4, r1
mov r1, r2
bl func_ov00_0207f8c0
bl _ZN7MapBase12FindEntranceEi
mov r3, r0
ldmia r3, {r0, r1, r2}
stmia r4, {r0, r1, r2}
@@ -1935,22 +1935,22 @@ _ZN10MapManager18func_ov00_02083664EP5Vec3pi: ; 0x02083664
.global _ZN10MapManager18func_ov00_020836bcEjPi
arm_func_start _ZN10MapManager18func_ov00_020836bcEjPi
_ZN10MapManager18func_ov00_020836bcEjPi: ; 0x020836bc
ldr ip, _020836c8 ; =func_ov00_0207faac
ldr ip, _020836c8 ; =_ZN7MapBase21GetTriggerBoundingBoxEiP4AABB
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020836bcEjPi
_020836c8: .word func_ov00_0207faac
_020836c8: .word _ZN7MapBase21GetTriggerBoundingBoxEiP4AABB
.global _ZN10MapManager18func_ov00_020836ccEjP4AABBj
arm_func_start _ZN10MapManager18func_ov00_020836ccEjP4AABBj
_ZN10MapManager18func_ov00_020836ccEjP4AABBj: ; 0x020836cc
ldr ip, _020836d8 ; =func_ov00_0207fb64
ldr ip, _020836d8 ; =_ZN7MapBase23GetTriggerBoundingBoxesEiP4AABBi
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020836ccEjP4AABBj
_020836d8: .word func_ov00_0207fb64
_020836d8: .word _ZN7MapBase23GetTriggerBoundingBoxesEiP4AABBi
.global _ZN10MapManager18func_ov00_020836dcEii
arm_func_start _ZN10MapManager18func_ov00_020836dcEii
@@ -2000,22 +2000,22 @@ _0208376c: .word data_027e0fe4
.global _ZN10MapManager18func_ov00_02083770Eji
arm_func_start _ZN10MapManager18func_ov00_02083770Eji
_ZN10MapManager18func_ov00_02083770Eji: ; 0x02083770
ldr ip, _0208377c ; =func_ov00_0207fd58
ldr ip, _0208377c ; =_ZN7MapBase23IsTriggerTypeOverlappedEiP5Vec3p
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083770Eji
_0208377c: .word func_ov00_0207fd58
_0208377c: .word _ZN7MapBase23IsTriggerTypeOverlappedEiP5Vec3p
.global _ZN10MapManager18func_ov00_02083780Ei
arm_func_start _ZN10MapManager18func_ov00_02083780Ei
_ZN10MapManager18func_ov00_02083780Ei: ; 0x02083780
ldr ip, _0208378c ; =func_ov00_0207fc2c
ldr ip, _0208378c ; =_ZN7MapBase21GetOverlappingTriggerEP5Vec3p
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083780Ei
_0208378c: .word func_ov00_0207fc2c
_0208378c: .word _ZN7MapBase21GetOverlappingTriggerEP5Vec3p
.global _ZN10MapManager18func_ov00_02083790Ei
arm_func_start _ZN10MapManager18func_ov00_02083790Ei
@@ -2058,7 +2058,7 @@ _ZN10MapManager18func_ov00_02083790Ei: ; 0x02083790
_0208381c:
ldr r0, [r5, #4]
mov r1, r4
bl func_ov00_0207fdd0
bl _ZN7MapBase18AnyTrigger_func_0cEi
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
@@ -2101,7 +2101,7 @@ _ZN10MapManager18func_ov00_02083840Ei: ; 0x02083840
_020838ac:
ldr r0, [r5, #4]
mov r1, r4
bl func_ov00_02080d80
bl _ZN7MapBase22TriggerOfType_vfunc_10Ei
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083840Ei
@@ -2112,82 +2112,82 @@ _020838c4: .word data_027e0fe4
.global _ZN10MapManager18func_ov00_020838c8Ei
arm_func_start _ZN10MapManager18func_ov00_020838c8Ei
_ZN10MapManager18func_ov00_020838c8Ei: ; 0x020838c8
ldr ip, _020838d4 ; =func_ov00_0207fe80
ldr ip, _020838d4 ; =_ZN7MapBase10AddTriggerEi
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020838c8Ei
_020838d4: .word func_ov00_0207fe80
_020838d4: .word _ZN7MapBase10AddTriggerEi
.global _ZN10MapManager18func_ov00_020838d8Ei
arm_func_start _ZN10MapManager18func_ov00_020838d8Ei
_ZN10MapManager18func_ov00_020838d8Ei: ; 0x020838d8
ldr ip, _020838e4 ; =func_ov00_0207ff88
ldr ip, _020838e4 ; =_ZN7MapBase18func_ov00_0207ff88Ei
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020838d8Ei
_020838e4: .word func_ov00_0207ff88
_020838e4: .word _ZN7MapBase18func_ov00_0207ff88Ei
.global _ZN10MapManager18func_ov00_020838e8EjPi
arm_func_start _ZN10MapManager18func_ov00_020838e8EjPi
_ZN10MapManager18func_ov00_020838e8EjPi: ; 0x020838e8
ldr ip, _020838f4 ; =func_ov00_0208039c
ldr ip, _020838f4 ; =_ZN7MapBase8FindExitEiP4Exit
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020838e8EjPi
_020838f4: .word func_ov00_0208039c
_020838f4: .word _ZN7MapBase8FindExitEiP4Exit
.global _ZN10MapManager18func_ov00_020838f8EPi
arm_func_start _ZN10MapManager18func_ov00_020838f8EPi
_ZN10MapManager18func_ov00_020838f8EPi: ; 0x020838f8
ldr ip, _02083904 ; =func_ov00_02080140
ldr ip, _02083904 ; =_ZN7MapBase18func_ov00_02080140EP4Exit
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020838f8EPi
_02083904: .word func_ov00_02080140
_02083904: .word _ZN7MapBase18func_ov00_02080140EP4Exit
.global _ZN10MapManager18func_ov00_02083908EcPi
arm_func_start _ZN10MapManager18func_ov00_02083908EcPi
_ZN10MapManager18func_ov00_02083908EcPi: ; 0x02083908
ldr ip, _02083914 ; =func_ov00_02080510
ldr ip, _02083914 ; =_ZN7MapBase19FindViewpoint_Unk_4EcP15CameraViewpoint
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083908EcPi
_02083914: .word func_ov00_02080510
_02083914: .word _ZN7MapBase19FindViewpoint_Unk_4EcP15CameraViewpoint
.global _ZN10MapManager18func_ov00_02083918EiPi
arm_func_start _ZN10MapManager18func_ov00_02083918EiPi
_ZN10MapManager18func_ov00_02083918EiPi: ; 0x02083918
ldr ip, _02083924 ; =func_ov00_020805d0
ldr ip, _02083924 ; =_ZN7MapBase19FindViewpoint_Unk_0EiP15CameraViewpoint
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083918EiPi
_02083924: .word func_ov00_020805d0
_02083924: .word _ZN7MapBase19FindViewpoint_Unk_0EiP15CameraViewpoint
.global _ZN10MapManager18func_ov00_02083928EPci
arm_func_start _ZN10MapManager18func_ov00_02083928EPci
_ZN10MapManager18func_ov00_02083928EPci: ; 0x02083928
ldr ip, _02083934 ; =func_ov00_02080688
ldr ip, _02083934 ; =_ZN7MapBase19GetCurrentViewpointEP15CameraViewpointi
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083928EPci
_02083934: .word func_ov00_02080688
_02083934: .word _ZN7MapBase19GetCurrentViewpointEP15CameraViewpointi
.global _ZN10MapManager18func_ov00_02083938Ei
arm_func_start _ZN10MapManager18func_ov00_02083938Ei
_ZN10MapManager18func_ov00_02083938Ei: ; 0x02083938
ldr ip, _02083944 ; =func_ov00_02080780
ldr ip, _02083944 ; =_ZN7MapBase26GetCurrentViewpoint_Unk_00Ei
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083938Ei
_02083944: .word func_ov00_02080780
_02083944: .word _ZN7MapBase26GetCurrentViewpoint_Unk_00Ei
.global _ZN10MapManager18Set_MapData_Unk_16Eci
arm_func_start _ZN10MapManager18Set_MapData_Unk_16Eci
@@ -2201,22 +2201,22 @@ _ZN10MapManager18Set_MapData_Unk_16Eci: ; 0x02083948
.global _ZN10MapManager18func_ov00_02083958Ei
arm_func_start _ZN10MapManager18func_ov00_02083958Ei
_ZN10MapManager18func_ov00_02083958Ei: ; 0x02083958
ldr ip, _02083964 ; =func_ov00_0207f924
ldr ip, _02083964 ; =_ZN7MapBase18func_ov00_0207f924Ei
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083958Ei
_02083964: .word func_ov00_0207f924
_02083964: .word _ZN7MapBase18func_ov00_0207f924Ei
.global _ZN10MapManager18func_ov00_02083968EjPc
arm_func_start _ZN10MapManager18func_ov00_02083968EjPc
_ZN10MapManager18func_ov00_02083968EjPc: ; 0x02083968
ldr ip, _02083974 ; =func_ov00_02080824
ldr ip, _02083974 ; =_ZN7MapBase18func_ov00_02080824Eii
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02083968EjPc
_02083974: .word func_ov00_02080824
_02083974: .word _ZN7MapBase18func_ov00_02080824Eii
.global _ZN10MapManager18func_ov00_02083978EiP5Vec3p
arm_func_start _ZN10MapManager18func_ov00_02083978EiP5Vec3p
@@ -2224,7 +2224,7 @@ _ZN10MapManager18func_ov00_02083978EiP5Vec3p: ; 0x02083978
stmdb sp!, {r4, lr}
ldr r0, [r0, #4]
mov r4, r2
bl func_ov00_02080a78
bl _ZN7MapBase18func_ov00_02080a78EP5Vec3p
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -2241,22 +2241,22 @@ _ZN10MapManager18func_ov00_02083978EiP5Vec3p: ; 0x02083978
.global _ZN10MapManager18func_ov00_020839b4Ei
arm_func_start _ZN10MapManager18func_ov00_020839b4Ei
_ZN10MapManager18func_ov00_020839b4Ei: ; 0x020839b4
ldr ip, _020839c0 ; =func_ov00_020808d0
ldr ip, _020839c0 ; =_ZN7MapBase10AddUnk_130Ei
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020839b4Ei
_020839c0: .word func_ov00_020808d0
_020839c0: .word _ZN7MapBase10AddUnk_130Ei
.global _ZN10MapManager18func_ov00_020839c4Ei
arm_func_start _ZN10MapManager18func_ov00_020839c4Ei
_ZN10MapManager18func_ov00_020839c4Ei: ; 0x020839c4
ldr ip, _020839d0 ; =func_ov00_020809b8
ldr ip, _020839d0 ; =_ZN7MapBase18func_ov00_020809b8Ei
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_020839c4Ei
_020839d0: .word func_ov00_020809b8
_020839d0: .word _ZN7MapBase18func_ov00_020809b8Ei
.global _ZN10MapManager18func_ov00_020839d4Ev
arm_func_start _ZN10MapManager18func_ov00_020839d4Ev
@@ -2268,7 +2268,7 @@ _ZN10MapManager18func_ov00_020839d4Ev: ; 0x020839d4
mov r1, r0
ldr r0, [r5, #4]
sub r1, r4, r1
bl func_ov00_0207f778
bl _ZN7MapBase15GetClampedTileXEi
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN10MapManager18func_ov00_020839d4Ev
@@ -2282,7 +2282,7 @@ _ZN10MapManager18func_ov00_020839f8Ev: ; 0x020839f8
mov r1, r0
ldr r0, [r5, #4]
sub r1, r4, r1
bl func_ov00_0207f7a0
bl _ZN7MapBase15GetClampedTileYEi
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN10MapManager18func_ov00_020839f8Ev
@@ -2355,11 +2355,11 @@ _02083ab4:
bl func_01ff9bf8
ldr r0, [r6, #4]
ldr r1, [sp, #0x14]
bl func_ov00_0207f7a0
bl _ZN7MapBase15GetClampedTileYEi
mov r4, r0
ldr r0, [r6, #4]
ldr r1, [sp, #0xc]
bl func_ov00_0207f778
bl _ZN7MapBase15GetClampedTileXEi
strb r0, [r7]
add sp, sp, #0x24
strb r4, [r7, #1]
@@ -2400,7 +2400,7 @@ _ZN10MapManager18func_ov00_02083b84Ev: ; 0x02083b84
mov r4, r0
ldr r0, [r6, #4]
mov r1, r5
bl func_ov00_0207f694
bl _ZN7MapBase13GetTileStartXEi
add r0, r4, r0
ldmia sp!, {r4, r5, r6, pc}
arm_func_end _ZN10MapManager18func_ov00_02083b84Ev
@@ -2415,7 +2415,7 @@ _ZN10MapManager18func_ov00_02083bacEv: ; 0x02083bac
mov r4, r0
ldr r0, [r6, #4]
mov r1, r5
bl func_ov00_0207f6a0
bl _ZN7MapBase13GetTileStartZEi
add r0, r4, r0
ldmia sp!, {r4, r5, r6, pc}
arm_func_end _ZN10MapManager18func_ov00_02083bacEv
@@ -2430,7 +2430,7 @@ _ZN10MapManager18func_ov00_02083bd4Ev: ; 0x02083bd4
mov r4, r0
ldr r0, [r6, #4]
mov r1, r5
bl func_ov00_0207f6ac
bl _ZN7MapBase11GetTileEndXEi
add r0, r4, r0
ldmia sp!, {r4, r5, r6, pc}
arm_func_end _ZN10MapManager18func_ov00_02083bd4Ev
@@ -2445,7 +2445,7 @@ _ZN10MapManager18func_ov00_02083bfcEv: ; 0x02083bfc
mov r4, r0
ldr r0, [r6, #4]
mov r1, r5
bl func_ov00_0207f6bc
bl _ZN7MapBase11GetTileEndZEi
add r0, r4, r0
ldmia sp!, {r4, r5, r6, pc}
arm_func_end _ZN10MapManager18func_ov00_02083bfcEv
@@ -2460,7 +2460,7 @@ _ZN10MapManager18func_ov00_02083c24Ei: ; 0x02083c24
mov r4, r0
ldr r0, [r6, #4]
mov r1, r5
bl func_ov00_0207f694
bl _ZN7MapBase13GetTileStartXEi
add r0, r4, r0
add r0, r0, #0x800
ldmia sp!, {r4, r5, r6, pc}
@@ -2476,7 +2476,7 @@ _ZN10MapManager18func_ov00_02083c50Ei: ; 0x02083c50
mov r4, r0
ldr r0, [r6, #4]
mov r1, r5
bl func_ov00_0207f6a0
bl _ZN7MapBase13GetTileStartZEi
add r0, r4, r0
add r0, r0, #0x800
ldmia sp!, {r4, r5, r6, pc}
@@ -2553,14 +2553,14 @@ _02083d44:
bl _ZN10MapManager18func_ov00_02083524EP5Vec3pii
ldrb r1, [sp, #0x30]
ldr r0, [r6, #4]
bl func_ov00_0207f694
bl _ZN7MapBase13GetTileStartXEi
ldr r2, [sp, #0xc]
ldrb r1, [sp, #0x31]
add r0, r2, r0
add r0, r0, #0x800
str r0, [r5]
ldr r0, [r6, #4]
bl func_ov00_0207f6a0
bl _ZN7MapBase13GetTileStartZEi
ldr r1, [sp, #0x14]
add r0, r1, r0
add r0, r0, #0x800
@@ -2569,24 +2569,24 @@ _02083d44:
_02083da4:
ldrb r1, [sp, #0x30]
ldr r0, [r6, #4]
bl func_ov00_0207f694
bl _ZN7MapBase13GetTileStartXEi
add r0, r0, #0x800
str r0, [r5]
ldrb r1, [sp, #0x31]
ldr r0, [r6, #4]
bl func_ov00_0207f6a0
bl _ZN7MapBase13GetTileStartZEi
add r0, r0, #0x800
str r0, [r5, #8]
b _02083df8
_02083dd0:
ldrb r1, [sp, #0x30]
ldr r0, [r6, #4]
bl func_ov00_0207f694
bl _ZN7MapBase13GetTileStartXEi
add r0, r0, #0x800
str r0, [r5]
ldrb r1, [sp, #0x31]
ldr r0, [r6, #4]
bl func_ov00_0207f6a0
bl _ZN7MapBase13GetTileStartZEi
add r0, r0, #0x800
str r0, [r5, #8]
_02083df8:
@@ -2789,7 +2789,7 @@ _ZN10MapManager18func_ov00_02084024EiP4AABB: ; 0x02084024
mov r6, r0
ldr r0, [r6, #4]
mov r5, r2
bl func_ov00_0207f6cc
bl _ZN7MapBase13GetTileBoundsEP5Vec2bP4AABB
mov r0, r6
bl _ZN10MapManager18Get_MapData_Unk_d8Ev
mov r4, r0
@@ -2890,22 +2890,22 @@ _ZN10MapManager17GetMapData_Unk_4cEv: ; 0x02084120
.global _ZN10MapManager18func_ov00_0208412cEv
arm_func_start _ZN10MapManager18func_ov00_0208412cEv
_ZN10MapManager18func_ov00_0208412cEv: ; 0x0208412c
ldr ip, _02084138 ; =func_ov00_0207f934
ldr ip, _02084138 ; =_ZN7MapBase18func_ov00_0207f934Ev
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_0208412cEv
_02084138: .word func_ov00_0207f934
_02084138: .word _ZN7MapBase18func_ov00_0207f934Ev
.global _ZN10MapManager18func_ov00_0208413cEi
arm_func_start _ZN10MapManager18func_ov00_0208413cEi
_ZN10MapManager18func_ov00_0208413cEi: ; 0x0208413c
ldr ip, _02084148 ; =func_ov00_0207f948
ldr ip, _02084148 ; =_ZN7MapBase18func_ov00_0207f948Ei
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_0208413cEi
_02084148: .word func_ov00_0207f948
_02084148: .word _ZN7MapBase18func_ov00_0207f948Ei
.global _ZN10MapManager16MapData_vfunc_58Ev
arm_func_start _ZN10MapManager16MapData_vfunc_58Ev
@@ -3079,7 +3079,7 @@ _ZN10MapManager18func_ov00_0208433cEP5Vec3pi: ; 0x0208433c
ldr r1, [r5, #4]
add r0, sp, #0
add r2, sp, #0x10
bl func_ov00_0207f53c
bl _ZN7MapBase18func_ov00_0207f53cEP5Vec2sPS_P5Vec3p
ldrsh r0, [sp]
strh r0, [r4]
ldrsh r0, [sp, #2]
@@ -3096,7 +3096,7 @@ _ZN10MapManager18func_ov00_0208439cEv: ; 0x0208439c
mov r5, r0
ldr r0, [r5, #4]
mov r4, r2
bl func_ov00_0207f630
bl _ZN7MapBase18func_ov00_0207f630EP5Vec2sP5Vec3p
add r1, sp, #0
mov r0, r5
bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p
@@ -3178,11 +3178,11 @@ _0208442c:
str r0, [sp, #0x50]
ldr r1, [r5, #4]
add r0, sp, #0x14
bl func_ov00_0207f53c
bl _ZN7MapBase18func_ov00_0207f53cEP5Vec2sPS_P5Vec3p
ldr r1, [r5, #4]
add r0, sp, #0x10
add r2, sp, #0x48
bl func_ov00_0207f53c
bl _ZN7MapBase18func_ov00_0207f53cEP5Vec2sPS_P5Vec3p
ldrsh r7, [sp, #0x14]
ldrsh r0, [sp, #0x10]
cmp r7, r0
@@ -3255,11 +3255,11 @@ _02084574:
str r0, [sp, #0x20]
ldr r1, [r5, #4]
add r0, sp, #0xc
bl func_ov00_0207f53c
bl _ZN7MapBase18func_ov00_0207f53cEP5Vec2sPS_P5Vec3p
ldr r1, [r5, #4]
add r0, sp, #8
add r2, sp, #0x18
bl func_ov00_0207f53c
bl _ZN7MapBase18func_ov00_0207f53cEP5Vec2sPS_P5Vec3p
ldrsh r7, [sp, #0xc]
ldrsh r0, [sp, #8]
cmp r7, r0
@@ -3424,7 +3424,7 @@ _ZN10MapManager18func_ov00_020847f0Ev: ; 0x020847f0
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, [r4, #4]
bl func_ov00_0207fc98
bl _ZN7MapBase11FindTriggerEi
cmp r0, #0
bne _02084814
mov r0, r4
@@ -3521,12 +3521,12 @@ _0208491c:
.global _ZN10MapManager18func_ov00_02084924Ej
arm_func_start _ZN10MapManager18func_ov00_02084924Ej
_ZN10MapManager18func_ov00_02084924Ej: ; 0x02084924
ldr ip, _02084930 ; =func_ov00_0208008c
ldr ip, _02084930 ; =_ZN7MapBase18func_ov00_0208008cEj
ldr r0, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN10MapManager18func_ov00_02084924Ej
_02084930: .word func_ov00_0208008c
_02084930: .word _ZN7MapBase18func_ov00_0208008cEj
.global _ZN10MapManager18func_ov00_02084934Ev
arm_func_start _ZN10MapManager18func_ov00_02084934Ev
@@ -3548,7 +3548,7 @@ _ZN10MapManager18func_ov00_02084934Ev: ; 0x02084934
str r5, [sp, #8]
str r0, [sp]
ldr r0, [r7, #4]
bl func_ov00_0207f7e8
bl _ZN7MapBase10IsInBoundsEP5Vec3p
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
arm_func_end _ZN10MapManager18func_ov00_02084934Ev
@@ -3971,7 +3971,7 @@ _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p: ; 0x02084d4c
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
ldr r3, _02084eac ; =data_ov00_020e24a4
ldr r1, _02084eb0 ; =func_ov00_0207e968
ldr r1, _02084eb0 ; =_ZN7MapBase18func_ov00_0207e968Ev
ldr r2, _02084eb4 ; =data_ov00_020ec9c8
mov r0, ip
str lr, [r3, #0x78]
@@ -4034,7 +4034,7 @@ _02084ea0: .word data_027e0f64
_02084ea4: .word data_ov00_020ec964
_02084ea8: .word data_ov00_020e2510
_02084eac: .word data_ov00_020e24a4
_02084eb0: .word func_ov00_0207e968
_02084eb0: .word _ZN7MapBase18func_ov00_0207e968Ev
_02084eb4: .word data_ov00_020ec9c8
_02084eb8: .word 0x0000019a
@@ -4933,7 +4933,7 @@ _02085b18:
_02085b24:
ldr r0, [r5, #4]
add r1, sp, #8
bl func_ov00_02080b24
bl _ZN7MapBase18func_ov00_02080b24EP5Vec2b
mov r2, #0
sub r1, r2, #1
mov r0, #1
@@ -5003,7 +5003,7 @@ _02085bdc:
strb r2, [sp, #5]
strb r0, [sp, #4]
ldr r0, [r5, #4]
bl func_ov00_02080d08
bl _ZN7MapBase18func_ov00_02080d08Ei
_02085c38:
mov r0, r6
ldr r2, [r0]
@@ -6513,7 +6513,7 @@ func_ov00_020df4cc: ; 0x020df4cc
str r2, [r0, #0x44]
str r1, [r0, #0x48]
ldr r0, _020df61c ; =data_ov00_020e24e8
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r1, _020df620 ; =_ZN15MapManager_Unk2D1Ev
ldr r2, _020df624 ; =data_ov00_020ec994
bl __register_global_object
ldr r0, _020df628 ; =data_ov00_020e24f0
@@ -6522,7 +6522,7 @@ func_ov00_020df4cc: ; 0x020df4cc
str r1, [r0]
add r1, r1, #0x20000
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r1, _020df620 ; =_ZN15MapManager_Unk2D1Ev
ldr r2, _020df62c ; =data_ov00_020ec9a0
bl __register_global_object
ldr r0, _020df630 ; =data_ov00_020e24f8
@@ -6531,7 +6531,7 @@ func_ov00_020df4cc: ; 0x020df4cc
str r1, [r0]
add r1, r1, #0x20000
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r1, _020df620 ; =_ZN15MapManager_Unk2D1Ev
ldr r2, _020df634 ; =data_ov00_020ec9ac
bl __register_global_object
ldr r0, _020df638 ; =data_ov00_020e2500
@@ -6540,7 +6540,7 @@ func_ov00_020df4cc: ; 0x020df4cc
str r1, [r0]
add r1, r1, #0x20000
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r1, _020df620 ; =_ZN15MapManager_Unk2D1Ev
ldr r2, _020df63c ; =data_ov00_020ec9b8
bl __register_global_object
ldmia sp!, {r3, pc}
@@ -6558,7 +6558,7 @@ _020df610: .word data_ov00_020ec97c
_020df614: .word data_ov00_020e24e0
_020df618: .word data_ov00_020ec988
_020df61c: .word data_ov00_020e24e8
_020df620: .word func_ov00_0207dd9c
_020df620: .word _ZN15MapManager_Unk2D1Ev
_020df624: .word data_ov00_020ec994
_020df628: .word data_ov00_020e24f0
_020df62c: .word data_ov00_020ec9a0
asm/ov00/ov00_0207da38.s
+522 -522
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_02086cd0.inc
+9 -9
View File
@@ -223,15 +223,15 @@
.extern func_ov00_02079008
.extern func_ov00_02079470
.extern func_ov00_02079680
.extern func_ov00_0207e940
.extern func_ov00_0207e968
.extern func_ov00_0207e96c
.extern func_ov00_0207f100
.extern func_ov00_0207faa8
.extern func_ov00_0207fb5c
.extern func_ov00_0207fc90
.extern func_ov00_0207fe34
.extern func_ov00_02080ddc
.extern _ZN7MapBase18func_ov00_0207e940EPc
.extern _ZN7MapBase18func_ov00_0207e968Ev
.extern _ZN7MapBase18func_ov00_0207e96cEv
.extern _ZN7MapBase18func_ov00_0207f100Ev
.extern _ZN11TriggerBase8vfunc_08Ev
.extern _ZN11TriggerBase14GetBoundingBoxEv
.extern _ZN11TriggerBase8OverlapsEv
.extern _ZN11TriggerBase8vfunc_0cEv
.extern _ZN11TriggerBase8vfunc_10Ev
.extern func_ov00_02081f4c
.extern func_ov00_02081f6c
.extern func_ov00_0209afc4
asm/ov00/ov00_02086cd0.s
+44 -44
View File
@@ -7387,7 +7387,7 @@ func_ov00_0208cd48: ; 0x0208cd48
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0208cd78:
ldr r4, _0208ce78 ; =func_ov00_0207f100
ldr r4, _0208ce78 ; =_ZN7MapBase18func_ov00_0207f100Ev
ldr r3, _0208ce7c ; =func_ov00_0208d018
add r0, sp, #0x24
mov r1, #0x40
@@ -7431,7 +7431,7 @@ _0208cdf4:
bl func_ov00_0208cf28
movs r4, r0
beq _0208ce44
ldr r3, _0208ce78 ; =func_ov00_0207f100
ldr r3, _0208ce78 ; =_ZN7MapBase18func_ov00_0207f100Ev
add r0, sp, #0x24
mov r1, #0x40
mov r2, #0x18
@@ -7446,7 +7446,7 @@ _0208ce44:
add r8, r8, #0x18
blt _0208cdf4
_0208ce54:
ldr r3, _0208ce78 ; =func_ov00_0207f100
ldr r3, _0208ce78 ; =_ZN7MapBase18func_ov00_0207f100Ev
add r0, sp, #0x24
mov r1, #0x40
mov r2, #0x18
@@ -7457,7 +7457,7 @@ _0208ce54:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0208cd48
_0208ce78: .word func_ov00_0207f100
_0208ce78: .word _ZN7MapBase18func_ov00_0207f100Ev
_0208ce7c: .word func_ov00_0208d018
_0208ce80: .word gMapManager
@@ -7612,7 +7612,7 @@ func_ov00_0208d01c: ; 0x0208d01c
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0208d064:
ldr r4, _0208d1ec ; =func_ov00_0207f100
ldr r4, _0208d1ec ; =_ZN7MapBase18func_ov00_0207f100Ev
ldr r3, _0208d1f0 ; =func_ov00_0208d018
add r0, sp, #0x44
mov r1, #0x40
@@ -7628,7 +7628,7 @@ _0208d064:
mov r4, r0
cmp r4, #0
bgt _0208d0c8
ldr r3, _0208d1ec ; =func_ov00_0207f100
ldr r3, _0208d1ec ; =_ZN7MapBase18func_ov00_0207f100Ev
add r0, sp, #0x44
mov r1, #0x40
mov r2, #0x18
@@ -7657,7 +7657,7 @@ _0208d0c8:
str r4, [sp]
bl func_ov00_0208d310
mov r4, r0
ldr r3, _0208d1ec ; =func_ov00_0207f100
ldr r3, _0208d1ec ; =_ZN7MapBase18func_ov00_0207f100Ev
add r0, sp, #0x44
mov r1, #0x40
mov r2, #0x18
@@ -7691,7 +7691,7 @@ _0208d154:
add r5, r5, r0
cmp r5, r8
blo _0208d1b8
ldr r3, _0208d1ec ; =func_ov00_0207f100
ldr r3, _0208d1ec ; =_ZN7MapBase18func_ov00_0207f100Ev
add r0, sp, #0x44
mov r1, #0x40
mov r2, #0x18
@@ -7706,7 +7706,7 @@ _0208d1b8:
add r7, r7, #0x18
blt _0208d154
_0208d1c8:
ldr r3, _0208d1ec ; =func_ov00_0207f100
ldr r3, _0208d1ec ; =_ZN7MapBase18func_ov00_0207f100Ev
add r0, sp, #0x44
mov r1, #0x40
mov r2, #0x18
@@ -7717,7 +7717,7 @@ _0208d1c8:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0208d01c
_0208d1ec: .word func_ov00_0207f100
_0208d1ec: .word _ZN7MapBase18func_ov00_0207f100Ev
_0208d1f0: .word func_ov00_0208d018
_0208d1f4: .word gMapManager
@@ -8658,9 +8658,9 @@ func_ov00_0208de04: ; 0x0208de04
str r0, [r4, #0x10]
ldr r0, [sp, #0x18]
str r1, [r4, #0x14]
ldr ip, _0208de68 ; =func_ov00_0207e968
ldr ip, _0208de68 ; =_ZN7MapBase18func_ov00_0207e968Ev
str r0, [r4, #0x18]
ldr r3, _0208de6c ; =func_ov00_0207e96c
ldr r3, _0208de6c ; =_ZN7MapBase18func_ov00_0207e96cEv
add r0, r4, #0x10c
mov r1, #4
mov r2, #0x10
@@ -8672,15 +8672,15 @@ func_ov00_0208de04: ; 0x0208de04
.align 2, 0
arm_func_end func_ov00_0208de04
_0208de64: .word data_ov00_020e2870
_0208de68: .word func_ov00_0207e968
_0208de6c: .word func_ov00_0207e96c
_0208de68: .word _ZN7MapBase18func_ov00_0207e968Ev
_0208de6c: .word _ZN7MapBase18func_ov00_0207e96cEv
.global func_ov00_0208de70
arm_func_start func_ov00_0208de70
func_ov00_0208de70: ; 0x0208de70
stmdb sp!, {r4, lr}
mov r4, r0
ldr r3, _0208de94 ; =func_ov00_0207e968
ldr r3, _0208de94 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, r4, #0x10c
mov r1, #4
mov r2, #0x10
@@ -8689,14 +8689,14 @@ func_ov00_0208de70: ; 0x0208de70
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_0208de70
_0208de94: .word func_ov00_0207e968
_0208de94: .word _ZN7MapBase18func_ov00_0207e968Ev
.global func_ov00_0208de98
arm_func_start func_ov00_0208de98
func_ov00_0208de98: ; 0x0208de98
stmdb sp!, {r4, lr}
mov r4, r0
ldr r3, _0208dec4 ; =func_ov00_0207e968
ldr r3, _0208dec4 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, r4, #0x10c
mov r1, #4
mov r2, #0x10
@@ -8707,14 +8707,14 @@ func_ov00_0208de98: ; 0x0208de98
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_0208de98
_0208dec4: .word func_ov00_0207e968
_0208dec4: .word _ZN7MapBase18func_ov00_0207e968Ev
.global func_ov00_0208dec8
arm_func_start func_ov00_0208dec8
func_ov00_0208dec8: ; 0x0208dec8
stmdb sp!, {r4, lr}
mov r4, r0
ldr r3, _0208deec ; =func_ov00_0207e968
ldr r3, _0208deec ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, r4, #0x10c
mov r1, #4
mov r2, #0x10
@@ -8723,7 +8723,7 @@ func_ov00_0208dec8: ; 0x0208dec8
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_0208dec8
_0208deec: .word func_ov00_0207e968
_0208deec: .word _ZN7MapBase18func_ov00_0207e968Ev
.global func_ov00_0208def0
arm_func_start func_ov00_0208def0
@@ -15792,7 +15792,7 @@ func_ov00_02093968: ; 0x02093968
cmp r0, #0
beq _020939bc
ldr r1, _020939d8 ; =func_ov00_020939e0
ldr ip, _020939dc ; =func_ov00_0207e940
ldr ip, _020939dc ; =_ZN7MapBase18func_ov00_0207e940EPc
str r1, [sp]
mov r1, r4
mov r2, #0x4c
@@ -15810,7 +15810,7 @@ _020939bc:
arm_func_end func_ov00_02093968
_020939d4: .word data_027e0ce0
_020939d8: .word func_ov00_020939e0
_020939dc: .word func_ov00_0207e940
_020939dc: .word _ZN7MapBase18func_ov00_0207e940EPc
.global func_ov00_020939e0
arm_func_start func_ov00_020939e0
@@ -15818,8 +15818,8 @@ func_ov00_020939e0: ; 0x020939e0
stmdb sp!, {r3, r4, lr}
sub sp, sp, #4
mov r4, r0
ldr ip, _02093a14 ; =func_ov00_0207e968
ldr r3, _02093a18 ; =func_ov00_0207e96c
ldr ip, _02093a14 ; =_ZN7MapBase18func_ov00_0207e968Ev
ldr r3, _02093a18 ; =_ZN7MapBase18func_ov00_0207e96cEv
add r0, r4, #0x18
mov r1, #3
mov r2, #0x10
@@ -15830,8 +15830,8 @@ func_ov00_020939e0: ; 0x020939e0
ldmia sp!, {r3, r4, pc}
.align 2, 0
arm_func_end func_ov00_020939e0
_02093a14: .word func_ov00_0207e968
_02093a18: .word func_ov00_0207e96c
_02093a14: .word _ZN7MapBase18func_ov00_0207e968Ev
_02093a18: .word _ZN7MapBase18func_ov00_0207e96cEv
.global func_ov00_02093a1c
arm_func_start func_ov00_02093a1c
@@ -15950,11 +15950,11 @@ func_ov00_02093b58: ; 0x02093b58
stmdb sp!, {r4, r5, r6, r7, r8, lr}
sub sp, sp, #0x50
mov r6, r3
ldr ip, _02093c94 ; =func_ov00_0207e968
ldr ip, _02093c94 ; =_ZN7MapBase18func_ov00_0207e968Ev
mov r4, r0
mov r8, r1
mov r7, r2
ldr r3, _02093c98 ; =func_ov00_0207e96c
ldr r3, _02093c98 ; =_ZN7MapBase18func_ov00_0207e96cEv
add r0, sp, #0x1c
mov r1, #3
mov r2, #0x10
@@ -15975,7 +15975,7 @@ func_ov00_02093b58: ; 0x02093b58
ldrh r1, [sp, #6]
mul r0, r3, r0
ldr ip, [r4, #0x20]
ldr r3, _02093c94 ; =func_ov00_0207e968
ldr r3, _02093c94 ; =_ZN7MapBase18func_ov00_0207e968Ev
strh r2, [ip, r0]
add ip, ip, r0
strh r1, [ip, #2]
@@ -16028,8 +16028,8 @@ func_ov00_02093b58: ; 0x02093b58
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_02093b58
_02093c94: .word func_ov00_0207e968
_02093c98: .word func_ov00_0207e96c
_02093c94: .word _ZN7MapBase18func_ov00_0207e968Ev
_02093c98: .word _ZN7MapBase18func_ov00_0207e96cEv
.global func_ov00_02093c9c
arm_func_start func_ov00_02093c9c
@@ -25556,10 +25556,10 @@ data_ov00_020e2fdc: ; 0x020e2fdc
.word func_ov00_02095e40
.global data_ov00_020e2fe0
data_ov00_020e2fe0: ; 0x020e2fe0
.word func_ov00_0207fe34
.word _ZN11TriggerBase8vfunc_0cEv
.global data_ov00_020e2fe4
data_ov00_020e2fe4: ; 0x020e2fe4
.word func_ov00_02080ddc
.word _ZN11TriggerBase8vfunc_10Ev
.global data_ov00_020e2fe8
data_ov00_020e2fe8: ; 0x020e2fe8
.word func_ov00_02095ec4
@@ -25607,13 +25607,13 @@ data_ov00_020e3020: ; 0x020e3020
.word func_ov00_02095778
.global data_ov00_020e3024
data_ov00_020e3024: ; 0x020e3024
.word func_ov00_0207faa8
.word _ZN11TriggerBase8vfunc_08Ev
.global data_ov00_020e3028
data_ov00_020e3028: ; 0x020e3028
.word func_ov00_0207fe34
.word _ZN11TriggerBase8vfunc_0cEv
.global data_ov00_020e302c
data_ov00_020e302c: ; 0x020e302c
.word func_ov00_02080ddc
.word _ZN11TriggerBase8vfunc_10Ev
.global data_ov00_020e3030
data_ov00_020e3030: ; 0x020e3030
.word func_ov00_02095eb4
@@ -25634,13 +25634,13 @@ data_ov00_020e3044: ; 0x020e3044
.word func_ov00_0209561c
.global data_ov00_020e3048
data_ov00_020e3048: ; 0x020e3048
.word func_ov00_0207faa8
.word _ZN11TriggerBase8vfunc_08Ev
.global data_ov00_020e304c
data_ov00_020e304c: ; 0x020e304c
.word func_ov00_0207fe34
.word _ZN11TriggerBase8vfunc_0cEv
.global data_ov00_020e3050
data_ov00_020e3050: ; 0x020e3050
.word func_ov00_02080ddc
.word _ZN11TriggerBase8vfunc_10Ev
.global data_ov00_020e3054
data_ov00_020e3054: ; 0x020e3054
.word func_ov00_02095ec4
@@ -25661,19 +25661,19 @@ data_ov00_020e3068: ; 0x020e3068
.word func_ov00_02095488
.global data_ov00_020e306c
data_ov00_020e306c: ; 0x020e306c
.word func_ov00_0207faa8
.word _ZN11TriggerBase8vfunc_08Ev
.global data_ov00_020e3070
data_ov00_020e3070: ; 0x020e3070
.word func_ov00_0207fe34
.word _ZN11TriggerBase8vfunc_0cEv
.global data_ov00_020e3074
data_ov00_020e3074: ; 0x020e3074
.word func_ov00_02080ddc
.word _ZN11TriggerBase8vfunc_10Ev
.global data_ov00_020e3078
data_ov00_020e3078: ; 0x020e3078
.word func_ov00_0207fc90
.word _ZN11TriggerBase8OverlapsEv
.global data_ov00_020e307c
data_ov00_020e307c: ; 0x020e307c
.word func_ov00_0207fb5c
.word _ZN11TriggerBase14GetBoundingBoxEv
.global data_ov00_020e3080
data_ov00_020e3080: ; 0x020e3080
.ascii "brg"
asm/ov00/ov00_020b1498.inc
+3 -3
View File
@@ -146,6 +146,8 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN7MapBase18func_ov00_0207e968Ev
.extern _ZN7MapBase18func_ov00_0207e96cEv
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
@@ -183,7 +185,6 @@
.extern data_027e0d84
.extern data_027e0e58
.extern data_027e0e5c
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f78
@@ -322,8 +323,6 @@
.extern func_ov00_0207c1f8
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_0207e968
.extern func_ov00_0207e96c
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_020872e8
@@ -460,5 +459,6 @@
.extern func_ov59_0219b020
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern strcat
asm/ov00/ov00_020b1498.s
+13 -13
View File
@@ -7002,8 +7002,8 @@ func_ov00_020b6ea0: ; 0x020b6ea0
cmp r5, #1
moveq r0, #1
streqb r0, [r4, #0xce]
ldr r1, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b732c ; =func_ov00_0207e96c
ldr r1, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
ldr r3, _020b732c ; =_ZN7MapBase18func_ov00_0207e96cEv
str r1, [sp]
add r0, sp, #0x90
mov r1, #3
@@ -7125,7 +7125,7 @@ _020b7000:
movlt r0, #0
cmp r0, #0
beq _020b70fc
ldr r3, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x90
mov r1, #3
mov r2, #0x10
@@ -7152,7 +7152,7 @@ _020b70fc:
_020b7138:
cmp r2, #0
bge _020b7160
ldr r3, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x90
mov r1, #3
mov r2, #0x10
@@ -7164,7 +7164,7 @@ _020b7160:
cmp r5, #2
mov r1, #3
bne _020b7188
ldr r3, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x90
mov r2, #0x10
bl func_0204f754
@@ -7177,13 +7177,13 @@ _020b7188:
add r0, sp, #0x90
mov r2, #0x10
blt _020b71d8
ldr r3, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
bl func_0204f754
add sp, sp, #0xc4
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, pc}
_020b71b0:
ldr r3, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
mov r5, #1
add r0, sp, #0x90
mov r1, #3
@@ -7194,7 +7194,7 @@ _020b71b0:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, pc}
_020b71d8:
ldr r3, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
bl func_0204f754
b _020b7318
_020b71e4:
@@ -7207,8 +7207,8 @@ _020b71f0:
ldrsh r0, [r4, #0x5a]
cmp r0, #4
bne _020b7318
ldr r1, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b732c ; =func_ov00_0207e96c
ldr r1, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
ldr r3, _020b732c ; =_ZN7MapBase18func_ov00_0207e96cEv
str r1, [sp]
add r0, sp, #0x44
mov r1, #3
@@ -7270,7 +7270,7 @@ _020b71f0:
rsb r6, r0, #0
cmp r6, r5
movle r6, r5
ldr r3, _020b7328 ; =func_ov00_0207e968
ldr r3, _020b7328 ; =_ZN7MapBase18func_ov00_0207e968Ev
add r0, sp, #0x44
mov r1, #3
mov r2, #0x10
@@ -7283,8 +7283,8 @@ _020b7318:
.align 2, 0
arm_func_end func_ov00_020b6ea0
_020b7324: .word data_027e0f6c
_020b7328: .word func_ov00_0207e968
_020b732c: .word func_ov00_0207e96c
_020b7328: .word _ZN7MapBase18func_ov00_0207e968Ev
_020b732c: .word _ZN7MapBase18func_ov00_0207e96cEv
_020b7330: .word data_02050f54
_020b7334: .word gMapManager
_020b7338: .word 0x00000e66
asm/ov04.inc
+11 -11
View File
@@ -60,13 +60,23 @@
.extern _ZN6Course11FindMapDataEj
.extern _ZN6Course13SetCourseNameEPc
.extern _ZN6Course14FindMapGridPosEP5Vec2bPS_j
.extern _ZN6Course18FindMapData_Unk_0cEi
.extern _ZN6Course14GetMCSFilePathEiii
.extern _ZN6Course14GetMRCFilePathEiii
.extern _ZN6Course15IsMapInMainGridEj
.extern _ZN6Course18FindMapData_Unk_0cEi
.extern _ZN6Course18func_ov00_0207ca78Eici
.extern _ZN6Course18func_ov00_0207ce20EiiPci
.extern _ZN6Course18func_ov00_0207d7bcEv
.extern _ZN7MapBase10AddTriggerEP13TriggerParams
.extern _ZN7MapBase11AddEntranceEP8Entrance
.extern _ZN7MapBase14GetMapFilePathEPcii
.extern _ZN7MapBase18AddCameraViewpointEP15CameraViewpoint
.extern _ZN7MapBase18func_ov00_0207ddf8Eb
.extern _ZN7MapBase18func_ov00_0207dea0Eb
.extern _ZN7MapBase18func_ov00_02080de4Ev
.extern _ZN7MapBase18func_ov00_02080edcEv
.extern _ZN7MapBase7AddExitEP4Exit
.extern _ZN7MapBase9SetBoundsEii
.extern _ZN9ActorType13func_0203e7c8Ev
.extern _ZN9ActorType4FindEj
.extern _ZN9SysObjectdlEPv
@@ -437,16 +447,6 @@
.extern func_ov00_0207c000
.extern func_ov00_0207c030
.extern func_ov00_0207c074
.extern func_ov00_0207dce4
.extern func_ov00_0207dda0
.extern func_ov00_0207ddf8
.extern func_ov00_0207dea0
.extern func_ov00_0207f844
.extern func_ov00_0207f958
.extern func_ov00_0208009c
.extern func_ov00_0208046c
.extern func_ov00_02080de4
.extern func_ov00_02080edc
.extern func_ov00_02086ea0
.extern func_ov00_020872e8
.extern func_ov00_02087d84
asm/ov04.s
+10 -10
View File
@@ -16511,7 +16511,7 @@ _02108bae:
bne _02108bae
add r0, r6, #0
add r1, sp, #0
blx func_ov00_0207f958
blx _ZN7MapBase10AddTriggerEP13TriggerParams
add r0, r4, #1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -16768,7 +16768,7 @@ _02108d7c:
strb r2, [r0, #0x15]
add r0, r7, #0
add r1, sp, #0
blx func_ov00_0208009c
blx _ZN7MapBase7AddExitEP4Exit
add r0, r4, #1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -17834,7 +17834,7 @@ _021094b2:
add r1, sp, #0x14
str r0, [sp, #0x24]
ldr r0, [sp, #4]
blx func_ov00_0207f844
blx _ZN7MapBase11AddEntranceEP8Entrance
add r0, r4, #1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -18037,7 +18037,7 @@ _021095ec:
strh r1, [r0, #0x1a]
ldr r0, [sp, #4]
add r1, sp, #0x3c
blx func_ov00_0208046c
blx _ZN7MapBase18AddCameraViewpointEP15CameraViewpoint
add r0, r5, #1
lsl r0, r0, #0x10
lsr r5, r0, #0x10
@@ -23356,7 +23356,7 @@ func_ov04_0210bfa8: ; 0x0210bfa8
mov r1, #1
strb r1, [r4, #4]
strb r2, [r4, #8]
blx func_ov00_02080de4
blx _ZN7MapBase18func_ov00_02080de4Ev
ldr r0, _0210c0f0 ; =data_027e0d38
ldr r2, [r0]
ldr r0, [r2, #0x14]
@@ -23510,7 +23510,7 @@ _0210c0dc:
mov r0, #0
strh r0, [r4, #0x30]
add r0, r4, #0
blx func_ov00_02080edc
blx _ZN7MapBase18func_ov00_02080edcEv
add sp, #0x60
pop {r3, r4, r5, pc}
.align 2, 0
@@ -23673,7 +23673,7 @@ _0210c218:
add r1, #0xc
add r2, r6, #0
add r3, sp
blx func_ov00_0207dda0
blx _ZN7MapBase14GetMapFilePathEPcii
mov r0, #0x10
str r0, [sp]
mov r0, #1
@@ -23692,10 +23692,10 @@ _0210c218:
add r0, r5, #0
add r1, r6, #0
add r2, r4, #0
blx func_ov00_0207dce4
blx _ZN7MapBase9SetBoundsEii
add r0, r5, #0
mov r1, #0
blx func_ov00_0207ddf8
blx _ZN7MapBase18func_ov00_0207ddf8Eb
add r0, sp, #8
add r1, r4, #0
add r2, r6, #0
@@ -23859,7 +23859,7 @@ _0210c370:
_0210c3c4:
add r0, r5, #0
mov r1, #1
blx func_ov00_0207dea0
blx _ZN7MapBase18func_ov00_0207dea0Eb
add sp, #0x1fc
add sp, #0x1fc
add sp, #0x1c8
asm/ov05.inc
+2 -2
View File
@@ -360,8 +360,8 @@
.extern func_ov00_0207c1f8
.extern func_ov00_0207c358
.extern func_ov00_0207c444
.extern func_ov00_0207dea0
.extern func_ov00_02080de8
.extern _ZN7MapBase18func_ov00_0207dea0Eb
.extern _ZN7MapBase18func_ov00_02080de8Ei
.extern func_ov00_02081f4c
.extern func_ov00_0208726c
.extern func_ov00_020872e8
asm/ov05.s
+2 -2
View File
@@ -20205,7 +20205,7 @@ func_ov05_02111c00: ; 0x02111c00
ldmeqia sp!, {r4, r5, pc}
mov r0, r5
mov r1, r4
bl func_ov00_02080de8
bl _ZN7MapBase18func_ov00_02080de8Ei
ldr r0, _02111c68 ; =gMapManager
add r1, sp, #0
ldr r0, [r0]
@@ -20607,7 +20607,7 @@ _02112190:
blt _021120c8
ldr r0, [r4]
mov r1, #0
bl func_ov00_0207dea0
bl _ZN7MapBase18func_ov00_0207dea0Eb
ldrh r0, [r4, #0x16]
cmp r0, #0
moveq r0, #0
asm/ov12.inc
+21 -21
View File
@@ -93,6 +93,26 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN7MapBase18func_ov00_0207f4a4EP5Vec2si
.extern _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
.extern _ZN7MapBase8vfunc_18Ev
.extern _ZN7MapBase8vfunc_48Ev
.extern _ZN7MapBase8vfunc_50Ev
.extern _ZN7MapBase8vfunc_64Ev
.extern _ZN7MapBase8vfunc_68Eii
.extern _ZN7MapBase8vfunc_6cEiii
.extern _ZN7MapBase8vfunc_70EP5Vec3p
.extern _ZN7MapBase8vfunc_74EP5Vec3p
.extern _ZN7MapBase8vfunc_84Ei
.extern _ZN7MapBase8vfunc_88Ev
.extern _ZN7MapBase8vfunc_8cEv
.extern _ZN7MapBase8vfunc_90Eiii
.extern _ZN7MapBase8vfunc_9cEv
.extern _ZN7MapBase8vfunc_a0Ev
.extern _ZN7MapBase8vfunc_b0Eii
.extern _ZN7MapBase8vfunc_b4Ev
.extern _ZN7MapBase8vfunc_b8Ev
.extern _ZN7MapBaseD1Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
@@ -128,7 +148,6 @@
.extern data_027e0dcc
.extern data_027e0e2c
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f84
@@ -354,26 +373,6 @@
.extern func_ov00_0207c1f8
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_0207da38
.extern func_ov00_0207ddf4
.extern func_ov00_0207e060
.extern func_ov00_0207e444
.extern func_ov00_0207e46c
.extern func_ov00_0207e488
.extern func_ov00_0207e4b0
.extern func_ov00_0207e4b8
.extern func_ov00_0207e970
.extern func_ov00_0207ee14
.extern func_ov00_0207eff4
.extern func_ov00_0207f324
.extern func_ov00_0207f32c
.extern func_ov00_0207f334
.extern func_ov00_0207f338
.extern func_ov00_0207f364
.extern func_ov00_0207f3c4
.extern func_ov00_0207f4a4
.extern func_ov00_0207f588
.extern func_ov00_020807d4
.extern func_ov00_02081f4c
.extern func_ov00_020872e8
.extern func_ov00_02087d84
@@ -759,6 +758,7 @@
.extern func_ov61_02179f88
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayerAnimHandler
.extern strncpy
asm/ov12.s
+24 -24
View File
@@ -30039,7 +30039,7 @@ _0212b4bc:
mov r1, #0
mov r0, r4
str r1, [r4, #0x188]
bl func_ov00_0207da38
bl _ZN7MapBaseD1Ev
mov r0, r4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
@@ -30083,7 +30083,7 @@ _0212b544:
mov r1, #0
mov r0, r4
str r1, [r4, #0x188]
bl func_ov00_0207da38
bl _ZN7MapBaseD1Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -30234,7 +30234,7 @@ _0212b700:
mov r3, #0
strb r7, [sp, #8]
strb r8, [sp, #9]
bl func_ov00_0207f588
bl _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
mov r0, r10
ldr r3, [r0]
mov r1, r5
@@ -30251,7 +30251,7 @@ _0212b700:
mov r1, r10
mov r2, r5
mov r3, #1
bl func_ov00_0207f588
bl _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
mov r0, r10
ldr r3, [r0]
mov r1, r5
@@ -30268,7 +30268,7 @@ _0212b700:
mov r1, r10
mov r2, r5
mov r3, #2
bl func_ov00_0207f588
bl _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
mov r0, r10
ldr r3, [r0]
mov r1, r5
@@ -30285,7 +30285,7 @@ _0212b700:
mov r1, r10
mov r2, r5
mov r3, #3
bl func_ov00_0207f588
bl _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
mov r0, r10
ldr r3, [r0]
mov r1, r5
@@ -30364,7 +30364,7 @@ func_ov12_0212b8cc: ; 0x0212b8cc
mov r4, r2
mov r6, r0
mov r5, r1
bl func_ov00_0207f4a4
bl _ZN7MapBase18func_ov00_0207f4a4EP5Vec2si
cmp r4, #0
cmpne r0, #0
mov r0, r6
@@ -48715,7 +48715,7 @@ data_ov12_02136c08: ; 0x02136c08
.word func_ov12_0212b568
.global data_ov12_02136c0c
data_ov12_02136c0c: ; 0x02136c0c
.word func_ov00_0207ddf4
.word _ZN7MapBase8vfunc_18Ev
.global data_ov12_02136c10
data_ov12_02136c10: ; 0x02136c10
.word func_ov12_0212b5fc
@@ -48751,13 +48751,13 @@ data_ov12_02136c38: ; 0x02136c38
.word func_ov04_0210cb00 ; data_ov07_0210cb00
.global data_ov12_02136c3c
data_ov12_02136c3c: ; 0x02136c3c
.word func_ov00_0207e46c
.word _ZN7MapBase8vfunc_48Ev
.global data_ov12_02136c40
data_ov12_02136c40: ; 0x02136c40
.word func_ov12_0212bbe8
.global data_ov12_02136c44
data_ov12_02136c44: ; 0x02136c44
.word func_ov00_0207e488
.word _ZN7MapBase8vfunc_50Ev
.global data_ov12_02136c48
data_ov12_02136c48: ; 0x02136c48
.word func_ov12_0212b908
@@ -48772,19 +48772,19 @@ data_ov12_02136c54: ; 0x02136c54
.word func_ov12_0212b978
.global data_ov12_02136c58
data_ov12_02136c58: ; 0x02136c58
.word func_ov00_0207e4b0
.word _ZN7MapBase8vfunc_64Ev
.global data_ov12_02136c5c
data_ov12_02136c5c: ; 0x02136c5c
.word func_ov00_0207e4b8
.word _ZN7MapBase8vfunc_68Eii
.global data_ov12_02136c60
data_ov12_02136c60: ; 0x02136c60
.word func_ov00_0207e970
.word _ZN7MapBase8vfunc_6cEiii
.global data_ov12_02136c64
data_ov12_02136c64: ; 0x02136c64
.word func_ov00_0207ee14
.word _ZN7MapBase8vfunc_70EP5Vec3p
.global data_ov12_02136c68
data_ov12_02136c68: ; 0x02136c68
.word func_ov00_0207eff4
.word _ZN7MapBase8vfunc_74EP5Vec3p
.global data_ov12_02136c6c
data_ov12_02136c6c: ; 0x02136c6c
.word func_ov12_0212ba6c
@@ -48796,16 +48796,16 @@ data_ov12_02136c74: ; 0x02136c74
.word func_ov12_0212bba4
.global data_ov12_02136c78
data_ov12_02136c78: ; 0x02136c78
.word func_ov00_0207f364
.word _ZN7MapBase8vfunc_84Ei
.global data_ov12_02136c7c
data_ov12_02136c7c: ; 0x02136c7c
.word func_ov00_0207f324
.word _ZN7MapBase8vfunc_88Ev
.global data_ov12_02136c80
data_ov12_02136c80: ; 0x02136c80
.word func_ov00_0207f32c
.word _ZN7MapBase8vfunc_8cEv
.global data_ov12_02136c84
data_ov12_02136c84: ; 0x02136c84
.word func_ov00_0207f3c4
.word _ZN7MapBase8vfunc_90Eiii
.global data_ov12_02136c88
data_ov12_02136c88: ; 0x02136c88
.word func_ov12_0212b674
@@ -48814,10 +48814,10 @@ data_ov12_02136c8c: ; 0x02136c8c
.word func_ov12_0212b9e4
.global data_ov12_02136c90
data_ov12_02136c90: ; 0x02136c90
.word func_ov00_0207f334
.word _ZN7MapBase8vfunc_9cEv
.global data_ov12_02136c94
data_ov12_02136c94: ; 0x02136c94
.word func_ov00_0207f338
.word _ZN7MapBase8vfunc_a0Ev
.global data_ov12_02136c98
data_ov12_02136c98: ; 0x02136c98
.word func_ov12_0212b844
@@ -48829,13 +48829,13 @@ data_ov12_02136ca0: ; 0x02136ca0
.word func_ov12_0212b8cc
.global data_ov12_02136ca4
data_ov12_02136ca4: ; 0x02136ca4
.word func_ov00_0207e060
.word _ZN7MapBase8vfunc_b0Eii
.global data_ov12_02136ca8
data_ov12_02136ca8: ; 0x02136ca8
.word func_ov00_0207e444
.word _ZN7MapBase8vfunc_b4Ev
.global data_ov12_02136cac
data_ov12_02136cac: ; 0x02136cac
.word func_ov00_020807d4
.word _ZN7MapBase8vfunc_b8Ev
.global data_ov12_02136cb0
data_ov12_02136cb0: ; 0x02136cb0
.word func_ov12_0212b9c4
asm/ov15.inc
+17 -17
View File
@@ -425,23 +425,23 @@
.extern _ZN6Course23IsAdjacentMapOnMainGridEi
.extern _ZN6Course14GetAdjacentMapEi
.extern _ZN6Course18func_ov00_0207d7bcEv
.extern func_ov00_0207da38
.extern func_ov00_0207dce4
.extern func_ov00_0207dda0
.extern func_ov00_0207ddf8
.extern func_ov00_0207dea0
.extern func_ov00_0207e46c
.extern func_ov00_0207e498
.extern func_ov00_0207e4b0
.extern func_ov00_0207f33c
.extern func_ov00_0207f344
.extern func_ov00_0207f348
.extern func_ov00_0207f4a0
.extern func_ov00_0207fce0
.extern func_ov00_02080140
.extern func_ov00_02080d74
.extern func_ov00_02080d78
.extern func_ov00_02080d7c
.extern _ZN7MapBaseD1Ev
.extern _ZN7MapBase9SetBoundsEii
.extern _ZN7MapBase14GetMapFilePathEPcii
.extern _ZN7MapBase18func_ov00_0207ddf8Eb
.extern _ZN7MapBase18func_ov00_0207dea0Eb
.extern _ZN7MapBase8vfunc_48Ev
.extern _ZN7MapBase8vfunc_58Ev
.extern _ZN7MapBase8vfunc_64Ev
.extern _ZN7MapBase8vfunc_a4Ev
.extern _ZN7MapBase8vfunc_a8Ev
.extern _ZN7MapBase8vfunc_acEv
.extern _ZN7MapBase8vfunc_94Ev
.extern _ZN7MapBase22GetOverlappingTriggersEP5Vec3pPP11TriggerBasei
.extern _ZN7MapBase18func_ov00_02080140EP4Exit
.extern _ZN7MapBase8vfunc_bcEv
.extern _ZN7MapBase8vfunc_98Ev
.extern _ZN7MapBase8vfunc_c0Ev
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_02081f58
asm/ov15.s
+22 -22
View File
@@ -11583,7 +11583,7 @@ _02128f30:
str r0, [r5, #0x198]
_02128f38:
mov r0, r5
bl func_ov00_0207da38
bl _ZN7MapBaseD1Ev
mov r0, r5
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -11647,7 +11647,7 @@ _02128ffc:
str r0, [r5, #0x198]
_02129004:
mov r0, r5
bl func_ov00_0207da38
bl _ZN7MapBaseD1Ev
mov r0, r5
bl _ZN9SysObjectdlEPv
mov r0, r5
@@ -11681,7 +11681,7 @@ _02129058:
mov r0, r7
mov r2, r6
add r1, r4, #0xc
bl func_ov00_0207dda0
bl _ZN7MapBase14GetMapFilePathEPcii
mov r0, #0x10
str r0, [sp]
mov r0, #1
@@ -11698,10 +11698,10 @@ _02129058:
mov r0, r7
mov r1, r6
mov r2, r4
bl func_ov00_0207dce4
bl _ZN7MapBase9SetBoundsEii
mov r0, r7
mov r1, #0
bl func_ov00_0207ddf8
bl _ZN7MapBase18func_ov00_0207ddf8Eb
add r0, sp, #8
mov r1, r4
mov r2, r6
@@ -11790,7 +11790,7 @@ _02129210:
bl func_ov15_0212925c
mov r0, r7
mov r1, #0
bl func_ov00_0207dea0
bl _ZN7MapBase18func_ov00_0207dea0Eb
add sp, sp, #0x128
add sp, sp, #0x400
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -12055,7 +12055,7 @@ _02129598:
mov r0, r9
add r1, sp, #0x14
mov r5, #4
bl func_ov00_02080140
bl _ZN7MapBase18func_ov00_02080140EP4Exit
ldr r1, [sp, #0x10]
strb r0, [sp, #0x28]
and r0, r0, #0xff
@@ -12807,7 +12807,7 @@ _02129df8:
mov r3, #0x10
movne r4, #0
str ip, [sp, #0x48]
bl func_ov00_0207fce0
bl _ZN7MapBase22GetOverlappingTriggersEP5Vec3pPP11TriggerBasei
cmp r0, #0
bne _02129e90
ldr r0, [r5, #0x144]
@@ -12828,7 +12828,7 @@ _02129df8:
bl func_ov15_0212c718
mov r0, r5
mov r1, #0
bl func_ov00_0207dea0
bl _ZN7MapBase18func_ov00_0207dea0Eb
add sp, sp, #0x4c
ldmia sp!, {r4, r5, pc}
_02129e90:
@@ -12890,7 +12890,7 @@ _02129eec:
bl func_ov15_0212c718
mov r0, r5
mov r1, #0
bl func_ov00_0207dea0
bl _ZN7MapBase18func_ov00_0207dea0Eb
add sp, sp, #0x4c
ldmia sp!, {r4, r5, pc}
_02129f74:
@@ -12906,7 +12906,7 @@ _02129f74:
bl func_ov15_0212c718
mov r0, r5
mov r1, #0
bl func_ov00_0207dea0
bl _ZN7MapBase18func_ov00_0207dea0Eb
add sp, sp, #0x4c
ldmia sp!, {r4, r5, pc}
_02129fb0:
@@ -12922,7 +12922,7 @@ _02129fb0:
bl func_ov15_0212c718
mov r0, r5
mov r1, #0
bl func_ov00_0207dea0
bl _ZN7MapBase18func_ov00_0207dea0Eb
add sp, sp, #0x4c
ldmia sp!, {r4, r5, pc}
.align 2, 0
@@ -130484,7 +130484,7 @@ data_ov15_0218a294: ; 0x0218a294
.word func_ov15_021299a8
.global data_ov15_0218a298
data_ov15_0218a298: ; 0x0218a298
.word func_ov00_0207e46c
.word _ZN7MapBase8vfunc_48Ev
.global data_ov15_0218a29c
data_ov15_0218a29c: ; 0x0218a29c
.word func_ov15_02129ff4
@@ -130496,7 +130496,7 @@ data_ov15_0218a2a4: ; 0x0218a2a4
.word func_ov15_021299e4
.global data_ov15_0218a2a8
data_ov15_0218a2a8: ; 0x0218a2a8
.word func_ov00_0207e498
.word _ZN7MapBase8vfunc_58Ev
.global data_ov15_0218a2ac
data_ov15_0218a2ac: ; 0x0218a2ac
.word func_ov15_021299ec
@@ -130505,7 +130505,7 @@ data_ov15_0218a2b0: ; 0x0218a2b0
.word func_ov15_021299f4
.global data_ov15_0218a2b4
data_ov15_0218a2b4: ; 0x0218a2b4
.word func_ov00_0207e4b0
.word _ZN7MapBase8vfunc_64Ev
.global data_ov15_0218a2b8
data_ov15_0218a2b8: ; 0x0218a2b8
.word func_ov15_021299fc
@@ -130541,10 +130541,10 @@ data_ov15_0218a2e0: ; 0x0218a2e0
.word func_ov15_02129b2c
.global data_ov15_0218a2e4
data_ov15_0218a2e4: ; 0x0218a2e4
.word func_ov00_0207f4a0
.word _ZN7MapBase8vfunc_94Ev
.global data_ov15_0218a2e8
data_ov15_0218a2e8: ; 0x0218a2e8
.word func_ov00_02080d78
.word _ZN7MapBase8vfunc_98Ev
.global data_ov15_0218a2ec
data_ov15_0218a2ec: ; 0x0218a2ec
.word func_ov15_02129b50
@@ -130553,13 +130553,13 @@ data_ov15_0218a2f0: ; 0x0218a2f0
.word func_ov15_02129c04
.global data_ov15_0218a2f4
data_ov15_0218a2f4: ; 0x0218a2f4
.word func_ov00_0207f33c
.word _ZN7MapBase8vfunc_a4Ev
.global data_ov15_0218a2f8
data_ov15_0218a2f8: ; 0x0218a2f8
.word func_ov00_0207f344
.word _ZN7MapBase8vfunc_a8Ev
.global data_ov15_0218a2fc
data_ov15_0218a2fc: ; 0x0218a2fc
.word func_ov00_0207f348
.word _ZN7MapBase8vfunc_acEv
.global data_ov15_0218a300
data_ov15_0218a300: ; 0x0218a300
.word func_ov15_02129b38
@@ -130571,10 +130571,10 @@ data_ov15_0218a308: ; 0x0218a308
.word func_ov15_02129b30
.global data_ov15_0218a30c
data_ov15_0218a30c: ; 0x0218a30c
.word func_ov00_02080d74
.word _ZN7MapBase8vfunc_bcEv
.global data_ov15_0218a310
data_ov15_0218a310: ; 0x0218a310
.word func_ov00_02080d7c
.word _ZN7MapBase8vfunc_c0Ev
.global data_ov15_0218a314
data_ov15_0218a314: ; 0x0218a314
.ascii "M01"
asm/ov17.inc
+20 -20
View File
@@ -207,26 +207,26 @@
.extern func_ov00_0207c358
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_0207da38
.extern func_ov00_0207ddf4
.extern func_ov00_0207e060
.extern func_ov00_0207e444
.extern func_ov00_0207e46c
.extern func_ov00_0207e488
.extern func_ov00_0207e4b0
.extern func_ov00_0207e4b8
.extern func_ov00_0207e970
.extern func_ov00_0207ee14
.extern func_ov00_0207eff4
.extern func_ov00_0207f324
.extern func_ov00_0207f32c
.extern func_ov00_0207f334
.extern func_ov00_0207f338
.extern func_ov00_0207f364
.extern func_ov00_0207f3c4
.extern func_ov00_0207f4a4
.extern func_ov00_0207f588
.extern func_ov00_020807d4
.extern _ZN7MapBaseD1Ev
.extern _ZN7MapBase8vfunc_18Ev
.extern _ZN7MapBase8vfunc_b0Eii
.extern _ZN7MapBase8vfunc_b4Ev
.extern _ZN7MapBase8vfunc_48Ev
.extern _ZN7MapBase8vfunc_50Ev
.extern _ZN7MapBase8vfunc_64Ev
.extern _ZN7MapBase8vfunc_68Eii
.extern _ZN7MapBase8vfunc_6cEiii
.extern _ZN7MapBase8vfunc_70EP5Vec3p
.extern _ZN7MapBase8vfunc_74EP5Vec3p
.extern _ZN7MapBase8vfunc_88Ev
.extern _ZN7MapBase8vfunc_8cEv
.extern _ZN7MapBase8vfunc_9cEv
.extern _ZN7MapBase8vfunc_a0Ev
.extern _ZN7MapBase8vfunc_84Ei
.extern _ZN7MapBase8vfunc_90Eiii
.extern _ZN7MapBase18func_ov00_0207f4a4EP5Vec2si
.extern _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
.extern _ZN7MapBase8vfunc_b8Ev
.extern func_ov00_02081f58
.extern func_ov00_02081f6c
.extern _ZN10MapManager18func_ov00_020823c4EPii
asm/ov17.s
+24 -24
View File
@@ -221,7 +221,7 @@ _0215b64a:
lsl r0, r0, #2
str r1, [r5, r0]
add r0, r5, #0
blx func_ov00_0207da38
blx _ZN7MapBaseD1Ev
add r0, r5, #0
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -298,7 +298,7 @@ _0215b6de:
lsl r0, r0, #2
str r1, [r5, r0]
add r0, r5, #0
blx func_ov00_0207da38
blx _ZN7MapBaseD1Ev
add r0, r5, #0
blx _ZN9SysObjectdlEPv
add r0, r5, #0
@@ -476,7 +476,7 @@ _0215b850:
mov r3, #0
strb r7, [sp, #8]
strb r8, [sp, #9]
bl func_ov00_0207f588
bl _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
mov r0, r10
ldr r3, [r0]
mov r1, r5
@@ -493,7 +493,7 @@ _0215b850:
mov r1, r10
mov r2, r5
mov r3, #1
bl func_ov00_0207f588
bl _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
mov r0, r10
ldr r3, [r0]
mov r1, r5
@@ -510,7 +510,7 @@ _0215b850:
mov r1, r10
mov r2, r5
mov r3, #2
bl func_ov00_0207f588
bl _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
mov r0, r10
ldr r3, [r0]
mov r1, r5
@@ -527,7 +527,7 @@ _0215b850:
mov r1, r10
mov r2, r5
mov r3, #3
bl func_ov00_0207f588
bl _ZN7MapBase18func_ov00_0207f588EP5Vec2sPS_P5Vec2bi
mov r0, r10
ldr r3, [r0]
mov r1, r5
@@ -606,7 +606,7 @@ func_ov17_0215ba1c: ; 0x0215ba1c
mov r4, r2
mov r6, r0
mov r5, r1
bl func_ov00_0207f4a4
bl _ZN7MapBase18func_ov00_0207f4a4EP5Vec2si
cmp r4, #0
cmpne r0, #0
mov r0, r6
@@ -20901,7 +20901,7 @@ data_ov17_0216ba14: ; 0x0216ba14
.word func_ov17_0215b708 + 1
.global data_ov17_0216ba18
data_ov17_0216ba18: ; 0x0216ba18
.word func_ov00_0207ddf4
.word _ZN7MapBase8vfunc_18Ev
.global data_ov17_0216ba1c
data_ov17_0216ba1c: ; 0x0216ba1c
.word func_ov17_0215b764
@@ -20937,13 +20937,13 @@ data_ov17_0216ba44: ; 0x0216ba44
.word func_ov04_0210cb00 ; data_ov07_0210cb00
.global data_ov17_0216ba48
data_ov17_0216ba48: ; 0x0216ba48
.word func_ov00_0207e46c
.word _ZN7MapBase8vfunc_48Ev
.global data_ov17_0216ba4c
data_ov17_0216ba4c: ; 0x0216ba4c
.word func_ov17_0215bd74
.global data_ov17_0216ba50
data_ov17_0216ba50: ; 0x0216ba50
.word func_ov00_0207e488
.word _ZN7MapBase8vfunc_50Ev
.global data_ov17_0216ba54
data_ov17_0216ba54: ; 0x0216ba54
.word func_ov17_0215ba58
@@ -20958,19 +20958,19 @@ data_ov17_0216ba60: ; 0x0216ba60
.word func_ov17_0215bac8
.global data_ov17_0216ba64
data_ov17_0216ba64: ; 0x0216ba64
.word func_ov00_0207e4b0
.word _ZN7MapBase8vfunc_64Ev
.global data_ov17_0216ba68
data_ov17_0216ba68: ; 0x0216ba68
.word func_ov00_0207e4b8
.word _ZN7MapBase8vfunc_68Eii
.global data_ov17_0216ba6c
data_ov17_0216ba6c: ; 0x0216ba6c
.word func_ov00_0207e970
.word _ZN7MapBase8vfunc_6cEiii
.global data_ov17_0216ba70
data_ov17_0216ba70: ; 0x0216ba70
.word func_ov00_0207ee14
.word _ZN7MapBase8vfunc_70EP5Vec3p
.global data_ov17_0216ba74
data_ov17_0216ba74: ; 0x0216ba74
.word func_ov00_0207eff4
.word _ZN7MapBase8vfunc_74EP5Vec3p
.global data_ov17_0216ba78
data_ov17_0216ba78: ; 0x0216ba78
.word func_ov17_0215bbbc
@@ -20982,16 +20982,16 @@ data_ov17_0216ba80: ; 0x0216ba80
.word func_ov17_0215bd30
.global data_ov17_0216ba84
data_ov17_0216ba84: ; 0x0216ba84
.word func_ov00_0207f364
.word _ZN7MapBase8vfunc_84Ei
.global data_ov17_0216ba88
data_ov17_0216ba88: ; 0x0216ba88
.word func_ov00_0207f324
.word _ZN7MapBase8vfunc_88Ev
.global data_ov17_0216ba8c
data_ov17_0216ba8c: ; 0x0216ba8c
.word func_ov00_0207f32c
.word _ZN7MapBase8vfunc_8cEv
.global data_ov17_0216ba90
data_ov17_0216ba90: ; 0x0216ba90
.word func_ov00_0207f3c4
.word _ZN7MapBase8vfunc_90Eiii
.global data_ov17_0216ba94
data_ov17_0216ba94: ; 0x0216ba94
.word func_ov17_0215b7c4
@@ -21000,10 +21000,10 @@ data_ov17_0216ba98: ; 0x0216ba98
.word func_ov17_0215bb34
.global data_ov17_0216ba9c
data_ov17_0216ba9c: ; 0x0216ba9c
.word func_ov00_0207f334
.word _ZN7MapBase8vfunc_9cEv
.global data_ov17_0216baa0
data_ov17_0216baa0: ; 0x0216baa0
.word func_ov00_0207f338
.word _ZN7MapBase8vfunc_a0Ev
.global data_ov17_0216baa4
data_ov17_0216baa4: ; 0x0216baa4
.word func_ov17_0215b994
@@ -21015,13 +21015,13 @@ data_ov17_0216baac: ; 0x0216baac
.word func_ov17_0215ba1c
.global data_ov17_0216bab0
data_ov17_0216bab0: ; 0x0216bab0
.word func_ov00_0207e060
.word _ZN7MapBase8vfunc_b0Eii
.global data_ov17_0216bab4
data_ov17_0216bab4: ; 0x0216bab4
.word func_ov00_0207e444
.word _ZN7MapBase8vfunc_b4Ev
.global data_ov17_0216bab8
data_ov17_0216bab8: ; 0x0216bab8
.word func_ov00_020807d4
.word _ZN7MapBase8vfunc_b8Ev
.global data_ov17_0216babc
data_ov17_0216babc: ; 0x0216babc
.word func_ov17_0215bb14
asm/ov18.inc
+21 -21
View File
@@ -233,27 +233,27 @@
.extern func_ov00_0207c474
.extern _ZN6Course23IsAdjacentMapOnMainGridEi
.extern _ZN6Course14GetAdjacentMapEi
.extern func_ov00_0207da38
.extern func_ov00_0207ddf4
.extern func_ov00_0207e060
.extern func_ov00_0207e444
.extern func_ov00_0207e46c
.extern func_ov00_0207e488
.extern func_ov00_0207e4b8
.extern func_ov00_0207e970
.extern func_ov00_0207ee14
.extern func_ov00_0207eff4
.extern func_ov00_0207f324
.extern func_ov00_0207f32c
.extern func_ov00_0207f334
.extern func_ov00_0207f338
.extern func_ov00_0207f344
.extern func_ov00_0207f348
.extern func_ov00_0207f364
.extern func_ov00_0207f3c4
.extern func_ov00_0207f4a4
.extern func_ov00_02080140
.extern func_ov00_020807d4
.extern _ZN7MapBaseD1Ev
.extern _ZN7MapBase8vfunc_18Ev
.extern _ZN7MapBase8vfunc_b0Eii
.extern _ZN7MapBase8vfunc_b4Ev
.extern _ZN7MapBase8vfunc_48Ev
.extern _ZN7MapBase8vfunc_50Ev
.extern _ZN7MapBase8vfunc_68Eii
.extern _ZN7MapBase8vfunc_6cEiii
.extern _ZN7MapBase8vfunc_70EP5Vec3p
.extern _ZN7MapBase8vfunc_74EP5Vec3p
.extern _ZN7MapBase8vfunc_88Ev
.extern _ZN7MapBase8vfunc_8cEv
.extern _ZN7MapBase8vfunc_9cEv
.extern _ZN7MapBase8vfunc_a0Ev
.extern _ZN7MapBase8vfunc_a8Ev
.extern _ZN7MapBase8vfunc_acEv
.extern _ZN7MapBase8vfunc_84Ei
.extern _ZN7MapBase8vfunc_90Eiii
.extern _ZN7MapBase18func_ov00_0207f4a4EP5Vec2si
.extern _ZN7MapBase18func_ov00_02080140EP4Exit
.extern _ZN7MapBase8vfunc_b8Ev
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager16MapData_vfunc_7cEv
.extern _ZN10MapManager18func_ov00_02082d08Ev
asm/ov18.s
+23 -23
View File
@@ -197,7 +197,7 @@ _0215b734:
mov r1, #0
mov r0, r5
str r1, [r5, #0x188]
bl func_ov00_0207da38
bl _ZN7MapBaseD1Ev
mov r0, r5
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -278,7 +278,7 @@ _0215b840:
mov r1, #0
mov r0, r5
str r1, [r5, #0x188]
bl func_ov00_0207da38
bl _ZN7MapBaseD1Ev
mov r0, r5
bl _ZN9SysObjectdlEPv
mov r0, r5
@@ -596,7 +596,7 @@ _0215bcb4:
_0215bce4:
mov r0, r9
add r1, sp, #0x10
bl func_ov00_02080140
bl _ZN7MapBase18func_ov00_02080140EP4Exit
strb r0, [sp, #0x24]
mov r1, #0
str r1, [sp]
@@ -1023,11 +1023,11 @@ func_ov18_0215c27c: ; 0x0215c27c
.global func_ov18_0215c284
arm_func_start func_ov18_0215c284
func_ov18_0215c284: ; 0x0215c284
ldr ip, _0215c28c ; =func_ov00_0207f4a4
ldr ip, _0215c28c ; =_ZN7MapBase18func_ov00_0207f4a4EP5Vec2si
bx ip
.align 2, 0
arm_func_end func_ov18_0215c284
_0215c28c: .word func_ov00_0207f4a4
_0215c28c: .word _ZN7MapBase18func_ov00_0207f4a4EP5Vec2si
.global func_ov18_0215c290
arm_func_start func_ov18_0215c290
@@ -1338,7 +1338,7 @@ func_ov18_0215c608: ; 0x0215c608
mov r4, r0
mov r6, r1
mov r5, r2
bl func_ov00_0207e060
bl _ZN7MapBase8vfunc_b0Eii
ldr r0, [r4, #0x1c0]
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
@@ -20980,7 +20980,7 @@ data_ov18_0216c0f4: ; 0x0216c0f4
.word func_ov18_0215bd84
.global data_ov18_0216c0f8
data_ov18_0216c0f8: ; 0x0216c0f8
.word func_ov00_0207ddf4
.word _ZN7MapBase8vfunc_18Ev
.global data_ov18_0216c0fc
data_ov18_0216c0fc: ; 0x0216c0fc
.word func_ov18_0215beb8
@@ -21016,13 +21016,13 @@ data_ov18_0216c124: ; 0x0216c124
.word func_ov04_0210cb00 ; data_ov07_0210cb00
.global data_ov18_0216c128
data_ov18_0216c128: ; 0x0216c128
.word func_ov00_0207e46c
.word _ZN7MapBase8vfunc_48Ev
.global data_ov18_0216c12c
data_ov18_0216c12c: ; 0x0216c12c
.word func_ov18_0215caa4
.global data_ov18_0216c130
data_ov18_0216c130: ; 0x0216c130
.word func_ov00_0207e488
.word _ZN7MapBase8vfunc_50Ev
.global data_ov18_0216c134
data_ov18_0216c134: ; 0x0216c134
.word func_ov18_0215c290
@@ -21040,16 +21040,16 @@ data_ov18_0216c144: ; 0x0216c144
.word func_ov18_0215c32c
.global data_ov18_0216c148
data_ov18_0216c148: ; 0x0216c148
.word func_ov00_0207e4b8
.word _ZN7MapBase8vfunc_68Eii
.global data_ov18_0216c14c
data_ov18_0216c14c: ; 0x0216c14c
.word func_ov00_0207e970
.word _ZN7MapBase8vfunc_6cEiii
.global data_ov18_0216c150
data_ov18_0216c150: ; 0x0216c150
.word func_ov00_0207ee14
.word _ZN7MapBase8vfunc_70EP5Vec3p
.global data_ov18_0216c154
data_ov18_0216c154: ; 0x0216c154
.word func_ov00_0207eff4
.word _ZN7MapBase8vfunc_74EP5Vec3p
.global data_ov18_0216c158
data_ov18_0216c158: ; 0x0216c158
.word func_ov18_0215c448
@@ -21061,16 +21061,16 @@ data_ov18_0216c160: ; 0x0216c160
.word func_ov18_0215c5c4
.global data_ov18_0216c164
data_ov18_0216c164: ; 0x0216c164
.word func_ov00_0207f364
.word _ZN7MapBase8vfunc_84Ei
.global data_ov18_0216c168
data_ov18_0216c168: ; 0x0216c168
.word func_ov00_0207f324
.word _ZN7MapBase8vfunc_88Ev
.global data_ov18_0216c16c
data_ov18_0216c16c: ; 0x0216c16c
.word func_ov00_0207f32c
.word _ZN7MapBase8vfunc_8cEv
.global data_ov18_0216c170
data_ov18_0216c170: ; 0x0216c170
.word func_ov00_0207f3c4
.word _ZN7MapBase8vfunc_90Eiii
.global data_ov18_0216c174
data_ov18_0216c174: ; 0x0216c174
.word func_ov18_0215c27c
@@ -21079,28 +21079,28 @@ data_ov18_0216c178: ; 0x0216c178
.word func_ov18_0215c3c0
.global data_ov18_0216c17c
data_ov18_0216c17c: ; 0x0216c17c
.word func_ov00_0207f334
.word _ZN7MapBase8vfunc_9cEv
.global data_ov18_0216c180
data_ov18_0216c180: ; 0x0216c180
.word func_ov00_0207f338
.word _ZN7MapBase8vfunc_a0Ev
.global data_ov18_0216c184
data_ov18_0216c184: ; 0x0216c184
.word func_ov18_0215c284
.global data_ov18_0216c188
data_ov18_0216c188: ; 0x0216c188
.word func_ov00_0207f344
.word _ZN7MapBase8vfunc_a8Ev
.global data_ov18_0216c18c
data_ov18_0216c18c: ; 0x0216c18c
.word func_ov00_0207f348
.word _ZN7MapBase8vfunc_acEv
.global data_ov18_0216c190
data_ov18_0216c190: ; 0x0216c190
.word func_ov18_0215c608
.global data_ov18_0216c194
data_ov18_0216c194: ; 0x0216c194
.word func_ov00_0207e444
.word _ZN7MapBase8vfunc_b4Ev
.global data_ov18_0216c198
data_ov18_0216c198: ; 0x0216c198
.word func_ov00_020807d4
.word _ZN7MapBase8vfunc_b8Ev
.global data_ov18_0216c19c
data_ov18_0216c19c: ; 0x0216c19c
.word func_ov18_0215c3a0
include/Map/MapBase.hpp
+137
View File
@@ -7,6 +7,7 @@
#include "lib/math.h"
#include "Map/Course.hpp"
#include "Map/Entrance.hpp"
#include "Map/TriggerBase.hpp"
#include "Map/Exit.hpp"
@@ -22,6 +23,25 @@
struct MapBase_Unk_180 {
/* 0 */ unk32 mUnk_0;
/* 4 */
~MapBase_Unk_180();
};
struct MapBase_Unk1 {
/* 00 */ s32 mUnk_00;
/* 04 */ Exit mExit_04;
/* 1c */ Exit mExit_1c;
/* 34 */
void func_ov00_02080324(s32 param_2, s32 param_3, s32 param_4);
};
struct MapBase_Unk2 {
/* 00 */ TriggerBase **mTrigger;
/* 04 */ Vec3p mVec;
/* 10 */
void func_ov00_02080ad0(TriggerBase **param_2, TriggerBase **param_3);
};
class MapBase : public SysObject {
@@ -96,5 +116,122 @@ public:
/* 1ae */ unk8 mUnk_1ae[2];
/* 1b0 */
/* 00 */ virtual ~MapBase();
/* 08 */ virtual void vfunc_08(u32 param_2, u32 param_3, Course *param_4);
/* 0c */ virtual void vfunc_0c(Course *param_2);
/* 10 */ virtual void vfunc_10();
/* 14 */ virtual void vfunc_14();
/* 18 */ virtual void vfunc_18();
/* 1c */ virtual void vfunc_1c(bool param_2);
/* 20 */ virtual void vfunc_20(s32 param_2);
/* 24 */ virtual void vfunc_24();
/* 28 */ virtual void vfunc_28(s32 param_2);
/* 2c */ virtual void vfunc_2c();
/* 30 */ virtual void vfunc_30(s32 param_2);
/* 34 */ virtual bool vfunc_34(char *param_2);
/* 38 */ virtual void vfunc_38();
/* 3c */ virtual void vfunc_3c();
/* 40 */ virtual void vfunc_40();
/* 44 */ virtual void vfunc_44();
/* 48 */ virtual void vfunc_48();
/* 4c */ virtual void vfunc_4c() = 0;
/* 50 */ virtual unk32 vfunc_50();
/* 54 */ virtual unk32 vfunc_54();
/* 58 */ virtual unk32 vfunc_58();
/* 5c */ virtual unk32 vfunc_5c();
/* 60 */ virtual unk32 vfunc_60();
/* 64 */ virtual unk32 vfunc_64();
/* 68 */ virtual unk8 vfunc_68(unk32 param_2, unk32 param_3);
/* 6c */ virtual unk8 vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4);
/* 70 */ virtual unk32 vfunc_70(Vec3p *param_2);
/* 74 */ virtual s32* vfunc_74(Vec3p *param_2);
/* 78 */ virtual unk32 vfunc_78();
/* 7c */ virtual unk32 vfunc_7c();
/* 80 */ virtual unk32 vfunc_80();
/* 84 */ virtual void vfunc_84(unk32 param_2);
/* 88 */ virtual unk32 vfunc_88();
/* 8c */ virtual unk32 vfunc_8c();
/* 90 */ virtual unk8 vfunc_90(unk32 param_2, unk32 param_3, unk32 param_4);
/* 94 */ virtual void vfunc_94();
/* 98 */ virtual void vfunc_98();
/* 9c */ virtual void vfunc_9c();
/* a0 */ virtual void vfunc_a0();
/* a4 */ virtual unk32 vfunc_a4();
/* a8 */ virtual void vfunc_a8();
/* ac */ virtual void vfunc_ac();
/* b0 */ virtual unk8 vfunc_b0(unk32 param_2, unk32 param_3);
/* b4 */ virtual void vfunc_b4();
/* b8 */ virtual unk32 vfunc_b8();
/* bc */ virtual void vfunc_bc();
/* c0 */ virtual void vfunc_c0();
/* c4 */
void SetBounds(unk32 map, unk32 course);
void GetMapFilePath(char *courseName, unk32 num1, unk32 buf);
void func_ov00_0207ddf8(bool param_2);
void func_ov00_0207de68(unk32 param_2);
void func_ov00_0207de88();
void func_ov00_0207dea0(bool param_2);
bool func_ov00_0207e08c(unk32 param_2, unk32 param_3);
s32 func_ov00_0207e0f0(unk32 param_2);
s32 func_ov00_0207e28c(unk32 param_2);
static unk8 func_ov00_0207e940(unk8 *param_1);
static unk8 func_ov00_0207e968();
static unk8 func_ov00_0207e96c();
static unk8 func_ov00_0207f100();
bool func_ov00_0207f104(unk32 param_2, unk32 param_3);
unk32 func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3);
unk8 func_ov00_0207f38c(unk32 param_2);
void func_ov00_0207f4a4(Vec2s *param_2, unk32 param_3);
static void func_ov00_0207f53c(Vec2s *param_1, MapBase *param_2, Vec3p *param_3);
static void func_ov00_0207f588(Vec2s *param_1, MapBase *param_2, Vec2b *param_3, unk32 param_4);
void func_ov00_0207f630(Vec2s *param_2, Vec3p *param_3);
unk8 GetTileStartX(unk32 x);
unk8 GetTileStartZ(unk32 z);
s32 GetTileEndX(unk32 x);
s32 GetTileEndZ(unk32 z);
void GetTileBounds(Vec2b *tilePos, AABB *bounds);
unk8 GetClampedTileX(unk32 worldX);
unk8 GetClampedTileY(unk32 worldZ);
unk8 GetTileX(unk32 worldX);
unk8 GetTileY(unk32 worldZ);
bool IsInBounds(Vec3p *tileWorldPos);
s32 AddEntrance(Entrance *param_2);
unk8 FindEntrance(unk32 id);
unk8 func_ov00_0207f924(unk32 param_2);
unk8 func_ov00_0207f934();
unk8 func_ov00_0207f948(unk32 param_2);
void AddTrigger(TriggerParams *param_2);
s32 GetTriggerBoundingBox(unk32 param_2, AABB *param_3);
unk8 GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4);
unk32 GetOverlappingTrigger(Vec3p *param_2);
unk8 FindTrigger(unk32 type);
unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase * *triggers, unk32 capacity);
bool IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3);
bool AnyTrigger_func_0c(unk32 type);
unk8 Trigger_vfunc_08();
bool AddTrigger(unk32 param_2);
bool func_ov00_0207ff88(unk32 param_2);
void func_ov00_0208005c(s32 param_2, s32 param_3, unk32 param_4);
void func_ov00_0208006c(unk32 param_2, s32 param_3);
void func_ov00_0208007c(s32 param_2, s32 param_3);
void func_ov00_0208008c(u32 param_2);
unk8 AddExit(Exit *param_2);
unk8 func_ov00_02080140(Exit *param_2);
bool FindExit(unk32 param_2, Exit *param_3);
unk8 AddCameraViewpoint(CameraViewpoint *param_2);
bool FindViewpoint_Unk_4(unk8 id, CameraViewpoint *param_3);
bool FindViewpoint_Unk_0(unk32 param_2, CameraViewpoint *param_3);
void GetCurrentViewpoint(CameraViewpoint *param_2, unk32 param_3);
unk8 GetCurrentViewpoint_Unk_00(s32 param_2);
bool func_ov00_02080824(unk32 param_2, unk32 param_3);
bool AddUnk_130(unk32 param_2);
bool func_ov00_020809b8(unk32 param_2);
unk8 func_ov00_02080a78(Vec3p *param_2);
unk8 func_ov00_02080b24(Vec2b *param_2);
void func_ov00_02080d08(unk32 param_2);
bool TriggerOfType_vfunc_10(unk32 type);
void func_ov00_02080de4();
unk8 func_ov00_02080de8(unk32 param_2);
void func_ov00_02080edc();
};
include/Map/MapManager.hpp
+1 -8
View File
@@ -6,6 +6,7 @@
#include "lib/math.h"
#include "Map/Course.hpp"
#include "Map/MapBase.hpp"
#include "Physics/AABB.hpp"
#include "System/SysNew.hpp"
@@ -25,14 +26,6 @@ struct MapManager_Unk2 {
~MapManager_Unk2();
};
class MapBase : public SysObject {
public:
/* 00 */ virtual ~MapBase();
MapBase();
MapBase(u32 param1, u32 param2);
};
class MapManager : public SysObject {
public:
/* 00 */ Course *mCourse;
include/Map/TriggerBase.hpp
+24 -1
View File
@@ -5,13 +5,36 @@
#include "System/SysNew.hpp"
struct TriggerParams {
/* 0 */ s8 id;
/* 1 */ unk8 zMin;
/* 2 */ unk8 zMax;
/* 3 */ unk8 xMin;
/* 4 */ unk8 xMax;
/* 5 */ bool isAABB_Unk1;
/* 6 */ s8 mUnk_6;
/* 7 */ s8 mUnk_7;
/* 8 */ s8 mUnk_8;
/* 9 */ bool isAABB_Unk2;
/* a */ bool isSphere;
/* b */
};
class TriggerBase : public SysObject {
/* 00 (vtable) */
/* 04 */ unk8 mUnk_04;
/* 05 */ u8 mType;
/* 05 */ u8 mId;
/* 06 */ unk8 mUnk_06[2];
/* 08 */ u32 mUnk_08;
/* 0c */ u32 mUnk_0c;
/* 10 */ u32 mUnk_10;
/* 14 */
/* 00 */ virtual ~TriggerBase();
/* 08 */ void vfunc_08();
/* 0c */ unk32 vfunc_0c();
/* 10 */ unk32 vfunc_10();
/* 14 */ bool Overlaps();
/* 18 */ bool GetBoundingBox();
/* 1c */
};
include/lib/math.h
+6
View File
@@ -19,6 +19,12 @@ typedef struct {
/* 2 */
} Vec2b;
typedef struct {
/* 0 */ s16 x;
/* 1 */ s16 y;
/* 2 */
} Vec2s;
typedef struct {
/* 0 */ q20 x;
/* 4 */ q20 y;
src/00_Core/Map/MapBase.cpp
+116
View File
@@ -0,0 +1,116 @@
#include "Map/MapBase.hpp"
#include "Map/MapManager.hpp"
#ifdef STUBS
MapBase::~MapBase() {}
MapBase_Unk_180::~MapBase_Unk_180() {}
void MapBase::SetBounds(unk32 map, unk32 course) {}
MapManager_Unk2::~MapManager_Unk2() {}
void MapBase::GetMapFilePath(char *courseName, unk32 num1, unk32 buf) {}
void MapBase::vfunc_18() {}
void MapBase::func_ov00_0207ddf8(bool param_2) {}
void MapBase::func_ov00_0207de68(unk32 param_2) {}
void MapBase::func_ov00_0207de88() {}
void MapBase::func_ov00_0207dea0(bool param_2) {}
unk8 MapBase::vfunc_b0(unk32 param_2, unk32 param_3) {}
bool MapBase::func_ov00_0207e08c(unk32 param_2, unk32 param_3) {}
s32 MapBase::func_ov00_0207e0f0(unk32 param_2) {}
s32 MapBase::func_ov00_0207e28c(unk32 param_2) {}
void MapBase::vfunc_b4() {}
void MapBase::vfunc_48() {}
unk32 MapBase::vfunc_50() {}
unk32 MapBase::vfunc_54() {}
unk32 MapBase::vfunc_58() {}
unk32 MapBase::vfunc_5c() {}
unk32 MapBase::vfunc_60() {}
unk32 MapBase::vfunc_64() {}
unk8 MapBase::vfunc_68(unk32 param_2, unk32 param_3) {}
unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {}
unk8 MapBase::func_ov00_0207e968() {}
unk8 MapBase::func_ov00_0207e96c() {}
unk8 MapBase::vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4) {}
unk32 MapBase::vfunc_70(Vec3p *param_2) {}
s32* MapBase::vfunc_74(Vec3p *param_2) {}
unk8 MapBase::func_ov00_0207f100() {}
bool MapBase::func_ov00_0207f104(unk32 param_2, unk32 param_3) {}
unk32 MapBase::func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3) {}
unk32 MapBase::vfunc_88() {}
unk32 MapBase::vfunc_8c() {}
void MapBase::vfunc_9c() {}
void MapBase::vfunc_a0() {}
unk32 MapBase::vfunc_a4() {}
void MapBase::vfunc_a8() {}
void MapBase::vfunc_ac() {}
unk32 MapBase::vfunc_78() {}
unk32 MapBase::vfunc_7c() {}
unk32 MapBase::vfunc_80() {}
void MapBase::vfunc_84(unk32 param_2) {}
unk8 MapBase::func_ov00_0207f38c(unk32 param_2) {}
unk8 MapBase::vfunc_90(unk32 param_2, unk32 param_3, unk32 param_4) {}
void MapBase::vfunc_94() {}
void MapBase::func_ov00_0207f4a4(Vec2s *param_2, unk32 param_3) {}
void MapBase::func_ov00_0207f53c(Vec2s *param_1, MapBase *param_2, Vec3p *param_3) {}
void MapBase::func_ov00_0207f588(Vec2s *param_1, MapBase *param_2, Vec2b *param_3, unk32 param_4) {}
void MapBase::func_ov00_0207f630(Vec2s *param_2, Vec3p *param_3) {}
unk8 MapBase::GetTileStartX(unk32 x) {}
unk8 MapBase::GetTileStartZ(unk32 z) {}
s32 MapBase::GetTileEndX(unk32 x) {}
s32 MapBase::GetTileEndZ(unk32 z) {}
void MapBase::GetTileBounds(Vec2b *tilePos, AABB *bounds) {}
unk8 MapBase::GetClampedTileX(unk32 worldX) {}
unk8 MapBase::GetClampedTileY(unk32 worldZ) {}
unk8 MapBase::GetTileX(unk32 worldX) {}
unk8 MapBase::GetTileY(unk32 worldZ) {}
bool MapBase::IsInBounds(Vec3p *tileWorldPos) {}
s32 MapBase::AddEntrance(Entrance *param_2) {}
unk8 MapBase::FindEntrance(unk32 id) {}
unk8 MapBase::func_ov00_0207f924(unk32 param_2) {}
unk8 MapBase::func_ov00_0207f934() {}
unk8 MapBase::func_ov00_0207f948(unk32 param_2) {}
void MapBase::AddTrigger(TriggerParams *param_2) {}
void TriggerBase::vfunc_08() {}
s32 MapBase::GetTriggerBoundingBox(unk32 param_2, AABB *param_3) {}
bool TriggerBase::GetBoundingBox() {}
unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4) {}
unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
bool TriggerBase::Overlaps() {}
unk8 MapBase::FindTrigger(unk32 type) {}
unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase * *triggers, unk32 capacity) {}
bool MapBase::IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3) {}
bool MapBase::AnyTrigger_func_0c(unk32 type) {}
unk32 TriggerBase::vfunc_0c() {}
unk8 MapBase::Trigger_vfunc_08() {}
bool MapBase::AddTrigger(unk32 param_2) {}
bool MapBase::func_ov00_0207ff88(unk32 param_2) {}
void MapBase::func_ov00_0208005c(s32 param_2, s32 param_3, unk32 param_4) {}
void MapBase::func_ov00_0208006c(unk32 param_2, s32 param_3) {}
void MapBase::func_ov00_0208007c(s32 param_2, s32 param_3) {}
void MapBase::func_ov00_0208008c(u32 param_2) {}
unk8 MapBase::AddExit(Exit *param_2) {}
unk8 MapBase::func_ov00_02080140(Exit *param_2) {}
void MapBase_Unk1::func_ov00_02080324(s32 param_2, s32 param_3, s32 param_4) {}
bool MapBase::FindExit(unk32 param_2, Exit *param_3) {}
unk8 MapBase::AddCameraViewpoint(CameraViewpoint *param_2) {}
bool MapBase::FindViewpoint_Unk_4(unk8 id, CameraViewpoint *param_3) {}
bool MapBase::FindViewpoint_Unk_0(unk32 param_2, CameraViewpoint *param_3) {}
void MapBase::GetCurrentViewpoint(CameraViewpoint *param_2, unk32 param_3) {}
unk8 MapBase::GetCurrentViewpoint_Unk_00(s32 param_2) {}
unk32 MapBase::vfunc_b8() {}
bool MapBase::func_ov00_02080824(unk32 param_2, unk32 param_3) {}
bool MapBase::AddUnk_130(unk32 param_2) {}
bool MapBase::func_ov00_020809b8(unk32 param_2) {}
unk8 MapBase::func_ov00_02080a78(Vec3p *param_2) {}
void MapBase_Unk2::func_ov00_02080ad0(TriggerBase * *param_2, TriggerBase * *param_3) {}
unk8 MapBase::func_ov00_02080b24(Vec2b *param_2) {}
void MapBase::func_ov00_02080d08(unk32 param_2) {}
void MapBase::vfunc_bc() {}
void MapBase::vfunc_98() {}
void MapBase::vfunc_c0() {}
bool MapBase::TriggerOfType_vfunc_10(unk32 type) {}
unk32 TriggerBase::vfunc_10() {}
void MapBase::func_ov00_02080de4() {}
unk8 MapBase::func_ov00_02080de8(unk32 param_2) {}
void MapBase::func_ov00_02080edc() {}
#endif