diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 4a84f67e..528f1d22 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -521,7 +521,7 @@ _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 +_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 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 46c2987c..d7e06342 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -521,7 +521,7 @@ _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 +_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 diff --git a/include/Map/MapOverworld.hpp b/include/Map/MapOverworld.hpp index 482b3ad1..4ce6d91a 100644 --- a/include/Map/MapOverworld.hpp +++ b/include/Map/MapOverworld.hpp @@ -46,7 +46,7 @@ public: /* 1c */ virtual void vfunc_1c(bool param_2) override; /* 20 */ virtual void vfunc_20(s32 param_2) override; /* 2c */ virtual void vfunc_2c() override; - /* 4c */ virtual void vfunc_4c() override; + /* 4c */ virtual s32 vfunc_4c() override; /* 54 */ virtual unk32 vfunc_54() override; /* 58 */ virtual unk32 vfunc_58() override; /* 5c */ virtual unk32 vfunc_5c() override; @@ -58,7 +58,7 @@ public: /* 94 */ virtual void vfunc_94() override; /* 98 */ virtual void vfunc_98() override; /* a4 */ virtual unk32 vfunc_a4() override; - /* b0 */ virtual unk8 vfunc_b0(unk32 param_2, unk32 param_3) override; + /* b0 */ virtual void vfunc_b0(unk32 param_2, unk32 param_3) override; /* bc */ virtual void vfunc_bc() override; /* c0 */ virtual void vfunc_c0() override; /* c4 */ diff --git a/src/18_Overworld/Map/MapOverworld.cpp b/src/18_Overworld/Map/MapOverworld.cpp index 5737ea54..e2c73db7 100644 --- a/src/18_Overworld/Map/MapOverworld.cpp +++ b/src/18_Overworld/Map/MapOverworld.cpp @@ -25,7 +25,7 @@ void MapOverworld::vfunc_c0() {} unk32 MapOverworld::vfunc_78() {} unk32 MapOverworld::vfunc_7c() {} unk32 MapOverworld::vfunc_80() {} -unk8 MapOverworld::vfunc_b0(unk32 param_2, unk32 param_3) {} +void MapOverworld::vfunc_b0(unk32 param_2, unk32 param_3) {} void MapOverworld::func_ov018_0215c650() {} void MapOverworld::func_ov018_0215c6ac() {} void MapOverworld::func_ov018_0215c6d0() {} @@ -35,4 +35,4 @@ void MapOverworld::func_ov018_0215c9ac() {} void func_ov018_0215ca24(s32 param1) {} void func_ov018_0215ca3c(s32 param1, s32 param2, unk32 param3, unk32 param4) {} void func_ov018_0215ca8c(s32 param1) {} -void MapOverworld::vfunc_4c() {} +s32 MapOverworld::vfunc_4c() {}