diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 3323a223..2e2a34c6 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -82,7 +82,7 @@ func_ov000_02078b0c kind:function(thumb,size=0x34) addr:0x2078b0c func_ov000_02078b40 kind:function(arm,size=0x24) addr:0x2078b40 func_ov000_02078b64 kind:function(arm,size=0x24) addr:0x2078b64 func_ov000_02078b88 kind:function(arm,size=0x3c) addr:0x2078b88 -func_ov000_02078bc4 kind:function(thumb,size=0x2c) addr:0x2078bc4 +_Z19func_ov000_02078bc4i kind:function(thumb,size=0x2c) addr:0x2078bc4 func_ov000_02078bf0 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 @@ -1236,7 +1236,7 @@ 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 func_ov000_02096324 kind:function(arm,size=0xf4) addr:0x2096324 -func_ov000_02096418 kind:function(arm,size=0xb4) addr:0x2096418 +_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 func_ov000_020967ac kind:function(arm,size=0x250) addr:0x20967ac diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 45d10fa7..09aba1f6 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -82,7 +82,7 @@ func_ov000_02078b0c kind:function(thumb,size=0x34) addr:0x2078aac func_ov000_02078b40 kind:function(arm,size=0x24) addr:0x2078ae0 func_ov000_02078b64 kind:function(arm,size=0x24) addr:0x2078b04 func_ov000_02078b88 kind:function(arm,size=0x3c) addr:0x2078b28 -func_ov000_02078bc4 kind:function(thumb,size=0x2c) addr:0x2078b64 +_Z19func_ov000_02078bc4i kind:function(thumb,size=0x2c) addr:0x2078b64 func_ov000_02078bf0 kind:function(thumb,size=0x11c) addr:0x2078b90 func_ov000_02078d0c kind:function(thumb,size=0x24) addr:0x2078cac func_ov000_02078d30 kind:function(thumb,size=0x24) addr:0x2078cd0 @@ -1236,7 +1236,7 @@ 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 func_ov000_02096324 kind:function(arm,size=0xf4) addr:0x20962c4 -func_ov000_02096418 kind:function(arm,size=0xb4) addr:0x20963b8 +_Z19func_ov000_02096418Pi 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 diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index feb89ddf..750476b5 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -3,9 +3,12 @@ #include "Actor/ActorManager.hpp" #include "Player/PlayerBase.hpp" +extern u32 func_ov000_02078bc4(unk32 param_1); extern void func_ov000_0208cc88(s32 *param1); +extern s32 *func_ov000_02096418(s32 *param_1); extern s32 *data_027e0f68; +extern s32 *data_027e0f70; ARM void MapManager::GetCourseDungeonProgress(CourseProgress *param_2) { this->mCourse->GetDungeonProgress(param_2); @@ -426,8 +429,8 @@ ARM void MapManager::func_ov00_02082acc() { this->mCourse->func_ov00_0207d7bc(); } -ARM unk32 *MapManager::func_ov00_02082adc() { - // func_ov000_02096418(DWORD_027e0f70); // Does not exist. +ARM s32 *MapManager::func_ov00_02082adc() { + return func_ov000_02096418(data_027e0f70); } ARM void MapManager::func_ov00_02082af4() { @@ -504,7 +507,7 @@ ARM u8 MapManager::func_ov00_02082d40() { } ARM u32 MapManager::func_ov00_02082d74(unk32 param_2) { - // return func_ov00_02082d80(param_2); // Does not exist. + return func_ov000_02078bc4(param_2); } ARM void MapManager::func_ov00_02082d84(unk8 *param_2, s32 *param_3, s32 *param_4) {