Skip to content

Decompile 00_Core/Map/MapBase.cpp (57%) #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SammygoodTunes wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Decompile 00_Core/Map/MapBase.cpp (57%) #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f8c322
Decomp vfunc_90
SammygoodTunes Sep 24, 2025
d7acf8a
Merge branch 'main' into decomp/MapBase
SammygoodTunes Nov 30, 2025
333cdaf
Progress
SammygoodTunes Nov 30, 2025
c787d7b
Merge branch 'decomp/MapBase' of https://github.com/SammygoodTunes/ph…
SammygoodTunes Nov 30, 2025
518bba6
MapManager correction
SammygoodTunes Nov 30, 2025
9444d7c
Apply no inline on functions using std::vector
SammygoodTunes Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config/eur/arm9/overlays/ov000/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,12 @@ _ZN7MapBase8vfunc_48Ev kind:function(arm,size=0x1c) addr:0x0207e46c
_ZN7MapBase8vfunc_50Ev kind:function(arm,size=0x8) addr:0x0207e488
_ZN7MapBase8vfunc_54EP7TilePos kind:function(arm,size=0x8) addr:0x0207e490
_ZN7MapBase8vfunc_58EP7TilePosi kind:function(arm,size=0x8) addr:0x0207e498
_ZN7MapBase8vfunc_5cEv kind:function(arm,size=0x8) addr:0x0207e4a0
_ZN7MapBase8vfunc_5cEP7TilePos kind:function(arm,size=0x8) addr:0x0207e4a0
_ZN7MapBase8vfunc_60EP7TilePos kind:function(arm,size=0x8) addr:0x0207e4a8
_ZN7MapBase8vfunc_64Ev kind:function(arm,size=0x8) addr:0x0207e4b0
_ZN7MapBase8vfunc_68EP5Vec3pb kind:function(arm,size=0x488) addr:0x0207e4b8
_ZN7MapBase18func_ov00_0207e940EPc kind:function(arm,size=0x28) addr:0x0207e940
_ZN7MapBase18func_ov00_0207e968Ev kind:function(arm,size=0x4) addr:0x0207e968
_ZN26MapBase_func_ov00_0207e940D1Ev kind:function(arm,size=0x28) addr:0x0207e940
_ZN26MapBase_func_ov00_0207e968D1Ev kind:function(arm,size=0x4) addr:0x0207e968
_ZN7MapBase18func_ov00_0207e96cEv kind:function(arm,size=0x4) addr:0x0207e96c
_ZN7MapBase8vfunc_6cEP5Vec3pPiS1_ kind:function(arm,size=0x4a4) addr:0x0207e970
_ZN7MapBase8vfunc_70EP5Vec3p kind:function(arm,size=0x1e0) addr:0x0207ee14
Expand Down Expand Up @@ -420,9 +420,9 @@ _ZN7MapBase18func_ov00_02080a78EP5Vec3p kind:function(arm,size=0x58) addr:0x0208
_ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_S2_ kind:function(arm,size=0x54) addr:0x02080ad0
_ZN7MapBase18func_ov00_02080b24EP7TilePos kind:function(arm,size=0x1e4) addr:0x02080b24
_ZN7MapBase18func_ov00_02080d08EP7TilePos kind:function(arm,size=0x6c) addr:0x02080d08
_ZN7MapBase8vfunc_bcEv kind:function(arm,size=0x4) addr:0x02080d74
_ZN7MapBase8vfunc_bcEP7TilePosi kind:function(arm,size=0x4) addr:0x02080d74
_ZN7MapBase8vfunc_98EP7TilePosii kind:function(arm,size=0x4) addr:0x02080d78
_ZN7MapBase8vfunc_c0Ev kind:function(arm,size=0x4) addr:0x02080d7c
_ZN7MapBase8vfunc_c0EP7TilePosi kind:function(arm,size=0x4) addr:0x02080d7c
_ZN7MapBase22TriggerOfType_vfunc_10Ei kind:function(arm,size=0x5c) addr:0x02080d80
_ZN11TriggerBase8vfunc_10Ev kind:function(arm,size=0x8) addr:0x02080ddc
_ZN7MapBase18func_ov00_02080de4Ev kind:function(arm,size=0x4) addr:0x02080de4
Expand Down
2 changes: 1 addition & 1 deletion config/eur/arm9/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2297,7 +2297,7 @@ strlen kind:function(arm,size=0x1c) addr:0x02047008
strcpy kind:function(arm,size=0xc8) addr:0x02047024
strncpy kind:function(arm,size=0x50) addr:0x020470ec
strcat kind:function(arm,size=0x30) addr:0x0204713c
strcmp kind:function(arm,size=0x114) addr:0x0204716c
_Z6strcmpPcS_ kind:function(arm,size=0x114) addr:0x0204716c
strncmp kind:function(arm,size=0x34) addr:0x02047280
strchr kind:function(arm,size=0x3c) addr:0x020472b4
strstr kind:function(arm,size=0x6c) addr:0x020472f0
Expand Down
12 changes: 6 additions & 6 deletions config/usa/arm9/overlays/ov000/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,12 @@ _ZN7MapBase8vfunc_48Ev kind:function(arm,size=0x1c) addr:0x0207e40c
_ZN7MapBase8vfunc_50Ev kind:function(arm,size=0x8) addr:0x0207e428
_ZN7MapBase8vfunc_54EP7TilePos kind:function(arm,size=0x8) addr:0x0207e430
_ZN7MapBase8vfunc_58EP7TilePosi kind:function(arm,size=0x8) addr:0x0207e438
_ZN7MapBase8vfunc_5cEv kind:function(arm,size=0x8) addr:0x0207e440
_ZN7MapBase8vfunc_5cEP7TilePos kind:function(arm,size=0x8) addr:0x0207e440
_ZN7MapBase8vfunc_60EP7TilePos kind:function(arm,size=0x8) addr:0x0207e448
_ZN7MapBase8vfunc_64Ev kind:function(arm,size=0x8) addr:0x0207e450
_ZN7MapBase8vfunc_68EP5Vec3pb kind:function(arm,size=0x488) addr:0x0207e458
_ZN7MapBase18func_ov00_0207e940EPc kind:function(arm,size=0x28) addr:0x0207e8e0
_ZN7MapBase18func_ov00_0207e968Ev kind:function(arm,size=0x4) addr:0x0207e908
_ZN26MapBase_func_ov00_0207e940D1Ev kind:function(arm,size=0x28) addr:0x0207e8e0
_ZN26MapBase_func_ov00_0207e968D1Ev kind:function(arm,size=0x4) addr:0x0207e908
_ZN7MapBase18func_ov00_0207e96cEv kind:function(arm,size=0x4) addr:0x0207e90c
_ZN7MapBase8vfunc_6cEP5Vec3pPiS1_ kind:function(arm,size=0x4a4) addr:0x0207e910
_ZN7MapBase8vfunc_70EP5Vec3p kind:function(arm,size=0x1e0) addr:0x0207edb4
Expand Down Expand Up @@ -420,9 +420,9 @@ _ZN7MapBase18func_ov00_02080a78EP5Vec3p kind:function(arm,size=0x58) addr:0x0208
_ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_S2_ kind:function(arm,size=0x54) addr:0x02080a70
_ZN7MapBase18func_ov00_02080b24EP7TilePos kind:function(arm,size=0x1e4) addr:0x02080ac4
_ZN7MapBase18func_ov00_02080d08EP7TilePos kind:function(arm,size=0x6c) addr:0x02080ca8
_ZN7MapBase8vfunc_bcEv kind:function(arm,size=0x4) addr:0x02080d14
_ZN7MapBase8vfunc_bcEP7TilePosi kind:function(arm,size=0x4) addr:0x02080d14
_ZN7MapBase8vfunc_98EP7TilePosii kind:function(arm,size=0x4) addr:0x02080d18
_ZN7MapBase8vfunc_c0Ev kind:function(arm,size=0x4) addr:0x02080d1c
_ZN7MapBase8vfunc_c0EP7TilePosi kind:function(arm,size=0x4) addr:0x02080d1c
_ZN7MapBase22TriggerOfType_vfunc_10Ei kind:function(arm,size=0x5c) addr:0x02080d20
_ZN11TriggerBase8vfunc_10Ev kind:function(arm,size=0x8) addr:0x02080d7c
_ZN7MapBase18func_ov00_02080de4Ev kind:function(arm,size=0x4) addr:0x02080d84
Expand Down Expand Up @@ -682,7 +682,7 @@ _ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0
_ZN10MapManager18func_ov00_0208583cEPS_P5Vec3pi kind:function(arm,size=0x74) addr:0x020857dc
_ZN10MapManager18func_ov00_020858b0EPS_P5Vec3pi kind:function(arm,size=0x184) addr:0x02085850
_ZN10MapManager18func_ov00_02085a34EP5Vec3pi kind:function(arm,size=0x22c) addr:0x020859d4
_ZN10MapManager18func_ov00_02085c60EP9UnkStructPiS2_j kind:function(arm,size=0x3e4) addr:0x02085c00
_ZN10MapManager18func_ov00_02085c60EP5Vec3pPiS2_j kind:function(arm,size=0x3e4) addr:0x02085c00
_ZN10MapManager18func_ov00_02086044EP5Vec3pS1_i kind:function(arm,size=0x240) addr:0x02085fe4
_ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ kind:function(arm,size=0x800) addr:0x02086224
_ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ kind:function(arm,size=0x24c) addr:0x02086a24
Expand Down
37 changes: 25 additions & 12 deletions include/Map/MapBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#define MAX_VIEWPOINTS 8
#define MAX_MAP_UNK_130 0x20

struct MapBase_Unk_13c {
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
struct MapBase_Unk_13c { // Related to map's ground texture
/* 00 */ unk32 mUnk_00; // ?
/* 04 */ unk32 mUnk_04; // Place map texture on ...?
/* 08 */ unk32 mUnk_08; // Offset to ground texture ?
/* 0c */
};

Expand Down Expand Up @@ -89,6 +89,19 @@ struct UnkStruct_0207f38c {
/* 14 */ TilePos mUnk_14;
};

class MapBase_func_ov00_0207e968 {
public:
unk8 mUnk_00[0x10];
~MapBase_func_ov00_0207e968();
};

class MapBase_func_ov00_0207e940 {
public:
/* 00 */ unk8 mUnk_00[0x18];
/* 18 */ MapBase_func_ov00_0207e968 mUnk_18[3];
~MapBase_func_ov00_0207e940();
};

class MapBase : public SysObject {
public:
/* 000 (vtable) */
Expand Down Expand Up @@ -146,7 +159,7 @@ class MapBase : public SysObject {
/* 140 */ MapBase_Unk_140 *mUnk_140;
/* 144 */ MapBase_Unk_144 *mUnk_144;
/* 148 */ s32 mUnk_148;
/* 14c */ unk32 mUnk_14c;
/* 14c */ unk8 *mUnk_14c; // pointer to MFCB data
/* 150 */ unk32 mUnk_150;
/* 154 */ unk32 mUnk_154;
/* 158 */ unk8 mUnk_158[8];
Expand All @@ -169,7 +182,7 @@ class MapBase : public SysObject {
/* 20 */ virtual void vfunc_20(s32 param_2);
/* 24 */ virtual void vfunc_24();
/* 28 */ virtual void vfunc_28(s32 param_2);
/* 2c */ virtual void vfunc_2c();
/* 2c */ virtual void vfunc_2c(); // Runs when exiting Oshus's house
/* 30 */ virtual void vfunc_30(s32 param_2);
/* 34 */ virtual bool vfunc_34(char *param_2);
/* 38 */ virtual void vfunc_38();
Expand All @@ -181,8 +194,8 @@ class MapBase : public SysObject {
/* 50 */ virtual unk32 vfunc_50();
/* 54 */ virtual unk32 vfunc_54(TilePos *param_1);
/* 58 */ virtual unk32 vfunc_58(TilePos *param_1, int param_2);
/* 5c */ virtual unk32 vfunc_5c();
/* 60 */ virtual unk32 vfunc_60(TilePos *param_1);
/* 5c */ virtual unk32 vfunc_5c(TilePos *param_2);
/* 60 */ virtual unk32 vfunc_60(TilePos *param_2);
/* 64 */ virtual unk32 vfunc_64();
/* 68 */ virtual unk32 vfunc_68(Vec3p *param_1, bool param_2);
/* 6c */ virtual void vfunc_6c(Vec3p *param_2, unk32 *param_3, Vec3p *param_4);
Expand All @@ -205,8 +218,8 @@ class MapBase : public SysObject {
/* b0 */ virtual void vfunc_b0(unk32 param_2, unk32 param_3);
/* b4 */ virtual unk32 *vfunc_b4();
/* b8 */ virtual unk32 vfunc_b8(unk32 param_2);
/* bc */ virtual void vfunc_bc();
/* c0 */ virtual void vfunc_c0();
/* bc */ virtual void vfunc_bc(TilePos *param_2, unk32 param_3);
/* c0 */ virtual void vfunc_c0(TilePos *param_2, unk32 param_3);
/* c4 */

void SetBounds(unk32 map, Course *course);
Expand All @@ -218,8 +231,8 @@ class MapBase : public SysObject {
bool func_ov00_0207e08c(s32 *param_2, s32 param_3);
s32 func_ov00_0207e0f0(s32 param_2);
s32 func_ov00_0207e28c(s32 param_2);
static unk8 *func_ov00_0207e940(unk8 *param_1);
static void func_ov00_0207e968();
// static unk8 *func_ov00_0207e940(unk8 *param_1);
// static void func_ov00_0207e968();
static void func_ov00_0207e96c();
static void func_ov00_0207f100();
bool func_ov00_0207f104(Vec3p *param_2, unk32 *param_3);
Expand Down
6 changes: 3 additions & 3 deletions include/Map/MapManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class MapManager : public SysObject {
bool func_ov00_020823c4(unk32 *param_2, s32 param_3);
s32 func_ov00_020823d4(s32 param_2);
s32 func_ov00_020823e4(s32 param_2);
void MapData_vfunc_b4();
unk32 *MapData_vfunc_b4();
void MapData_vfunc_9c();
s32 func_ov00_02082424();
bool func_ov00_02082454(Vec3p *param_2, Vec3p *param_3);
Expand Down Expand Up @@ -244,13 +244,13 @@ class MapManager : public SysObject {
s32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4);
bool func_ov00_020836dc(u32 param_2, u32 actorId);
bool IsTriggerTypeOverlapped(u32 param_2, Vec3p *param_3);
unk8 GetOverlappingTrigger(Vec3p *param_2);
u8 GetOverlappingTrigger(Vec3p *param_2);
bool func_ov00_02083790(s32 param_2);
bool func_ov00_02083840(s32 param_2);
bool AddTrigger(TriggerBase *param_2);
bool func_ov00_020838d8(TriggerBase *param_2);
bool FindExit(u32 param_2, Exit *param_3);
char func_ov00_020838f8(Exit *param_2);
u8 func_ov00_020838f8(Exit *param_2);
bool func_ov00_02083908(char param_2, CameraViewpoint *param_3);
void func_ov00_02083918(s32 param_2, CameraViewpoint *param_3);
void GetCurrentViewpoint(CameraViewpoint *param_2, s32 param_3);
Expand Down
1 change: 1 addition & 0 deletions libs/cpp/include/vector
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <string.h>

namespace std {

template <class T> class vector {
public:
T *mElements;
Expand Down
Binary file added ph_eur.ml1
View file
Open in desktop
Binary file not shown.
Loading