mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 06:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp src/00_Core/Map/MapBase.cpp (57%) (#129)

Browse Source 
* Comments

* Lay out theoretical code

* Externalise func_020196bc & func_020196fc

* Pull merge

* Pull merge

* Decomp MapBase::func_ov00_02080edc

* Fix MapManager TilePos params

* Decomp progress

* Fix MapManager param issue

* Decomp progress

* Update MapManager var pointer type

* Fix function defs

* Update symbols

* Update

* Match MapBase_Unk2::func_ov00_02080ad0 (thx 2 dt mow & yanis)

* Update

* Decomp progress 26%

* Decomp progress 28%

* Fix struct overlap

* Fix unknown members

* Uncomment and fix rest of methods (most still non-matching)

* Decomp progress

* Corrections
This commit is contained in:
SammygoodTunes
2025-09-21 14:21:31 +02:00
committed by GitHub
parent cb52c8c23f
commit 5b15874c4d
16 changed files with 2505 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/overlays/ov000/symbols.txt
+44 -44
View File
@@ -134,7 +134,7 @@ _ZN12GameModePlay8vfunc_20Ev kind:function(thumb,size=0x2) addr:0x02079dd8
func_ov000_02079ddc kind:function(thumb,size=0x14) addr:0x02079ddc
func_ov000_02079df0 kind:function(thumb,size=0x14) addr:0x02079df0
func_ov000_02079e04 kind:function(arm,size=0x38) addr:0x02079e04
func_ov000_02079e3c kind:function(arm,size=0x2c) addr:0x02079e3c
_Z19func_ov000_02079e3cv kind:function(arm,size=0x2c) addr:0x02079e3c
_ZN18UnkStruct_020e936019func_ov000_02079e68Ei kind:function(arm,size=0x4c) addr:0x02079e68
func_ov000_02079eb4 kind:function(arm,size=0x24) addr:0x02079eb4
func_ov000_02079ed8 kind:function(thumb,size=0x22) addr:0x02079ed8
@@ -321,9 +321,9 @@ _ZN7MapBaseD1Ev kind:function(arm,size=0xe0) addr:0x0207da38
_ZN15MapBase_Unk_180D1Ev kind:function(arm,size=0x4) addr:0x0207db18
_ZN7MapBaseD0Ev kind:function(arm,size=0xe8) addr:0x0207db1c
_ZN7MapBaseD2Ev kind:function(arm,size=0xe0) addr:0x0207dc04
_ZN7MapBase9SetBoundsEii kind:function(arm,size=0xb8) addr:0x0207dce4
_ZN7MapBase9SetBoundsEiP6Course kind:function(arm,size=0xb8) addr:0x0207dce4
_ZN15MapManager_Unk2D1Ev kind:function(arm,size=0x4) addr:0x0207dd9c
_ZN7MapBase14GetMapFilePathEPcii kind:function(arm,size=0x54) addr:0x0207dda0
_ZN7MapBase14GetMapFilePathEPciS0_ kind:function(arm,size=0x54) addr:0x0207dda0
_ZN7MapBase8vfunc_18Ev kind:function(arm,size=0x4) addr:0x0207ddf4
_ZN7MapBase18func_ov00_0207ddf8Eb kind:function(arm,size=0x70) addr:0x0207ddf8
_ZN7MapBase18func_ov00_0207de68Ei kind:function(arm,size=0x20) addr:0x0207de68
@@ -345,7 +345,7 @@ _ZN7MapBase8vfunc_68EP5Vec3pb kind:function(arm,size=0x488) addr:0x0207e4b8
_ZN7MapBase18func_ov00_0207e940EPc kind:function(arm,size=0x28) addr:0x0207e940
_ZN7MapBase18func_ov00_0207e968Ev kind:function(arm,size=0x4) addr:0x0207e968
_ZN7MapBase18func_ov00_0207e96cEv kind:function(arm,size=0x4) addr:0x0207e96c
_ZN7MapBase8vfunc_6cEiii kind:function(arm,size=0x4a4) addr:0x0207e970
_ZN7MapBase8vfunc_6cEP5Vec3pPiS1_ kind:function(arm,size=0x4a4) addr:0x0207e970
_ZN7MapBase8vfunc_70EP5Vec3p kind:function(arm,size=0x1e0) addr:0x0207ee14
_ZN7MapBase8vfunc_74EP5Vec3p kind:function(arm,size=0x10c) addr:0x0207eff4
_ZN7MapBase18func_ov00_0207f100Ev kind:function(arm,size=0x4) addr:0x0207f100
@@ -360,9 +360,9 @@ _ZN7MapBase8vfunc_a8Ev kind:function(arm,size=0x4) addr:0x0207f344
_ZN7MapBase8vfunc_acEv kind:function(arm,size=0x4) addr:0x0207f348
_ZN7MapBase8vfunc_78EP7TilePos kind:function(arm,size=0x8) addr:0x0207f34c
_ZN7MapBase8vfunc_7cEiPiiPs kind:function(arm,size=0x8) addr:0x0207f354
_ZN7MapBase8vfunc_80Ev kind:function(arm,size=0x8) addr:0x0207f35c
_ZN7MapBase8vfunc_84Ei kind:function(arm,size=0x28) addr:0x0207f364
_ZN7MapBase18func_ov00_0207f38cEPi kind:function(arm,size=0x38) addr:0x0207f38c
_ZN7MapBase8vfunc_80EP7TilePos kind:function(arm,size=0x8) addr:0x0207f35c
_ZN7MapBase8vfunc_84EP18UnkStruct_0207f38c kind:function(arm,size=0x28) addr:0x0207f364
_ZN7MapBase18func_ov00_0207f38cEP18UnkStruct_0207f38c kind:function(arm,size=0x38) addr:0x0207f38c
_ZN7MapBase8vfunc_90EP7TilePosi kind:function(arm,size=0xdc) addr:0x0207f3c4
_ZN7MapBase8vfunc_94Ev kind:function(arm,size=0x4) addr:0x0207f4a0
_ZN7MapBase18func_ov00_0207f4a4EP5Vec2si kind:function(arm,size=0x98) addr:0x0207f4a4
@@ -383,7 +383,7 @@ _ZN7MapBase11AddEntranceEP8Entrance kind:function(arm,size=0x7c) addr:0x0207f844
_ZN7MapBase12FindEntranceEi kind:function(arm,size=0x64) addr:0x0207f8c0
_ZN7MapBase18func_ov00_0207f924Ei kind:function(arm,size=0x10) addr:0x0207f924
_ZN7MapBase18func_ov00_0207f934Ev kind:function(arm,size=0x14) addr:0x0207f934
_ZN7MapBase18func_ov00_0207f948Ei kind:function(arm,size=0x10) addr:0x0207f948
_ZN7MapBase18func_ov00_0207f948EPi kind:function(arm,size=0x10) addr:0x0207f948
_ZN7MapBase10AddTriggerEP13TriggerParams kind:function(arm,size=0x150) addr:0x0207f958
_ZN11TriggerBase8vfunc_08Ev kind:function(arm,size=0x4) addr:0x0207faa8
_ZN7MapBase21GetTriggerBoundingBoxEiP4AABB kind:function(arm,size=0xb0) addr:0x0207faac
@@ -395,33 +395,33 @@ _ZN7MapBase11FindTriggerEi kind:function(arm,size=0x48) addr:0x0207fc98
_ZN7MapBase22GetOverlappingTriggersEP5Vec3pPP11TriggerBasei kind:function(arm,size=0x78) addr:0x0207fce0
_ZN7MapBase23IsTriggerTypeOverlappedEiP5Vec3p kind:function(arm,size=0x78) addr:0x0207fd58
_ZN7MapBase18AnyTrigger_func_0cEi kind:function(arm,size=0x64) addr:0x0207fdd0
_ZN11TriggerBase8vfunc_0cEv kind:function(arm,size=0x8) addr:0x0207fe34
_ZN11TriggerBase8vfunc_0cEb kind:function(arm,size=0x8) addr:0x0207fe34
_ZN7MapBase16Trigger_vfunc_08Ev kind:function(arm,size=0x44) addr:0x0207fe3c
_ZN7MapBase10AddTriggerEi kind:function(arm,size=0x108) addr:0x0207fe80
_ZN7MapBase18func_ov00_0207ff88Ei kind:function(arm,size=0xd4) addr:0x0207ff88
_ZN7MapBase10AddTriggerEP11TriggerBase kind:function(arm,size=0x108) addr:0x0207fe80
_ZN7MapBase18func_ov00_0207ff88EP11TriggerBase kind:function(arm,size=0xd4) addr:0x0207ff88
_ZN7MapBase18func_ov00_0208005cEiii kind:function(arm,size=0x10) addr:0x0208005c
_ZN7MapBase18func_ov00_0208006cEii kind:function(arm,size=0x10) addr:0x0208006c
_ZN7MapBase18func_ov00_0208007cEii kind:function(arm,size=0x10) addr:0x0208007c
_ZN7MapBase18func_ov00_0208008cEj kind:function(arm,size=0x10) addr:0x0208008c
_ZN7MapBase7AddExitEP4Exit kind:function(arm,size=0xa4) addr:0x0208009c
_ZN7MapBase18func_ov00_02080140EP4Exit kind:function(arm,size=0x1e4) addr:0x02080140
_ZN12MapBase_Unk118func_ov00_02080324Eiii kind:function(arm,size=0x78) addr:0x02080324
_ZN12MapBase_Unk118func_ov00_02080324EP23UnkStruct_027e0d38_UnkCS1_S1_ kind:function(arm,size=0x78) addr:0x02080324
_ZN7MapBase8FindExitEjP4Exit kind:function(arm,size=0xd0) addr:0x0208039c
_ZN7MapBase18AddCameraViewpointEP15CameraViewpoint kind:function(arm,size=0xa4) addr:0x0208046c
_ZN7MapBase19FindViewpoint_Unk_4EcP15CameraViewpoint kind:function(arm,size=0xc0) addr:0x02080510
_ZN7MapBase19FindViewpoint_Unk_0EiP15CameraViewpoint kind:function(arm,size=0xb8) addr:0x020805d0
_ZN7MapBase19GetCurrentViewpointEP15CameraViewpointi kind:function(arm,size=0xf8) addr:0x02080688
_ZN7MapBase26GetCurrentViewpoint_Unk_00Ei kind:function(arm,size=0x54) addr:0x02080780
_ZN7MapBase8vfunc_b8Ev kind:function(arm,size=0x50) addr:0x020807d4
_ZN7MapBase8vfunc_b8Ei kind:function(arm,size=0x50) addr:0x020807d4
_ZN7MapBase18func_ov00_02080824EjPc kind:function(arm,size=0xac) addr:0x02080824
_ZN7MapBase10AddUnk_130Ei kind:function(arm,size=0xe8) addr:0x020808d0
_ZN7MapBase18func_ov00_020809b8Ei kind:function(arm,size=0xc0) addr:0x020809b8
_ZN7MapBase10AddUnk_130EP11TriggerBase kind:function(arm,size=0xe8) addr:0x020808d0
_ZN7MapBase18func_ov00_020809b8EP11TriggerBase kind:function(arm,size=0xc0) addr:0x020809b8
_ZN7MapBase18func_ov00_02080a78EP5Vec3p kind:function(arm,size=0x58) addr:0x02080a78
_ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_ kind:function(arm,size=0x54) addr:0x02080ad0
_ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_S2_ kind:function(arm,size=0x54) addr:0x02080ad0
_ZN7MapBase18func_ov00_02080b24EP7TilePos kind:function(arm,size=0x1e4) addr:0x02080b24
_ZN7MapBase18func_ov00_02080d08EP7TilePos kind:function(arm,size=0x6c) addr:0x02080d08
_ZN7MapBase8vfunc_bcEv kind:function(arm,size=0x4) addr:0x02080d74
_ZN7MapBase8vfunc_98Eiii kind:function(arm,size=0x4) addr:0x02080d78
_ZN7MapBase8vfunc_98EP7TilePosii kind:function(arm,size=0x4) addr:0x02080d78
_ZN7MapBase8vfunc_c0Ev kind:function(arm,size=0x4) addr:0x02080d7c
_ZN7MapBase22TriggerOfType_vfunc_10Ei kind:function(arm,size=0x5c) addr:0x02080d80
_ZN11TriggerBase8vfunc_10Ev kind:function(arm,size=0x8) addr:0x02080ddc
@@ -515,15 +515,15 @@ _ZN10MapManager16MapData_vfunc_b0Eii kind:function(arm,size=0x18) addr:0x0208263
_ZN10MapManager18func_ov00_02082650Eiii kind:function(arm,size=0x10) addr:0x02082650
_ZN10MapManager18func_ov00_02082660Eii kind:function(arm,size=0x10) addr:0x02082660
_ZN10MapManager18func_ov00_02082670Eii kind:function(arm,size=0x10) addr:0x02082670
_ZN10MapManager18func_ov00_02082680Eii kind:function(arm,size=0x20) addr:0x02082680
_ZN10MapManager18func_ov00_020826a0Eii kind:function(arm,size=0x20) addr:0x020826a0
_ZN10MapManager18func_ov00_02082680EP7TilePosi kind:function(arm,size=0x20) addr:0x02082680
_ZN10MapManager18func_ov00_020826a0EP7TilePosi kind:function(arm,size=0x20) addr:0x020826a0
_ZN10MapManager9CreateMapEiii kind:function(arm,size=0x100) addr:0x020826c0
_ZN10MapManager10DestroyMapEv kind:function(arm,size=0x30) addr:0x020827c0
_ZN10MapManager16MapData_vfunc_44Ev kind:function(arm,size=0x18) addr:0x020827f0
_ZN10MapManager18func_ov00_02082808Eb kind:function(arm,size=0xb8) addr:0x02082808
_ZN10MapManager16MapData_vfunc_7cEiPiiPs kind:function(arm,size=0x20) addr:0x020828c0
_ZN10MapManager16MapData_vfunc_84Ei kind:function(arm,size=0x18) addr:0x020828e0
_ZN10MapManager18func_ov00_020828f8EPi kind:function(arm,size=0x10) addr:0x020828f8
_ZN10MapManager16MapData_vfunc_84EP18UnkStruct_0207f38c kind:function(arm,size=0x18) addr:0x020828e0
_ZN10MapManager18func_ov00_020828f8EP18UnkStruct_0207f38c kind:function(arm,size=0x10) addr:0x020828f8
_ZN10MapManager10GetNumMapsEv kind:function(arm,size=0xc) addr:0x02082908
_ZN10MapManager18func_ov00_02082914Ei kind:function(arm,size=0x1b8) addr:0x02082914
_ZN10MapManager18func_ov00_02082accEv kind:function(arm,size=0x10) addr:0x02082acc
@@ -585,8 +585,8 @@ _ZN10MapManager23IsTriggerTypeOverlappedEjP5Vec3p kind:function(arm,size=0x10) a
_ZN10MapManager21GetOverlappingTriggerEP5Vec3p kind:function(arm,size=0x10) addr:0x02083780
_ZN10MapManager18func_ov00_02083790Ei kind:function(arm,size=0xb0) addr:0x02083790
_ZN10MapManager18func_ov00_02083840Ei kind:function(arm,size=0x88) addr:0x02083840
_ZN10MapManager10AddTriggerEi kind:function(arm,size=0x10) addr:0x020838c8
_ZN10MapManager18func_ov00_020838d8Ei kind:function(arm,size=0x10) addr:0x020838d8
_ZN10MapManager10AddTriggerEP11TriggerBase kind:function(arm,size=0x10) addr:0x020838c8
_ZN10MapManager18func_ov00_020838d8EP11TriggerBase kind:function(arm,size=0x10) addr:0x020838d8
_ZN10MapManager8FindExitEjP4Exit kind:function(arm,size=0x10) addr:0x020838e8
_ZN10MapManager18func_ov00_020838f8EP4Exit kind:function(arm,size=0x10) addr:0x020838f8
_ZN10MapManager18func_ov00_02083908EcP15CameraViewpoint kind:function(arm,size=0x10) addr:0x02083908
@@ -597,8 +597,8 @@ _ZN10MapManager21SetCurrentViewpointIdEci kind:function(arm,size=0x10) addr:0x02
_ZN10MapManager18func_ov00_02083958Ei kind:function(arm,size=0x10) addr:0x02083958
_ZN10MapManager18func_ov00_02083968EjPc kind:function(arm,size=0x10) addr:0x02083968
_ZN10MapManager18func_ov00_02083978EP5Vec3pS1_ kind:function(arm,size=0x3c) addr:0x02083978
_ZN10MapManager18func_ov00_020839b4Ei kind:function(arm,size=0x10) addr:0x020839b4
_ZN10MapManager18func_ov00_020839c4Ei kind:function(arm,size=0x10) addr:0x020839c4
_ZN10MapManager18func_ov00_020839b4EP11TriggerBase kind:function(arm,size=0x10) addr:0x020839b4
_ZN10MapManager18func_ov00_020839c4EP11TriggerBase kind:function(arm,size=0x10) addr:0x020839c4
_ZN10MapManager18func_ov00_020839d4Ei kind:function(arm,size=0x24) addr:0x020839d4
_ZN10MapManager18func_ov00_020839f8Ei kind:function(arm,size=0x24) addr:0x020839f8
_ZN10MapManager18func_ov00_02083a1cEP5Vec3p kind:function(arm,size=0x38) addr:0x02083a1c
@@ -629,7 +629,7 @@ _ZN10MapManager18func_ov00_02084100EPiPS_ kind:function(arm,size=0x14) addr:0x02
_ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x02084114
_ZN10MapManager17GetMapData_Unk_4cEv kind:function(arm,size=0xc) addr:0x02084120
_ZN10MapManager18func_ov00_0208412cEv kind:function(arm,size=0x10) addr:0x0208412c
_ZN10MapManager18func_ov00_0208413cEi kind:function(arm,size=0x10) addr:0x0208413c
_ZN10MapManager18func_ov00_0208413cEPi kind:function(arm,size=0x10) addr:0x0208413c
_ZN10MapManager16MapData_vfunc_58EP7TilePosi kind:function(arm,size=0x18) addr:0x0208414c
_ZN10MapManager18func_ov00_02084164EP7TilePos kind:function(arm,size=0x1a8) addr:0x02084164
_ZN10MapManager17GetMapData_Unk_0aEv kind:function(arm,size=0xc) addr:0x0208430c
@@ -711,7 +711,7 @@ func_ov000_02087b78 kind:function(arm,size=0x1bc) addr:0x02087b78
func_ov000_02087d34 kind:function(arm,size=0x50) addr:0x02087d34
func_ov000_02087d84 kind:function(arm,size=0x14) addr:0x02087d84
func_ov000_02087d98 kind:function(arm,size=0x40) addr:0x02087d98
func_ov000_02087dd8 kind:function(arm,size=0x20) addr:0x02087dd8
_Z19func_ov000_02087dd8Pv kind:function(arm,size=0x20) addr:0x02087dd8
func_ov000_02087df8 kind:function(arm,size=0x1c) addr:0x02087df8
func_ov000_02087e14 kind:function(arm,size=0x78) addr:0x02087e14
func_ov000_02087e8c kind:function(arm,size=0x64) addr:0x02087e8c
@@ -881,7 +881,7 @@ func_ov000_0208d5e0 kind:function(arm,size=0x40) addr:0x0208d5e0
_ZN18UnkStruct_027e0f6819func_ov000_0208d620Ev kind:function(arm,size=0x60) addr:0x0208d620
_ZN18UnkStruct_027e0f6819func_ov000_0208d680Ev kind:function(arm,size=0x60) addr:0x0208d680
func_ov000_0208d6e0 kind:function(arm,size=0x140) addr:0x0208d6e0
func_ov000_0208d820 kind:function(arm,size=0x110) addr:0x0208d820
_ZN18UnkStruct_027e0f6819func_ov000_0208d820EPv kind:function(arm,size=0x110) addr:0x0208d820
func_ov000_0208d930 kind:function(arm,size=0xb0) addr:0x0208d930
func_ov000_0208d9e0 kind:function(arm,size=0x64) addr:0x0208d9e0
func_ov000_0208da44 kind:function(arm,size=0x98) addr:0x0208da44
@@ -1412,35 +1412,35 @@ func_ov000_0209bf80 kind:function(arm,size=0x44) addr:0x0209bf80
func_ov000_0209bfc4 kind:function(arm,size=0x1c) addr:0x0209bfc4
func_ov000_0209bfe0 kind:function(arm,size=0x7c) addr:0x0209bfe0
func_ov000_0209c05c kind:function(arm,size=0x30) addr:0x0209c05c
func_ov000_0209c08c kind:function(arm,size=0x1c) addr:0x0209c08c
_ZN15MapBase_Unk_14419func_ov000_0209c08cEii kind:function(arm,size=0x1c) addr:0x0209c08c
func_ov000_0209c0a8 kind:function(arm,size=0x13c) addr:0x0209c0a8
func_ov000_0209c1e4 kind:function(arm,size=0xd0) addr:0x0209c1e4
func_ov000_0209c2b4 kind:function(arm,size=0x1c) addr:0x0209c2b4
func_ov000_0209c2d0 kind:function(arm,size=0x1a4) addr:0x0209c2d0
_ZN15MapBase_Unk_14419func_ov000_0209c1e4Eiii kind:function(arm,size=0xd0) addr:0x0209c1e4
_ZN15MapBase_Unk_14419func_ov000_0209c2b4Eii kind:function(arm,size=0x1c) addr:0x0209c2b4
_ZN15MapBase_Unk_14419func_ov000_0209c2d0Eii kind:function(arm,size=0x1a4) addr:0x0209c2d0
func_ov000_0209c474 kind:function(arm,size=0xbc) addr:0x0209c474
func_ov000_0209c530 kind:function(arm,size=0x8) addr:0x0209c530
_ZN15Mapbase_Unk_14419func_ov000_0209c530Ev kind:function(arm,size=0x8) addr:0x0209c530
func_ov000_0209c538 kind:function(arm,size=0xe4) addr:0x0209c538
func_ov000_0209c61c kind:function(arm,size=0x2c) addr:0x0209c61c
_ZN15MapBase_Unk_14419func_ov000_0209c61cEv kind:function(arm,size=0x2c) addr:0x0209c61c
func_ov000_0209c648 kind:function(arm,size=0x140) addr:0x0209c648
func_ov000_0209c788 kind:function(arm,size=0x15c) addr:0x0209c788
func_ov000_0209c8e4 kind:function(arm,size=0x10) addr:0x0209c8e4
_ZN15Mapbase_Unk_14419func_ov000_0209c788Ev kind:function(arm,size=0x15c) addr:0x0209c788
_ZN15MapBase_Unk_14419func_ov000_0209c8e4Ei kind:function(arm,size=0x10) addr:0x0209c8e4
func_ov000_0209c8f4 kind:function(arm,size=0x64) addr:0x0209c8f4
func_ov000_0209c958 kind:function(arm,size=0x100) addr:0x0209c958
func_ov000_0209ca58 kind:function(arm,size=0x28) addr:0x0209ca58
func_ov000_0209ca80 kind:function(arm,size=0x154) addr:0x0209ca80
func_ov000_0209cbd4 kind:function(arm,size=0x5c) addr:0x0209cbd4
func_ov000_0209cc30 kind:function(arm,size=0xc) addr:0x0209cc30
func_ov000_0209cc3c kind:function(arm,size=0xc) addr:0x0209cc3c
func_ov000_0209cc48 kind:function(arm,size=0xa0) addr:0x0209cc48
_ZN18UnkStruct_027e0f7819func_ov000_0209cc3cEis kind:function(arm,size=0xc) addr:0x0209cc3c
_ZN18UnkStruct_027e0f7819func_ov000_0209cc48Ev kind:function(arm,size=0xa0) addr:0x0209cc48
func_ov000_0209cce8 kind:function(arm,size=0x4) addr:0x0209cce8
func_ov000_0209ccec kind:function(arm,size=0x28) addr:0x0209ccec
func_ov000_0209cd14 kind:function(arm,size=0x2c) addr:0x0209cd14
func_ov000_0209cd40 kind:function(arm,size=0x40) addr:0x0209cd40
func_ov000_0209cd80 kind:function(arm,size=0x1c) addr:0x0209cd80
func_ov000_0209cd9c kind:function(arm,size=0x20) addr:0x0209cd9c
_ZN18UnkStruct_020ee0a019func_ov000_0209cd80Es kind:function(arm,size=0x1c) addr:0x0209cd80
_ZN18UnkStruct_020ee0a019func_ov000_0209cd9cEsi kind:function(arm,size=0x20) addr:0x0209cd9c
func_ov000_0209cdbc kind:function(arm,size=0x20) addr:0x0209cdbc
func_ov000_0209cddc kind:function(arm,size=0x1c) addr:0x0209cddc
func_ov000_0209cdf8 kind:function(arm,size=0x1c) addr:0x0209cdf8
_ZN18UnkStruct_020ee0a019func_ov000_0209cddcEi kind:function(arm,size=0x1c) addr:0x0209cddc
_ZN18UnkStruct_020ee0a019func_ov000_0209cdf8Ei kind:function(arm,size=0x1c) addr:0x0209cdf8
func_ov000_0209ce14 kind:function(arm,size=0x64) addr:0x0209ce14
func_ov000_0209ce78 kind:function(arm,size=0xec) addr:0x0209ce78
func_ov000_0209cf64 kind:function(arm,size=0x140) addr:0x0209cf64
@@ -1642,7 +1642,7 @@ func_ov000_020a1988 kind:function(arm,size=0x28) addr:0x020a1988
func_ov000_020a19b0 kind:function(arm,size=0x18) addr:0x020a19b0
func_ov000_020a19c8 kind:function(arm,size=0x34) addr:0x020a19c8
func_ov000_020a19fc kind:function(arm,size=0x10) addr:0x020a19fc
func_ov000_020a1a0c kind:function(arm,size=0x18) addr:0x020a1a0c
_ZN18UnkStruct_027e0f8819func_ov000_020a1a0cEis kind:function(arm,size=0x18) addr:0x020a1a0c
func_ov000_020a1a24 kind:function(arm,size=0x18) addr:0x020a1a24
_ZN18UnkStruct_027e0f8819func_ov000_020a1a3cEv kind:function(arm,size=0x80) addr:0x020a1a3c
func_ov000_020a1abc kind:function(arm,size=0x68) addr:0x020a1abc
@@ -1713,7 +1713,7 @@ func_ov000_020a3d58 kind:function(arm,size=0x48) addr:0x020a3d58
func_ov000_020a3da0 kind:function(arm,size=0x28) addr:0x020a3da0
func_ov000_020a3dc8 kind:function(arm,size=0x8) addr:0x020a3dc8
func_ov000_020a3dd0 kind:function(arm,size=0x10) addr:0x020a3dd0
func_ov000_020a3de0 kind:function(arm,size=0x34) addr:0x020a3de0
_Z19func_ov000_020a3de0bi kind:function(arm,size=0x34) addr:0x020a3de0
func_ov000_020a3e14 kind:function(arm,size=0x8c) addr:0x020a3e14
func_ov000_020a3ea0 kind:function(arm,size=0x50) addr:0x020a3ea0
func_ov000_020a3ef0 kind:function(arm,size=0x64) addr:0x020a3ef0
config/usa/arm9/overlays/ov000/symbols.txt
+44 -44
View File
@@ -134,7 +134,7 @@ _ZN12GameModePlay8vfunc_20Ev kind:function(thumb,size=0x2) addr:0x02079d78
func_ov000_02079ddc kind:function(thumb,size=0x14) addr:0x02079d7c
func_ov000_02079df0 kind:function(thumb,size=0x14) addr:0x02079d90
func_ov000_02079e04 kind:function(arm,size=0x38) addr:0x02079da4
func_ov000_02079e3c kind:function(arm,size=0x2c) addr:0x02079ddc
_Z19func_ov000_02079e3cv kind:function(arm,size=0x2c) addr:0x02079ddc
_ZN18UnkStruct_020e936019func_ov000_02079e68Ei kind:function(arm,size=0x4c) addr:0x02079e08
func_ov000_02079eb4 kind:function(arm,size=0x24) addr:0x02079e54
func_ov000_02079ed8 kind:function(thumb,size=0x22) addr:0x02079e78
@@ -321,9 +321,9 @@ _ZN7MapBaseD1Ev kind:function(arm,size=0xe0) addr:0x0207d9d8
_ZN15MapBase_Unk_180D1Ev kind:function(arm,size=0x4) addr:0x0207dab8
_ZN7MapBaseD0Ev kind:function(arm,size=0xe8) addr:0x0207dabc
_ZN7MapBaseD2Ev kind:function(arm,size=0xe0) addr:0x0207dba4
_ZN7MapBase9SetBoundsEii kind:function(arm,size=0xb8) addr:0x0207dc84
_ZN7MapBase9SetBoundsEiP6Course kind:function(arm,size=0xb8) addr:0x0207dc84
_ZN15MapManager_Unk2D1Ev kind:function(arm,size=0x4) addr:0x0207dd3c
_ZN7MapBase14GetMapFilePathEPcii kind:function(arm,size=0x54) addr:0x0207dd40
_ZN7MapBase14GetMapFilePathEPciS0_ kind:function(arm,size=0x54) addr:0x0207dd40
_ZN7MapBase8vfunc_18Ev kind:function(arm,size=0x4) addr:0x0207dd94
_ZN7MapBase18func_ov00_0207ddf8Eb kind:function(arm,size=0x70) addr:0x0207dd98
_ZN7MapBase18func_ov00_0207de68Ei kind:function(arm,size=0x20) addr:0x0207de08
@@ -345,7 +345,7 @@ _ZN7MapBase8vfunc_68EP5Vec3pb kind:function(arm,size=0x488) addr:0x0207e458
_ZN7MapBase18func_ov00_0207e940EPc kind:function(arm,size=0x28) addr:0x0207e8e0
_ZN7MapBase18func_ov00_0207e968Ev kind:function(arm,size=0x4) addr:0x0207e908
_ZN7MapBase18func_ov00_0207e96cEv kind:function(arm,size=0x4) addr:0x0207e90c
_ZN7MapBase8vfunc_6cEiii kind:function(arm,size=0x4a4) addr:0x0207e910
_ZN7MapBase8vfunc_6cEP5Vec3pPiS1_ kind:function(arm,size=0x4a4) addr:0x0207e910
_ZN7MapBase8vfunc_70EP5Vec3p kind:function(arm,size=0x1e0) addr:0x0207edb4
_ZN7MapBase8vfunc_74EP5Vec3p kind:function(arm,size=0x10c) addr:0x0207ef94
_ZN7MapBase18func_ov00_0207f100Ev kind:function(arm,size=0x4) addr:0x0207f0a0
@@ -360,9 +360,9 @@ _ZN7MapBase8vfunc_a8Ev kind:function(arm,size=0x4) addr:0x0207f2e4
_ZN7MapBase8vfunc_acEv kind:function(arm,size=0x4) addr:0x0207f2e8
_ZN7MapBase8vfunc_78EP7TilePos kind:function(arm,size=0x8) addr:0x0207f2ec
_ZN7MapBase8vfunc_7cEiPiiPs kind:function(arm,size=0x8) addr:0x0207f2f4
_ZN7MapBase8vfunc_80Ev kind:function(arm,size=0x8) addr:0x0207f2fc
_ZN7MapBase8vfunc_84Ei kind:function(arm,size=0x28) addr:0x0207f304
_ZN7MapBase18func_ov00_0207f38cEPi kind:function(arm,size=0x38) addr:0x0207f32c
_ZN7MapBase8vfunc_80EP7TilePos kind:function(arm,size=0x8) addr:0x0207f2fc
_ZN7MapBase8vfunc_84EP18UnkStruct_0207f38c kind:function(arm,size=0x28) addr:0x0207f304
_ZN7MapBase18func_ov00_0207f38cEP18UnkStruct_0207f38c kind:function(arm,size=0x38) addr:0x0207f32c
_ZN7MapBase8vfunc_90EP7TilePosi kind:function(arm,size=0xdc) addr:0x0207f364
_ZN7MapBase8vfunc_94Ev kind:function(arm,size=0x4) addr:0x0207f440
_ZN7MapBase18func_ov00_0207f4a4EP5Vec2si kind:function(arm,size=0x98) addr:0x0207f444
@@ -383,7 +383,7 @@ _ZN7MapBase11AddEntranceEP8Entrance kind:function(arm,size=0x7c) addr:0x0207f7e4
_ZN7MapBase12FindEntranceEi kind:function(arm,size=0x64) addr:0x0207f860
_ZN7MapBase18func_ov00_0207f924Ei kind:function(arm,size=0x10) addr:0x0207f8c4
_ZN7MapBase18func_ov00_0207f934Ev kind:function(arm,size=0x14) addr:0x0207f8d4
_ZN7MapBase18func_ov00_0207f948Ei kind:function(arm,size=0x10) addr:0x0207f8e8
_ZN7MapBase18func_ov00_0207f948EPi kind:function(arm,size=0x10) addr:0x0207f8e8
_ZN7MapBase10AddTriggerEP13TriggerParams kind:function(arm,size=0x150) addr:0x0207f8f8
_ZN11TriggerBase8vfunc_08Ev kind:function(arm,size=0x4) addr:0x0207fa48
_ZN7MapBase21GetTriggerBoundingBoxEiP4AABB kind:function(arm,size=0xb0) addr:0x0207fa4c
@@ -395,33 +395,33 @@ _ZN7MapBase11FindTriggerEi kind:function(arm,size=0x48) addr:0x0207fc38
_ZN7MapBase22GetOverlappingTriggersEP5Vec3pPP11TriggerBasei kind:function(arm,size=0x78) addr:0x0207fc80
_ZN7MapBase23IsTriggerTypeOverlappedEiP5Vec3p kind:function(arm,size=0x78) addr:0x0207fcf8
_ZN7MapBase18AnyTrigger_func_0cEi kind:function(arm,size=0x64) addr:0x0207fd70
_ZN11TriggerBase8vfunc_0cEv kind:function(arm,size=0x8) addr:0x0207fdd4
_ZN11TriggerBase8vfunc_0cEb kind:function(arm,size=0x8) addr:0x0207fdd4
_ZN7MapBase16Trigger_vfunc_08Ev kind:function(arm,size=0x44) addr:0x0207fddc
_ZN7MapBase10AddTriggerEi kind:function(arm,size=0x108) addr:0x0207fe20
_ZN7MapBase18func_ov00_0207ff88Ei kind:function(arm,size=0xd4) addr:0x0207ff28
_ZN7MapBase10AddTriggerEP11TriggerBase kind:function(arm,size=0x108) addr:0x0207fe20
_ZN7MapBase18func_ov00_0207ff88EP11TriggerBase kind:function(arm,size=0xd4) addr:0x0207ff28
_ZN7MapBase18func_ov00_0208005cEiii kind:function(arm,size=0x10) addr:0x0207fffc
_ZN7MapBase18func_ov00_0208006cEii kind:function(arm,size=0x10) addr:0x0208000c
_ZN7MapBase18func_ov00_0208007cEii kind:function(arm,size=0x10) addr:0x0208001c
_ZN7MapBase18func_ov00_0208008cEj kind:function(arm,size=0x10) addr:0x0208002c
_ZN7MapBase7AddExitEP4Exit kind:function(arm,size=0xa4) addr:0x0208003c
_ZN7MapBase18func_ov00_02080140EP4Exit kind:function(arm,size=0x1e4) addr:0x020800e0
_ZN12MapBase_Unk118func_ov00_02080324Eiii kind:function(arm,size=0x78) addr:0x020802c4
_ZN12MapBase_Unk118func_ov00_02080324EP23UnkStruct_027e0d38_UnkCS1_S1_ kind:function(arm,size=0x78) addr:0x020802c4
_ZN7MapBase8FindExitEjP4Exit kind:function(arm,size=0xd0) addr:0x0208033c
_ZN7MapBase18AddCameraViewpointEP15CameraViewpoint kind:function(arm,size=0xa4) addr:0x0208040c
_ZN7MapBase19FindViewpoint_Unk_4EcP15CameraViewpoint kind:function(arm,size=0xc0) addr:0x020804b0
_ZN7MapBase19FindViewpoint_Unk_0EiP15CameraViewpoint kind:function(arm,size=0xb8) addr:0x02080570
_ZN7MapBase19GetCurrentViewpointEP15CameraViewpointi kind:function(arm,size=0xf8) addr:0x02080628
_ZN7MapBase26GetCurrentViewpoint_Unk_00Ei kind:function(arm,size=0x54) addr:0x02080720
_ZN7MapBase8vfunc_b8Ev kind:function(arm,size=0x50) addr:0x02080774
_ZN7MapBase8vfunc_b8Ei kind:function(arm,size=0x50) addr:0x02080774
_ZN7MapBase18func_ov00_02080824EjPc kind:function(arm,size=0xac) addr:0x020807c4
_ZN7MapBase10AddUnk_130Ei kind:function(arm,size=0xe8) addr:0x02080870
_ZN7MapBase18func_ov00_020809b8Ei kind:function(arm,size=0xc0) addr:0x02080958
_ZN7MapBase10AddUnk_130EP11TriggerBase kind:function(arm,size=0xe8) addr:0x02080870
_ZN7MapBase18func_ov00_020809b8EP11TriggerBase kind:function(arm,size=0xc0) addr:0x02080958
_ZN7MapBase18func_ov00_02080a78EP5Vec3p kind:function(arm,size=0x58) addr:0x02080a18
_ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_ kind:function(arm,size=0x54) addr:0x02080a70
_ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_S2_ kind:function(arm,size=0x54) addr:0x02080a70
_ZN7MapBase18func_ov00_02080b24EP7TilePos kind:function(arm,size=0x1e4) addr:0x02080ac4
_ZN7MapBase18func_ov00_02080d08EP7TilePos kind:function(arm,size=0x6c) addr:0x02080ca8
_ZN7MapBase8vfunc_bcEv kind:function(arm,size=0x4) addr:0x02080d14
_ZN7MapBase8vfunc_98Eiii kind:function(arm,size=0x4) addr:0x02080d18
_ZN7MapBase8vfunc_98EP7TilePosii kind:function(arm,size=0x4) addr:0x02080d18
_ZN7MapBase8vfunc_c0Ev kind:function(arm,size=0x4) addr:0x02080d1c
_ZN7MapBase22TriggerOfType_vfunc_10Ei kind:function(arm,size=0x5c) addr:0x02080d20
_ZN11TriggerBase8vfunc_10Ev kind:function(arm,size=0x8) addr:0x02080d7c
@@ -515,15 +515,15 @@ _ZN10MapManager16MapData_vfunc_b0Eii kind:function(arm,size=0x18) addr:0x020825d
_ZN10MapManager18func_ov00_02082650Eiii kind:function(arm,size=0x10) addr:0x020825f0
_ZN10MapManager18func_ov00_02082660Eii kind:function(arm,size=0x10) addr:0x02082600
_ZN10MapManager18func_ov00_02082670Eii kind:function(arm,size=0x10) addr:0x02082610
_ZN10MapManager18func_ov00_02082680Eii kind:function(arm,size=0x20) addr:0x02082620
_ZN10MapManager18func_ov00_020826a0Eii kind:function(arm,size=0x20) addr:0x02082640
_ZN10MapManager18func_ov00_02082680EP7TilePosi kind:function(arm,size=0x20) addr:0x02082620
_ZN10MapManager18func_ov00_020826a0EP7TilePosi kind:function(arm,size=0x20) addr:0x02082640
_ZN10MapManager9CreateMapEiii kind:function(arm,size=0x100) addr:0x02082660
_ZN10MapManager10DestroyMapEv kind:function(arm,size=0x30) addr:0x02082760
_ZN10MapManager16MapData_vfunc_44Ev kind:function(arm,size=0x18) addr:0x02082790
_ZN10MapManager18func_ov00_02082808Eb kind:function(arm,size=0xb8) addr:0x020827a8
_ZN10MapManager16MapData_vfunc_7cEiPiiPs kind:function(arm,size=0x20) addr:0x02082860
_ZN10MapManager16MapData_vfunc_84Ei kind:function(arm,size=0x18) addr:0x02082880
_ZN10MapManager18func_ov00_020828f8EPi kind:function(arm,size=0x10) addr:0x02082898
_ZN10MapManager16MapData_vfunc_84EP18UnkStruct_0207f38c kind:function(arm,size=0x18) addr:0x02082880
_ZN10MapManager18func_ov00_020828f8EP18UnkStruct_0207f38c kind:function(arm,size=0x10) addr:0x02082898
_ZN10MapManager10GetNumMapsEv kind:function(arm,size=0xc) addr:0x020828a8
_ZN10MapManager18func_ov00_02082914Ei kind:function(arm,size=0x1b8) addr:0x020828b4
_ZN10MapManager18func_ov00_02082accEv kind:function(arm,size=0x10) addr:0x02082a6c
@@ -585,8 +585,8 @@ _ZN10MapManager23IsTriggerTypeOverlappedEjP5Vec3p kind:function(arm,size=0x10) a
_ZN10MapManager21GetOverlappingTriggerEP5Vec3p kind:function(arm,size=0x10) addr:0x02083720
_ZN10MapManager18func_ov00_02083790Ei kind:function(arm,size=0xb0) addr:0x02083730
_ZN10MapManager18func_ov00_02083840Ei kind:function(arm,size=0x88) addr:0x020837e0
_ZN10MapManager10AddTriggerEi kind:function(arm,size=0x10) addr:0x02083868
_ZN10MapManager18func_ov00_020838d8Ei kind:function(arm,size=0x10) addr:0x02083878
_ZN10MapManager10AddTriggerEP11TriggerBase kind:function(arm,size=0x10) addr:0x02083868
_ZN10MapManager18func_ov00_020838d8EP11TriggerBase kind:function(arm,size=0x10) addr:0x02083878
_ZN10MapManager8FindExitEjP4Exit kind:function(arm,size=0x10) addr:0x02083888
_ZN10MapManager18func_ov00_020838f8EP4Exit kind:function(arm,size=0x10) addr:0x02083898
_ZN10MapManager18func_ov00_02083908EcP15CameraViewpoint kind:function(arm,size=0x10) addr:0x020838a8
@@ -597,8 +597,8 @@ _ZN10MapManager21SetCurrentViewpointIdEci kind:function(arm,size=0x10) addr:0x02
_ZN10MapManager18func_ov00_02083958Ei kind:function(arm,size=0x10) addr:0x020838f8
_ZN10MapManager18func_ov00_02083968EjPc kind:function(arm,size=0x10) addr:0x02083908
_ZN10MapManager18func_ov00_02083978EP5Vec3pS1_ kind:function(arm,size=0x3c) addr:0x02083918
_ZN10MapManager18func_ov00_020839b4Ei kind:function(arm,size=0x10) addr:0x02083954
_ZN10MapManager18func_ov00_020839c4Ei kind:function(arm,size=0x10) addr:0x02083964
_ZN10MapManager18func_ov00_020839b4EP11TriggerBase kind:function(arm,size=0x10) addr:0x02083954
_ZN10MapManager18func_ov00_020839c4EP11TriggerBase kind:function(arm,size=0x10) addr:0x02083964
_ZN10MapManager18func_ov00_020839d4Ei kind:function(arm,size=0x24) addr:0x02083974
_ZN10MapManager18func_ov00_020839f8Ei kind:function(arm,size=0x24) addr:0x02083998
_ZN10MapManager18func_ov00_02083a1cEP5Vec3p kind:function(arm,size=0x38) addr:0x020839bc
@@ -629,7 +629,7 @@ _ZN10MapManager18func_ov00_02084100EPiPS_ kind:function(arm,size=0x14) addr:0x02
_ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x020840b4
_ZN10MapManager17GetMapData_Unk_4cEv kind:function(arm,size=0xc) addr:0x020840c0
_ZN10MapManager18func_ov00_0208412cEv kind:function(arm,size=0x10) addr:0x020840cc
_ZN10MapManager18func_ov00_0208413cEi kind:function(arm,size=0x10) addr:0x020840dc
_ZN10MapManager18func_ov00_0208413cEPi kind:function(arm,size=0x10) addr:0x020840dc
_ZN10MapManager16MapData_vfunc_58EP7TilePosi kind:function(arm,size=0x18) addr:0x020840ec
_ZN10MapManager18func_ov00_02084164EP7TilePos kind:function(arm,size=0x1a8) addr:0x02084104
_ZN10MapManager17GetMapData_Unk_0aEv kind:function(arm,size=0xc) addr:0x020842ac
@@ -711,7 +711,7 @@ func_ov000_02087b78 kind:function(arm,size=0x1bc) addr:0x02087b18
func_ov000_02087d34 kind:function(arm,size=0x50) addr:0x02087cd4
func_ov000_02087d84 kind:function(arm,size=0x14) addr:0x02087d24
func_ov000_02087d98 kind:function(arm,size=0x40) addr:0x02087d38
func_ov000_02087dd8 kind:function(arm,size=0x20) addr:0x02087d78
_Z19func_ov000_02087dd8Pv kind:function(arm,size=0x20) addr:0x02087d78
func_ov000_02087df8 kind:function(arm,size=0x1c) addr:0x02087d98
func_ov000_02087e14 kind:function(arm,size=0x78) addr:0x02087db4
func_ov000_02087e8c kind:function(arm,size=0x64) addr:0x02087e2c
@@ -881,7 +881,7 @@ func_ov000_0208d5e0 kind:function(arm,size=0x40) addr:0x0208d580
_ZN18UnkStruct_027e0f6819func_ov000_0208d620Ev kind:function(arm,size=0x60) addr:0x0208d5c0
_ZN18UnkStruct_027e0f6819func_ov000_0208d680Ev kind:function(arm,size=0x60) addr:0x0208d620
func_ov000_0208d6e0 kind:function(arm,size=0x140) addr:0x0208d680
func_ov000_0208d820 kind:function(arm,size=0x110) addr:0x0208d7c0
_ZN18UnkStruct_027e0f6819func_ov000_0208d820EPv kind:function(arm,size=0x110) addr:0x0208d7c0
func_ov000_0208d930 kind:function(arm,size=0xb0) addr:0x0208d8d0
func_ov000_0208d9e0 kind:function(arm,size=0x64) addr:0x0208d980
func_ov000_0208da44 kind:function(arm,size=0x98) addr:0x0208d9e4
@@ -1412,35 +1412,35 @@ func_ov000_0209bf80 kind:function(arm,size=0x44) addr:0x0209bf20
func_ov000_0209bfc4 kind:function(arm,size=0x1c) addr:0x0209bf64
func_ov000_0209bfe0 kind:function(arm,size=0x7c) addr:0x0209bf80
func_ov000_0209c05c kind:function(arm,size=0x30) addr:0x0209bffc
func_ov000_0209c08c kind:function(arm,size=0x1c) addr:0x0209c02c
_ZN15MapBase_Unk_14419func_ov000_0209c08cEii kind:function(arm,size=0x1c) addr:0x0209c02c
func_ov000_0209c0a8 kind:function(arm,size=0x13c) addr:0x0209c048
func_ov000_0209c1e4 kind:function(arm,size=0xd0) addr:0x0209c184
func_ov000_0209c2b4 kind:function(arm,size=0x1c) addr:0x0209c254
func_ov000_0209c2d0 kind:function(arm,size=0x1a4) addr:0x0209c270
_ZN15MapBase_Unk_14419func_ov000_0209c1e4Eiii kind:function(arm,size=0xd0) addr:0x0209c184
_ZN15MapBase_Unk_14419func_ov000_0209c2b4Eii kind:function(arm,size=0x1c) addr:0x0209c254
_ZN15MapBase_Unk_14419func_ov000_0209c2d0Eii kind:function(arm,size=0x1a4) addr:0x0209c270
func_ov000_0209c474 kind:function(arm,size=0xbc) addr:0x0209c414
func_ov000_0209c530 kind:function(arm,size=0x8) addr:0x0209c4d0
_ZN15Mapbase_Unk_14419func_ov000_0209c530Ev kind:function(arm,size=0x8) addr:0x0209c4d0
func_ov000_0209c538 kind:function(arm,size=0xe4) addr:0x0209c4d8
func_ov000_0209c61c kind:function(arm,size=0x2c) addr:0x0209c5bc
_ZN15MapBase_Unk_14419func_ov000_0209c61cEv kind:function(arm,size=0x2c) addr:0x0209c5bc
func_ov000_0209c648 kind:function(arm,size=0x140) addr:0x0209c5e8
func_ov000_0209c788 kind:function(arm,size=0x15c) addr:0x0209c728
func_ov000_0209c8e4 kind:function(arm,size=0x10) addr:0x0209c884
_ZN15Mapbase_Unk_14419func_ov000_0209c788Ev kind:function(arm,size=0x15c) addr:0x0209c728
_ZN15MapBase_Unk_14419func_ov000_0209c8e4Ei kind:function(arm,size=0x10) addr:0x0209c884
func_ov000_0209c8f4 kind:function(arm,size=0x64) addr:0x0209c894
func_ov000_0209c958 kind:function(arm,size=0x100) addr:0x0209c8f8
func_ov000_0209ca58 kind:function(arm,size=0x28) addr:0x0209c9f8
func_ov000_0209ca80 kind:function(arm,size=0x154) addr:0x0209ca20
func_ov000_0209cbd4 kind:function(arm,size=0x5c) addr:0x0209cb74
func_ov000_0209cc30 kind:function(arm,size=0xc) addr:0x0209cbd0
func_ov000_0209cc3c kind:function(arm,size=0xc) addr:0x0209cbdc
func_ov000_0209cc48 kind:function(arm,size=0xa0) addr:0x0209cbe8
_ZN18UnkStruct_027e0f7819func_ov000_0209cc3cEis kind:function(arm,size=0xc) addr:0x0209cbdc
_ZN18UnkStruct_027e0f7819func_ov000_0209cc48Ev kind:function(arm,size=0xa0) addr:0x0209cbe8
func_ov000_0209cce8 kind:function(arm,size=0x4) addr:0x0209cc88
func_ov000_0209ccec kind:function(arm,size=0x28) addr:0x0209cc8c
func_ov000_0209cd14 kind:function(arm,size=0x2c) addr:0x0209ccb4
func_ov000_0209cd40 kind:function(arm,size=0x40) addr:0x0209cce0
func_ov000_0209cd80 kind:function(arm,size=0x1c) addr:0x0209cd20
func_ov000_0209cd9c kind:function(arm,size=0x20) addr:0x0209cd3c
_ZN18UnkStruct_020ee0a019func_ov000_0209cd80Es kind:function(arm,size=0x1c) addr:0x0209cd20
_ZN18UnkStruct_020ee0a019func_ov000_0209cd9cEsi kind:function(arm,size=0x20) addr:0x0209cd3c
func_ov000_0209cdbc kind:function(arm,size=0x20) addr:0x0209cd5c
func_ov000_0209cddc kind:function(arm,size=0x1c) addr:0x0209cd7c
func_ov000_0209cdf8 kind:function(arm,size=0x1c) addr:0x0209cd98
_ZN18UnkStruct_020ee0a019func_ov000_0209cddcEi kind:function(arm,size=0x1c) addr:0x0209cd7c
_ZN18UnkStruct_020ee0a019func_ov000_0209cdf8Ei kind:function(arm,size=0x1c) addr:0x0209cd98
func_ov000_0209ce14 kind:function(arm,size=0x64) addr:0x0209cdb4
func_ov000_0209ce78 kind:function(arm,size=0xec) addr:0x0209ce18
func_ov000_0209cf64 kind:function(arm,size=0x140) addr:0x0209cf04
@@ -1642,7 +1642,7 @@ func_ov000_020a1988 kind:function(arm,size=0x28) addr:0x020a1928
func_ov000_020a19b0 kind:function(arm,size=0x18) addr:0x020a1950
func_ov000_020a19c8 kind:function(arm,size=0x34) addr:0x020a1968
func_ov000_020a19fc kind:function(arm,size=0x10) addr:0x020a199c
func_ov000_020a1a0c kind:function(arm,size=0x18) addr:0x020a19ac
_ZN18UnkStruct_027e0f8819func_ov000_020a1a0cEis kind:function(arm,size=0x18) addr:0x020a19ac
func_ov000_020a1a24 kind:function(arm,size=0x18) addr:0x020a19c4
_ZN18UnkStruct_027e0f8819func_ov000_020a1a3cEv kind:function(arm,size=0x80) addr:0x020a19dc
func_ov000_020a1abc kind:function(arm,size=0x68) addr:0x020a1a5c
@@ -1713,7 +1713,7 @@ func_ov000_020a3d58 kind:function(arm,size=0x48) addr:0x020a3cf8
func_ov000_020a3da0 kind:function(arm,size=0x28) addr:0x020a3d40
func_ov000_020a3dc8 kind:function(arm,size=0x8) addr:0x020a3d68
func_ov000_020a3dd0 kind:function(arm,size=0x10) addr:0x020a3d70
func_ov000_020a3de0 kind:function(arm,size=0x34) addr:0x020a3d80
_Z19func_ov000_020a3de0bi kind:function(arm,size=0x34) addr:0x020a3d80
func_ov000_020a3e14 kind:function(arm,size=0x8c) addr:0x020a3db4
func_ov000_020a3ea0 kind:function(arm,size=0x50) addr:0x020a3e40
func_ov000_020a3ef0 kind:function(arm,size=0x64) addr:0x020a3e90
include/DTCM/UnkStruct_027e0e58.hpp
+3
View File
@@ -4,6 +4,9 @@
#include "types.h"
struct UnkStruct_027e0e58 {
/* 00 */ unk8 mUnk_00[0x22];
/* 22 */ unk16 mUnk_22;
void func_ov000_0207c5d4(unk32 param1, bool param2);
void func_ov000_0207c1b0(unk32 param1, Vec3p *param2, unk32 param3, unk32 param4, unk32 param5);
};
include/DTCM/UnkStruct_027e0f68.hpp
+15
View File
@@ -0,0 +1,15 @@
#pragma once
#include "global.h"
#include "types.h"
class UnkStruct_027e0f68 {
public:
void func_ov000_0208cc88();
void func_ov000_0208d620();
void func_ov000_0208d680();
bool func_ov000_0208d820(void *param_1);
void func_ov004_02102b28();
};
extern UnkStruct_027e0f68 *data_027e0f68;
include/DTCM/UnkStruct_027e0f78.hpp
+2
View File
@@ -12,6 +12,8 @@ struct UnkStruct_027e0f78 {
/* 20 */
void func_ov004_02102e3c();
void func_ov000_0209cc3c(unk32 param_1, unk16 param_2);
void func_ov000_0209cc48();
};
extern UnkStruct_027e0f78 *data_027e0f78;
include/Map/CameraViewpoint.hpp
+9 -3
View File
@@ -8,12 +8,18 @@
#include "System/SysNew.hpp"
class CameraViewpoint : public SysObject {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk8 mUnk_04;
/* 05 */ unk8 mUnk_05[3];
/* 04 */ u8 mUnk_04;
/* 08 */ Vec3p mPos;
/* 14 */ unk16 mUnk_14;
/* 16 */ unk16 mUnk_16;
/* 18 */ unk16 mUnk_18[2];
/* 18 */ u16 mUnk_18[2];
/* 1c */
inline CameraViewpoint() :
mUnk_00(0),
mUnk_04(0xff),
mUnk_14(0),
mUnk_16(0) {}
};
include/Map/Exit.hpp
+5 -4
View File
@@ -6,15 +6,16 @@
#include "System/SysNew.hpp"
class Exit : public SysObject {
public:
/* 00 */ unk32 mDestCourse;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0c */ unk32 mUnk_0c;
/* 10 */ unk16 mUnk_10;
/* 12 */ unk8 mDestMap;
/* 13 */ unk8 mDestEntrance;
/* 14 */ unk8 mUnk_14;
/* 15 */ unk8 mUnk_15;
/* 12 */ u8 mDestMap;
/* 13 */ u8 mDestEntrance;
/* 14 */ u8 mUnk_14;
/* 15 */ u8 mUnk_15;
/* 16 */ unk8 mUnk_16;
/* 17 */ unk8 mUnk_17;
/* 18 */
include/Map/MapBase.hpp
+96 -52
View File
@@ -7,6 +7,7 @@
#include "nds/math.h"
#include "DTCM/UnkStruct_027e0d38.hpp"
#include "Map/CameraViewpoint.hpp"
#include "Map/Course.hpp"
#include "Map/Entrance.hpp"
@@ -20,6 +21,36 @@
#define MAX_VIEWPOINTS 8
#define MAX_MAP_UNK_130 0x20
struct MapBase_Unk_13c {
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0c */
};
struct MapBase_Unk_140 {
/* 00 */ unk8 mUnk_00[0x5c];
/* 5c */ unk8 mUnk_5c;
/* 5d */ unk8 mUnk_5d[3];
/* 60 */ unk32 *mUnk_60;
/* 64 */
};
struct MapBase_Unk_144 {
/* 00 */ unk8 mUnk_00[0xc];
/* 0c */ unk32 mUnk_0c;
/* 10 */
unk32 *func_ov000_0209c08c(unk32 param_2, unk32 param_3);
void func_ov000_0209c61c(void);
unk32 *func_ov000_0209c530(void);
void func_ov000_0209c788(void);
void func_ov000_0209c8e4(unk32 param_2);
void func_ov000_0209c1e4(unk32 param_2, unk32 param_3, unk32 param_4);
void func_ov000_0209c2b4(unk32 param_2, unk32 param_3);
void func_ov000_0209c2d0(unk32 param_2, unk32 param_3);
};
struct MapBase_Unk_180 {
/* 0 */ unk32 mUnk_0;
/* 4 */
@@ -29,20 +60,33 @@ struct MapBase_Unk_180 {
};
struct MapBase_Unk1 {
/* 00 */ s32 mUnk_00;
/* 00 */ unk32 *mUnk_00;
/* 04 */ Exit mExit_04;
/* 1c */ Exit mExit_1c;
/* 34 */
void func_ov00_02080324(s32 param_2, s32 param_3, s32 param_4);
void func_ov00_02080324(void *param_2, void *param_3, void *param_4);
};
struct MapBase_Unk2_02080ad0 {
TriggerBase **mUnk_00;
TriggerBase **mUnk_04;
};
struct MapBase_Unk2 {
/* 00 */ TriggerBase **mTrigger;
/* 04 */ Vec3p mVec;
/* 10 */
/* 00 */ TriggerBase **ppTVar1;
/* 04 */ TriggerBase **ppTVar2;
/* 08 */ TriggerBase **mTrigger;
/* 10 */ Vec3p mVec;
/* 14 */
/* 20 */
void func_ov00_02080ad0(TriggerBase **param_2, TriggerBase **param_3);
void func_ov00_02080ad0(MapBase_Unk2_02080ad0 param_2, TriggerBase **param_3);
};
struct UnkStruct_0207f38c {
/* 00 */ unk8 mUnk_00[0x14];
/* 14 */ TilePos mUnk_14;
};
class MapBase : public SysObject {
@@ -67,7 +111,7 @@ public:
/* 014 */ unk8 mUnk_014;
/* 015 */ unk8 mUnk_015;
/* 016 */ unk8 mCurrViewpointId[2];
/* 018 */ unk8 mUnk_018[2];
/* 018 */ u8 mUnk_018[2];
/* 01a */ unk8 mUnk_01a;
/* 01b */ unk8 mUnk_01b;
/* 01c */ unk8 mUnk_01c;
@@ -80,7 +124,7 @@ public:
/* 02a */ s16 mHeight;
/* 02c */ unk16 mUnk_02c;
/* 02e */ unk16 mUnk_02e;
/* 030 */ s16 mUnk_030;
/* 030 */ u16 mUnk_030;
/* 032 */ unk8 mUnk_032[2];
/* 034 */ unk32 mUnk_034;
/* 038 */ unk32 mUnk_038;
@@ -92,17 +136,17 @@ public:
/* 050 */ unk8 mUnk_050[0x80];
/* 0d0 */ Vec3p mCenter;
/* 0dc */ AABB mBounds;
/* 0f4 */ Vec3p mUnk_0f4;
/* 0f4 */ Vec3p mOffset;
/* 100 */ std::vector<Entrance> mEntrances;
/* 10c */ std::vector<TriggerBase *> mTriggers;
/* 118 */ std::vector<Exit> mExits;
/* 124 */ std::vector<CameraViewpoint> mViewpoints;
/* 130 */ std::vector<TriggerBase *> mUnk_130;
/* 13c */ unk32 mUnk_13c;
/* 140 */ unk32 mUnk_140;
/* 144 */ void *mUnk_144;
/* 13c */ MapBase_Unk_13c *mUnk_13c;
/* 140 */ MapBase_Unk_140 *mUnk_140;
/* 144 */ MapBase_Unk_144 *mUnk_144;
/* 148 */ s32 mUnk_148;
/* 14c */ s32 mUnk_14c;
/* 14c */ unk32 mUnk_14c;
/* 150 */ unk32 mUnk_150;
/* 154 */ unk32 mUnk_154;
/* 158 */ unk8 mUnk_158[8];
@@ -141,32 +185,32 @@ public:
/* 60 */ virtual unk32 vfunc_60(TilePos *param_1);
/* 64 */ virtual unk32 vfunc_64();
/* 68 */ virtual unk32 vfunc_68(Vec3p *param_1, bool param_2);
/* 6c */ virtual unk8 vfunc_6c(Vec3p *param_2, unk32 *param_3, Vec3p *param_4);
/* 6c */ virtual void vfunc_6c(Vec3p *param_2, unk32 *param_3, Vec3p *param_4);
/* 70 */ virtual u16 vfunc_70(Vec3p *param_2);
/* 74 */ virtual unk32 *vfunc_74(Vec3p *param_2);
/* 78 */ virtual unk32 *vfunc_78(TilePos *param_1);
/* 7c */ virtual s32 vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]);
/* 80 */ virtual unk32 vfunc_80();
/* 84 */ virtual void vfunc_84(unk32 param_2);
/* 80 */ virtual bool vfunc_80(TilePos *param_2);
/* 84 */ virtual bool vfunc_84(UnkStruct_0207f38c *param_2);
/* 88 */ virtual unk32 vfunc_88();
/* 8c */ virtual unk32 vfunc_8c();
/* 90 */ virtual unk8 vfunc_90(TilePos *param_2, unk32 param_3);
/* 90 */ virtual void vfunc_90(TilePos *param_2, unk32 param_3);
/* 94 */ virtual void vfunc_94();
/* 98 */ virtual void vfunc_98(unk32 param_2, unk32 param_3, unk32 param_4);
/* 98 */ virtual void vfunc_98(TilePos *param_2, unk32 param_3, unk32 param_4);
/* 9c */ virtual void vfunc_9c();
/* a0 */ virtual void vfunc_a0();
/* a4 */ virtual unk32 vfunc_a4(unk8 *param_1);
/* a8 */ virtual void vfunc_a8();
/* ac */ virtual void vfunc_ac();
/* b0 */ virtual void vfunc_b0(unk32 param_2, unk32 param_3);
/* b4 */ virtual void vfunc_b4();
/* b8 */ virtual unk32 vfunc_b8();
/* b4 */ virtual unk32 *vfunc_b4();
/* b8 */ virtual unk32 vfunc_b8(unk32 param_2);
/* 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 SetBounds(unk32 map, Course *course);
void GetMapFilePath(char *courseName, unk32 num1, char *buf);
void func_ov00_0207ddf8(bool param_2);
void func_ov00_0207de68(unk32 param_2);
void func_ov00_0207de88();
@@ -174,64 +218,64 @@ public:
bool func_ov00_0207e08c(s32 *param_2, s32 param_3);
s32 func_ov00_0207e0f0(s32 param_2);
s32 func_ov00_0207e28c(s32 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);
static unk8 *func_ov00_0207e940(unk8 *param_1);
static void func_ov00_0207e968();
static void func_ov00_0207e96c();
static void func_ov00_0207f100();
bool func_ov00_0207f104(Vec3p *param_2, unk32 *param_3);
unk32 func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3);
bool func_ov00_0207f38c(s32 *param_2);
bool func_ov00_0207f38c(UnkStruct_0207f38c *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, TilePos *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);
unk32 GetTileStartX(unk32 x);
unk32 GetTileStartZ(unk32 z);
unk32 GetTileEndX(unk32 x);
unk32 GetTileEndZ(unk32 z);
void GetTileBounds(TilePos *tilePos, AABB *bounds);
s32 GetClampedTileX(s32 worldX);
s32 GetClampedTileY(s32 worldZ);
unk8 GetTileX(s32 worldX);
unk8 GetTileY(s32 worldZ);
unk32 GetTileX(s32 worldX);
unk32 GetTileY(s32 worldZ);
bool IsInBounds(Vec3p *tileWorldPos);
s32 AddEntrance(Entrance *param_2);
unk32 AddEntrance(Entrance *param_2);
Entrance *FindEntrance(unk32 id);
void func_ov00_0207f924(s32 param_2);
unk8 func_ov00_0207f934();
unk8 func_ov00_0207f948(unk32 param_2);
void func_ov00_0207f924(unk32 param_2);
unk32 *func_ov00_0207f934();
void func_ov00_0207f948(unk32 *param_2);
void AddTrigger(TriggerParams *param_2);
s32 GetTriggerBoundingBox(s32 param_2, AABB *param_3);
s32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4);
unk8 GetOverlappingTrigger(Vec3p *param_2);
u32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4);
u8 GetOverlappingTrigger(Vec3p *param_2);
TriggerBase *FindTrigger(unk32 type);
unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity);
unk32 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(s32 param_2);
void Trigger_vfunc_08();
bool AddTrigger(TriggerBase *param_2);
bool func_ov00_0207ff88(TriggerBase *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);
char func_ov00_02080140(Exit *param_2);
void AddExit(Exit *param_2);
u8 func_ov00_02080140(Exit *param_2);
bool FindExit(u32 param_2, Exit *param_3);
unk8 AddCameraViewpoint(CameraViewpoint *param_2);
void AddCameraViewpoint(CameraViewpoint *param_2);
bool FindViewpoint_Unk_4(unk8 id, CameraViewpoint *param_3);
bool FindViewpoint_Unk_0(s32 param_2, CameraViewpoint *param_3);
void GetCurrentViewpoint(CameraViewpoint *param_2, s32 param_3);
unk32 GetCurrentViewpoint_Unk_00(s32 param_2);
bool func_ov00_02080824(u32 param_2, unk8 *param_3);
bool AddUnk_130(s32 param_2);
bool func_ov00_020809b8(s32 param_2);
unk8 func_ov00_02080a78(Vec3p *param_2);
unk8 func_ov00_02080b24(TilePos *param_2);
bool AddUnk_130(TriggerBase *param_2);
bool func_ov00_020809b8(TriggerBase *param_2);
TriggerBase *func_ov00_02080a78(Vec3p *param_2);
void func_ov00_02080b24(TilePos *param_2);
void func_ov00_02080d08(TilePos *param_2);
bool TriggerOfType_vfunc_10(unk32 type);
void func_ov00_02080de4();
unk8 func_ov00_02080de8(unk32 param_2);
void func_ov00_02080de8(unk32 param_2);
void func_ov00_02080edc();
MapBase(u32 param1, u32 param2);
include/Map/MapManager.hpp
+10 -10
View File
@@ -165,15 +165,15 @@ public:
void func_ov00_02082650(s32 param_2, s32 param_3, unk32 param_4);
void func_ov00_02082660(s32 param_2, s32 param_3);
void func_ov00_02082670(unk32 param_2, s32 param_3);
void func_ov00_02082680(unk32 param_2, unk32 param_3);
void func_ov00_020826a0(unk32 param_2, unk32 param_3);
void func_ov00_02082680(TilePos *param_2, unk32 param_3);
void func_ov00_020826a0(TilePos *param_2, unk32 param_3);
void CreateMap(unk32 mapType, unk32 param_3, unk32 param_4);
void DestroyMap();
void MapData_vfunc_44();
void func_ov00_02082808(bool param_2);
s32 MapData_vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]);
void MapData_vfunc_84(unk32 param_2);
bool func_ov00_020828f8(s32 *param_2);
void MapData_vfunc_84(UnkStruct_0207f38c *param_2);
bool func_ov00_020828f8(UnkStruct_0207f38c *param_2);
u8 GetNumMaps();
s32 func_ov00_02082914(unk32 param_2);
void func_ov00_02082acc();
@@ -235,8 +235,8 @@ public:
unk8 GetOverlappingTrigger(Vec3p *param_2);
bool func_ov00_02083790(s32 param_2);
bool func_ov00_02083840(s32 param_2);
bool AddTrigger(s32 param_2);
bool func_ov00_020838d8(s32 param_2);
bool AddTrigger(TriggerBase *param_2);
bool func_ov00_020838d8(TriggerBase *param_2);
bool FindExit(u32 param_2, Exit *param_3);
char func_ov00_020838f8(Exit *param_2);
bool func_ov00_02083908(char param_2, CameraViewpoint *param_3);
@@ -247,8 +247,8 @@ public:
void func_ov00_02083958(s32 param_2);
void func_ov00_02083968(u32 param_2, unk8 *param_3);
bool func_ov00_02083978(Vec3p *param_2, Vec3p *param_3);
bool func_ov00_020839b4(s32 param_2);
bool func_ov00_020839c4(s32 param_2);
bool func_ov00_020839b4(TriggerBase *param_2);
bool func_ov00_020839c4(TriggerBase *param_2);
s32 func_ov00_020839d4(s32 param_2);
s32 func_ov00_020839f8(s32 param_2);
TilePos func_ov00_02083a1c(Vec3p *param_3);
@@ -278,8 +278,8 @@ public:
static unk8 func_ov00_02084100(unk32 *param_1, MapManager *param_2);
unk32 GetMapData_Unk_48();
unk32 GetMapData_Unk_4c();
unk32 func_ov00_0208412c();
void func_ov00_0208413c(unk32 param_2);
unk32 *func_ov00_0208412c();
void func_ov00_0208413c(unk32 *param_2);
unk8 MapData_vfunc_58(TilePos *param_1, int param_2);
s32 func_ov00_02084164(TilePos *param_2);
u8 GetMapData_Unk_0a();
include/Map/TriggerBase.hpp
+8 -3
View File
@@ -23,10 +23,15 @@ struct TriggerParams {
/* b */
};
class TriggerBase : public SysObject {
class UnkStruct_TriggerBase : public SysObject {
public:
virtual unk32 vfunc_00(void *);
};
class TriggerBase : public UnkStruct_TriggerBase {
public:
/* 00 (vtable) */
/* 04 */ unk8 mUnk_04;
/* 04 */ bool mUnk_04;
/* 05 */ u8 mId;
/* 06 */ unk8 mUnk_06[2];
/* 08 */ u32 mUnk_08;
@@ -36,7 +41,7 @@ public:
/* 00 */ virtual ~TriggerBase();
/* 08 */ virtual void vfunc_08();
/* 0c */ virtual unk32 vfunc_0c();
/* 0c */ virtual bool vfunc_0c(bool param_2);
/* 10 */ virtual unk32 vfunc_10();
/* 14 */ virtual bool Overlaps(Vec3p *point);
/* 18 */ virtual bool GetBoundingBox(AABB *bbox);
include/Map/TriggerSphere.hpp
+1
View File
@@ -7,6 +7,7 @@
#include "Physics/Sphere.hpp"
class TriggerSphere : public TriggerBase {
public:
/* 00 (base) */
/* 14 */ Sphere mSphere;
/* 24 */ s32 mHeight;
include/Unknown/UnkStruct_020ee0a0.hpp
+4
View File
@@ -25,6 +25,10 @@ public:
UnkStruct_020ee0a0();
void func_ov008_021135b8();
void func_ov000_0209cd80(unk16 param_2);
void func_ov000_0209cd9c(unk16 param_2, unk32 param_3);
void func_ov000_0209cddc(unk32 param_2);
void func_ov000_0209cdf8(unk32 param_2);
};
extern UnkStruct_020ee0a0 data_ov000_020ee0a0;
include/Unknown/UnkStruct_027e0f88.hpp
+1
View File
@@ -39,6 +39,7 @@ public:
static void func_ov008_02113678(u32 *param_1);
void func_ov008_021136c0();
void func_ov000_020a1a0c(unk32 param_1, unk16 param_2);
};
extern UnkStruct_027e0f88 *data_027e0f88;
libs/cpp/include/vector
+1 -1
View File
@@ -16,7 +16,7 @@ namespace std {
}
}
void push_back(T &value) {
int push_back(T &value) {
get_new_capacity(1);
append_back(1, &value);
}
src/00_Core/Map/MapBase.cpp
+2246 -107
View File
File diff suppressed because it is too large Load Diff
src/00_Core/Map/MapManager.cpp
+16 -22
View File
@@ -10,6 +10,7 @@
#include "DTCM/UnkStruct_027e0c68.hpp"
#include "DTCM/UnkStruct_027e0d38.hpp"
#include "DTCM/UnkStruct_027e0f64.hpp"
#include "DTCM/UnkStruct_027e0f68.hpp"
#include "DTCM/UnkStruct_027e0f6c.hpp"
#include "DTCM/UnkStruct_027e0f78.hpp"
#include "DTCM/UnkStruct_027e0fd4.hpp"
@@ -122,13 +123,6 @@ public:
virtual unk32 vfunc_3c(unk32 param_2);
};
struct UnkStruct_027e0f68 {
void func_ov000_0208cc88();
void func_ov000_0208d620();
void func_ov000_0208d680();
void func_ov004_02102b28();
};
extern u32 *data_027e0ce0[];
extern UnkStruct_0202e894 *data_027e0ce4;
extern unk32 *data_027e0d3c;
@@ -404,11 +398,11 @@ ARM void MapManager::func_ov00_02082670(unk32 param_2, s32 param_3) {
this->mMap->func_ov00_0208006c(param_2, param_3);
}
ARM void MapManager::func_ov00_02082680(unk32 param_2, unk32 param_3) {
ARM void MapManager::func_ov00_02082680(TilePos *param_2, unk32 param_3) {
this->mMap->vfunc_98(param_2, 5, param_3);
}
ARM void MapManager::func_ov00_020826a0(unk32 param_2, unk32 param_3) {
ARM void MapManager::func_ov00_020826a0(TilePos *param_2, unk32 param_3) {
this->mMap->vfunc_98(param_2, 7, param_3);
}
@@ -478,11 +472,11 @@ ARM s32 MapManager::MapData_vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, s
return this->mMap->vfunc_7c(param_1, param_2, param_3, param_4);
}
ARM void MapManager::MapData_vfunc_84(unk32 param_2) {
ARM void MapManager::MapData_vfunc_84(UnkStruct_0207f38c *param_2) {
this->mMap->vfunc_84(param_2);
}
ARM bool MapManager::func_ov00_020828f8(s32 *param_2) {
ARM bool MapManager::func_ov00_020828f8(UnkStruct_0207f38c *param_2) {
return this->mMap->func_ov00_0207f38c(param_2);
}
@@ -1056,11 +1050,11 @@ ARM bool MapManager::func_ov00_02083840(s32 param_2) {
return this->mMap->TriggerOfType_vfunc_10(param_2);
}
ARM bool MapManager::AddTrigger(s32 param_2) {
ARM bool MapManager::AddTrigger(TriggerBase *param_2) {
return this->mMap->AddTrigger(param_2);
}
ARM bool MapManager::func_ov00_020838d8(s32 param_2) {
ARM bool MapManager::func_ov00_020838d8(TriggerBase *param_2) {
return this->mMap->func_ov00_0207ff88(param_2);
}
@@ -1101,21 +1095,21 @@ ARM void MapManager::func_ov00_02083968(u32 param_2, unk8 *param_3) {
}
ARM bool MapManager::func_ov00_02083978(Vec3p *param_2, Vec3p *param_3) {
s32 iVar1 = this->mMap->func_ov00_02080a78(param_2);
TriggerBase *iVar1 = this->mMap->func_ov00_02080a78(param_2);
if (iVar1 != 0) {
param_3->x = *(s32 *) (iVar1 + 0x8);
param_3->y = *(s32 *) (iVar1 + 0xc);
param_3->z = *(s32 *) (iVar1 + 0x10);
param_3->x = iVar1->mUnk_08;
param_3->y = iVar1->mUnk_0c;
param_3->z = iVar1->mUnk_10;
return true;
}
return false;
}
ARM bool MapManager::func_ov00_020839b4(s32 param_2) {
ARM bool MapManager::func_ov00_020839b4(TriggerBase *param_2) {
return this->mMap->AddUnk_130(param_2);
}
ARM bool MapManager::func_ov00_020839c4(s32 param_2) {
ARM bool MapManager::func_ov00_020839c4(TriggerBase *param_2) {
return this->mMap->func_ov00_020809b8(param_2);
}
@@ -1345,11 +1339,11 @@ unk32 MapManager::GetMapData_Unk_4c() {
return this->mMap->mUnk_04c;
}
unk32 MapManager::func_ov00_0208412c() {
unk32 *MapManager::func_ov00_0208412c() {
return this->mMap->func_ov00_0207f934();
}
void MapManager::func_ov00_0208413c(unk32 param_2) {
void MapManager::func_ov00_0208413c(unk32 *param_2) {
this->mMap->func_ov00_0207f948(param_2);
}
@@ -2458,7 +2452,7 @@ s32 MapManager::func_ov00_02085a34(Vec3p *param_2, s32 param_3) {
return -1;
}
piVar1->mUnk_04.x &= -2;
this->func_ov00_020828f8((s32 *) piVar1);
this->func_ov00_020828f8((UnkStruct_0207f38c *) piVar1);
}
this->mMap->func_ov00_02080b24(aVStack_28);
uStack_14 = 0xffff;