Merge branch 'decomp/MapManager' of github-aetias-hax:SammygoodTunes/ph into decomp/MapManager

8 files changed, 111 insertions, 111 deletions

diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index 237f2a65..037efe47 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -83,7 +83,7 @@ _ZN18UnkStruct_027e0d3819func_ov000_02078b40Ev kind:function(arm,size=0x24) addr
 _ZN18UnkStruct_027e0d3819func_ov000_02078b64Ev kind:function(arm,size=0x24) addr:0x2078b64
 _ZN18UnkStruct_027e0d3819func_ov000_02078b88Ev kind:function(arm,size=0x3c) addr:0x2078b88
 _Z19func_ov000_02078bc4i kind:function(thumb,size=0x2c) addr:0x2078bc4
-func_ov000_02078bf0 kind:function(thumb,size=0x11c) addr:0x2078bf0
+_Z19func_ov000_02078bf0PiS_ kind:function(thumb,size=0x11c) addr:0x2078bf0
 func_ov000_02078d0c kind:function(thumb,size=0x24) addr:0x2078d0c
 func_ov000_02078d30 kind:function(thumb,size=0x24) addr:0x2078d30
 func_ov000_02078d54 kind:function(thumb,size=0x3c) addr:0x2078d54
@@ -109,7 +109,7 @@ func_ov000_02079470 kind:function(arm,size=0x210) addr:0x2079470
 func_ov000_02079680 kind:function(arm,size=0xfc) addr:0x2079680
 func_ov000_0207977c kind:function(arm,size=0xfc) addr:0x207977c
 func_ov000_02079878 kind:function(arm,size=0x20) addr:0x2079878
-func_ov000_02079898 kind:function(arm,size=0x24) addr:0x2079898
+_Z19func_ov000_02079898Piii kind:function(arm,size=0x24) addr:0x2079898
 _Z19func_ov000_020798bcPii kind:function(arm,size=0x2c) addr:0x20798bc
 func_ov000_020798e8 kind:function(arm,size=0x40) addr:0x20798e8
 func_ov000_02079928 kind:function(arm,size=0x124) addr:0x2079928
@@ -283,7 +283,7 @@ _ZN6Course14GetMCSFilePathEiii kind:function(arm,size=0xf0) addr:0x207cc84
 _ZN6Course14GetMRCFilePathEiii kind:function(arm,size=0xac) addr:0x207cd74
 _ZN6Course18func_ov00_0207ce20EiiPci kind:function(arm,size=0x2c) addr:0x207ce20
 _ZN6Course18func_ov00_0207ce4cEiiiPci kind:function(arm,size=0x5b8) addr:0x207ce4c
-_ZN6Course18func_ov00_0207d404Eiii kind:function(arm,size=0x78) addr:0x207d404
+_ZN6Course18func_ov00_0207d404Eiiii kind:function(arm,size=0x78) addr:0x207d404
 _ZN6Course22IsCurrentMapInMainGridEv kind:function(arm,size=0x14) addr:0x207d47c
 _ZN6Course12IsInMainGridEii kind:function(arm,size=0x54) addr:0x207d490
 _ZN6Course15IsMapInMainGridEj kind:function(arm,size=0x34) addr:0x207d4e4
@@ -313,7 +313,7 @@ _ZN6Course15SetMapDataFlag2Eib kind:function(arm,size=0x20) addr:0x207d924
 _ZN6Course15GetMapDataFlag2Ei kind:function(arm,size=0x18) addr:0x207d944
 _ZN6Course15SetMapDataFlag3Eib kind:function(arm,size=0x20) addr:0x207d95c
 _ZN6Course15GetMapDataFlag3Ei kind:function(arm,size=0x18) addr:0x207d97c
-_ZN6Course15SetMapDataFlag4Eii kind:function(arm,size=0x20) addr:0x207d994
+_ZN6Course15SetMapDataFlag4Eib kind:function(arm,size=0x20) addr:0x207d994
 _ZN6Course15GetMapDataFlag4Ei kind:function(arm,size=0x18) addr:0x207d9b4
 _ZN6Course11FindMapDataEj kind:function(arm,size=0x48) addr:0x207d9cc
 _ZN6Course18FindCurrentMapDataEv kind:function(arm,size=0x24) addr:0x207da14
@@ -336,12 +336,12 @@ _ZN7MapBase18func_ov00_0207e28cEi kind:function(arm,size=0x1b8) addr:0x207e28c
 _ZN7MapBase8vfunc_b4Ev kind:function(arm,size=0x28) addr:0x207e444
 _ZN7MapBase8vfunc_48Ev kind:function(arm,size=0x1c) addr:0x207e46c
 _ZN7MapBase8vfunc_50Ev kind:function(arm,size=0x8) addr:0x207e488
-_ZN7MapBase8vfunc_54Ev kind:function(arm,size=0x8) addr:0x207e490
-_ZN7MapBase8vfunc_58Ev kind:function(arm,size=0x8) addr:0x207e498
+_ZN7MapBase8vfunc_54EP5Vec2b kind:function(arm,size=0x8) addr:0x207e490
+_ZN7MapBase8vfunc_58EP5Vec2bi kind:function(arm,size=0x8) addr:0x207e498
 _ZN7MapBase8vfunc_5cEv kind:function(arm,size=0x8) addr:0x207e4a0
-_ZN7MapBase8vfunc_60Ev kind:function(arm,size=0x8) addr:0x207e4a8
+_ZN7MapBase8vfunc_60EPh kind:function(arm,size=0x8) addr:0x207e4a8
 _ZN7MapBase8vfunc_64Ev kind:function(arm,size=0x8) addr:0x207e4b0
-_ZN7MapBase8vfunc_68Ev kind:function(arm,size=0x488) addr:0x207e4b8
+_ZN7MapBase8vfunc_68EP5Vec3pb kind:function(arm,size=0x488) addr:0x207e4b8
 _ZN7MapBase18func_ov00_0207e940EPc kind:function(arm,size=0x28) addr:0x207e940
 _ZN7MapBase18func_ov00_0207e968Ev kind:function(arm,size=0x4) addr:0x207e968
 _ZN7MapBase18func_ov00_0207e96cEv kind:function(arm,size=0x4) addr:0x207e96c
@@ -355,11 +355,11 @@ _ZN7MapBase8vfunc_88Ev kind:function(arm,size=0x8) addr:0x207f324
 _ZN7MapBase8vfunc_8cEv kind:function(arm,size=0x8) addr:0x207f32c
 _ZN7MapBase8vfunc_9cEv kind:function(arm,size=0x4) addr:0x207f334
 _ZN7MapBase8vfunc_a0Ev kind:function(arm,size=0x4) addr:0x207f338
-_ZN7MapBase8vfunc_a4Ev kind:function(arm,size=0x8) addr:0x207f33c
+_ZN7MapBase8vfunc_a4EPc kind:function(arm,size=0x8) addr:0x207f33c
 _ZN7MapBase8vfunc_a8Ev kind:function(arm,size=0x4) addr:0x207f344
 _ZN7MapBase8vfunc_acEv kind:function(arm,size=0x4) addr:0x207f348
-_ZN7MapBase8vfunc_78Ev kind:function(arm,size=0x8) addr:0x207f34c
-_ZN7MapBase8vfunc_7cEv kind:function(arm,size=0x8) addr:0x207f354
+_ZN7MapBase8vfunc_78EPb kind:function(arm,size=0x8) addr:0x207f34c
+_ZN7MapBase8vfunc_7cEiPiiPs kind:function(arm,size=0x8) addr:0x207f354
 _ZN7MapBase8vfunc_80Ev kind:function(arm,size=0x8) addr:0x207f35c
 _ZN7MapBase8vfunc_84Ei kind:function(arm,size=0x28) addr:0x207f364
 _ZN7MapBase18func_ov00_0207f38cEPi kind:function(arm,size=0x38) addr:0x207f38c
@@ -516,12 +516,12 @@ _ZN10MapManager18func_ov00_02082650Eiii kind:function(arm,size=0x10) addr:0x2082
 _ZN10MapManager18func_ov00_02082660Eii kind:function(arm,size=0x10) addr:0x2082660
 _ZN10MapManager18func_ov00_02082670Eii kind:function(arm,size=0x10) addr:0x2082670
 _ZN10MapManager18func_ov00_02082680Eii kind:function(arm,size=0x20) addr:0x2082680
-_ZN10MapManager18func_ov00_020826a0Eiii kind:function(arm,size=0x20) addr:0x20826a0
+_ZN10MapManager18func_ov00_020826a0Eii kind:function(arm,size=0x20) addr:0x20826a0
 _ZN10MapManager9CreateMapEiii kind:function(arm,size=0x100) addr:0x20826c0
 _ZN10MapManager10DestroyMapEv kind:function(arm,size=0x30) addr:0x20827c0
 _ZN10MapManager16MapData_vfunc_44Ev kind:function(arm,size=0x18) addr:0x20827f0
-_ZN10MapManager18func_ov00_02082808Ei kind:function(arm,size=0xb8) addr:0x2082808
-_ZN10MapManager16MapData_vfunc_7cEv kind:function(arm,size=0x20) addr:0x20828c0
+_ZN10MapManager18func_ov00_02082808Eb kind:function(arm,size=0xb8) addr:0x2082808
+_ZN10MapManager16MapData_vfunc_7cEiPiiPs kind:function(arm,size=0x20) addr:0x20828c0
 _ZN10MapManager16MapData_vfunc_84Ei kind:function(arm,size=0x18) addr:0x20828e0
 _ZN10MapManager18func_ov00_020828f8EPi kind:function(arm,size=0x10) addr:0x20828f8
 _ZN10MapManager10GetNumMapsEv kind:function(arm,size=0xc) addr:0x2082908
@@ -529,17 +529,17 @@ _ZN10MapManager18func_ov00_02082914Ei kind:function(arm,size=0x1b8) addr:0x20829
 _ZN10MapManager18func_ov00_02082accEv kind:function(arm,size=0x10) addr:0x2082acc
 _ZN10MapManager18func_ov00_02082adcEv kind:function(arm,size=0x18) addr:0x2082adc
 _ZN10MapManager18func_ov00_02082af4Ev kind:function(arm,size=0x48) addr:0x2082af4
-_ZN10MapManager18func_ov00_02082b3cEi kind:function(arm,size=0x1cc) addr:0x2082b3c
+_ZN10MapManager18func_ov00_02082b3cEPiP5Vec2b kind:function(arm,size=0x1cc) addr:0x2082b3c
 _ZN10MapManager18func_ov00_02082d08Ev kind:function(arm,size=0x20) addr:0x2082d08
 _ZN10MapManager17GetCurrentMapPosXEv kind:function(arm,size=0xc) addr:0x2082d28
 _ZN10MapManager17GetCurrentMapPosYEv kind:function(arm,size=0xc) addr:0x2082d34
 _ZN10MapManager18func_ov00_02082d40Ev kind:function(arm,size=0x34) addr:0x2082d40
 _ZN10MapManager18func_ov00_02082d74Ei kind:function(arm,size=0x10) addr:0x2082d74
-_ZN10MapManager18func_ov00_02082d84EPcPiS1_ kind:function(arm,size=0x98) addr:0x2082d84
+_ZN10MapManager18func_ov00_02082d84EP5Vec2bPiS2_ kind:function(arm,size=0x98) addr:0x2082d84
 _ZN10MapManager18func_ov00_02082e1cEPiS0_ kind:function(arm,size=0x250) addr:0x2082e1c
 _ZN10MapManager18func_ov00_0208306cEPiS0_ kind:function(arm,size=0xf0) addr:0x208306c
 _ZN10MapManager18func_ov00_0208315cEPiS0_ kind:function(arm,size=0xe8) addr:0x208315c
-_ZN10MapManager18func_ov00_02083244EjPiS0_S0_ kind:function(arm,size=0x54) addr:0x2083244
+_ZN10MapManager18func_ov00_02083244EjP5Vec3pPiS2_ kind:function(arm,size=0x54) addr:0x2083244
 _ZN10MapManager18func_ov00_02083298EjP5Vec3pPiS2_ kind:function(arm,size=0x74) addr:0x2083298
 _ZN10MapManager21GetCourseData_Unk_25cEv kind:function(arm,size=0xc) addr:0x208330c
 _ZN10MapManager15IsMapInMainGridEj kind:function(arm,size=0x10) addr:0x2083318
@@ -567,11 +567,11 @@ _ZN10MapManager18func_ov00_0208346cEP4AABB kind:function(arm,size=0x50) addr:0x2
 _ZN10MapManager18func_ov00_020834bcEP5Vec3pii kind:function(arm,size=0x68) addr:0x20834bc
 _ZN10MapManager18func_ov00_02083524EP5Vec3pii kind:function(arm,size=0x3c) addr:0x2083524
 _ZN10MapManager18func_ov00_02083560EP5Vec2bPS_j kind:function(arm,size=0x10) addr:0x2083560
-_ZN10MapManager18func_ov00_02083570Eii kind:function(arm,size=0x18) addr:0x2083570
+_ZN10MapManager18func_ov00_02083570Ehh kind:function(arm,size=0x18) addr:0x2083570
 _ZN10MapManager18func_ov00_02083588Ev kind:function(arm,size=0x1c) addr:0x2083588
 _ZN10MapManager18func_ov00_020835a4Ev kind:function(arm,size=0x10) addr:0x20835a4
 _ZN10MapManager18func_ov00_020835b4Ev kind:function(arm,size=0x10) addr:0x20835b4
-_ZN10MapManager18func_ov00_020835c4EPS_ii kind:function(arm,size=0x20) addr:0x20835c4
+_ZN10MapManager18func_ov00_020835c4Eii kind:function(arm,size=0x20) addr:0x20835c4
 _ZN10MapManager18func_ov00_020835e4EiPiPc kind:function(arm,size=0x10) addr:0x20835e4
 _ZN10MapManager18func_ov00_020835f4Ei kind:function(arm,size=0x10) addr:0x20835f4
 _ZN10MapManager18func_ov00_02083604Ei kind:function(arm,size=0x10) addr:0x2083604
@@ -610,13 +610,13 @@ _ZN10MapManager11GetTileEndZEi kind:function(arm,size=0x28) addr:0x2083bfc
 _ZN10MapManager18func_ov00_02083c24Ei kind:function(arm,size=0x2c) addr:0x2083c24
 _ZN10MapManager18func_ov00_02083c50Ei kind:function(arm,size=0x2c) addr:0x2083c50
 _ZN10MapManager18func_ov00_02083c7cEP5Vec3p5Vec2b kind:function(arm,size=0x6c) addr:0x2083c7c
-_ZN10MapManager18func_ov00_02083ce8EPS_Pijij kind:function(arm,size=0x14c) addr:0x2083ce8
+_ZN10MapManager18func_ov00_02083ce8EP5Vec3pjij kind:function(arm,size=0x14c) addr:0x2083ce8
 _ZN10MapManager18func_ov00_02083e34Ecci kind:function(arm,size=0x24) addr:0x2083e34
-_ZN10MapManager16MapData_vfunc_60EPh kind:function(arm,size=0x18) addr:0x2083e58
-_ZN10MapManager18func_ov00_02083e70Ev kind:function(arm,size=0x70) addr:0x2083e70
+_ZN10MapManager16MapData_vfunc_60EP5Vec2b kind:function(arm,size=0x18) addr:0x2083e58
+_ZN10MapManager18func_ov00_02083e70EP5Vec2b kind:function(arm,size=0x70) addr:0x2083e70
 _ZN10MapManager16MapData_vfunc_68EP5Vec3pb kind:function(arm,size=0x18) addr:0x2083ee0
-_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ kind:function(arm,size=0x4c) addr:0x2083ef8
-_ZN10MapManager18func_ov00_02083f44EP5Vec3p kind:function(arm,size=0x3c) addr:0x2083f44
+_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_b kind:function(arm,size=0x4c) addr:0x2083ef8
+_ZN10MapManager18func_ov00_02083f44EP5Vec3pb kind:function(arm,size=0x3c) addr:0x2083f44
 _ZN10MapManager16MapData_vfunc_6cEiii kind:function(arm,size=0x18) addr:0x2083f80
 _ZN10MapManager16MapData_vfunc_70EP5Vec3p kind:function(arm,size=0x18) addr:0x2083f98
 _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p kind:function(arm,size=0x74) addr:0x2083fb0
@@ -624,7 +624,7 @@ _ZN10MapManager18GetTileWorldBoundsEP5Vec2bP4AABB kind:function(arm,size=0x64) a
 _ZN10MapManager16MapData_vfunc_54EP5Vec2b kind:function(arm,size=0x18) addr:0x2084088
 _ZN10MapManager18func_ov00_020840a0Ecc kind:function(arm,size=0x24) addr:0x20840a0
 _ZN10MapManager16MapData_vfunc_78EP5Vec2b kind:function(arm,size=0x18) addr:0x20840c4
-_ZN10MapManager18func_ov00_020840dcEv kind:function(arm,size=0x24) addr:0x20840dc
+_ZN10MapManager18func_ov00_020840dcEP5Vec2b kind:function(arm,size=0x24) addr:0x20840dc
 _ZN10MapManager18func_ov00_02084100EPiPS_ kind:function(arm,size=0x14) addr:0x2084100
 _ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x2084114
 _ZN10MapManager17GetMapData_Unk_4cEv kind:function(arm,size=0xc) addr:0x2084120
@@ -635,19 +635,19 @@ _ZN10MapManager18func_ov00_02084164EP5Vec2b kind:function(arm,size=0x1a8) addr:0
 _ZN10MapManager17GetMapData_Unk_0aEv kind:function(arm,size=0xc) addr:0x208430c
 _ZN10MapManager17GetMapData_Unk_0bEv kind:function(arm,size=0xc) addr:0x2084318
 _ZN10MapManager16MapData_vfunc_a4EPc kind:function(arm,size=0x18) addr:0x2084324
-_ZN10MapManager18func_ov00_0208433cEP5Vec3pS1_ kind:function(arm,size=0x60) addr:0x208433c
+_ZN10MapManager18func_ov00_0208433cEP5Vec3pP5Vec2s kind:function(arm,size=0x60) addr:0x208433c
 _ZN10MapManager18func_ov00_0208439cEP5Vec2sP5Vec3p kind:function(arm,size=0x50) addr:0x208439c
 _ZN10MapManager18func_ov00_020843ecEPi kind:function(arm,size=0x2ac) addr:0x20843ec
 _ZN10MapManager17GetMapData_Unk_38Ev kind:function(arm,size=0xc) addr:0x2084698
 _ZN10MapManager18func_ov00_020846a4Ev kind:function(arm,size=0x5c) addr:0x20846a4
-_ZN10MapManager18func_ov00_02084700EPS_ kind:function(arm,size=0x40) addr:0x2084700
+_ZN10MapManager18func_ov00_02084700Ev kind:function(arm,size=0x40) addr:0x2084700
 _ZN10MapManager18func_ov00_02084740Ev kind:function(arm,size=0xa0) addr:0x2084740
 _ZN10MapManager18func_ov00_020847e0Ev kind:function(arm,size=0x10) addr:0x20847e0
-_ZN10MapManager18func_ov00_020847f0Ev kind:function(arm,size=0x48) addr:0x20847f0
+_ZN10MapManager18func_ov00_020847f0Ei kind:function(arm,size=0x48) addr:0x20847f0
 _ZN10MapManager18func_ov00_02084838Ev kind:function(arm,size=0x80) addr:0x2084838
 _ZN10MapManager18func_ov00_020848b8Ev kind:function(arm,size=0x6c) addr:0x20848b8
 _ZN10MapManager18func_ov00_02084924Ej kind:function(arm,size=0x10) addr:0x2084924
-_ZN10MapManager18func_ov00_02084934EPi kind:function(arm,size=0x50) addr:0x2084934
+_ZN10MapManager18func_ov00_02084934EP5Vec3p kind:function(arm,size=0x50) addr:0x2084934
 _ZN10MapManager17GetMapData_Unk_06Ev kind:function(arm,size=0xc) addr:0x2084984
 _ZN10MapManager17GetMapData_Unk_07Ev kind:function(arm,size=0xc) addr:0x2084990
 _ZN10MapManager18func_ov00_0208499cEv kind:function(arm,size=0x24) addr:0x208499c
@@ -661,24 +661,24 @@ _ZN10MapManager10SetNumKeysEi kind:function(arm,size=0xc) addr:0x2084b08
 _ZN10MapManager10GetNumKeysEv kind:function(arm,size=0xc) addr:0x2084b14
 _ZN10MapManager15SetBlueWarpOpenEb kind:function(arm,size=0xc) addr:0x2084b20
 _ZN10MapManager15GetBlueWarpOpenEv kind:function(arm,size=0xc) addr:0x2084b2c
-_ZN10MapManager18func_ov00_02084b38Eiii kind:function(arm,size=0xa8) addr:0x2084b38
+_ZN10MapManager18func_ov00_02084b38Ejib kind:function(arm,size=0xa8) addr:0x2084b38
 _ZN10MapManager18func_ov00_02084be0Eji kind:function(arm,size=0x7c) addr:0x2084be0
 _ZN10MapManager15SetMapDataFlag1Eib kind:function(arm,size=0x10) addr:0x2084c5c
 _ZN10MapManager15GetMapDataFlag1Ei kind:function(arm,size=0x10) addr:0x2084c6c
-_ZN10MapManager18func_ov00_02084c7cEi kind:function(arm,size=0x18) addr:0x2084c7c
+_ZN10MapManager18func_ov00_02084c7cEib kind:function(arm,size=0x18) addr:0x2084c7c
 _ZN10MapManager18func_ov00_02084c94Ei kind:function(arm,size=0x1c) addr:0x2084c94
-_ZN10MapManager18func_ov00_02084cb0Ei kind:function(arm,size=0x18) addr:0x2084cb0
+_ZN10MapManager18func_ov00_02084cb0Eib kind:function(arm,size=0x18) addr:0x2084cb0
 _ZN10MapManager18func_ov00_02084cc8Ei kind:function(arm,size=0x1c) addr:0x2084cc8
-_ZN10MapManager18func_ov00_02084ce4Ei kind:function(arm,size=0x18) addr:0x2084ce4
+_ZN10MapManager18func_ov00_02084ce4Eib kind:function(arm,size=0x18) addr:0x2084ce4
 _ZN10MapManager18func_ov00_02084cfcEi kind:function(arm,size=0x1c) addr:0x2084cfc
 _ZN10MapManager17GetMapData_Unk_09Ev kind:function(arm,size=0xc) addr:0x2084d18
-_ZN10MapManager18func_ov00_02084d24Ecci kind:function(arm,size=0x28) addr:0x2084d24
+_ZN10MapManager18func_ov00_02084d24Eccs kind:function(arm,size=0x28) addr:0x2084d24
 _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p kind:function(arm,size=0x170) addr:0x2084d4c
 _ZN10MapManager18func_ov00_02084ebcEP5Vec3p kind:function(arm,size=0x24c) addr:0x2084ebc
-_ZN10MapManager18func_ov00_02085108EPi kind:function(arm,size=0x174) addr:0x2085108
+_ZN10MapManager18func_ov00_02085108EP5Vec3p kind:function(arm,size=0x174) addr:0x2085108
 _ZN10MapManager18func_ov00_0208527cEPS_iPi kind:function(arm,size=0x180) addr:0x208527c
 _ZN10MapManager18func_ov00_020853fcEPS_P5Vec3pPi kind:function(arm,size=0x198) addr:0x20853fc
-_ZN10MapManager18func_ov00_02085594EPS_P5Vec3pii kind:function(arm,size=0x2a8) addr:0x2085594
+_ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0x2085594
 _ZN10MapManager18func_ov00_0208583cEPS_P5Vec3pi kind:function(arm,size=0x74) addr:0x208583c
 _ZN10MapManager18func_ov00_020858b0EPS_P5Vec3pi kind:function(arm,size=0x184) addr:0x20858b0
 _ZN10MapManager18func_ov00_02085a34EP5Vec3pi kind:function(arm,size=0x22c) addr:0x2085a34
@@ -779,7 +779,7 @@ func_ov000_0208aed8 kind:function(arm,size=0x244) addr:0x208aed8
 func_ov000_0208b11c kind:function(arm,size=0x20) addr:0x208b11c
 func_ov000_0208b13c kind:function(arm,size=0x1c) addr:0x208b13c
 func_ov000_0208b158 kind:function(arm,size=0x28) addr:0x208b158
-_Z19func_ov000_0208b180Pi kind:function(arm,size=0x28) addr:0x208b180
+_ZN18UnkStruct_027e0f6419func_ov000_0208b180Ev kind:function(arm,size=0x28) addr:0x208b180
 func_ov000_0208b1a8 kind:function(arm,size=0x28) addr:0x208b1a8
 func_ov000_0208b1d0 kind:function(arm,size=0x28) addr:0x208b1d0
 func_ov000_0208b1f8 kind:function(arm,size=0x28) addr:0x208b1f8
@@ -1091,7 +1091,7 @@ func_ov000_0209394c kind:function(arm,size=0xc) addr:0x209394c
 func_ov000_02093958 kind:function(arm,size=0x10) addr:0x2093958
 func_ov000_02093968 kind:function(arm,size=0x78) addr:0x2093968
 func_ov000_020939e0 kind:function(arm,size=0x3c) addr:0x20939e0
-_Z19func_ov000_02093a1cPjPi kind:function(arm,size=0x20) addr:0x2093a1c
+_Z19func_ov000_02093a1cPjPii kind:function(arm,size=0x20) addr:0x2093a1c
 func_ov000_02093a3c kind:function(arm,size=0x10) addr:0x2093a3c
 func_ov000_02093a4c kind:function(arm,size=0x10) addr:0x2093a4c
 func_ov000_02093a5c kind:function(arm,size=0x94) addr:0x2093a5c
@@ -1235,7 +1235,7 @@ func_ov000_02095fe0 kind:function(arm,size=0x180) addr:0x2095fe0
 func_ov000_02096160 kind:function(arm,size=0x98) addr:0x2096160
 func_ov000_020961f8 kind:function(arm,size=0x24) addr:0x20961f8
 func_ov000_0209621c kind:function(arm,size=0x108) addr:0x209621c
-_Z19func_ov000_02096324Pii kind:function(arm,size=0xf4) addr:0x2096324
+_Z19func_ov000_02096324PiS_ kind:function(arm,size=0xf4) addr:0x2096324
 _Z19func_ov000_02096418Pi kind:function(arm,size=0xb4) addr:0x2096418
 func_ov000_020964cc kind:function(arm,size=0xf4) addr:0x20964cc
 func_ov000_020965c0 kind:function(arm,size=0x1ec) addr:0x20965c0
@@ -1457,9 +1457,9 @@ func_ov000_0209d550 kind:function(arm,size=0x14) addr:0x209d550
 func_ov000_0209d564 kind:function(arm,size=0x16c) addr:0x209d564
 func_ov000_0209d6d0 kind:function(arm,size=0x4) addr:0x209d6d0
 func_ov000_0209d6d4 kind:function(arm,size=0x14) addr:0x209d6d4
-_Z19func_ov000_0209d6e8ii kind:function(arm,size=0x28) addr:0x209d6e8
+_Z19func_ov000_0209d6e8PiS_ kind:function(arm,size=0x28) addr:0x209d6e8
 func_ov000_0209d710 kind:function(arm,size=0xc) addr:0x209d710
-func_ov000_0209d71c kind:function(arm,size=0xc) addr:0x209d71c
+_Z19func_ov000_0209d71cPii kind:function(arm,size=0xc) addr:0x209d71c
 func_ov000_0209d728 kind:function(arm,size=0x10) addr:0x209d728
 func_ov000_0209d738 kind:function(arm,size=0x10) addr:0x209d738
 func_ov000_0209d748 kind:function(arm,size=0x10) addr:0x209d748
@@ -2833,7 +2833,7 @@ _ZN5Actor8vfunc_b0Ev kind:function(arm,size=0x4) addr:0x20c322c
 _ZN5Actor10GetLinkPosEP5Vec3p kind:function(arm,size=0x60) addr:0x20c3230
 _ZN5Actor15GetLinkDummyPosEP5Vec3p kind:function(arm,size=0x98) addr:0x20c3290
 _ZN19Actor_UnkStruct_09cC2Ev kind:function(arm,size=0x20) addr:0x20c3328
-func_ov000_020c3348 kind:function(arm,size=0x24) addr:0x20c3348
+_Z19func_ov000_020c3348P17ActorSpawnOptions kind:function(arm,size=0x24) addr:0x20c3348
 func_ov000_020c336c kind:function(thumb,size=0x1a) addr:0x20c336c
 func_ov000_020c3388 kind:function(thumb,size=0x28) addr:0x20c3388
 func_ov000_020c33b0 kind:function(thumb,size=0x24) addr:0x20c33b0
@@ -3588,19 +3588,19 @@ func_ov000_020d6c5c kind:function(arm,size=0xd4) addr:0x20d6c5c
 func_ov000_020d6d30 kind:function(arm,size=0xe4) addr:0x20d6d30
 func_ov000_020d6e14 kind:function(arm,size=0x2c) addr:0x20d6e14
 func_ov000_020d6e40 kind:function(arm,size=0x264) addr:0x20d6e40
-func_ov000_020d70a4 kind:function(arm,size=0xc8) addr:0x20d70a4
+_Z19func_ov000_020d70a4Piiii kind:function(arm,size=0xc8) addr:0x20d70a4
 func_ov000_020d716c kind:function(arm,size=0x14) addr:0x20d716c
 func_ov000_020d7180 kind:function(arm,size=0x20) addr:0x20d7180
 func_ov000_020d71a0 kind:function(arm,size=0xc8) addr:0x20d71a0
 func_ov000_020d7268 kind:function(arm,size=0xc) addr:0x20d7268
 func_ov000_020d7274 kind:function(arm,size=0x44) addr:0x20d7274
-func_ov000_020d72b8 kind:function(arm,size=0x70) addr:0x20d72b8
+_Z19func_ov000_020d72b8Pi kind:function(arm,size=0x70) addr:0x20d72b8
 func_ov000_020d7328 kind:function(arm,size=0x6c) addr:0x20d7328
 func_ov000_020d7394 kind:function(arm,size=0x28) addr:0x20d7394
 PlaySoundEffect kind:function(arm,size=0x34) addr:0x20d73bc
 func_ov000_020d73f0 kind:function(arm,size=0x14) addr:0x20d73f0
 func_ov000_020d7404 kind:function(arm,size=0x20) addr:0x20d7404
-func_ov000_020d7424 kind:function(arm,size=0xc) addr:0x20d7424
+_Z19func_ov000_020d7424Pi kind:function(arm,size=0xc) addr:0x20d7424
 func_ov000_020d7430 kind:function(arm,size=0x40) addr:0x20d7430
 func_ov000_020d7470 kind:function(arm,size=0x1c) addr:0x20d7470
 func_ov000_020d748c kind:function(arm,size=0x20) addr:0x20d748c
@@ -4054,7 +4054,7 @@ data_ov000_020e250c kind:data(any) addr:0x20e250c
 data_ov000_020e2510 kind:data(any) addr:0x20e2510
 data_ov000_020e2520 kind:data(any) addr:0x20e2520
 data_ov000_020e2524 kind:data(any) addr:0x20e2524
-data_ov000_020e2528 kind:data(any) addr:0x20e2528
+@1495 kind:data(any) addr:0x20e2528
 data_ov000_020e2544 kind:data(any) addr:0x20e2544
 data_ov000_020e2568 kind:data(any) addr:0x20e2568
 data_ov000_020e2588 kind:data(any) addr:0x20e2588
diff --git a/config/eur/arm9/overlays/ov012/symbols.txt b/config/eur/arm9/overlays/ov012/symbols.txt
index 84b02182..350d7c30 100644
--- a/config/eur/arm9/overlays/ov012/symbols.txt
+++ b/config/eur/arm9/overlays/ov012/symbols.txt
@@ -665,7 +665,7 @@ func_ov012_0212b31c kind:function(arm,size=0x20) addr:0x212b31c
 func_ov012_0212b33c kind:function(arm,size=0xc) addr:0x212b33c
 func_ov012_0212b348 kind:function(arm,size=0x8) addr:0x212b348
 func_ov012_0212b350 kind:function(arm,size=0x8) addr:0x212b350
-func_ov012_0212b358 kind:function(arm,size=0xf8) addr:0x212b358
+_Z19func_ov012_0212b358P7MapBaseii kind:function(arm,size=0xf8) addr:0x212b358
 func_ov012_0212b450 kind:function(arm,size=0x88) addr:0x212b450
 func_ov012_0212b4d8 kind:function(arm,size=0x90) addr:0x212b4d8
 func_ov012_0212b568 kind:function(arm,size=0x94) addr:0x212b568
diff --git a/config/eur/arm9/overlays/ov015/symbols.txt b/config/eur/arm9/overlays/ov015/symbols.txt
index 2e587e84..1c160f1b 100644
--- a/config/eur/arm9/overlays/ov015/symbols.txt
+++ b/config/eur/arm9/overlays/ov015/symbols.txt
@@ -253,7 +253,7 @@ func_ov015_02128b9c kind:function(arm,size=0x90) addr:0x2128b9c
 func_ov015_02128c2c kind:function(arm,size=0x140) addr:0x2128c2c
 func_ov015_02128d6c kind:function(arm,size=0x20) addr:0x2128d6c
 func_ov015_02128d8c kind:function(arm,size=0x4c) addr:0x2128d8c
-func_ov015_02128dd8 kind:function(arm,size=0xac) addr:0x2128dd8
+_Z19func_ov015_02128dd8P7MapBaseii kind:function(arm,size=0xac) addr:0x2128dd8
 func_ov015_02128e84 kind:function(arm,size=0xcc) addr:0x2128e84
 func_ov015_02128f50 kind:function(arm,size=0xd4) addr:0x2128f50
 func_ov015_02129024 kind:function(arm,size=0x220) addr:0x2129024
@@ -1986,7 +1986,7 @@ func_ov015_021847bc kind:function(arm,size=0x7c) addr:0x21847bc
 func_ov015_02184838 kind:function(arm,size=0xa4) addr:0x2184838
 func_ov015_021848dc kind:function(arm,size=0x8c) addr:0x21848dc
 func_ov015_02184968 kind:function(arm,size=0x3c) addr:0x2184968
-func_ov015_021849a4 kind:function(arm,size=0x1c) addr:0x21849a4
+_Z19func_ov015_021849a4Pi kind:function(arm,size=0x1c) addr:0x21849a4
 func_ov015_021849c0 kind:function(arm,size=0x1c) addr:0x21849c0
 func_ov015_021849dc kind:function(arm,size=0x10) addr:0x21849dc
 func_ov015_021849ec kind:function(arm,size=0x54) addr:0x21849ec
diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt
index 9b7a4935..756ad603 100644
--- a/config/eur/arm9/overlays/ov017/symbols.txt
+++ b/config/eur/arm9/overlays/ov017/symbols.txt
@@ -1,6 +1,6 @@
-func_ov017_0215b4a0 kind:function(arm,size=0x2c) addr:0x215b4a0
+_Z19func_ov017_0215b4a0P7MapBaseii kind:function(arm,size=0x2c) addr:0x215b4a0
 func_ov017_0215b4cc kind:function(arm,size=0x1c) addr:0x215b4cc
-func_ov017_0215b4e8 kind:function(thumb,size=0xf0) addr:0x215b4e8
+_Z19func_ov017_0215b4e8P7MapBaseii kind:function(thumb,size=0xf0) addr:0x215b4e8
 func_ov017_0215b5d8 kind:function(thumb,size=0x94) addr:0x215b5d8
 func_ov017_0215b66c kind:function(thumb,size=0x9c) addr:0x215b66c
 func_ov017_0215b708 kind:function(thumb,size=0x5c) addr:0x215b708
diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt
index 0d64be3f..5ebae6aa 100644
--- a/config/eur/arm9/symbols.txt
+++ b/config/eur/arm9/symbols.txt
@@ -478,7 +478,7 @@ func_0200c7c4 kind:function(arm,size=0x30) addr:0x200c7c4
 func_0200c7f4 kind:function(arm,size=0x30) addr:0x200c7f4
 func_0200c824 kind:function(arm,size=0x54) addr:0x200c824
 func_0200c878 kind:function(arm,size=0x58) addr:0x200c878
-sprintf kind:function(arm,size=0x28) addr:0x200c8d0
+_Z7sprintfrPcrPKcz kind:function(arm,size=0x28) addr:0x200c8d0
 vsprintf kind:function(arm,size=0x18) addr:0x200c8f8
 va_sprintf kind:function(arm,size=0x28) addr:0x200c910
 vsnprintf kind:function(arm,size=0x8fc) addr:0x200c938
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index 293b51c3..ff058d9f 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -95,14 +95,14 @@ func_ov000_02078f80 kind:function(arm,size=0x2c) addr:0x2078f20
 func_ov000_02078fac kind:function(arm,size=0x14) addr:0x2078f4c
 func_ov000_02078fc0 kind:function(arm,size=0x14) addr:0x2078f60
 func_ov000_02078fd4 kind:function(arm,size=0x14) addr:0x2078f74
-_Z19func_ov000_02078fe8Pi kind:function(arm,size=0x14) addr:0x2078f88
+func_ov000_02078fe8 kind:function(arm,size=0x14) addr:0x2078f88
 func_ov000_02078ffc kind:function(arm,size=0xc) addr:0x2078f9c
 func_ov000_02079008 kind:function(arm,size=0x1c) addr:0x2078fa8
 func_ov000_02079024 kind:function(arm,size=0x128) addr:0x2078fc4
 func_ov000_0207914c kind:function(arm,size=0x90) addr:0x20790ec
 func_ov000_020791dc kind:function(arm,size=0x30) addr:0x207917c
-_Z19func_ov000_0207920cPiP5Vec3pS_S_ kind:function(arm,size=0x94) addr:0x20791ac
-_Z19func_ov000_020792a0Piiii kind:function(arm,size=0x118) addr:0x2079240
+func_ov000_0207920c kind:function(arm,size=0x94) addr:0x20791ac
+func_ov000_020792a0 kind:function(arm,size=0x118) addr:0x2079240
 func_ov000_020793b8 kind:function(arm,size=0x18) addr:0x2079358
 func_ov000_020793d0 kind:function(arm,size=0xa0) addr:0x2079370
 func_ov000_02079470 kind:function(arm,size=0x210) addr:0x2079410
@@ -110,7 +110,7 @@ func_ov000_02079680 kind:function(arm,size=0xfc) addr:0x2079620
 func_ov000_0207977c kind:function(arm,size=0xfc) addr:0x207971c
 func_ov000_02079878 kind:function(arm,size=0x20) addr:0x2079818
 func_ov000_02079898 kind:function(arm,size=0x24) addr:0x2079838
-_Z19func_ov000_020798bcPii kind:function(arm,size=0x2c) addr:0x207985c
+func_ov000_020798bc kind:function(arm,size=0x2c) addr:0x207985c
 func_ov000_020798e8 kind:function(arm,size=0x40) addr:0x2079888
 func_ov000_02079928 kind:function(arm,size=0x124) addr:0x20798c8
 func_ov000_02079a4c kind:function(arm,size=0x44) addr:0x20799ec
@@ -330,7 +330,7 @@ _ZN7MapBase18func_ov00_0207de68Ei kind:function(arm,size=0x20) addr:0x207de08
 _ZN7MapBase18func_ov00_0207de88Ev kind:function(arm,size=0x18) addr:0x207de28
 _ZN7MapBase18func_ov00_0207dea0Eb kind:function(arm,size=0x1c0) addr:0x207de40
 _ZN7MapBase8vfunc_b0Eii kind:function(arm,size=0x2c) addr:0x207e000
-_ZN7MapBase18func_ov00_0207e08cEPii kind:function(arm,size=0x64) addr:0x207e02c
+_ZN7MapBase18func_ov00_0207e08cEii kind:function(arm,size=0x64) addr:0x207e02c
 _ZN7MapBase18func_ov00_0207e0f0Ei kind:function(arm,size=0x19c) addr:0x207e090
 _ZN7MapBase18func_ov00_0207e28cEi kind:function(arm,size=0x1b8) addr:0x207e22c
 _ZN7MapBase8vfunc_b4Ev kind:function(arm,size=0x28) addr:0x207e3e4
@@ -341,7 +341,7 @@ _ZN7MapBase8vfunc_58Ev kind:function(arm,size=0x8) addr:0x207e438
 _ZN7MapBase8vfunc_5cEv kind:function(arm,size=0x8) addr:0x207e440
 _ZN7MapBase8vfunc_60Ev kind:function(arm,size=0x8) addr:0x207e448
 _ZN7MapBase8vfunc_64Ev kind:function(arm,size=0x8) addr:0x207e450
-_ZN7MapBase8vfunc_68Ev kind:function(arm,size=0x488) addr:0x207e458
+_ZN7MapBase8vfunc_68Eii kind:function(arm,size=0x488) addr:0x207e458
 _ZN7MapBase18func_ov00_0207e940EPc kind:function(arm,size=0x28) addr:0x207e8e0
 _ZN7MapBase18func_ov00_0207e968Ev kind:function(arm,size=0x4) addr:0x207e908
 _ZN7MapBase18func_ov00_0207e96cEv kind:function(arm,size=0x4) addr:0x207e90c
@@ -362,7 +362,7 @@ _ZN7MapBase8vfunc_78Ev kind:function(arm,size=0x8) addr:0x207f2ec
 _ZN7MapBase8vfunc_7cEv kind:function(arm,size=0x8) addr:0x207f2f4
 _ZN7MapBase8vfunc_80Ev kind:function(arm,size=0x8) addr:0x207f2fc
 _ZN7MapBase8vfunc_84Ei kind:function(arm,size=0x28) addr:0x207f304
-_ZN7MapBase18func_ov00_0207f38cEPi kind:function(arm,size=0x38) addr:0x207f32c
+_ZN7MapBase18func_ov00_0207f38cEi kind:function(arm,size=0x38) addr:0x207f32c
 _ZN7MapBase8vfunc_90Eiii kind:function(arm,size=0xdc) addr:0x207f364
 _ZN7MapBase8vfunc_94Ev kind:function(arm,size=0x4) addr:0x207f440
 _ZN7MapBase18func_ov00_0207f4a4EP5Vec2si kind:function(arm,size=0x98) addr:0x207f444
@@ -406,14 +406,14 @@ _ZN7MapBase18func_ov00_0208008cEj kind:function(arm,size=0x10) addr:0x208002c
 _ZN7MapBase7AddExitEP4Exit kind:function(arm,size=0xa4) addr:0x208003c
 _ZN7MapBase18func_ov00_02080140EP4Exit kind:function(arm,size=0x1e4) addr:0x20800e0
 _ZN12MapBase_Unk118func_ov00_02080324Eiii kind:function(arm,size=0x78) addr:0x20802c4
-_ZN7MapBase8FindExitEjP4Exit kind:function(arm,size=0xd0) addr:0x208033c
+_ZN7MapBase8FindExitEiP4Exit kind:function(arm,size=0xd0) addr:0x208033c
 _ZN7MapBase18AddCameraViewpointEP15CameraViewpoint kind:function(arm,size=0xa4) addr:0x208040c
 _ZN7MapBase19FindViewpoint_Unk_4EcP15CameraViewpoint kind:function(arm,size=0xc0) addr:0x20804b0
 _ZN7MapBase19FindViewpoint_Unk_0EiP15CameraViewpoint kind:function(arm,size=0xb8) addr:0x2080570
 _ZN7MapBase19GetCurrentViewpointEP15CameraViewpointi kind:function(arm,size=0xf8) addr:0x2080628
 _ZN7MapBase26GetCurrentViewpoint_Unk_00Ei kind:function(arm,size=0x54) addr:0x2080720
 _ZN7MapBase8vfunc_b8Ev kind:function(arm,size=0x50) addr:0x2080774
-_ZN7MapBase18func_ov00_02080824EjPc kind:function(arm,size=0xac) addr:0x20807c4
+_ZN7MapBase18func_ov00_02080824Eii kind:function(arm,size=0xac) addr:0x20807c4
 _ZN7MapBase10AddUnk_130Ei kind:function(arm,size=0xe8) addr:0x2080870
 _ZN7MapBase18func_ov00_020809b8Ei kind:function(arm,size=0xc0) addr:0x2080958
 _ZN7MapBase18func_ov00_02080a78EP5Vec3p kind:function(arm,size=0x58) addr:0x2080a18
@@ -421,7 +421,7 @@ _ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_ kind:function(arm,size=
 _ZN7MapBase18func_ov00_02080b24EP5Vec2b kind:function(arm,size=0x1e4) addr:0x2080ac4
 _ZN7MapBase18func_ov00_02080d08Ei kind:function(arm,size=0x6c) addr:0x2080ca8
 _ZN7MapBase8vfunc_bcEv kind:function(arm,size=0x4) addr:0x2080d14
-_ZN7MapBase8vfunc_98Eiii kind:function(arm,size=0x4) addr:0x2080d18
+_ZN7MapBase8vfunc_98Ev kind:function(arm,size=0x4) addr:0x2080d18
 _ZN7MapBase8vfunc_c0Ev kind:function(arm,size=0x4) addr:0x2080d1c
 _ZN7MapBase22TriggerOfType_vfunc_10Ei kind:function(arm,size=0x5c) addr:0x2080d20
 _ZN11TriggerBase8vfunc_10Ev kind:function(arm,size=0x8) addr:0x2080d7c
@@ -516,12 +516,12 @@ _ZN10MapManager18func_ov00_02082650Eiii kind:function(arm,size=0x10) addr:0x2082
 _ZN10MapManager18func_ov00_02082660Eii kind:function(arm,size=0x10) addr:0x2082600
 _ZN10MapManager18func_ov00_02082670Eii kind:function(arm,size=0x10) addr:0x2082610
 _ZN10MapManager18func_ov00_02082680Eii kind:function(arm,size=0x20) addr:0x2082620
-_ZN10MapManager18func_ov00_020826a0Eiii kind:function(arm,size=0x20) addr:0x2082640
+_ZN10MapManager18func_ov00_020826a0Eii kind:function(arm,size=0x20) addr:0x2082640
 _ZN10MapManager9CreateMapEiii kind:function(arm,size=0x100) addr:0x2082660
 _ZN10MapManager10DestroyMapEv kind:function(arm,size=0x30) addr:0x2082760
 _ZN10MapManager16MapData_vfunc_44Ev kind:function(arm,size=0x18) addr:0x2082790
-_ZN10MapManager18func_ov00_02082808Ei kind:function(arm,size=0xb8) addr:0x20827a8
-_ZN10MapManager16MapData_vfunc_7cEv kind:function(arm,size=0x20) addr:0x2082860
+_ZN10MapManager18func_ov00_02082808Eb kind:function(arm,size=0xb8) addr:0x20827a8
+_ZN10MapManager16MapData_vfunc_7cEiPiiPs kind:function(arm,size=0x20) addr:0x2082860
 _ZN10MapManager16MapData_vfunc_84Ei kind:function(arm,size=0x18) addr:0x2082880
 _ZN10MapManager18func_ov00_020828f8EPi kind:function(arm,size=0x10) addr:0x2082898
 _ZN10MapManager10GetNumMapsEv kind:function(arm,size=0xc) addr:0x20828a8
@@ -529,17 +529,17 @@ _ZN10MapManager18func_ov00_02082914Ei kind:function(arm,size=0x1b8) addr:0x20828
 _ZN10MapManager18func_ov00_02082accEv kind:function(arm,size=0x10) addr:0x2082a6c
 _ZN10MapManager18func_ov00_02082adcEv kind:function(arm,size=0x18) addr:0x2082a7c
 _ZN10MapManager18func_ov00_02082af4Ev kind:function(arm,size=0x48) addr:0x2082a94
-_ZN10MapManager18func_ov00_02082b3cEi kind:function(arm,size=0x1cc) addr:0x2082adc
+_ZN10MapManager18func_ov00_02082b3cEPiP5Vec2b kind:function(arm,size=0x1cc) addr:0x2082adc
 _ZN10MapManager18func_ov00_02082d08Ev kind:function(arm,size=0x20) addr:0x2082ca8
 _ZN10MapManager17GetCurrentMapPosXEv kind:function(arm,size=0xc) addr:0x2082cc8
 _ZN10MapManager17GetCurrentMapPosYEv kind:function(arm,size=0xc) addr:0x2082cd4
 _ZN10MapManager18func_ov00_02082d40Ev kind:function(arm,size=0x34) addr:0x2082ce0
 _ZN10MapManager18func_ov00_02082d74Ei kind:function(arm,size=0x10) addr:0x2082d14
-_ZN10MapManager18func_ov00_02082d84EPcPiS1_ kind:function(arm,size=0x98) addr:0x2082d24
+_ZN10MapManager18func_ov00_02082d84EP5Vec2bPiS2_ kind:function(arm,size=0x98) addr:0x2082d24
 _ZN10MapManager18func_ov00_02082e1cEPiS0_ kind:function(arm,size=0x250) addr:0x2082dbc
 _ZN10MapManager18func_ov00_0208306cEPiS0_ kind:function(arm,size=0xf0) addr:0x208300c
 _ZN10MapManager18func_ov00_0208315cEPiS0_ kind:function(arm,size=0xe8) addr:0x20830fc
-_ZN10MapManager18func_ov00_02083244EjPiS0_S0_ kind:function(arm,size=0x54) addr:0x20831e4
+_ZN10MapManager18func_ov00_02083244EjP5Vec3pPiS2_ kind:function(arm,size=0x54) addr:0x20831e4
 _ZN10MapManager18func_ov00_02083298EjP5Vec3pPiS2_ kind:function(arm,size=0x74) addr:0x2083238
 _ZN10MapManager21GetCourseData_Unk_25cEv kind:function(arm,size=0xc) addr:0x20832ac
 _ZN10MapManager15IsMapInMainGridEj kind:function(arm,size=0x10) addr:0x20832b8
@@ -567,11 +567,11 @@ _ZN10MapManager18func_ov00_0208346cEP4AABB kind:function(arm,size=0x50) addr:0x2
 _ZN10MapManager18func_ov00_020834bcEP5Vec3pii kind:function(arm,size=0x68) addr:0x208345c
 _ZN10MapManager18func_ov00_02083524EP5Vec3pii kind:function(arm,size=0x3c) addr:0x20834c4
 _ZN10MapManager18func_ov00_02083560EP5Vec2bPS_j kind:function(arm,size=0x10) addr:0x2083500
-_ZN10MapManager18func_ov00_02083570Eii kind:function(arm,size=0x18) addr:0x2083510
+_ZN10MapManager18func_ov00_02083570Ehh kind:function(arm,size=0x18) addr:0x2083510
 _ZN10MapManager18func_ov00_02083588Ev kind:function(arm,size=0x1c) addr:0x2083528
 _ZN10MapManager18func_ov00_020835a4Ev kind:function(arm,size=0x10) addr:0x2083544
 _ZN10MapManager18func_ov00_020835b4Ev kind:function(arm,size=0x10) addr:0x2083554
-_ZN10MapManager18func_ov00_020835c4EPS_ii kind:function(arm,size=0x20) addr:0x2083564
+_ZN10MapManager18func_ov00_020835c4Eii kind:function(arm,size=0x20) addr:0x2083564
 _ZN10MapManager18func_ov00_020835e4EiPiPc kind:function(arm,size=0x10) addr:0x2083584
 _ZN10MapManager18func_ov00_020835f4Ei kind:function(arm,size=0x10) addr:0x2083594
 _ZN10MapManager18func_ov00_02083604Ei kind:function(arm,size=0x10) addr:0x20835a4
@@ -601,7 +601,7 @@ _ZN10MapManager18func_ov00_020839b4Ei kind:function(arm,size=0x10) addr:0x208395
 _ZN10MapManager18func_ov00_020839c4Ei kind:function(arm,size=0x10) addr:0x2083964
 _ZN10MapManager18func_ov00_020839d4Ei kind:function(arm,size=0x24) addr:0x2083974
 _ZN10MapManager18func_ov00_020839f8Ei kind:function(arm,size=0x24) addr:0x2083998
-_ZN10MapManager18fun_ZN10MapManager18func_ov00_02083a1cEP5Vec2bPS_P5Vec3pc_ov00_02083a1cEPiPS_P5Vec3p kind:function(arm,size=0x38) addr:0x20839bc
+_ZN10MapManager18func_ov00_02083a1cEP5Vec2bPS_P5Vec3p kind:function(arm,size=0x38) addr:0x20839bc
 _ZN10MapManager18func_ov00_02083a54EPhPS_PiiS2_ kind:function(arm,size=0x130) addr:0x20839f4
 _ZN10MapManager13GetTileStartXEi kind:function(arm,size=0x28) addr:0x2083b24
 _ZN10MapManager13GetTileStartZEi kind:function(arm,size=0x28) addr:0x2083b4c
@@ -610,13 +610,13 @@ _ZN10MapManager11GetTileEndZEi kind:function(arm,size=0x28) addr:0x2083b9c
 _ZN10MapManager18func_ov00_02083c24Ei kind:function(arm,size=0x2c) addr:0x2083bc4
 _ZN10MapManager18func_ov00_02083c50Ei kind:function(arm,size=0x2c) addr:0x2083bf0
 _ZN10MapManager18func_ov00_02083c7cEP5Vec3p5Vec2b kind:function(arm,size=0x6c) addr:0x2083c1c
-_ZN10MapManager18func_ov00_02083ce8EPS_Pijij kind:function(arm,size=0x14c) addr:0x2083c88
+_ZN10MapManager18func_ov00_02083ce8EP5Vec3pjij kind:function(arm,size=0x14c) addr:0x2083c88
 _ZN10MapManager18func_ov00_02083e34Ecci kind:function(arm,size=0x24) addr:0x2083dd4
-_ZN10MapManager16MapData_vfunc_60EPh kind:function(arm,size=0x18) addr:0x2083df8
-_ZN10MapManager18func_ov00_02083e70Ev kind:function(arm,size=0x70) addr:0x2083e10
+_ZN10MapManager16MapData_vfunc_60EP5Vec2b kind:function(arm,size=0x18) addr:0x2083df8
+_ZN10MapManager18func_ov00_02083e70EP5Vec2b kind:function(arm,size=0x70) addr:0x2083e10
 _ZN10MapManager16MapData_vfunc_68EP5Vec3pb kind:function(arm,size=0x18) addr:0x2083e80
-_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ kind:function(arm,size=0x4c) addr:0x2083e98
-_ZN10MapManager18func_ov00_02083f44EP5Vec3p kind:function(arm,size=0x3c) addr:0x2083ee4
+_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_b kind:function(arm,size=0x4c) addr:0x2083e98
+_ZN10MapManager18func_ov00_02083f44EP5Vec3pb kind:function(arm,size=0x3c) addr:0x2083ee4
 _ZN10MapManager16MapData_vfunc_6cEiii kind:function(arm,size=0x18) addr:0x2083f20
 _ZN10MapManager16MapData_vfunc_70EP5Vec3p kind:function(arm,size=0x18) addr:0x2083f38
 _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p kind:function(arm,size=0x74) addr:0x2083f50
@@ -624,7 +624,7 @@ _ZN10MapManager18GetTileWorldBoundsEP5Vec2bP4AABB kind:function(arm,size=0x64) a
 _ZN10MapManager16MapData_vfunc_54EP5Vec2b kind:function(arm,size=0x18) addr:0x2084028
 _ZN10MapManager18func_ov00_020840a0Ecc kind:function(arm,size=0x24) addr:0x2084040
 _ZN10MapManager16MapData_vfunc_78EP5Vec2b kind:function(arm,size=0x18) addr:0x2084064
-_ZN10MapManager18func_ov00_020840dcEv kind:function(arm,size=0x24) addr:0x208407c
+_ZN10MapManager18func_ov00_020840dcEP5Vec2b kind:function(arm,size=0x24) addr:0x208407c
 _ZN10MapManager18func_ov00_02084100EPiPS_ kind:function(arm,size=0x14) addr:0x20840a0
 _ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x20840b4
 _ZN10MapManager17GetMapData_Unk_4cEv kind:function(arm,size=0xc) addr:0x20840c0
@@ -635,19 +635,19 @@ _ZN10MapManager18func_ov00_02084164EP5Vec2b kind:function(arm,size=0x1a8) addr:0
 _ZN10MapManager17GetMapData_Unk_0aEv kind:function(arm,size=0xc) addr:0x20842ac
 _ZN10MapManager17GetMapData_Unk_0bEv kind:function(arm,size=0xc) addr:0x20842b8
 _ZN10MapManager16MapData_vfunc_a4EPc kind:function(arm,size=0x18) addr:0x20842c4
-_ZN10MapManager18func_ov00_0208433cEP5Vec3pS1_ kind:function(arm,size=0x60) addr:0x20842dc
+_ZN10MapManager18func_ov00_0208433cEP5Vec3pP5Vec2s kind:function(arm,size=0x60) addr:0x20842dc
 _ZN10MapManager18func_ov00_0208439cEP5Vec2sP5Vec3p kind:function(arm,size=0x50) addr:0x208433c
 _ZN10MapManager18func_ov00_020843ecEPi kind:function(arm,size=0x2ac) addr:0x208438c
 _ZN10MapManager17GetMapData_Unk_38Ev kind:function(arm,size=0xc) addr:0x2084638
 _ZN10MapManager18func_ov00_020846a4Ev kind:function(arm,size=0x5c) addr:0x2084644
-_ZN10MapManager18func_ov00_02084700EPS_ kind:function(arm,size=0x40) addr:0x20846a0
+_ZN10MapManager18func_ov00_02084700Ev kind:function(arm,size=0x40) addr:0x20846a0
 _ZN10MapManager18func_ov00_02084740Ev kind:function(arm,size=0xa0) addr:0x20846e0
 _ZN10MapManager18func_ov00_020847e0Ev kind:function(arm,size=0x10) addr:0x2084780
-_ZN10MapManager18func_ov00_020847f0Ev kind:function(arm,size=0x48) addr:0x2084790
+_ZN10MapManager18func_ov00_020847f0Ei kind:function(arm,size=0x48) addr:0x2084790
 _ZN10MapManager18func_ov00_02084838Ev kind:function(arm,size=0x80) addr:0x20847d8
 _ZN10MapManager18func_ov00_020848b8Ev kind:function(arm,size=0x6c) addr:0x2084858
 _ZN10MapManager18func_ov00_02084924Ej kind:function(arm,size=0x10) addr:0x20848c4
-_ZN10MapManager18func_ov00_02084934EPi kind:function(arm,size=0x50) addr:0x20848d4
+_ZN10MapManager18func_ov00_02084934EP5Vec3p kind:function(arm,size=0x50) addr:0x20848d4
 _ZN10MapManager17GetMapData_Unk_06Ev kind:function(arm,size=0xc) addr:0x2084924
 _ZN10MapManager17GetMapData_Unk_07Ev kind:function(arm,size=0xc) addr:0x2084930
 _ZN10MapManager18func_ov00_0208499cEv kind:function(arm,size=0x24) addr:0x208493c
@@ -661,24 +661,24 @@ _ZN10MapManager10SetNumKeysEi kind:function(arm,size=0xc) addr:0x2084aa8
 _ZN10MapManager10GetNumKeysEv kind:function(arm,size=0xc) addr:0x2084ab4
 _ZN10MapManager15SetBlueWarpOpenEb kind:function(arm,size=0xc) addr:0x2084ac0
 _ZN10MapManager15GetBlueWarpOpenEv kind:function(arm,size=0xc) addr:0x2084acc
-_ZN10MapManager18func_ov00_02084b38Eiii kind:function(arm,size=0xa8) addr:0x2084ad8
+_ZN10MapManager18func_ov00_02084b38Ejib kind:function(arm,size=0xa8) addr:0x2084ad8
 _ZN10MapManager18func_ov00_02084be0Eji kind:function(arm,size=0x7c) addr:0x2084b80
 _ZN10MapManager15SetMapDataFlag1Eib kind:function(arm,size=0x10) addr:0x2084bfc
 _ZN10MapManager15GetMapDataFlag1Ei kind:function(arm,size=0x10) addr:0x2084c0c
-_ZN10MapManager18func_ov00_02084c7cEi kind:function(arm,size=0x18) addr:0x2084c1c
+_ZN10MapManager18func_ov00_02084c7cEib kind:function(arm,size=0x18) addr:0x2084c1c
 _ZN10MapManager18func_ov00_02084c94Ei kind:function(arm,size=0x1c) addr:0x2084c34
-_ZN10MapManager18func_ov00_02084cb0Ei kind:function(arm,size=0x18) addr:0x2084c50
+_ZN10MapManager18func_ov00_02084cb0Eib kind:function(arm,size=0x18) addr:0x2084c50
 _ZN10MapManager18func_ov00_02084cc8Ei kind:function(arm,size=0x1c) addr:0x2084c68
-_ZN10MapManager18func_ov00_02084ce4Ei kind:function(arm,size=0x18) addr:0x2084c84
+_ZN10MapManager18func_ov00_02084ce4Eib kind:function(arm,size=0x18) addr:0x2084c84
 _ZN10MapManager18func_ov00_02084cfcEi kind:function(arm,size=0x1c) addr:0x2084c9c
 _ZN10MapManager17GetMapData_Unk_09Ev kind:function(arm,size=0xc) addr:0x2084cb8
-_ZN10MapManager18func_ov00_02084d24Ecci kind:function(arm,size=0x28) addr:0x2084cc4
+_ZN10MapManager18func_ov00_02084d24Eccs kind:function(arm,size=0x28) addr:0x2084cc4
 _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p kind:function(arm,size=0x170) addr:0x2084cec
 _ZN10MapManager18func_ov00_02084ebcEP5Vec3p kind:function(arm,size=0x24c) addr:0x2084e5c
-_ZN10MapManager18func_ov00_02085108EPi kind:function(arm,size=0x174) addr:0x20850a8
+_ZN10MapManager18func_ov00_02085108EP5Vec3p kind:function(arm,size=0x174) addr:0x20850a8
 _ZN10MapManager18func_ov00_0208527cEPS_iPi kind:function(arm,size=0x180) addr:0x208521c
 _ZN10MapManager18func_ov00_020853fcEPS_P5Vec3pPi kind:function(arm,size=0x198) addr:0x208539c
-_ZN10MapManager18func_ov00_02085594EPS_P5Vec3pii kind:function(arm,size=0x2a8) addr:0x2085534
+_ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0x2085534
 _ZN10MapManager18func_ov00_0208583cEPS_P5Vec3pi kind:function(arm,size=0x74) addr:0x20857dc
 _ZN10MapManager18func_ov00_020858b0EPS_P5Vec3pi kind:function(arm,size=0x184) addr:0x2085850
 _ZN10MapManager18func_ov00_02085a34EP5Vec3pi kind:function(arm,size=0x22c) addr:0x20859d4
@@ -720,12 +720,12 @@ func_ov000_02087f08 kind:function(arm,size=0x18) addr:0x2087ea8
 func_ov000_02087f20 kind:function(arm,size=0xa0) addr:0x2087ec0
 func_ov000_02087fc0 kind:function(arm,size=0x20) addr:0x2087f60
 func_ov000_02087fe0 kind:function(arm,size=0x20) addr:0x2087f80
-_Z19func_ov000_02088000ii kind:function(arm,size=0x10) addr:0x2087fa0
+func_ov000_02088000 kind:function(arm,size=0x10) addr:0x2087fa0
 func_ov000_02088010 kind:function(arm,size=0x64) addr:0x2087fb0
 func_ov000_02088074 kind:function(arm,size=0x84) addr:0x2088014
 func_ov000_020880f8 kind:function(arm,size=0x38) addr:0x2088098
-_Z19func_ov000_02088130Phi kind:function(arm,size=0x14) addr:0x20880d0
-_Z19func_ov000_02088144Phi kind:function(arm,size=0x14) addr:0x20880e4
+func_ov000_02088130 kind:function(arm,size=0x14) addr:0x20880d0
+func_ov000_02088144 kind:function(arm,size=0x14) addr:0x20880e4
 func_ov000_02088158 kind:function(arm,size=0x44) addr:0x20880f8
 func_ov000_0208819c kind:function(arm,size=0x58) addr:0x208813c
 func_ov000_020881f4 kind:function(arm,size=0x50) addr:0x2088194
@@ -779,7 +779,7 @@ func_ov000_0208aed8 kind:function(arm,size=0x244) addr:0x208ae78
 func_ov000_0208b11c kind:function(arm,size=0x20) addr:0x208b0bc
 func_ov000_0208b13c kind:function(arm,size=0x1c) addr:0x208b0dc
 func_ov000_0208b158 kind:function(arm,size=0x28) addr:0x208b0f8
-_Z19func_ov000_0208b180Pi kind:function(arm,size=0x28) addr:0x208b120
+_ZN18UnkStruct_027e0f6419func_ov000_0208b180Ev kind:function(arm,size=0x28) addr:0x208b120
 func_ov000_0208b1a8 kind:function(arm,size=0x28) addr:0x208b148
 func_ov000_0208b1d0 kind:function(arm,size=0x28) addr:0x208b170
 func_ov000_0208b1f8 kind:function(arm,size=0x28) addr:0x208b198
@@ -811,10 +811,10 @@ func_ov000_0208b70c kind:function(arm,size=0x4) addr:0x208b6ac
 func_ov000_0208b710 kind:function(arm,size=0x4) addr:0x208b6b0
 func_ov000_0208b714 kind:function(arm,size=0x8) addr:0x208b6b4
 func_ov000_0208b71c kind:function(arm,size=0x20) addr:0x208b6bc
-_Z19func_ov000_0208b73cii kind:function(arm,size=0x60) addr:0x208b6dc
+func_ov000_0208b73c kind:function(arm,size=0x60) addr:0x208b6dc
 func_ov000_0208b79c kind:function(arm,size=0x34) addr:0x208b73c
-_Z19func_ov000_0208b7d0iP5Vec3p kind:function(arm,size=0x34) addr:0x208b770
-_Z19func_ov000_0208b804PiP5Vec3pS1_ kind:function(arm,size=0x40) addr:0x208b7a4
+func_ov000_0208b7d0 kind:function(arm,size=0x34) addr:0x208b770
+func_ov000_0208b804 kind:function(arm,size=0x40) addr:0x208b7a4
 func_ov000_0208b844 kind:function(arm,size=0x2c) addr:0x208b7e4
 func_ov000_0208b870 kind:function(arm,size=0x2c) addr:0x208b810
 func_ov000_0208b89c kind:function(arm,size=0x44) addr:0x208b83c
@@ -861,7 +861,7 @@ func_ov000_0208cb84 kind:function(arm,size=0x4c) addr:0x208cb24
 func_ov000_0208cbd0 kind:function(arm,size=0x84) addr:0x208cb70
 func_ov000_0208cc54 kind:function(arm,size=0x10) addr:0x208cbf4
 func_ov000_0208cc64 kind:function(arm,size=0x24) addr:0x208cc04
-_Z19func_ov000_0208cc88Pi kind:function(arm,size=0x54) addr:0x208cc28
+func_ov000_0208cc88 kind:function(arm,size=0x54) addr:0x208cc28
 func_ov000_0208ccdc kind:function(arm,size=0x10) addr:0x208cc7c
 func_ov000_0208ccec kind:function(arm,size=0x10) addr:0x208cc8c
 func_ov000_0208ccfc kind:function(arm,size=0x10) addr:0x208cc9c
@@ -878,8 +878,8 @@ func_ov000_0208d310 kind:function(arm,size=0xec) addr:0x208d2b0
 func_ov000_0208d3fc kind:function(arm,size=0x98) addr:0x208d39c
 func_ov000_0208d494 kind:function(arm,size=0x14c) addr:0x208d434
 func_ov000_0208d5e0 kind:function(arm,size=0x40) addr:0x208d580
-_Z19func_ov000_0208d620Pi kind:function(arm,size=0x60) addr:0x208d5c0
-_Z19func_ov000_0208d680Pi kind:function(arm,size=0x60) addr:0x208d620
+func_ov000_0208d620 kind:function(arm,size=0x60) addr:0x208d5c0
+func_ov000_0208d680 kind:function(arm,size=0x60) addr:0x208d620
 func_ov000_0208d6e0 kind:function(arm,size=0x140) addr:0x208d680
 func_ov000_0208d820 kind:function(arm,size=0x110) addr:0x208d7c0
 func_ov000_0208d930 kind:function(arm,size=0xb0) addr:0x208d8d0
@@ -901,7 +901,7 @@ func_ov000_0208def0 kind:function(arm,size=0x14) addr:0x208de90
 func_ov000_0208df04 kind:function(arm,size=0x28) addr:0x208dea4
 func_ov000_0208df2c kind:function(arm,size=0x48) addr:0x208decc
 func_ov000_0208df74 kind:function(arm,size=0x4) addr:0x208df14
-_Z19func_ov000_0208df78PiiiP5Vec3pS_ kind:function(arm,size=0x250) addr:0x208df18
+func_ov000_0208df78 kind:function(arm,size=0x250) addr:0x208df18
 func_ov000_0208e1c8 kind:function(arm,size=0x208) addr:0x208e168
 func_ov000_0208e3d0 kind:function(arm,size=0x4c) addr:0x208e370
 func_ov000_0208e41c kind:function(arm,size=0x4) addr:0x208e3bc
@@ -1091,7 +1091,7 @@ func_ov000_0209394c kind:function(arm,size=0xc) addr:0x20938ec
 func_ov000_02093958 kind:function(arm,size=0x10) addr:0x20938f8
 func_ov000_02093968 kind:function(arm,size=0x78) addr:0x2093908
 func_ov000_020939e0 kind:function(arm,size=0x3c) addr:0x2093980
-_Z19func_ov000_02093a1cPjPi kind:function(arm,size=0x20) addr:0x20939bc
+func_ov000_02093a1c kind:function(arm,size=0x20) addr:0x20939bc
 func_ov000_02093a3c kind:function(arm,size=0x10) addr:0x20939dc
 func_ov000_02093a4c kind:function(arm,size=0x10) addr:0x20939ec
 func_ov000_02093a5c kind:function(arm,size=0x94) addr:0x20939fc
@@ -1235,8 +1235,8 @@ func_ov000_02095fe0 kind:function(arm,size=0x180) addr:0x2095f80
 func_ov000_02096160 kind:function(arm,size=0x98) addr:0x2096100
 func_ov000_020961f8 kind:function(arm,size=0x24) addr:0x2096198
 func_ov000_0209621c kind:function(arm,size=0x108) addr:0x20961bc
-_Z19func_ov000_02096324Pii kind:function(arm,size=0xf4) addr:0x20962c4
-_Z19func_ov000_02096418Pi kind:function(arm,size=0xb4) addr:0x20963b8
+func_ov000_02096324 kind:function(arm,size=0xf4) addr:0x20962c4
+func_ov000_02096418 kind:function(arm,size=0xb4) addr:0x20963b8
 func_ov000_020964cc kind:function(arm,size=0xf4) addr:0x209646c
 func_ov000_020965c0 kind:function(arm,size=0x1ec) addr:0x2096560
 func_ov000_020967ac kind:function(arm,size=0x250) addr:0x209674c
@@ -1457,7 +1457,7 @@ func_ov000_0209d550 kind:function(arm,size=0x14) addr:0x209d4f0
 func_ov000_0209d564 kind:function(arm,size=0x16c) addr:0x209d504
 func_ov000_0209d6d0 kind:function(arm,size=0x4) addr:0x209d670
 func_ov000_0209d6d4 kind:function(arm,size=0x14) addr:0x209d674
-_Z19func_ov000_0209d6e8ii kind:function(arm,size=0x28) addr:0x209d688
+func_ov000_0209d6e8 kind:function(arm,size=0x28) addr:0x209d688
 func_ov000_0209d710 kind:function(arm,size=0xc) addr:0x209d6b0
 func_ov000_0209d71c kind:function(arm,size=0xc) addr:0x209d6bc
 func_ov000_0209d728 kind:function(arm,size=0x10) addr:0x209d6c8
@@ -1783,7 +1783,7 @@ func_ov000_020a5d50 kind:function(arm,size=0xc) addr:0x20a5cf0
 func_ov000_020a5d5c kind:function(arm,size=0x18) addr:0x20a5cfc
 func_ov000_020a5d74 kind:function(arm,size=0x94) addr:0x20a5d14
 func_ov000_020a5e08 kind:function(arm,size=0x94) addr:0x20a5da8
-_Z19func_ov000_020a5e9cPi kind:function(arm,size=0x5c) addr:0x20a5e3c
+func_ov000_020a5e9c kind:function(arm,size=0x5c) addr:0x20a5e3c
 func_ov000_020a5ef8 kind:function(arm,size=0x30) addr:0x20a5e98
 func_ov000_020a5f28 kind:function(arm,size=0x30) addr:0x20a5ec8
 func_ov000_020a5f58 kind:function(arm,size=0x14) addr:0x20a5ef8
@@ -2833,7 +2833,7 @@ _ZN5Actor8vfunc_b0Ev kind:function(arm,size=0x4) addr:0x20c31cc
 _ZN5Actor10GetLinkPosEP5Vec3p kind:function(arm,size=0x60) addr:0x20c31d0
 _ZN5Actor15GetLinkDummyPosEP5Vec3p kind:function(arm,size=0x98) addr:0x20c3230
 _ZN19Actor_UnkStruct_09cC2Ev kind:function(arm,size=0x20) addr:0x20c32c8
-func_ov000_020c3348 kind:function(arm,size=0x24) addr:0x20c32e8
+_Z19func_ov000_020c3348P17ActorSpawnOptions kind:function(arm,size=0x24) addr:0x20c32e8
 func_ov000_020c336c kind:function(thumb,size=0x1a) addr:0x20c330c
 func_ov000_020c3388 kind:function(thumb,size=0x28) addr:0x20c3328
 func_ov000_020c33b0 kind:function(thumb,size=0x24) addr:0x20c3350
diff --git a/config/usa/arm9/overlays/ov004/symbols.txt b/config/usa/arm9/overlays/ov004/symbols.txt
index 0653bf36..9d88dbb9 100644
--- a/config/usa/arm9/overlays/ov004/symbols.txt
+++ b/config/usa/arm9/overlays/ov004/symbols.txt
@@ -72,7 +72,7 @@ func_ov004_02102aa0 kind:function(thumb,size=0x38) addr:0x2102a20
 func_ov004_02102ad8 kind:function(thumb,size=0x1e) addr:0x2102a58
 func_ov004_02102af8 kind:function(thumb,size=0x6) addr:0x2102a78
 func_ov004_02102b00 kind:function(thumb,size=0x28) addr:0x2102a80
-_Z19func_ov004_02102b28Pi kind:function(thumb,size=0x54) addr:0x2102aa8
+func_ov004_02102b28 kind:function(thumb,size=0x54) addr:0x2102aa8
 func_ov004_02102b7c kind:function(arm,size=0x14) addr:0x2102afc
 func_ov004_02102b90 kind:function(arm,size=0x14) addr:0x2102b10
 func_ov004_02102ba4 kind:function(arm,size=0x44) addr:0x2102b24
@@ -86,7 +86,7 @@ func_ov004_02102da4 kind:function(thumb,size=0x44) addr:0x2102d24
 func_ov004_02102de8 kind:function(thumb,size=0x2) addr:0x2102d68
 func_ov004_02102dec kind:function(thumb,size=0x2c) addr:0x2102d6c
 func_ov004_02102e18 kind:function(thumb,size=0x24) addr:0x2102d98
-_Z19func_ov004_02102e3cPi kind:function(thumb,size=0x1c) addr:0x2102dbc
+func_ov004_02102e3c kind:function(thumb,size=0x1c) addr:0x2102dbc
 func_ov004_02102e58 kind:function(thumb,size=0x5ec) addr:0x2102dd8
 func_ov004_02103444 kind:function(thumb,size=0xb8) addr:0x21033c4
 func_ov004_021034fc kind:function(thumb,size=0xbc) addr:0x210347c
diff --git a/config/usa/arm9/overlays/ov015/symbols.txt b/config/usa/arm9/overlays/ov015/symbols.txt
index 6bf3d18b..17c977cb 100644
--- a/config/usa/arm9/overlays/ov015/symbols.txt
+++ b/config/usa/arm9/overlays/ov015/symbols.txt
@@ -287,10 +287,10 @@ func_ov015_02129b30 kind:function(arm,size=0x8) addr:0x2129ab0
 func_ov015_02129b38 kind:function(arm,size=0x18) addr:0x2129ab8
 func_ov015_02129b50 kind:function(arm,size=0xb4) addr:0x2129ad0
 func_ov015_02129c04 kind:function(arm,size=0x10) addr:0x2129b84
-_Z19func_ov015_02129c14P7MapBase kind:function(arm,size=0x10) addr:0x2129b94
-_Z19func_ov015_02129c24P7MapBaseP5Vec3pS2_ kind:function(arm,size=0x10) addr:0x2129ba4
-_Z19func_ov015_02129c34P7MapBasei kind:function(arm,size=0x10) addr:0x2129bb4
-_Z19func_ov015_02129c44P7MapBasei kind:function(arm,size=0x10) addr:0x2129bc4
+func_ov015_02129c14 kind:function(arm,size=0x10) addr:0x2129b94
+func_ov015_02129c24 kind:function(arm,size=0x10) addr:0x2129ba4
+func_ov015_02129c34 kind:function(arm,size=0x10) addr:0x2129bb4
+func_ov015_02129c44 kind:function(arm,size=0x10) addr:0x2129bc4
 func_ov015_02129c54 kind:function(arm,size=0x50) addr:0x2129bd4
 func_ov015_02129ca4 kind:function(arm,size=0x44) addr:0x2129c24
 func_ov015_02129ce8 kind:function(arm,size=0xac) addr:0x2129c68