Merge remote-tracking branch 'zeldaret/main' into hammer

4 files changed, 119 insertions, 111 deletions

diff --git a/config/usa/arm9/delinks.txt b/config/usa/arm9/delinks.txt
index 3913ca13..25601a31 100644
--- a/config/usa/arm9/delinks.txt
+++ b/config/usa/arm9/delinks.txt
@@ -51,3 +51,11 @@ src/Main/Message/func_0203c72c.cpp:
 
 src/Main/Unknown/UnkStruct_0203dae0.cpp:
     .text       start:0x0203da9c end:0x0203e740
+
+src/Main/Unknown/UnkStruct_0206322c.cpp:
+    .text       start:0x02030350 end:0x020306bc
+
+src/Main/Unknown/UnkStruct_02063220.cpp:
+    .text       start:0x0202f3ec end:0x0202f8e4
+    .rodata     start:0x0205629c end:0x020562bc
+    .data       start:0x020576e4 end:0x020577c0
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index 8b455cf0..5448d534 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -488,11 +488,11 @@ func_ov000_0208208c kind:function(arm,size=0x14) addr:0x208202c
 func_ov000_020820a0 kind:function(arm,size=0x1c) addr:0x2082040
 func_ov000_020820bc kind:function(arm,size=0x14) addr:0x208205c
 func_ov000_020820d0 kind:function(arm,size=0x1c) addr:0x2082070
-_ZN10MapManager18func_ov00_020820ecEPi kind:function(arm,size=0x10) addr:0x208208c
+_ZN10MapManager24GetCourseDungeonProgressEP14CourseProgress kind:function(arm,size=0x10) addr:0x208208c
 _ZN10MapManager18func_ov00_020820fcEiii kind:function(arm,size=0x10) addr:0x208209c
-_ZN10MapManager18func_ov00_0208210cEii kind:function(arm,size=0x200) addr:0x20820ac
-_ZN10MapManager18func_ov00_0208230cEi kind:function(arm,size=0x3c) addr:0x20822ac
-_ZN10MapManager18func_ov00_02082348Ei kind:function(arm,size=0x5c) addr:0x20822e8
+_ZN10MapManager18func_ov00_0208210cEiPi kind:function(arm,size=0x200) addr:0x20820ac
+_ZN10MapManager18func_ov00_0208230cEPi kind:function(arm,size=0x3c) addr:0x20822ac
+_ZN10MapManager18func_ov00_02082348EPi kind:function(arm,size=0x5c) addr:0x20822e8
 _ZN10MapManager18func_ov00_020823a4Ei kind:function(arm,size=0x10) addr:0x2082344
 _ZN10MapManager18func_ov00_020823b4Ev kind:function(arm,size=0x10) addr:0x2082354
 _ZN10MapManager18func_ov00_020823c4EPii kind:function(arm,size=0x10) addr:0x2082364
@@ -501,7 +501,7 @@ _ZN10MapManager18func_ov00_020823e4Ei kind:function(arm,size=0x10) addr:0x208238
 _ZN10MapManager16MapData_vfunc_b4Ev kind:function(arm,size=0x18) addr:0x2082394
 _ZN10MapManager16MapData_vfunc_9cEv kind:function(arm,size=0x18) addr:0x20823ac
 _ZN10MapManager18func_ov00_02082424Ev kind:function(arm,size=0x30) addr:0x20823c4
-_ZN10MapManager18func_ov00_02082454Eii kind:function(arm,size=0x40) addr:0x20823f4
+_ZN10MapManager18func_ov00_02082454EP5Vec3pS1_ kind:function(arm,size=0x40) addr:0x20823f4
 _ZN10MapManager18func_ov00_02082494Ei kind:function(arm,size=0x38) addr:0x2082434
 _ZN10MapManager18func_ov00_020824ccEi kind:function(arm,size=0x38) addr:0x208246c
 _ZN10MapManager18func_ov00_02082504Ev kind:function(arm,size=0x34) addr:0x20824a4
@@ -509,145 +509,145 @@ _ZN10MapManager18func_ov00_02082538Ev kind:function(arm,size=0x5c) addr:0x20824d
 _ZN10MapManager18func_ov00_02082594Ev kind:function(arm,size=0x18) addr:0x2082534
 _ZN10MapManager18func_ov00_020825acEv kind:function(arm,size=0x18) addr:0x208254c
 _ZN10MapManager17GetCourseFilePathEPcS0_ kind:function(arm,size=0x20) addr:0x2082564
-_ZN10MapManager18func_ov00_020825e4Eii kind:function(arm,size=0x30) addr:0x2082584
-_ZN10MapManager18func_ov00_02082614Eii kind:function(arm,size=0x24) addr:0x20825b4
-_ZN10MapManager16MapData_vfunc_b0Ev kind:function(arm,size=0x18) addr:0x20825d8
+_ZN10MapManager18func_ov00_020825e4EiPc kind:function(arm,size=0x30) addr:0x2082584
+_ZN10MapManager18func_ov00_02082614EPci kind:function(arm,size=0x24) addr:0x20825b4
+_ZN10MapManager16MapData_vfunc_b0Eii kind:function(arm,size=0x18) addr:0x20825d8
 _ZN10MapManager18func_ov00_02082650Eiii kind:function(arm,size=0x10) addr:0x20825f0
 _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_02082808Ev kind:function(arm,size=0xb8) addr:0x20827a8
-_ZN10MapManager16MapData_vfunc_7cEv kind:function(arm,size=0x20) addr:0x2082860
-_ZN10MapManager16MapData_vfunc_84Ev kind:function(arm,size=0x18) addr:0x2082880
+_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
-_ZN10MapManager20GetCourseData_Unk_b0Ev kind:function(arm,size=0xc) addr:0x20828a8
+_ZN10MapManager10GetNumMapsEv kind:function(arm,size=0xc) addr:0x20828a8
 _ZN10MapManager18func_ov00_02082914Ei kind:function(arm,size=0x1b8) addr:0x20828b4
 _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
-_ZN10MapManager20GetCourseData_Unk_1cEv kind:function(arm,size=0xc) addr:0x2082cc8
-_ZN10MapManager20GetCourseData_Unk_1dEv kind:function(arm,size=0xc) addr:0x2082cd4
+_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_02082d84Ev 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_0208306cEv kind:function(arm,size=0xf0) addr:0x208300c
+_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_02083298EjPiS0_S0_ kind:function(arm,size=0x74) addr:0x2083238
+_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
-_ZN10MapManager18func_ov00_02083318Ei kind:function(arm,size=0x10) addr:0x20832b8
+_ZN10MapManager15IsMapInMainGridEj kind:function(arm,size=0x10) addr:0x20832b8
 _ZN10MapManager18func_ov00_02083328Ev kind:function(arm,size=0x1c) addr:0x20832c8
-_ZN10MapManager20GetCourseData_Unk_86Ev kind:function(arm,size=0xc) addr:0x20832e4
-_ZN10MapManager20GetCourseData_Unk_87Ev kind:function(arm,size=0xc) addr:0x20832f0
-_ZN10MapManager17Get_MapData_Unk28Ev kind:function(arm,size=0xc) addr:0x20832fc
-_ZN10MapManager17Get_MapData_Unk2aEv kind:function(arm,size=0xc) addr:0x2083308
+_ZN10MapManager22GetCourseMainGridSizeXEv kind:function(arm,size=0xc) addr:0x20832e4
+_ZN10MapManager22GetCourseMainGridSizeYEv kind:function(arm,size=0xc) addr:0x20832f0
+_ZN10MapManager11GetMapWidthEv kind:function(arm,size=0xc) addr:0x20832fc
+_ZN10MapManager12GetMapHeightEv kind:function(arm,size=0xc) addr:0x2083308
 _ZN10MapManager18func_ov00_02083374Ev kind:function(arm,size=0x10) addr:0x2083314
 _ZN10MapManager18func_ov00_02083384Ev kind:function(arm,size=0x10) addr:0x2083324
 _ZN10MapManager13GetCourseMinXEv kind:function(arm,size=0xc) addr:0x2083334
 _ZN10MapManager13GetCourseMinZEv kind:function(arm,size=0xc) addr:0x2083340
 _ZN10MapManager13GetCourseMaxXEv kind:function(arm,size=0xc) addr:0x208334c
 _ZN10MapManager13GetCourseMaxZEv kind:function(arm,size=0xc) addr:0x2083358
-_ZN10MapManager18func_ov00_020833c4Ev kind:function(arm,size=0xc) addr:0x2083364
-_ZN10MapManager18func_ov00_020833d0Ev kind:function(arm,size=0xc) addr:0x2083370
-_ZN10MapManager18func_ov00_020833dcEv kind:function(arm,size=0xc) addr:0x208337c
-_ZN10MapManager18func_ov00_020833e8Ev kind:function(arm,size=0xc) addr:0x2083388
-_ZN10MapManager18Get_MapData_Unk_d0Ev kind:function(arm,size=0xc) addr:0x2083394
-_ZN10MapManager18Get_MapData_Unk_d8Ev kind:function(arm,size=0xc) addr:0x20833a0
-_ZN10MapManager17GetMapData_Unk_dcEP5Vec3p kind:function(arm,size=0x20) addr:0x20833ac
-_ZN10MapManager17GetMapData_Unk_e8EP5Vec3p kind:function(arm,size=0x20) addr:0x20833cc
-_ZN10MapManager17GetMapData_Unk_d0EP5Vec3p kind:function(arm,size=0x20) addr:0x20833ec
+_ZN10MapManager10GetMapMinXEv kind:function(arm,size=0xc) addr:0x2083364
+_ZN10MapManager10GetMapMinZEv kind:function(arm,size=0xc) addr:0x2083370
+_ZN10MapManager10GetMapMaxXEv kind:function(arm,size=0xc) addr:0x208337c
+_ZN10MapManager10GetMapMaxZEv kind:function(arm,size=0xc) addr:0x2083388
+_ZN10MapManager13GetMapCenterXEv kind:function(arm,size=0xc) addr:0x2083394
+_ZN10MapManager13GetMapCenterZEv kind:function(arm,size=0xc) addr:0x20833a0
+_ZN10MapManager15GetMapMinBoundsEP5Vec3p kind:function(arm,size=0x20) addr:0x20833ac
+_ZN10MapManager15GetMapMaxBoundsEP5Vec3p kind:function(arm,size=0x20) addr:0x20833cc
+_ZN10MapManager12GetMapCenterEP5Vec3p kind:function(arm,size=0x20) addr:0x20833ec
 _ZN10MapManager18func_ov00_0208346cEP4AABB kind:function(arm,size=0x50) addr:0x208340c
 _ZN10MapManager18func_ov00_020834bcEP5Vec3pii kind:function(arm,size=0x68) addr:0x208345c
 _ZN10MapManager18func_ov00_02083524EP5Vec3pii kind:function(arm,size=0x3c) addr:0x20834c4
-_ZN10MapManager18func_ov00_02083560EiPS_j kind:function(arm,size=0x10) addr:0x2083500
-_ZN10MapManager18func_ov00_02083570Eii kind:function(arm,size=0x18) addr:0x2083510
+_ZN10MapManager18func_ov00_02083560EP5Vec2bPS_j kind:function(arm,size=0x10) addr:0x2083500
+_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_020835c4Eii kind:function(arm,size=0x20) addr:0x2083564
-_ZN10MapManager18func_ov00_020835e4EiPiS0_ kind:function(arm,size=0x10) addr:0x2083584
+_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
 _ZN10MapManager18func_ov00_02083614Ei kind:function(arm,size=0x10) addr:0x20835b4
-_ZN10MapManager14GetEntrancePosEP5Vec3pi kind:function(arm,size=0x40) addr:0x20835c4
-_ZN10MapManager18func_ov00_02083664EP5Vec3pi kind:function(arm,size=0x58) addr:0x2083604
-_ZN10MapManager18func_ov00_020836bcEjPi kind:function(arm,size=0x10) addr:0x208365c
-_ZN10MapManager23GetTriggerBoundingBoxesEjP4AABBj kind:function(arm,size=0x10) addr:0x208366c
-_ZN10MapManager18func_ov00_020836dcEii kind:function(arm,size=0x94) addr:0x208367c
-_ZN10MapManager18func_ov00_02083770Eji kind:function(arm,size=0x10) addr:0x2083710
-_ZN10MapManager18func_ov00_02083780Ei kind:function(arm,size=0x10) addr:0x2083720
+_ZN10MapManager14GetEntrancePosEP8Entrancei kind:function(arm,size=0x40) addr:0x20835c4
+_ZN10MapManager18func_ov00_02083664EP8Entrancei kind:function(arm,size=0x58) addr:0x2083604
+_ZN10MapManager21GetTriggerBoundingBoxEiP4AABB kind:function(arm,size=0x10) addr:0x208365c
+_ZN10MapManager23GetTriggerBoundingBoxesEiP4AABBi kind:function(arm,size=0x10) addr:0x208366c
+_ZN10MapManager18func_ov00_020836dcEjj kind:function(arm,size=0x94) addr:0x208367c
+_ZN10MapManager23IsTriggerTypeOverlappedEjP5Vec3p kind:function(arm,size=0x10) addr:0x2083710
+_ZN10MapManager21GetOverlappingTriggerEP5Vec3p kind:function(arm,size=0x10) addr:0x2083720
 _ZN10MapManager18func_ov00_02083790Ei kind:function(arm,size=0xb0) addr:0x2083730
 _ZN10MapManager18func_ov00_02083840Ei kind:function(arm,size=0x88) addr:0x20837e0
-_ZN10MapManager18func_ov00_020838c8Ei kind:function(arm,size=0x10) addr:0x2083868
+_ZN10MapManager10AddTriggerEi kind:function(arm,size=0x10) addr:0x2083868
 _ZN10MapManager18func_ov00_020838d8Ei kind:function(arm,size=0x10) addr:0x2083878
-_ZN10MapManager18func_ov00_020838e8EjPi kind:function(arm,size=0x10) addr:0x2083888
-_ZN10MapManager18func_ov00_020838f8EPi kind:function(arm,size=0x10) addr:0x2083898
-_ZN10MapManager18func_ov00_02083908EcPi kind:function(arm,size=0x10) addr:0x20838a8
-_ZN10MapManager18func_ov00_02083918EiPi kind:function(arm,size=0x10) addr:0x20838b8
-_ZN10MapManager18func_ov00_02083928EPci kind:function(arm,size=0x10) addr:0x20838c8
+_ZN10MapManager8FindExitEjP4Exit kind:function(arm,size=0x10) addr:0x2083888
+_ZN10MapManager18func_ov00_020838f8EP4Exit kind:function(arm,size=0x10) addr:0x2083898
+_ZN10MapManager18func_ov00_02083908EcP15CameraViewpoint kind:function(arm,size=0x10) addr:0x20838a8
+_ZN10MapManager18func_ov00_02083918EiP15CameraViewpoint kind:function(arm,size=0x10) addr:0x20838b8
+_ZN10MapManager19GetCurrentViewpointEP15CameraViewpointi kind:function(arm,size=0x10) addr:0x20838c8
 _ZN10MapManager18func_ov00_02083938Ei kind:function(arm,size=0x10) addr:0x20838d8
-_ZN10MapManager18Set_MapData_Unk_16Eci kind:function(arm,size=0x10) addr:0x20838e8
+_ZN10MapManager21SetCurrentViewpointIdEci kind:function(arm,size=0x10) addr:0x20838e8
 _ZN10MapManager18func_ov00_02083958Ei kind:function(arm,size=0x10) addr:0x20838f8
 _ZN10MapManager18func_ov00_02083968EjPc kind:function(arm,size=0x10) addr:0x2083908
-_ZN10MapManager18func_ov00_02083978EiP5Vec3p kind:function(arm,size=0x3c) addr:0x2083918
+_ZN10MapManager18func_ov00_02083978EP5Vec3pS1_ kind:function(arm,size=0x3c) addr:0x2083918
 _ZN10MapManager18func_ov00_020839b4Ei kind:function(arm,size=0x10) addr:0x2083954
 _ZN10MapManager18func_ov00_020839c4Ei kind:function(arm,size=0x10) addr:0x2083964
-_ZN10MapManager18func_ov00_020839d4Ev kind:function(arm,size=0x24) addr:0x2083974
-_ZN10MapManager18func_ov00_020839f8Ev kind:function(arm,size=0x24) addr:0x2083998
+_ZN10MapManager18func_ov00_020839d4Ei kind:function(arm,size=0x24) addr:0x2083974
+_ZN10MapManager18func_ov00_020839f8Ei kind:function(arm,size=0x24) addr:0x2083998
 _ZN10MapManager18func_ov00_02083a1cEP5Vec2bPS_P5Vec3p kind:function(arm,size=0x38) addr:0x20839bc
-_ZN10MapManager18func_ov00_02083a54EiPS_iii kind:function(arm,size=0x130) addr:0x20839f4
-_ZN10MapManager18func_ov00_02083b84Ev kind:function(arm,size=0x28) addr:0x2083b24
-_ZN10MapManager18func_ov00_02083bacEv kind:function(arm,size=0x28) addr:0x2083b4c
-_ZN10MapManager18func_ov00_02083bd4Ev kind:function(arm,size=0x28) addr:0x2083b74
-_ZN10MapManager18func_ov00_02083bfcEv kind:function(arm,size=0x28) addr:0x2083b9c
+_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
+_ZN10MapManager11GetTileEndXEi kind:function(arm,size=0x28) addr:0x2083b74
+_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_02083ce8Ecccci 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_60Ev kind:function(arm,size=0x18) addr:0x2083df8
-_ZN10MapManager18func_ov00_02083e70Ev kind:function(arm,size=0x70) addr:0x2083e10
-_ZN10MapManager16MapData_vfunc_68Ev kind:function(arm,size=0x18) addr:0x2083e80
-_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i kind:function(arm,size=0x4c) addr:0x2083e98
-_ZN10MapManager18func_ov00_02083f44EP5Vec3p kind:function(arm,size=0x3c) addr:0x2083ee4
-_ZN10MapManager16MapData_vfunc_6cEv kind:function(arm,size=0x18) addr:0x2083f20
-_ZN10MapManager16MapData_vfunc_70Ev kind:function(arm,size=0x18) addr:0x2083f38
+_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_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
 _ZN10MapManager18GetTileWorldBoundsEP5Vec2bP4AABB kind:function(arm,size=0x64) addr:0x2083fc4
-_ZN10MapManager16MapData_vfunc_54Ev kind:function(arm,size=0x18) addr:0x2084028
-_ZN10MapManager18func_ov00_020840a0Ecci kind:function(arm,size=0x24) addr:0x2084040
+_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_02084100EiPS_ kind:function(arm,size=0x14) addr:0x20840a0
+_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
 _ZN10MapManager18func_ov00_0208412cEv kind:function(arm,size=0x10) addr:0x20840cc
 _ZN10MapManager18func_ov00_0208413cEi kind:function(arm,size=0x10) addr:0x20840dc
-_ZN10MapManager16MapData_vfunc_58Ev kind:function(arm,size=0x18) addr:0x20840ec
-_ZN10MapManager18func_ov00_02084164Ev kind:function(arm,size=0x1a8) addr:0x2084104
+_ZN10MapManager16MapData_vfunc_58EP5Vec2bi kind:function(arm,size=0x18) addr:0x20840ec
+_ZN10MapManager18func_ov00_02084164EP5Vec2b kind:function(arm,size=0x1a8) addr:0x2084104
 _ZN10MapManager17GetMapData_Unk_0aEv kind:function(arm,size=0xc) addr:0x20842ac
 _ZN10MapManager17GetMapData_Unk_0bEv kind:function(arm,size=0xc) addr:0x20842b8
-_ZN10MapManager16MapData_vfunc_a4Ev kind:function(arm,size=0x18) addr:0x20842c4
-_ZN10MapManager18func_ov00_0208433cEP5Vec3pi kind:function(arm,size=0x60) addr:0x20842dc
-_ZN10MapManager18func_ov00_0208439cEv kind:function(arm,size=0x50) addr:0x208433c
+_ZN10MapManager16MapData_vfunc_a4EPc kind:function(arm,size=0x18) addr:0x20842c4
+_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_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_02084934Ev 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
@@ -659,31 +659,31 @@ _ZN10MapManager8SpawnNPCEP5Vec3pii kind:function(arm,size=0x68) addr:0x20849fc
 _ZN10MapManager18func_ov00_02084ac4Ej kind:function(arm,size=0x44) addr:0x2084a64
 _ZN10MapManager10SetNumKeysEi kind:function(arm,size=0xc) addr:0x2084aa8
 _ZN10MapManager10GetNumKeysEv kind:function(arm,size=0xc) addr:0x2084ab4
-_ZN10MapManager21SetCourseData_Unk_25cEc kind:function(arm,size=0xc) addr:0x2084ac0
-_ZN10MapManager21GetCourseData_Unk_25dEv kind:function(arm,size=0xc) addr:0x2084acc
-_ZN10MapManager18func_ov00_02084b38Eiii kind:function(arm,size=0xa8) addr:0x2084ad8
-_ZN10MapManager18func_ov00_02084be0Eii kind:function(arm,size=0x7c) addr:0x2084b80
-_ZN10MapManager18func_ov00_02084c5cEii kind:function(arm,size=0x10) addr:0x2084bfc
-_ZN10MapManager18func_ov00_02084c6cEi kind:function(arm,size=0x10) addr:0x2084c0c
-_ZN10MapManager18func_ov00_02084c7cEi kind:function(arm,size=0x18) addr:0x2084c1c
+_ZN10MapManager15SetBlueWarpOpenEb kind:function(arm,size=0xc) addr:0x2084ac0
+_ZN10MapManager15GetBlueWarpOpenEv kind:function(arm,size=0xc) addr:0x2084acc
+_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_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_02084ebcEi kind:function(arm,size=0x24c) addr:0x2084e5c
+_ZN10MapManager18func_ov00_02084ebcEP5Vec3p kind:function(arm,size=0x24c) addr:0x2084e5c
 _ZN10MapManager18func_ov00_02085108EP5Vec3p kind:function(arm,size=0x174) addr:0x20850a8
-_ZN10MapManager18func_ov00_0208527cEv kind:function(arm,size=0x180) addr:0x208521c
-_ZN10MapManager18func_ov00_020853fcEv kind:function(arm,size=0x198) addr:0x208539c
+_ZN10MapManager18func_ov00_0208527cEPS_iPi kind:function(arm,size=0x180) addr:0x208521c
+_ZN10MapManager18func_ov00_020853fcEPS_P5Vec3pPi kind:function(arm,size=0x198) addr:0x208539c
 _ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0x2085534
-_ZN10MapManager18func_ov00_0208583cEiP5Vec3pi kind:function(arm,size=0x74) addr:0x20857dc
+_ZN10MapManager18func_ov00_0208583cEPS_P5Vec3pi kind:function(arm,size=0x74) addr:0x20857dc
 _ZN10MapManager18func_ov00_020858b0EPS_P5Vec3pi kind:function(arm,size=0x184) addr:0x2085850
-_ZN10MapManager18func_ov00_02085a34Eii kind:function(arm,size=0x22c) addr:0x20859d4
-_ZN10MapManager18func_ov00_02085c60Eiiii kind:function(arm,size=0x3e4) addr:0x2085c00
-_ZN10MapManager18func_ov00_02086044Eiii kind:function(arm,size=0x240) addr:0x2085fe4
+_ZN10MapManager18func_ov00_02085a34EP5Vec3pi kind:function(arm,size=0x22c) addr:0x20859d4
+_ZN10MapManager18func_ov00_02085c60EP5Vec3pPiS2_j kind:function(arm,size=0x3e4) addr:0x2085c00
+_ZN10MapManager18func_ov00_02086044EP5Vec3pS1_i kind:function(arm,size=0x240) addr:0x2085fe4
 _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ kind:function(arm,size=0x800) addr:0x2086224
 _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ kind:function(arm,size=0x24c) addr:0x2086a24
 func_ov000_02086cd0 kind:function(arm,size=0x4) addr:0x2086c70
@@ -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 532f2002..9d88dbb9 100644
--- a/config/usa/arm9/overlays/ov004/symbols.txt
+++ b/config/usa/arm9/overlays/ov004/symbols.txt
@@ -51,7 +51,7 @@ func_ov004_021026cc kind:function(thumb,size=0x24) addr:0x210264c
 func_ov004_021026f0 kind:function(thumb,size=0x4c) addr:0x2102670
 func_ov004_0210273c kind:function(thumb,size=0xc) addr:0x21026bc
 func_ov004_02102748 kind:function(thumb,size=0x26) addr:0x21026c8
-func_ov004_02102770 kind:function(thumb,size=0x44) addr:0x21026f0
+_Z19func_ov004_02102770Pi kind:function(thumb,size=0x44) addr:0x21026f0
 func_ov004_021027b4 kind:function(arm,size=0x28) addr:0x2102734
 func_ov004_021027dc kind:function(arm,size=0x4) addr:0x210275c
 func_ov004_021027e0 kind:function(arm,size=0x14) addr:0x2102760
diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt
index 649b6fcb..df0b33c8 100644
--- a/config/usa/arm9/symbols.txt
+++ b/config/usa/arm9/symbols.txt
@@ -1474,13 +1474,13 @@ func_0202f2f8 kind:function(arm,size=0x30) addr:0x202f2f4
 func_0202f328 kind:function(arm,size=0x38) addr:0x202f324
 func_0202f360 kind:function(thumb,size=0x14) addr:0x202f35c
 func_0202f374 kind:function(thumb,size=0x7c) addr:0x202f370
-func_0202f3f0 kind:function(thumb,size=0x10) addr:0x202f3ec
-func_0202f400 kind:function(thumb,size=0x16) addr:0x202f3fc
-DisplayAssertError kind:function(thumb,size=0x9c) addr:0x202f414
-func_0202f4b4 kind:function(thumb,size=0x4c) addr:0x202f4b0
-func_0202f500 kind:function(thumb,size=0x2c) addr:0x202f4fc
-DisplayException kind:function(thumb,size=0x228) addr:0x202f528
-func_0202f754 kind:function(thumb,size=0x194) addr:0x202f750
+_ZN18UnkStruct_0206322013func_0202f3f0Ei kind:function(thumb,size=0x10) addr:0x202f3ec
+_ZN18UnkStruct_0206322013func_0202f400Ei kind:function(thumb,size=0x16) addr:0x202f3fc
+_ZN18UnkStruct_0206322018DisplayAssertErrorEPctS0_z kind:function(thumb,size=0x9c) addr:0x202f414
+_ZN18UnkStruct_0206322013func_0202f4b4Ev kind:function(thumb,size=0x4c) addr:0x202f4b0
+_ZN18UnkStruct_0206322013func_0202f500Ev kind:function(thumb,size=0x2c) addr:0x202f4fc
+_ZN18UnkStruct_0206322016DisplayExceptionEP9Registers kind:function(thumb,size=0x228) addr:0x202f528
+_ZN18UnkStruct_0206322013func_0202f754Ei kind:function(thumb,size=0x194) addr:0x202f750
 func_0202f8e8 kind:function(thumb,size=0x30) addr:0x202f8e4
 func_0202f918 kind:function(thumb,size=0x88) addr:0x202f914
 func_0202f9a0 kind:function(arm,size=0x88) addr:0x202f99c
@@ -1539,16 +1539,16 @@ _ZN18DebugHierarchyBase8vfunc_2cEv kind:function(thumb,size=0x2) addr:0x2030340
 _ZN18DebugHierarchyBase8vfunc_30Ev kind:function(thumb,size=0x2) addr:0x2030344
 _ZN18DebugHierarchyBase8vfunc_38Ev kind:function(thumb,size=0x2) addr:0x2030348
 _ZN18DebugHierarchyBase8vfunc_3cEv kind:function(thumb,size=0x2) addr:0x203034c
-func_02030354 kind:function(thumb,size=0xb4) addr:0x2030350
-func_02030408 kind:function(thumb,size=0x16) addr:0x2030404
+_ZN18UnkStruct_0206322c13func_02030354Ebb kind:function(thumb,size=0xb4) addr:0x2030350
+_ZN18UnkStruct_0206322c13func_02030408Ev kind:function(thumb,size=0x16) addr:0x2030404
 func_02030420 kind:function(thumb,size=0x44) addr:0x203041c
-func_02030464 kind:function(thumb,size=0x42) addr:0x2030460
-func_020304a8 kind:function(thumb,size=0x2c) addr:0x20304a4
+_ZN18UnkStruct_0206322c13func_02030464Ebb kind:function(thumb,size=0x42) addr:0x2030460
+_ZN18UnkStruct_0206322c13func_020304a8Ebb kind:function(thumb,size=0x2c) addr:0x20304a4
 DisplayDebugText kind:function(thumb,size=0xd8) addr:0x20304d0
 func_020305ac kind:function(thumb,size=0x88) addr:0x20305a8
-DisplayDebugTextFormat kind:function(thumb,size=0x30) addr:0x2030630
-DisplayDebugTextFormat_thunk kind:function(thumb,size=0x26) addr:0x2030660
-DisplayDebugTextF kind:function(thumb,size=0x32) addr:0x2030688
+_Z22DisplayDebugTextFormatiiiiiPcS_ kind:function(thumb,size=0x30) addr:0x2030630
+_Z28DisplayDebugTextFormat_thunkiiiiiPcz kind:function(thumb,size=0x26) addr:0x2030660
+_Z17DisplayDebugTextFiiiiPcz kind:function(thumb,size=0x32) addr:0x2030688
 func_020306c0 kind:function(thumb,size=0x70) addr:0x20306bc
 func_02030730 kind:function(thumb,size=0x28) addr:0x203072c
 func_02030758 kind:function(thumb,size=0x84) addr:0x2030754