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

* 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

1 files changed, 44 insertions, 44 deletions

diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index dc608c31..18f31359 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -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