Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 21:19:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Debug menu 1 data

Browse Source
This commit is contained in:
Kermalis 2023-09-15 01:28:50 -04:00
parent 7936c6dc4c
commit 9fa7035ded
21 changed files with 155 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
data/data_80E7D40.s
View File

@ -1,6 +1,9 @@
.section .rodata
.global gUnknown_80E7F3C
@ code_803B050 #1
.align 2,0
.string "pksdir0\0"
.global gUnknown_80E7F3C
gUnknown_80E7F3C: @ 80E7F3C
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
@ -9,7 +12,7 @@ gUnknown_80E7F3C: @ 80E7F3C
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7F54
.global gUnknown_80E7F54
gUnknown_80E7F54: @ 80E7F54
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
@ -18,19 +21,27 @@ gUnknown_80E7F54: @ 80E7F54
.byte 0x11, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7F6C
.global gUnknown_80E7F6C
gUnknown_80E7F6C: @ 80E7F6C
.string "Script\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
@ code_803B050 #2
.align 2,0
.string "pksdir0\0"
@ code_803B050 #3
.align 2,0
.string "pksdir0\0"
@ code_803B050 #4
.align 2,0
.string "pksdir0\0"
@ code_803B050 #5
.align 2,0
.string "pksdir0\0"
.align 2,0
.global gUnknown_80E7F94
gUnknown_80E7F94: @ 80E7F94
.macro st_80E7F94 a, b, c, e, f, g, h, i, j, k, m, n
@ -75,7 +86,7 @@ sUnknown_80E8088: @ 80E8088
.string "SHOW　TITLE00\0"
.align 2, 0
sUnknown_80E8098: @ 80E8098
@ code_803B050 #6 (code_803C1D0)
.string "pksdir0\0"
.align 2, 0
@ -1174,12 +1185,13 @@ gRewardText: @ 80E8B74
gUnknown_80E8B7C: @ 80E8B7C
.string "Wonder Mail:\0"
.align 2,0
@ code_803B050 #7
.string "pksdir0\0"
.align 2,0
.global gUnknown_80E8B94
gUnknown_80E8B94: @ 80E8B94
@ replacing .incbin "baserom.gba", 0x000e8b94, 0x38
.4byte UnkData_80E8BC8
.4byte UnkData_80E8BC4
.4byte UnkData_80E8BC0

12
include/debug_menu1.h
View File

@ -12,18 +12,6 @@ struct DebugMenu
u32 fill1A0;
};
enum DebugMenuOptions
{
MENU_DEBUG_MENU_DUNGEONS = 0,
MENU_DEBUG_MENU_FIELD,
MENU_DEBUG_MENU_FIELD_MAP,
MENU_DEBUG_MENU_FIELD_SCRIPT,
MENU_DEBUG_MENU_DEBUG_MENU,
MENU_DEBUG_MENU_UNKNOWN_1,
MENU_DEBUG_MENU_STORAGE,
MENU_DEBUG_MENU_H_OPEN = 9,
};
void CreateDebugMenu(void);
void DeleteDebugMenu(void);
u32 UpdateDebugMenu(void);

2
include/main_menu1.h
View File

@ -41,7 +41,7 @@ void CleanUpMenu(void);
void DeleteMainMenu(void);
MainMenu1Work *GetMainMenu(void);
void InitMainMenu(void);
void SetMenuItems(MenuStruct *, UnkTextStruct2 *, s32 index, const UnkTextStruct2 *, const MenuItem *menuItems, bool8, u32 menuAction, u32 unused);
void SetMenuItems(MenuStruct *, UnkTextStruct2 *, s32 index, const UnkTextStruct2 *, const MenuItem *menuItems, bool8, u32 menuAction, bool8 unused);
void SetUpMenu(void);
s32 UpdateMenu(void);

2
src/code_803B050.c
View File

@ -15,6 +15,8 @@
#include "wonder_mail.h"
#include "dungeon.h"
// This file was originally 7 files. Check data_80E7D40.s
extern s16 gUnknown_80E80E0[];
extern s16 gUnknown_80E8126[];
extern u8 gUnknown_80E888C[];

41
src/data/debug_menu1.h Normal file
View File

@ -0,0 +1,41 @@
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
static const UnkTextStruct2 sUnknown_80E7D40 =
{
0, 0, 0, 0,
3,
0, 0,
0, 0,
0, 0,
NULL
};
static const UnkTextStruct2 sUnknown_80E7D58 =
{
0, 0, 0, 0,
3,
2, 2,
9, 11,
11, 0,
NULL
};
static const MenuItem sDebugMenuItems[8] =
{
{"Dungeons", MENU_DEBUG_MENU_DUNGEONS},
{"Field", MENU_DEBUG_MENU_FIELD},
{"Field Map", MENU_DEBUG_MENU_FIELD_MAP},
{"Field Script", MENU_DEBUG_MENU_FIELD_SCRIPT},
{"Debug Menu", MENU_DEBUG_MENU_DEBUG_MENU},
{"Storage", MENU_DEBUG_MENU_STORAGE},
{"h-open", MENU_DEBUG_MENU_H_OPEN},
{NULL, 10},
};
// TODO: These belong to files after, which have no data. More stripped-out debug menus..? They'd be between debug_menu1.c and debug_menu2.c
ALIGNED(4) static const u8 sFill1[] = _("pksdir0");
ALIGNED(4) static const u8 sFill2[] = _("pksdir0");
ALIGNED(4) static const u8 sFill3[] = _("pksdir0");
ALIGNED(4) static const u8 sFill4[] = _("pksdir0");
ALIGNED(4) static const u8 sFill5[] = _("pksdir0");
ALIGNED(4) static const u8 sFill6[] = _("pksdir0");

70
src/debug_menu1.c
View File

@ -12,51 +12,27 @@
#include "text_util.h"
#include "text1.h"
EWRAM_DATA_2 static struct DebugMenu *sDebugMenu = {0};
static const UnkTextStruct2 sUnknown_80E7D40 =
enum DebugMenuOptions
{
0x00, 0x00, 0x00, 0x00,
0x03,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
NULL
MENU_DEBUG_MENU_DUNGEONS,
MENU_DEBUG_MENU_FIELD,
MENU_DEBUG_MENU_FIELD_MAP,
MENU_DEBUG_MENU_FIELD_SCRIPT,
MENU_DEBUG_MENU_DEBUG_MENU,
MENU_DEBUG_MENU_UNKNOWN_1,
MENU_DEBUG_MENU_STORAGE,
//
MENU_DEBUG_MENU_H_OPEN = 9,
};
static const UnkTextStruct2 sUnknown_80E7D58 =
{
0x00, 0x00, 0x00, 0x00,
0x03,
0x02, 0x02,
0x09, 0x0b,
0x0b, 0x00,
NULL
};
static EWRAM_DATA_2 struct DebugMenu *sDebugMenu = {0};
static const MenuItem sDebugMenuItems[8] =
{
{"Dungeons", MENU_DEBUG_MENU_DUNGEONS},
{"Field", MENU_DEBUG_MENU_FIELD},
{"Field Map", MENU_DEBUG_MENU_FIELD_MAP},
{"Field Script", MENU_DEBUG_MENU_FIELD_SCRIPT},
{"Debug Menu", MENU_DEBUG_MENU_DEBUG_MENU},
{"Storage", MENU_DEBUG_MENU_STORAGE},
{"h-open", MENU_DEBUG_MENU_H_OPEN},
{NULL, 10},
};
#include "data/debug_menu1.h"
ALIGNED(4) static const u8 sDebugMenuFill1[] = "pksdir0";
ALIGNED(4) static const u8 sDebugMenuFill2[] = "pksdir0";
ALIGNED(4) static const u8 sDebugMenuFill3[] = "pksdir0";
ALIGNED(4) static const u8 sDebugMenuFill4[] = "pksdir0";
ALIGNED(4) static const u8 sDebugMenuFill5[] = "pksdir0";
ALIGNED(4) static const u8 sDebugMenuFill6[] = "pksdir0";
ALIGNED(4) static const u8 sDebugMenuFill7[] = "pksdir0";
static void SetDebugMenuItems(void);
void SetDebugMenuItems(void);
void sub_803A3A0(void);
void sub_803A3BC(void);
static void sub_803A3A0(void);
static void sub_803A3BC(void);
void CreateDebugMenu(void)
{
@ -137,23 +113,23 @@ u32 UpdateDebugMenu(void)
return nextMenu;
}
void SetDebugMenuItems(void)
static void SetDebugMenuItems(void)
{
SetMenuItems(sDebugMenu->unk0, sDebugMenu->unk140, 0, &sUnknown_80E7D58, sDebugMenuItems, TRUE, 13, 0);
SetMenuItems(sDebugMenu->unk0, sDebugMenu->unk140, 0, &sUnknown_80E7D58, sDebugMenuItems, TRUE, 13, FALSE);
sub_8035CF4(sDebugMenu->unk0, 0, 1);
}
void sub_803A3A0(void)
static void sub_803A3A0(void)
{
sub_8035CC0(sDebugMenu->unk140, 0);
}
void sub_803A3BC(void)
static void sub_803A3BC(void)
{
s32 speciesIndex;
u8 sp_0x8 [88];
u8 sp_0x8[88];
u16 r7 [4]; // r7
u8 buffer [20]; // r6
u8 buffer[20]; // r6
u32 sp_0x7C;
s32 sp_0x80;
@ -176,7 +152,7 @@ void sub_803A3BC(void)
r9 = 0;
sp_0x7C = 0x1006;
index++;
speciesIndex = index * 0x10000 >> 0x10; // dumb way to force s16
speciesIndex = index * 0x10000 >> 0x10; // TODO: dumb way to force s16. Temp var may fix the regswap
memset(r7, 0, 8);
r7[0] = 0x27;
CopyMonsterNametoBuffer(buffer, speciesIndex);
@ -188,4 +164,4 @@ void sub_803A3BC(void)
sp_0x80 = r9;
WriteSavetoPak(&sp_0x80, 1);
}
}

3
src/debug_menu2.c
View File

@ -11,6 +11,8 @@
static EWRAM_DATA_2 struct unkStruct_203B3F0 *sUnknown_203B3F0 = {0};
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
static const UnkTextStruct2 sUnknown_80E7E34 =
{
0x00, 0x00, 0x00, 0x00,
@ -40,7 +42,6 @@ static const UnkTextStruct2 sUnknown_80E7E64 =
};
ALIGNED(4) static const u8 sNumberPrompt[] = "Number?";
ALIGNED(4) static const u8 sFill[] = "pksdir0";
void sub_803A504(u32);
void sub_803A51C(void);

3
src/debug_menu3.c
View File

@ -13,6 +13,8 @@
static EWRAM_DATA_2 unkStruct_203B3F4 *sUnknown_203B3F4 = {0};
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
static const UnkTextStruct2 sUnknown_80E7E8C =
{
0x00, 0x00, 0x00, 0x00,
@ -34,7 +36,6 @@ static const UnkTextStruct2 sUnknown_80E7EA4 =
ALIGNED(4) static const u8 sClose[] = "CLOSE";
ALIGNED(4) static const u8 sOpen[] = "OPEN";
ALIGNED(4) static const u8 sFill[] = "pksdir0";
void sub_803A924(u32);
void sub_803A93C(void);

5
src/debug_menu4.c
View File

@ -8,7 +8,9 @@
#include "text1.h"
#include "text2.h"
EWRAM_DATA_2 static unkStruct_203B3F8 *sUnknown_203B3F8 = {0};
static EWRAM_DATA_2 unkStruct_203B3F8 *sUnknown_203B3F8 = {0};
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
static const UnkTextStruct2 sUnknown_80E7ED4 =
{
@ -40,7 +42,6 @@ static const UnkTextStruct2 sUnknown_80E7F04 =
ALIGNED(4) static const u8 sNumberPrompt[] = "Number?";
ALIGNED(4) static const u8 sLevel[] = "LEVEL";
ALIGNED(4) static const u8 sName[] = "Name";
static const u8 sFill[] = "pksdir0";
void sub_803ACD0(u32);
void sub_803ACE8(void);

8
src/friend_rescue.c
View File

@ -888,7 +888,7 @@ void sub_8032828(void)
break;
case 0x27:
sub_8006518(gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E2334, &gUnknown_80E234C, TRUE, 0, 0);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E2334, &gUnknown_80E234C, TRUE, 0, FALSE);
sub_8023DA4();
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
break;
@ -1051,7 +1051,7 @@ void sub_8032828(void)
break;
case 0x5D:
sub_8006518(gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, &gUnknown_80E2408, TRUE, 0, 0);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, &gUnknown_80E2408, TRUE, 0, FALSE);
sub_803092C();
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
break;
@ -1067,7 +1067,7 @@ void sub_8032828(void)
break;
case 0x60:
sub_8006518(gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E23F0, &gUnknown_80E2408, TRUE, 0, 0);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E23F0, &gUnknown_80E2408, TRUE, 0, FALSE);
sub_801CCD8();
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
break;
@ -1230,7 +1230,7 @@ void sub_8032828(void)
case 0x1E:
case 0x33:
sub_8006518(gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, &gUnknown_80E234C, TRUE, 0, 0);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, &gUnknown_80E234C, TRUE, 0, FALSE);
sub_803092C();
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
break;

14
src/load_screen.c
View File

@ -165,25 +165,25 @@ void CreateLoadScreen(u32 currMenu)
}
ResetUnusedInputStruct();
sub_800641C(gLoadScreen->unk144, TRUE, TRUE);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,0,&gUnknown_80E7610,gUnknown_203B378,FALSE,6,0);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,0,&gUnknown_80E7610,gUnknown_203B378,FALSE,6,FALSE);
switch(gLoadScreen->currMenu){
case MENU_CONTINUE:
if (IsQuickSave())
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeQuicksaveMenuItems,FALSE,6,0);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeQuicksaveMenuItems,FALSE,6,FALSE);
else
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeAdventureMenuItems,FALSE,6,0);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeAdventureMenuItems,FALSE,6,FALSE);
break;
case MENU_AWAITING_RESCUE:
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gQuitWaitingRescueMenuItems,FALSE,6,0);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gQuitWaitingRescueMenuItems,FALSE,6,FALSE);
break;
case MENU_DELETE_SAVE_PROMPT:
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gDeleteSavePromptMenuItems,FALSE,6,0);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gDeleteSavePromptMenuItems,FALSE,6,FALSE);
break;
case MENU_DELETE_SAVE_CONFIRM:
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C, gDeleteSaveConfirmMenuItems,FALSE,6,0);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C, gDeleteSaveConfirmMenuItems,FALSE,6,FALSE);
break;
}
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,2,&gUnknown_80E7784,gLoadScreenYesNoMenu,TRUE,2,0);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,2,&gUnknown_80E7784,gLoadScreenYesNoMenu,TRUE,2,FALSE);
sub_8035CF4(gLoadScreen->unk4,0,0);
sub_8035CF4(gLoadScreen->unk4,1,0);
sub_8035CF4(gLoadScreen->unk4,2,1);

2
src/main_menu1.c
View File

@ -290,7 +290,7 @@ void sub_8035C1C(void)
sMainMenu->sub.unk2D = 0;
}
void SetMenuItems(MenuStruct *a0, UnkTextStruct2 *a1, s32 index, const UnkTextStruct2 *a3, const MenuItem *menuItems, bool8 a5, u32 menuAction, u32 unused)
void SetMenuItems(MenuStruct *a0, UnkTextStruct2 *a1, s32 index, const UnkTextStruct2 *a3, const MenuItem *menuItems, bool8 a5, u32 menuAction, bool8 unused)
{
a1[index] = *a3;
ResetUnusedInputStruct();

36
src/main_menu2.c
View File

@ -152,50 +152,50 @@ static bool8 SetMainMenuText(void)
switch (menuChoice) {
case MENU_WIRELESS_COMMS:
// Using wireless communications, you can go on an adventure to unknown worlds.
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E6030, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E6030, FALSE, 0, FALSE);
break;
case MENU_WONDER_MAIL:
// Using passwords, you can receive Wonder Mail
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5F80, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5F80, FALSE, 0, FALSE);
break;
case MENU_AWAITING_RESCUE:
// You are awaiting resuce by a friend
// You can give up waiting for rescue
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5F1C, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5F1C, FALSE, 0, FALSE);
break;
case MENU_NEW_GAME:
// Start an entirely new adventure
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5CCC, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5CCC, FALSE, 0, FALSE);
break;
case MENU_CONTINUE:
// Resume your adventure from where you last saved
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5DA0, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5DA0, FALSE, 0, FALSE);
break;
case MENU_DELETE_SAVE_PROMPT:
// This will delete your saved game data.
// Beware! This will delete it forever
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5DF0, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5DF0, FALSE, 0, FALSE);
break;
case MENU_ADVENTURE_LOG:
// Check your career as an adventurer
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5D0C, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5D0C, FALSE, 0, FALSE);
break;
case MENU_FRIEND_RESCUE:
// Using a Game Link cable or passwords, friends may rescue each other
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5E5C, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5E5C, FALSE, 0, FALSE);
break;
case MENU_TRADE_ITEMS:
// Using a Game Link cable you can trade stored items with a friend
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5EBC, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5EBC, FALSE, 0, FALSE);
break;
case MENU_DUAL_SLOT:
// Using Dual Slot function, you can receive teams from your friends
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5FCC, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5FCC, FALSE, 0, FALSE);
break;
case MENU_DEBUG:
// This is the Debug Mode.
// It won't be in the release version
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5D48, FALSE, 0, 0);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5D48, FALSE, 0, FALSE);
break;
default:
break;
@ -228,7 +228,7 @@ static void SetMainMenuItems(void)
// Friend Rescue
// Trade Items
// Wonder Mail
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5C18, TRUE, sUnknown_203B350, 1);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5C18, TRUE, sUnknown_203B350, TRUE);
}
else {
// Revive Team
@ -236,7 +236,7 @@ static void SetMainMenuItems(void)
// Adventure Log
// Friend Rescue
// Trade Items
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5BC4, sUnknown_80E5BDC, TRUE, sUnknown_203B350, 1);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5BC4, sUnknown_80E5BDC, TRUE, sUnknown_203B350, TRUE);
}
}
else {
@ -247,7 +247,7 @@ static void SetMainMenuItems(void)
// Friend Rescue
// Trade Items
// Wonder Mail
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5AFC, TRUE, sUnknown_203B350, 1);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5AFC, TRUE, sUnknown_203B350, TRUE);
}
else {
// Continue
@ -255,7 +255,7 @@ static void SetMainMenuItems(void)
// Adventure Log
// Friend Rescue
// Trade Items
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A60, sUnknown_80E5A90, TRUE, sUnknown_203B350, 1);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A60, sUnknown_80E5A90, TRUE, sUnknown_203B350, TRUE);
}
}
}
@ -267,7 +267,7 @@ static void SetMainMenuItems(void)
// Friend Rescue
// Trade Items
// Wonder Mail
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5B8C, TRUE, sUnknown_203B350, 1);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5B8C, TRUE, sUnknown_203B350, TRUE);
}
else {
// Awaiting Rescue
@ -275,14 +275,14 @@ static void SetMainMenuItems(void)
// Adventure Log
// Friend Rescue
// Trade Items
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5B34, sUnknown_80E5B4C, TRUE, sUnknown_203B350, 1);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5B34, sUnknown_80E5B4C, TRUE, sUnknown_203B350, TRUE);
}
}
}
else {
// New Game
// Adventure Log
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E59E0, sUnknown_80E59F8, TRUE, sUnknown_203B350, 1);
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E59E0, sUnknown_80E59F8, TRUE, sUnknown_203B350, TRUE);
}
}

6
src/other_menus1.c
View File

@ -64,7 +64,7 @@ void sub_8036FDC(s32 param_1)
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B35C->unk15C, TRUE, TRUE);
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6CD0, sUnknown_80E6CE8, FALSE, 6, 0);
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6CD0, sUnknown_80E6CE8, FALSE, 6, FALSE);
sub_8035CF4(sUnknown_203B35C->unk1C, 0, TRUE);
sub_80376CC();
}
@ -138,7 +138,7 @@ static void sub_80371B8(void)
// Success!
// The item exchange with your friend
// went through successfully
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6C50, sUnknown_80E6C68, FALSE, 6, 0);
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6C50, sUnknown_80E6C68, FALSE, 6, FALSE);
sub_8035CF4(sUnknown_203B35C->unk1C, 0, TRUE);
}
}
@ -200,7 +200,7 @@ static void sub_80371B8(void)
break;
}
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, puVar5, MenuItems, FALSE, 6, 0);
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, puVar5, MenuItems, FALSE, 6, FALSE);
sub_8035CF4(sUnknown_203B35C->unk1C, 0, TRUE);
if (sUnknown_203B35C->linkStatus != COMMS_GOOD && sUnknown_203B35C->unk0 == 0) {

20
src/rescue_password_menu.c
View File

@ -555,31 +555,31 @@ void DisplayRescuePasswordError(u32 passwordError)
sub_80155F0();
switch(passwordError) {
case PASSWORD_ENTRY_INCORRECT_PASSWORD:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E71FC,gUnknown_80E7214,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E71FC,gUnknown_80E7214,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NOT_SOS_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E72EC,gUnknown_80E7304,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E72EC,gUnknown_80E7304,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7344,gUnknown_80E735C,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7344,gUnknown_80E735C,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NO_SPACE:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7588,gUnknown_80E75A0,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7588,gUnknown_80E75A0,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NOT_AOK_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E73AC,gUnknown_80E73C4,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E73AC,gUnknown_80E73C4,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_DUPLICATE_AOK_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7408,gUnknown_80E7420,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7408,gUnknown_80E7420,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NOT_THANK_YOU_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7468,gUnknown_80E7480,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7468,gUnknown_80E7480,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_DUPLICATE_THANK_YOU_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E74C8,gUnknown_80E74E0,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E74C8,gUnknown_80E74E0,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NOT_WONDER_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E752C,gUnknown_80E7544,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E752C,gUnknown_80E7544,FALSE,13,FALSE);
break;
default:
break;
@ -593,7 +593,7 @@ void DisplayPasswordAcceptScreen(void)
ResetUnusedInputStruct();
sub_800641C(NULL, TRUE, TRUE);
sub_80155F0();
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7278,gUnknown_80E7290,FALSE,0xd,0);
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7278,gUnknown_80E7290,FALSE,13,FALSE);
sub_8035CF4(gRescuePasswordMenu->unk8,0,TRUE);
}

12
src/save_menu.c
View File

@ -138,12 +138,12 @@ void CreateSaveMenu(s32 currMenu)
if (currMenu == MENU_DELETE_SAVE) {
// Beware, Deleting your Adventure
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,gDeletingYourAdventureMenuItems,
FALSE,6,0);
FALSE,6,FALSE);
}
else {
// Saving your Adventure
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,gSavingAdventureMenuItems,
FALSE,6,0);
FALSE,6,FALSE);
}
sub_8035CF4(sUnknown_203B364->unk8,0,TRUE);
sUnknown_203B364->unk4 = 0;
@ -190,11 +190,11 @@ s32 UpdateSaveMenu(void)
sub_8035CC0(sUnknown_203B364->unk148,0);
if (sUnknown_203B364->currMenu == MENU_DELETE_SAVE) {
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
gDeletedSaveMenuItems,FALSE,6,0);
gDeletedSaveMenuItems,FALSE,6,FALSE);
}
else {
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
gAdventureSavedMenuItems,FALSE,6,0);
gAdventureSavedMenuItems,FALSE,6,FALSE);
}
if (sUnknown_203B364->currMenu == 0x2d) {
sUnknown_203B364->unk4 = 1;
@ -211,11 +211,11 @@ s32 UpdateSaveMenu(void)
sub_8035CC0(sUnknown_203B364->unk148,0);
if (sUnknown_203B364->currMenu == MENU_DELETE_SAVE) {
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
gAdventureCouldNotBeDeletedMenuItems,FALSE,6,0);
gAdventureCouldNotBeDeletedMenuItems,FALSE,6,FALSE);
}
else {
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
gAdventureCouldNotBeSavedMenuItems,FALSE,6,0);
gAdventureCouldNotBeSavedMenuItems,FALSE,6,FALSE);
}
sub_8035CF4(sUnknown_203B364->unk8,0,TRUE);
sUnknown_203B364->unk4 = 1;

4
src/thank_you_wonder_mail.c
View File

@ -1278,7 +1278,7 @@ void UpdateThankYouMailText(void)
break;
case 0x11:
sub_8006518(gUnknown_203B2C4->unk35C);
SetMenuItems(gUnknown_203B2C4->unk21C,gUnknown_203B2C4->unk35C,3,&gUnknown_80DED60,gUnknown_80DED78,TRUE,0,0);
SetMenuItems(gUnknown_203B2C4->unk21C,gUnknown_203B2C4->unk35C,3,&gUnknown_80DED60,gUnknown_80DED78,TRUE,0,FALSE);
sub_803092C();
sub_8035CF4(gUnknown_203B2C4->unk21C,3,TRUE);
break;
@ -1294,7 +1294,7 @@ void UpdateThankYouMailText(void)
break;
case 0x14:
sub_8006518(gUnknown_203B2C4->unk35C);
SetMenuItems(gUnknown_203B2C4->unk21C,gUnknown_203B2C4->unk35C,3,&gUnknown_80DED48,gUnknown_80DED78,TRUE,0,0);
SetMenuItems(gUnknown_203B2C4->unk21C,gUnknown_203B2C4->unk35C,3,&gUnknown_80DED48,gUnknown_80DED78,TRUE,0,FALSE);
sub_801CCD8();
sub_8035CF4(gUnknown_203B2C4->unk21C,3,TRUE);
break;

2
src/trade_items_menu.c
View File

@ -520,7 +520,7 @@ void sub_8036B28(void)
case TRADE_ITEMS_SEND_ITEM_POPUP_MENU:
sub_8006518(sTradeItemsMenu->unk184);
SetMenuItems(sTradeItemsMenu->unk44,sTradeItemsMenu->unk184,3,&sUnknown_80E60EC,
sUnknown_80E6104,TRUE,0,0);
sUnknown_80E6104,TRUE,0,FALSE);
sub_801CCD8();
sub_8035CF4(sTradeItemsMenu->unk44,3,TRUE);
break;

2
src/unk_menu_203B360.c
View File

@ -75,7 +75,7 @@ void sub_80382E4(s32 currMenu)
// The storage space is empty!
// Please check again.
SetMenuItems(sUnknown_203B360->unk8,sUnknown_203B360->unk148,0,&gUnknown_80E6E94,gUnknown_80E6EAC,
FALSE,4,0);
FALSE,4,FALSE);
}
sub_8035CF4(sUnknown_203B360->unk8,0,TRUE);
sUnknown_203B360->currMenu = currMenu;

4
src/wonder_mail.c
View File

@ -542,7 +542,7 @@ void sub_8028348(void)
break;
case 0x34:
sub_8006518(gUnknown_203B2C0->unk35C);
SetMenuItems(gUnknown_203B2C0->unk21C, gUnknown_203B2C0->unk35C, 3, &gUnknown_80DDAE4, gUnknown_80DDAFC, TRUE, 0, 0);
SetMenuItems(gUnknown_203B2C0->unk21C, gUnknown_203B2C0->unk35C, 3, &gUnknown_80DDAE4, gUnknown_80DDAFC, TRUE, 0, FALSE);
sub_8023DA4();
sub_8035CF4(gUnknown_203B2C0->unk21C, 3, TRUE);
break;
@ -697,7 +697,7 @@ void sub_8028348(void)
case 0x20:
case 0x2B:
sub_8006518(gUnknown_203B2C0->unk35C);
SetMenuItems(gUnknown_203B2C0->unk21C, gUnknown_203B2C0->unk35C, 3, &gUnknown_80DDACC, gUnknown_80DDAFC, TRUE, 0, 0);
SetMenuItems(gUnknown_203B2C0->unk21C, gUnknown_203B2C0->unk35C, 3, &gUnknown_80DDACC, gUnknown_80DDAFC, TRUE, 0, FALSE);
sub_803092C();
sub_8035CF4(gUnknown_203B2C0->unk21C, 3, TRUE);
break;

1
src/wonder_mail_main_menu.c
View File

@ -82,7 +82,6 @@ ALIGNED(4) const char Cancel_80E7D24[] = "Cancel";
ALIGNED(4) const char Yes_80E7D2C[] = "Yes";
ALIGNED(4) const char wonder_mail_main_fill1[] = "pksdir0";
ALIGNED(4) const char wonder_mail_main_fill2[] = "pksdir0";
struct unkStruct_203B3E8
{