From 2025fdf4604ba6db6391ab8354352b707c5a9359 Mon Sep 17 00:00:00 2001 From: SammygoodTunes Date: Mon, 21 Apr 2025 23:26:30 +0200 Subject: [PATCH] Restore usa overlay symbols --- config/eur/arm9/overlays/ov000/symbols.txt | 2 +- config/usa/arm9/overlays/ov000/symbols.txt | 250 ++++++++++----------- config/usa/arm9/overlays/ov004/symbols.txt | 6 +- config/usa/arm9/overlays/ov015/symbols.txt | 8 +- include/Map/MapManager.hpp | 2 +- src/00_Core/Map/MapManager.cpp | 26 +-- 6 files changed, 147 insertions(+), 147 deletions(-) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index b1c0fe2b..638de37c 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -635,7 +635,7 @@ _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 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 6287e650..84b9f721 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 @@ -283,7 +283,7 @@ _ZN6Course14GetMCSFilePathEiii kind:function(arm,size=0xf0) addr:0x207cc24 _ZN6Course14GetMRCFilePathEiii kind:function(arm,size=0xac) addr:0x207cd14 _ZN6Course18func_ov00_0207ce20EiiPci kind:function(arm,size=0x2c) addr:0x207cdc0 _ZN6Course18func_ov00_0207ce4cEiiiPci kind:function(arm,size=0x5b8) addr:0x207cdec -_ZN6Course18func_ov00_0207d404Eiiii kind:function(arm,size=0x78) addr:0x207d3a4 +_ZN6Course18func_ov00_0207d404Eiii kind:function(arm,size=0x78) addr:0x207d3a4 _ZN6Course22IsCurrentMapInMainGridEv kind:function(arm,size=0x14) addr:0x207d41c _ZN6Course12IsInMainGridEii kind:function(arm,size=0x54) addr:0x207d430 _ZN6Course15IsMapInMainGridEj kind:function(arm,size=0x34) addr:0x207d484 @@ -330,18 +330,18 @@ _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 _ZN7MapBase8vfunc_48Ev kind:function(arm,size=0x1c) addr:0x207e40c _ZN7MapBase8vfunc_50Ev kind:function(arm,size=0x8) addr:0x207e428 -_ZN7MapBase8vfunc_54EP5Vec2b kind:function(arm,size=0x8) addr:0x207e430 -_ZN7MapBase8vfunc_58EP5Vec2bi kind:function(arm,size=0x8) addr:0x207e438 +_ZN7MapBase8vfunc_54Ev kind:function(arm,size=0x8) addr:0x207e430 +_ZN7MapBase8vfunc_58Ev kind:function(arm,size=0x8) addr:0x207e438 _ZN7MapBase8vfunc_5cEv kind:function(arm,size=0x8) addr:0x207e440 -_ZN7MapBase8vfunc_60EPh kind:function(arm,size=0x8) addr:0x207e448 +_ZN7MapBase8vfunc_60Ev kind:function(arm,size=0x8) addr:0x207e448 _ZN7MapBase8vfunc_64Ev kind:function(arm,size=0x8) addr:0x207e450 -_ZN7MapBase8vfunc_68EP5Vec3pb 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 @@ -355,14 +355,14 @@ _ZN7MapBase8vfunc_88Ev kind:function(arm,size=0x8) addr:0x207f2c4 _ZN7MapBase8vfunc_8cEv kind:function(arm,size=0x8) addr:0x207f2cc _ZN7MapBase8vfunc_9cEv kind:function(arm,size=0x4) addr:0x207f2d4 _ZN7MapBase8vfunc_a0Ev kind:function(arm,size=0x4) addr:0x207f2d8 -_ZN7MapBase8vfunc_a4EPc kind:function(arm,size=0x8) addr:0x207f2dc +_ZN7MapBase8vfunc_a4Ev kind:function(arm,size=0x8) addr:0x207f2dc _ZN7MapBase8vfunc_a8Ev kind:function(arm,size=0x4) addr:0x207f2e4 _ZN7MapBase8vfunc_acEv kind:function(arm,size=0x4) addr:0x207f2e8 -_ZN7MapBase8vfunc_78EPb kind:function(arm,size=0x8) addr:0x207f2ec -_ZN7MapBase8vfunc_7cEiPiiPs kind:function(arm,size=0x8) addr:0x207f2f4 +_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 @@ -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 -_ZN10MapManager24GetCourseDungeonProgressEP14CourseProgress kind:function(arm,size=0x10) addr:0x208208c +_ZN10MapManager18func_ov00_020820ecEPi kind:function(arm,size=0x10) addr:0x208208c _ZN10MapManager18func_ov00_020820fcEiii kind:function(arm,size=0x10) addr:0x208209c -_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_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_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_02082454EP5Vec3pS1_ kind:function(arm,size=0x40) addr:0x20823f4 +_ZN10MapManager18func_ov00_02082454Eii 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,162 +509,162 @@ _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_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_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_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_020826a0Eii kind:function(arm,size=0x20) addr:0x2082640 +_ZN10MapManager18func_ov00_020826a0Eiii 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_7cEiPiiPs kind:function(arm,size=0x20) addr:0x2082860 -_ZN10MapManager16MapData_vfunc_84Ei kind:function(arm,size=0x18) addr:0x2082880 +_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_020828f8EPi kind:function(arm,size=0x10) addr:0x2082898 -_ZN10MapManager10GetNumMapsEv kind:function(arm,size=0xc) addr:0x20828a8 +_ZN10MapManager20GetCourseData_Unk_b0Ev 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_02082d08Ev kind:function(arm,size=0x20) addr:0x2082ca8 -_ZN10MapManager17GetCurrentMapPosXEv kind:function(arm,size=0xc) addr:0x2082cc8 -_ZN10MapManager17GetCurrentMapPosYEv kind:function(arm,size=0xc) addr:0x2082cd4 +_ZN10MapManager20GetCourseData_Unk_1cEv kind:function(arm,size=0xc) addr:0x2082cc8 +_ZN10MapManager20GetCourseData_Unk_1dEv 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_02082d84Ev 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_0208306cEv 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_02083298EjP5Vec3pPiS2_ kind:function(arm,size=0x74) addr:0x2083238 +_ZN10MapManager18func_ov00_02083298EjPiS0_S0_ 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 +_ZN10MapManager18func_ov00_02083318Ei kind:function(arm,size=0x10) addr:0x20832b8 _ZN10MapManager18func_ov00_02083328Ev kind:function(arm,size=0x1c) addr:0x20832c8 -_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 +_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 _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 -_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_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 _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_02083560EP5Vec2bPS_j kind:function(arm,size=0x10) addr:0x2083500 +_ZN10MapManager18func_ov00_02083560EiPS_j kind:function(arm,size=0x10) addr:0x2083500 _ZN10MapManager18func_ov00_02083570Eii 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_020835e4EiPiPc kind:function(arm,size=0x10) addr:0x2083584 +_ZN10MapManager18func_ov00_020835e4EiPiS0_ 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 -_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 +_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 _ZN10MapManager18func_ov00_02083790Ei kind:function(arm,size=0xb0) addr:0x2083730 _ZN10MapManager18func_ov00_02083840Ei kind:function(arm,size=0x88) addr:0x20837e0 -_ZN10MapManager10AddTriggerEi kind:function(arm,size=0x10) addr:0x2083868 +_ZN10MapManager18func_ov00_020838c8Ei kind:function(arm,size=0x10) addr:0x2083868 _ZN10MapManager18func_ov00_020838d8Ei kind:function(arm,size=0x10) addr:0x2083878 -_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_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 _ZN10MapManager18func_ov00_02083938Ei kind:function(arm,size=0x10) addr:0x20838d8 -_ZN10MapManager21SetCurrentViewpointIdEci kind:function(arm,size=0x10) addr:0x20838e8 +_ZN10MapManager18Set_MapData_Unk_16Eci 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_02083978EP5Vec3pS1_ kind:function(arm,size=0x3c) addr:0x2083918 +_ZN10MapManager18func_ov00_02083978EiP5Vec3p 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_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_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_020839d4Ev kind:function(arm,size=0x24) addr:0x2083974 +_ZN10MapManager18func_ov00_020839f8Ev kind:function(arm,size=0x24) addr:0x2083998 +_ZN10MapManager18func_ov00_02083a1cEiPS_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_02083c24Ei kind:function(arm,size=0x2c) addr:0x2083bc4 _ZN10MapManager18func_ov00_02083c50Ei kind:function(arm,size=0x2c) addr:0x2083bf0 -_ZN10MapManager18func_ov00_02083c7cEP5Vec3pj kind:function(arm,size=0x6c) addr:0x2083c1c -_ZN10MapManager18func_ov00_02083ce8EPS_Pijij kind:function(arm,size=0x14c) addr:0x2083c88 +_ZN10MapManager18func_ov00_02083c7cEP5Vec3pi kind:function(arm,size=0x6c) addr:0x2083c1c +_ZN10MapManager18func_ov00_02083ce8Ecccci 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 +_ZN10MapManager16MapData_vfunc_60Ev kind:function(arm,size=0x18) addr:0x2083df8 _ZN10MapManager18func_ov00_02083e70Ev 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 +_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_6cEiii kind:function(arm,size=0x18) addr:0x2083f20 -_ZN10MapManager16MapData_vfunc_70EP5Vec3p kind:function(arm,size=0x18) addr:0x2083f38 +_ZN10MapManager16MapData_vfunc_6cEv kind:function(arm,size=0x18) addr:0x2083f20 +_ZN10MapManager16MapData_vfunc_70Ev 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_54EP5Vec2b kind:function(arm,size=0x18) addr:0x2084028 -_ZN10MapManager18func_ov00_020840a0Eccs kind:function(arm,size=0x24) addr:0x2084040 -_ZN10MapManager16MapData_vfunc_78EP5Vec2b kind:function(arm,size=0x18) addr:0x2084064 -_ZN10MapManager18func_ov00_020840dcEP5Vec2b kind:function(arm,size=0x24) addr:0x208407c -_ZN10MapManager18func_ov00_02084100EPiPS_ kind:function(arm,size=0x14) addr:0x20840a0 +_ZN10MapManager16MapData_vfunc_54Ev kind:function(arm,size=0x18) addr:0x2084028 +_ZN10MapManager18func_ov00_020840a0Ecci kind:function(arm,size=0x24) addr:0x2084040 +_ZN10MapManager16MapData_vfunc_78Ev 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 _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_58EP5Vec2bi kind:function(arm,size=0x18) addr:0x20840ec -_ZN10MapManager18func_ov00_02084164EP5Vec2b kind:function(arm,size=0x1a8) addr:0x2084104 +_ZN10MapManager16MapData_vfunc_58Ev kind:function(arm,size=0x18) addr:0x20840ec +_ZN10MapManager18func_ov00_02084164Ev 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_a4EPc kind:function(arm,size=0x18) addr:0x20842c4 -_ZN10MapManager18func_ov00_0208433cEP5Vec3pS1_ kind:function(arm,size=0x60) addr:0x20842dc -_ZN10MapManager18func_ov00_0208439cEP5Vec2sP5Vec3p kind:function(arm,size=0x50) addr:0x208433c +_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 _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_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_02084934EP5Vec3p kind:function(arm,size=0x50) addr:0x20848d4 +_ZN10MapManager18func_ov00_02084934Ev 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 _ZN10MapManager18func_ov00_020849c0Ev kind:function(arm,size=0x1c) addr:0x2084960 _ZN10MapManager18func_ov00_020849dcEv kind:function(arm,size=0x1c) addr:0x208497c -_ZN10MapManager18func_ov00_020849f8Ev kind:function(arm,size=0x58) addr:0x2084998 +_ZN10MapManager18func_ov00_020849f8Ei kind:function(arm,size=0x58) addr:0x2084998 _ZN10MapManager18func_ov00_02084a50Ev kind:function(arm,size=0xc) addr:0x20849f0 _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 -_ZN10MapManager15SetBlueWarpOpenEb kind:function(arm,size=0xc) addr:0x2084ac0 -_ZN10MapManager15GetBlueWarpOpenEv kind:function(arm,size=0xc) addr:0x2084acc +_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_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_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 _ZN10MapManager18func_ov00_02084c94Ei kind:function(arm,size=0x1c) addr:0x2084c34 _ZN10MapManager18func_ov00_02084cb0Ei kind:function(arm,size=0x18) addr:0x2084c50 @@ -672,18 +672,18 @@ _ZN10MapManager18func_ov00_02084cc8Ei kind:function(arm,size=0x1c) addr:0x2084c6 _ZN10MapManager18func_ov00_02084ce4Ei 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_02084d24Eccs kind:function(arm,size=0x28) addr:0x2084cc4 +_ZN10MapManager18func_ov00_02084d24Ecci 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_02084ebcEi kind:function(arm,size=0x24c) addr:0x2084e5c _ZN10MapManager18func_ov00_02085108EPi 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_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 -_ZN10MapManager18func_ov00_02085c60EP5Vec3pPiS2_j kind:function(arm,size=0x3e4) addr:0x2085c00 -_ZN10MapManager18func_ov00_02086044EP5Vec3pS1_i kind:function(arm,size=0x240) addr:0x2085fe4 +_ZN10MapManager18func_ov00_0208527cEv kind:function(arm,size=0x180) addr:0x208521c +_ZN10MapManager18func_ov00_020853fcEv kind:function(arm,size=0x198) addr:0x208539c +_ZN10MapManager18func_ov00_02085594Ev kind:function(arm,size=0x2a8) addr:0x2085534 +_ZN10MapManager18func_ov00_0208583cEiP5Vec3pi kind:function(arm,size=0x74) addr:0x20857dc +_ZN10MapManager18func_ov00_020858b0Ev 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_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 @@ -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 +func_ov000_0208b180 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 diff --git a/config/usa/arm9/overlays/ov004/symbols.txt b/config/usa/arm9/overlays/ov004/symbols.txt index 8b40db5f..0f7cd422 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=0x28) addr:0x21026c8 -_Z19func_ov004_02102770Pi kind:function(thumb,size=0x44) addr:0x21026f0 +func_ov004_02102770 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 @@ -72,7 +72,7 @@ func_ov004_02102aa0 kind:function(thumb,size=0x38) addr:0x2102a20 func_ov004_02102ad8 kind:function(thumb,size=0x20) addr:0x2102a58 func_ov004_02102af8 kind:function(thumb,size=0x8) 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=0x4) 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 848bd45f..c9b2ed11 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 diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 870a9696..6e7ea945 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -192,7 +192,7 @@ public: u8 GetMapData_Unk_0a(); u8 GetMapData_Unk_0b(); unk8 MapData_vfunc_a4(unk8 *param_1); - unk8 func_ov00_0208433c(Vec3p *param_2, Vec3p *param_3); + unk8 func_ov00_0208433c(Vec3p *param_2, Vec2s *param_3); unk8 func_ov00_0208439c(Vec2s *param_2, Vec3p *param_3); void func_ov00_020843ec(s32 *param_2); unk32 GetMapData_Unk_38(); diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index 8164011e..7a96bf04 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -71,16 +71,18 @@ struct UnkStruct_02082348 { /* 12 */ unk8 mUnk_12[0x4]; }; -extern s32 *data_027e0c68; +extern unk32 *data_027e0c68; extern u32 *data_027e0ce4; -extern s32 *data_027e0d3c; -extern s32 *data_027e0f64; -extern s32 *data_027e0f68; -extern s32 *data_027e0f6c; -extern s32 *data_027e0f70; -extern s32 *data_027e0f78; -extern s32 *data_027e0f7c; -extern s32 *data_027e103c; +extern unk32 *data_027e0d3c; +extern unk32 *data_027e0f64; +extern unk32 *data_027e0f68; +extern unk32 *data_027e0f6c; +extern unk32 *data_027e0f70; +extern unk32 *data_027e0f78; +extern unk32 *data_027e0f7c; +extern unk32 *data_027e103c; + +extern unk32 *data_ov000_020e24a4; ARM void MapManager::GetCourseDungeonProgress(CourseProgress *param_2) { this->mCourse->GetDungeonProgress(param_2); @@ -1294,9 +1296,7 @@ ARM void MapManager::func_ov00_02083f44(Vec3p *param_2) { local_18.z = param_2->z; local_18.x = param_2->x; - /*local_18.y = *(int *)( - PTR_PTR_s_anc_overlay_d_0__020e24a0_overlay_d_0__020e24a4_overlay_d_0__02083f7c - + 0x20);*/ + local_18.y = *(data_ov000_020e24a4 + 0x10); this->func_ov00_02083ef8(param_2, &local_18); } @@ -1467,7 +1467,7 @@ unk8 MapManager::MapData_vfunc_a4(unk8 *param_1) { this->mMap->vfunc_a4(param_1); } -unk8 MapManager::func_ov00_0208433c(Vec3p *param_2, Vec3p *param_3) { +unk8 MapManager::func_ov00_0208433c(Vec3p *param_2, Vec2s *param_3) { Vec2s local_28; Vec3p VStack_24; Vec3p local_18;