Skip to content

Decompile map_menu #53

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

Merged
Eebit merged 5 commits into from
Mar 2, 2026
Merged

Decompile map_menu #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
021d899
(map_menu) Split (+ accumulation of assorted player-phase updates)
Eebit Mar 1, 2026
b18e5cd
(map_menu) Raw decomp
Eebit Mar 1, 2026
35683e2
(map_menu) Reorganize into classes
Eebit Mar 2, 2026
e1d4686
(map_menu) Renames
Eebit Mar 2, 2026
9880bbb
(playerphase) Fix function after rename; fix inline in Disposition
Eebit Mar 2, 2026
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
3 changes: 3 additions & 0 deletions config/YFEE01/arm9/overlays/ov000/delinks.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ src/ov000/playerphase.cpp:
src/ov000/mind.cpp:
.text start:0x021af79c end:0x021b06fc

src/ov000/map_menu.cpp:
.text start:0x021beaf4 end:0x021bfa60

src/ov000/map_unit_menu.cpp:
.text start:0x021bfa60 end:0x021c1e18
.data start:0x021de3a8 end:0x021dfc20
Expand Down
128 changes: 64 additions & 64 deletions config/YFEE01/arm9/overlays/ov000/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ func_ov000_021adf58 kind:function(arm,size=0xc0) addr:0x021adf58
func_ov000_021ae018 kind:function(arm,size=0x90) addr:0x021ae018
func_ov000_021ae0a8 kind:function(arm,size=0x5c) addr:0x021ae0a8
func_ov000_021ae104 kind:function(arm,size=0x2c) addr:0x021ae104
func_ov000_021ae130 kind:function(arm,size=0x50) addr:0x021ae130
func_ov000_021ae180 kind:function(arm,size=0x3c) addr:0x021ae180
func_ov000_021ae1bc kind:function(arm,size=0x14) addr:0x021ae1bc
StartPlayerPhase kind:function(arm,size=0x50) addr:0x021ae130
PlayerPhase_GotoLabel kind:function(arm,size=0x3c) addr:0x021ae180
GetPlayerPhaseProc kind:function(arm,size=0x14) addr:0x021ae1bc
func_ov000_021ae1d0 kind:function(arm,size=0x2c) addr:0x021ae1d0
func_ov000_021ae1fc kind:function(arm,size=0x2c) addr:0x021ae1fc
func_ov000_021ae228 kind:function(arm,size=0x44) addr:0x021ae228
Expand Down Expand Up @@ -531,66 +531,66 @@ func_ov000_021be9a4 kind:function(arm,size=0x6c) addr:0x021be9a4
func_ov000_021bea10 kind:function(arm,size=0x64) addr:0x021bea10
func_ov000_021bea74 kind:function(arm,size=0x3c) addr:0x021bea74
func_ov000_021beab0 kind:function(arm,size=0x44) addr:0x021beab0
func_ov000_021beaf4 kind:function(arm,size=0xa0) addr:0x021beaf4
func_ov000_021beb94 kind:function(arm,size=0x90) addr:0x021beb94
func_ov000_021bec24 kind:function(arm,size=0x14c) addr:0x021bec24
func_ov000_021bed70 kind:function(arm,size=0xf0) addr:0x021bed70
func_ov000_021bee60 kind:function(arm,size=0xa0) addr:0x021bee60
func_ov000_021bef00 kind:function(arm,size=0x1c) addr:0x021bef00
func_ov000_021bef1c kind:function(arm,size=0x34) addr:0x021bef1c
func_ov000_021bef50 kind:function(arm,size=0x24) addr:0x021bef50
func_ov000_021bef74 kind:function(arm,size=0x1c) addr:0x021bef74
func_ov000_021bef90 kind:function(arm,size=0x2c) addr:0x021bef90
func_ov000_021befbc kind:function(arm,size=0x14) addr:0x021befbc
func_ov000_021befd0 kind:function(arm,size=0x28) addr:0x021befd0
func_ov000_021beff8 kind:function(arm,size=0x1c) addr:0x021beff8
func_ov000_021bf014 kind:function(arm,size=0x2c) addr:0x021bf014
func_ov000_021bf040 kind:function(arm,size=0x18) addr:0x021bf040
func_ov000_021bf058 kind:function(arm,size=0x18) addr:0x021bf058
func_ov000_021bf070 kind:function(arm,size=0x14) addr:0x021bf070
func_ov000_021bf084 kind:function(arm,size=0x38) addr:0x021bf084
func_ov000_021bf0bc kind:function(arm,size=0x38) addr:0x021bf0bc
func_ov000_021bf0f4 kind:function(arm,size=0x28) addr:0x021bf0f4
func_ov000_021bf11c kind:function(arm,size=0x2c) addr:0x021bf11c
func_ov000_021bf148 kind:function(arm,size=0x3c) addr:0x021bf148
func_ov000_021bf184 kind:function(arm,size=0x3c) addr:0x021bf184
func_ov000_021bf1c0 kind:function(arm,size=0x18) addr:0x021bf1c0
func_ov000_021bf1d8 kind:function(arm,size=0x30) addr:0x021bf1d8
func_ov000_021bf208 kind:function(arm,size=0x5c) addr:0x021bf208
func_ov000_021bf264 kind:function(arm,size=0x38) addr:0x021bf264
func_ov000_021bf29c kind:function(arm,size=0x24) addr:0x021bf29c
func_ov000_021bf2c0 kind:function(arm,size=0x1c) addr:0x021bf2c0
func_ov000_021bf2dc kind:function(arm,size=0x2c) addr:0x021bf2dc
func_ov000_021bf308 kind:function(arm,size=0x18) addr:0x021bf308
func_ov000_021bf320 kind:function(arm,size=0x14) addr:0x021bf320
func_ov000_021bf334 kind:function(arm,size=0x24) addr:0x021bf334
func_ov000_021bf358 kind:function(arm,size=0x1c) addr:0x021bf358
func_ov000_021bf374 kind:function(arm,size=0x2c) addr:0x021bf374
func_ov000_021bf3a0 kind:function(arm,size=0x38) addr:0x021bf3a0
func_ov000_021bf3d8 kind:function(arm,size=0x14) addr:0x021bf3d8
func_ov000_021bf3ec kind:function(arm,size=0x24) addr:0x021bf3ec
func_ov000_021bf410 kind:function(arm,size=0x1c) addr:0x021bf410
func_ov000_021bf42c kind:function(arm,size=0x2c) addr:0x021bf42c
func_ov000_021bf458 kind:function(arm,size=0x8) addr:0x021bf458
func_ov000_021bf460 kind:function(arm,size=0x14) addr:0x021bf460
func_ov000_021bf474 kind:function(arm,size=0x6c) addr:0x021bf474
func_ov000_021bf4e0 kind:function(arm,size=0x64) addr:0x021bf4e0
func_ov000_021bf544 kind:function(arm,size=0x30) addr:0x021bf544
func_ov000_021bf574 kind:function(arm,size=0x8) addr:0x021bf574
func_ov000_021bf57c kind:function(arm,size=0x58) addr:0x021bf57c
func_ov000_021bf5d4 kind:function(arm,size=0x188) addr:0x021bf5d4
func_ov000_021bf75c kind:function(arm,size=0x8c) addr:0x021bf75c
func_ov000_021bf7e8 kind:function(arm,size=0xa4) addr:0x021bf7e8
func_ov000_021bf88c kind:function(arm,size=0x18) addr:0x021bf88c
func_ov000_021bf8a4 kind:function(arm,size=0x8) addr:0x021bf8a4
func_ov000_021bf8ac kind:function(arm,size=0x8) addr:0x021bf8ac
func_ov000_021bf8b4 kind:function(arm,size=0x8) addr:0x021bf8b4
func_ov000_021bf8bc kind:function(arm,size=0x3c) addr:0x021bf8bc
func_ov000_021bf8f8 kind:function(arm,size=0x44) addr:0x021bf8f8
func_ov000_021bf93c kind:function(arm,size=0x3c) addr:0x021bf93c
func_ov000_021bf978 kind:function(arm,size=0x44) addr:0x021bf978
func_ov000_021bf9bc kind:function(arm,size=0x3c) addr:0x021bf9bc
func_ov000_021bf9f8 kind:function(arm,size=0x44) addr:0x021bf9f8
StartChoice_TemporarySave kind:function(arm,size=0xa0) addr:0x021beaf4
StartChoice_Surrender kind:function(arm,size=0x90) addr:0x021beb94
StartMapMenu kind:function(arm,size=0x14c) addr:0x021bec24
StartChoice_EndPreparations kind:function(arm,size=0xf0) addr:0x021bed70
_ZN14BMapSallyEndNo8vfunc_1cEv kind:function(arm,size=0xa0) addr:0x021bee60
_ZN15BMapSallyEndYes8vfunc_1cEv kind:function(arm,size=0x1c) addr:0x021bef00
_ZN17BMapSallyEndYesNo8vfunc_c0Ev kind:function(arm,size=0x34) addr:0x021bef1c
_ZN3map11MIM_TurnEnd8vfunc_1cEv kind:function(arm,size=0x24) addr:0x021bef50
_ZN3map11MIM_TurnEnd8vfunc_78EP4MenuP13MenuItemState kind:function(arm,size=0x1c) addr:0x021bef74
_ZN3map11MIM_TurnEnd8vfunc_90EP4MenuP13MenuItemState kind:function(arm,size=0x2c) addr:0x021bef90
_ZN3map11MIM_TurnEnd8vfunc_00Ev kind:function(arm,size=0x14) addr:0x021befbc
_ZN3map13MIM_Surrender8vfunc_24EP4MenuP13MenuItemState kind:function(arm,size=0x28) addr:0x021befd0
_ZN3map13MIM_Surrender8vfunc_78EP4MenuP13MenuItemState kind:function(arm,size=0x1c) addr:0x021beff8
_ZN3map13MIM_Surrender8vfunc_90EP4MenuP13MenuItemState kind:function(arm,size=0x2c) addr:0x021bf014
_ZN3map13MIM_Surrender8vfunc_14Ev kind:function(arm,size=0x18) addr:0x021bf040
_ZN3map13MIM_Surrender8vfunc_10EP13MenuItemState kind:function(arm,size=0x18) addr:0x021bf058
_ZN3map13MIM_Surrender8vfunc_00Ev kind:function(arm,size=0x14) addr:0x021bf070
_ZN3map12DI_Surrender8vfunc_1cEv kind:function(arm,size=0x38) addr:0x021bf084
_ZN3map20SurrenderDialogYesNo8vfunc_b8El kind:function(arm,size=0x38) addr:0x021bf0bc
_ZN3map17MIM_TemporarySave8vfunc_24EP4MenuP13MenuItemState kind:function(arm,size=0x28) addr:0x021bf0f4
_ZN3map17MIM_TemporarySave8vfunc_78EP4MenuP13MenuItemState kind:function(arm,size=0x2c) addr:0x021bf11c
_ZN3map17MIM_TemporarySave8vfunc_90EP4MenuP13MenuItemState kind:function(arm,size=0x3c) addr:0x021bf148
_ZN3map17MIM_TemporarySave8vfunc_14Ev kind:function(arm,size=0x3c) addr:0x021bf184
_ZN3map17MIM_TemporarySave8vfunc_10EP13MenuItemState kind:function(arm,size=0x18) addr:0x021bf1c0
_ZN3map17MIM_TemporarySave8vfunc_00Ev kind:function(arm,size=0x30) addr:0x021bf1d8
_ZN3map16DI_TemporarySave8vfunc_1cEv kind:function(arm,size=0x5c) addr:0x021bf208
_ZN3map24TemporarySaveDialogYesNo8vfunc_b8El kind:function(arm,size=0x38) addr:0x021bf264
_ZN3map10MIM_Config8vfunc_1cEv kind:function(arm,size=0x24) addr:0x021bf29c
_ZN3map10MIM_Config8vfunc_78EP4MenuP13MenuItemState kind:function(arm,size=0x1c) addr:0x021bf2c0
_ZN3map10MIM_Config8vfunc_90EP4MenuP13MenuItemState kind:function(arm,size=0x2c) addr:0x021bf2dc
_ZN3map10MIM_Config8vfunc_14Ev kind:function(arm,size=0x18) addr:0x021bf308
_ZN3map10MIM_Config8vfunc_00Ev kind:function(arm,size=0x14) addr:0x021bf320
_ZN3map11MIM_TutList8vfunc_1cEv kind:function(arm,size=0x24) addr:0x021bf334
_ZN3map11MIM_TutList8vfunc_78EP4MenuP13MenuItemState kind:function(arm,size=0x1c) addr:0x021bf358
_ZN3map11MIM_TutList8vfunc_90EP4MenuP13MenuItemState kind:function(arm,size=0x2c) addr:0x021bf374
_ZN3map11MIM_TutList8vfunc_14Ev kind:function(arm,size=0x38) addr:0x021bf3a0
_ZN3map11MIM_TutList8vfunc_00Ev kind:function(arm,size=0x14) addr:0x021bf3d8
_ZN3map12MIM_UnitList8vfunc_1cEv kind:function(arm,size=0x24) addr:0x021bf3ec
_ZN3map12MIM_UnitList8vfunc_78EP4MenuP13MenuItemState kind:function(arm,size=0x1c) addr:0x021bf410
_ZN3map12MIM_UnitList8vfunc_90EP4MenuP13MenuItemState kind:function(arm,size=0x2c) addr:0x021bf42c
_ZN3map12MIM_UnitList8vfunc_14Ev kind:function(arm,size=0x8) addr:0x021bf458
_ZN3map12MIM_UnitList8vfunc_00Ev kind:function(arm,size=0x14) addr:0x021bf460
_ZN3map7MapMenuD0Ev kind:function(arm,size=0x6c) addr:0x021bf474
_ZN3map7MapMenuD1Ev kind:function(arm,size=0x64) addr:0x021bf4e0
_ZN3map7MapMenu8vfunc_28El kind:function(arm,size=0x30) addr:0x021bf544
_ZN3map7MapMenu8vfunc_24EP13MenuItemStatel kind:function(arm,size=0x8) addr:0x021bf574
_ZN3map7MapMenu8vfunc_dcEv kind:function(arm,size=0x58) addr:0x021bf57c
_ZN3map7MapMenu8vfunc_d8Ev kind:function(arm,size=0x188) addr:0x021bf5d4
_ZN3map7MapMenu8vfunc_ecEv kind:function(arm,size=0x8c) addr:0x021bf75c
_ZN3map7MapMenu8vfunc_e8Ev kind:function(arm,size=0xa4) addr:0x021bf7e8
_ZN3map7MapMenu8vfunc_00Ev kind:function(arm,size=0x18) addr:0x021bf88c
_ZN3map12MI_Separator8vfunc_14Ev kind:function(arm,size=0x8) addr:0x021bf8a4
_ZN3map12MI_Separator8vfunc_ccEv kind:function(arm,size=0x8) addr:0x021bf8ac
_ZN3map12MI_Separator8vfunc_c4Ev kind:function(arm,size=0x8) addr:0x021bf8b4
_ZN3map24TemporarySaveDialogYesNoD1Ev kind:function(arm,size=0x3c) addr:0x021bf8bc
_ZN3map24TemporarySaveDialogYesNoD0Ev kind:function(arm,size=0x44) addr:0x021bf8f8
_ZN3map20SurrenderDialogYesNoD1Ev kind:function(arm,size=0x3c) addr:0x021bf93c
_ZN3map20SurrenderDialogYesNoD0Ev kind:function(arm,size=0x44) addr:0x021bf978
_ZN17BMapSallyEndYesNoD1Ev kind:function(arm,size=0x3c) addr:0x021bf9bc
_ZN17BMapSallyEndYesNoD0Ev kind:function(arm,size=0x44) addr:0x021bf9f8
func_ov000_021bfa3c kind:function(arm,size=0x24) addr:0x021bfa3c
func_ov000_021bfa60 kind:function(arm,size=0x90) addr:0x021bfa60
func_ov000_021bfaf0 kind:function(arm,size=0x90) addr:0x021bfaf0
Expand Down Expand Up @@ -1475,7 +1475,7 @@ data_ov000_021dbe58 kind:data(any) addr:0x021dbe58
data_ov000_021dbed0 kind:data(any) addr:0x021dbed0
data_ov000_021dbf68 kind:data(any) addr:0x021dbf68
data_ov000_021dc028 kind:data(any) addr:0x021dc028
data_ov000_021dc190 kind:data(any) addr:0x021dc190
ProcScr_map_ProcPL kind:data(any) addr:0x021dc190
data_ov000_021dc4e8 kind:data(any) addr:0x021dc4e8
data_ov000_021dc4f4 kind:data(any) addr:0x021dc4f4
data_ov000_021dc508 kind:data(any) addr:0x021dc508
Expand Down
2 changes: 1 addition & 1 deletion config/YFEE01/arm9/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ func_02022eb8 kind:function(arm,size=0x1c) addr:0x02022eb8
func_02022ed4 kind:function(arm,size=0x20) addr:0x02022ed4
func_02022ef4 kind:function(arm,size=0x1c) addr:0x02022ef4
StartGame kind:function(arm,size=0x18) addr:0x02022f10
func_02022f28 kind:function(arm,size=0x24) addr:0x02022f28
GameCtrl_GotoLabel kind:function(arm,size=0x24) addr:0x02022f28
func_02022f4c kind:function(arm,size=0x8) addr:0x02022f4c
func_02022f54 kind:function(arm,size=0x8) addr:0x02022f54
func_02022f5c kind:function(arm,size=0x50) addr:0x02022f5c
Expand Down
11 changes: 6 additions & 5 deletions include/action.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,23 @@ enum
ACTION_DOOR = 0x05,
ACTION_CHEST = 0x06,
ACTION_BRIDGE = 0x07,
// 0x08
// 0x09
ACTION_VISIT_08 = 0x08,
ACTION_VISIT_09 = 0x09,
ACTION_ARMORY = 0x0A,
ACTION_VENDOR = 0x0B,
ACTION_SECRET_SHOP = 0x0C,
// 0x0D
ACTION_ARENA = 0x0D,
ACTION_SEIZE = 0x0E,
ACTION_ESCAPE = 0x0F,
// 0x10
ACTION_10 = 0x10,
ACTION_IMITATION = 0x11,
// 0x12
ACTION_DECOY = 0x13,
ACTION_TALK = 0x14,
// 0x15
// 0x16
ACTION_END_TURN = 0x16,
// 0x17
ACTION_SURRENDER = 0x18,
};

class ActionState
Expand Down
8 changes: 7 additions & 1 deletion include/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ struct CharmData
char * unk_04;
};

struct TutorialData
{
char * unk_00;
STRUCT_PAD(0x04, 0x18);
};

struct DBFE11Footer
{
s32 pidTableLength;
Expand Down Expand Up @@ -61,7 +67,7 @@ class FE11Database
/* 30 */ void * unk_30;
/* 34 */ void * unk_34;
/* 38 */ struct Unit_unk_a4 * unk_38;
/* 3C */ void * unk_3c;
/* 3C */ struct TutorialData * unk_3c;
/* 40 */ void * unk_40;
/* 44 */ void * unk_44;
/* 48 */ struct DBFE11Footer * pDBFE11Footer;
Expand Down
10 changes: 10 additions & 0 deletions include/map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ class Camera
void func_ov000_021a52c8(s32, s32, s32);
void func_ov000_021a52d0(s32, s32, s32);
BOOL func_ov000_021a52f8(s32, s32, struct Vec3 *);

inline BOOL Check_18()
{
return this->unk_18 >= 2;
}
};

class MapStateManager_04_04
Expand All @@ -129,6 +134,11 @@ class MapStateManager_04_04
this->unk_60 = -1;
}
}

inline u8 Check_54(void)
{
return (!(this->unk_54 & 1)) & 0xFF;
}
};

class MapStateManager_04
Expand Down
4 changes: 3 additions & 1 deletion include/menu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,9 @@ class DialogYesNo : public Dialog
{
public:
DialogYesNo() {};
virtual ~DialogYesNo();
virtual ~DialogYesNo()
{
}
};

class DialogItem : public MenuItem
Expand Down
14 changes: 14 additions & 0 deletions include/unit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,20 @@ inline struct Unit * func_0203c378(struct Unit * unit)
return m ? func_0203c378(unit->unk_a0) : unit;
}

extern Unit * gUnitList;

inline Unit * GetUnit(s32 unitId)
{
if (unitId != 0)
{
return gUnitList + unitId - 1;
}
else
{
return NULL;
}
}

EXTERN_C_END

#endif // UNIT_HPP
2 changes: 1 addition & 1 deletion include/unknown_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3444,7 +3444,7 @@ extern int data_027e00e0;
// extern ??? data_ov000_021dbed0
// extern ??? data_ov000_021dbf68
// extern ??? data_ov000_021dc028
// extern ??? data_ov000_021dc190
// extern ??? ProcScr_map_ProcPL
// extern ??? data_ov000_021dc4e8
// extern ??? data_ov000_021dc4f4
// extern ??? data_ov000_021dc508
Expand Down
Loading