Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-09 12:08:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

document more vars

Browse Source
This commit is contained in:
Seth Barberee 2023-04-09 16:37:23 -07:00
parent 261ba2c4c2
commit e92e483f0c
4 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/debug_menu_mid.c
View File

@ -12,8 +12,7 @@ struct unkStruct_203B3F0
// size: 0x138
u32 state;
u8 id;
u8 fill5[0x8 - 5];
u32 unk8;
u32 menuAction;
struct MenuItem menuItems[8];
struct MenuStruct unk4C;
u32 unk9C;
@ -192,7 +191,7 @@ void sub_803A5A0(void)
case 2:
sub_801CCD8();
sub_803A6F0();
sub_8012D60(&gUnknown_203B3F0->unk4C, gUnknown_203B3F0->menuItems, 0, 0, gUnknown_203B3F0->unk8, 2);
sub_8012D60(&gUnknown_203B3F0->unk4C, gUnknown_203B3F0->menuItems, 0, 0, gUnknown_203B3F0->menuAction, 2);
break;
case 3:
gUnknown_203B3F0->unkAC = 3;
@ -233,10 +232,10 @@ void sub_803A6F0(void)
gUnknown_203B3F0->menuItems[0].text = &gDebug_NumberText;
gUnknown_203B3F0->menuItems[0].menuAction = 2;
gUnknown_203B3F0->unk8 = 2;
gUnknown_203B3F0->menuAction = 2;
if (!IsNotMoneyOrUsedTMItem(gUnknown_203B3F0->id)) {
gUnknown_203B3F0->menuItems[0].menuAction = -1;
gUnknown_203B3F0->unk8 = 3;
gUnknown_203B3F0->menuAction = 3;
}
preload = gUnknown_203B3F0;
// this var gets loaded in between the sets... very dumb

32
src/main_menu.c
View File

@ -460,7 +460,7 @@ void SetUpMenu(void)
s32 UpdateMenu(void)
{
s32 iVar1;
s32 nextMenu1;
s32 nextMenu;
nextMenu = MENU_NO_SCREEN_CHANGE;
@ -475,37 +475,37 @@ s32 UpdateMenu(void)
nextMenu = UpdateLoadScreenMenu();
break;
case MENU_TRADE_ITEMS:
iVar1 = UpdateTradeItemsMenu();
nextMenu1 = UpdateTradeItemsMenu();
nextMenu = MENU_MAIN_SCREEN;
if (iVar1 != 3) {
if (nextMenu1 != 3) {
nextMenu = MENU_NO_SCREEN_CHANGE;
}
break;
case MENU_FRIEND_RESCUE:
iVar1 = UpdateFriendRescueMenu();
nextMenu1 = UpdateFriendRescueMenu();
nextMenu = MENU_MAIN_SCREEN;
if (iVar1 != 3) {
if (nextMenu1 != 3) {
nextMenu = MENU_NO_SCREEN_CHANGE;
}
break;
case MENU_WONDER_MAIL:
iVar1 = UpdateWonderMailMenu();
nextMenu1 = UpdateWonderMailMenu();
nextMenu = MENU_MAIN_SCREEN;
if (iVar1 != 3) {
if (nextMenu1 != 3) {
nextMenu = MENU_NO_SCREEN_CHANGE;
}
break;
case MENU_DUAL_SLOT:
iVar1 = UpdateDualSlotMenu();
nextMenu1 = UpdateDualSlotMenu();
nextMenu = MENU_MAIN_SCREEN;
if (iVar1 != 3) {
if (nextMenu1 != 3) {
nextMenu = MENU_NO_SCREEN_CHANGE;
}
break;
case MENU_WIRELESS_COMMS:
iVar1 = UpdateWirelessCommsMenu();
nextMenu1 = UpdateWirelessCommsMenu();
nextMenu = 5;
if ((iVar1 != 3) && (nextMenu = MENU_NO_SCREEN_CHANGE, iVar1 == 2)) {
if ((nextMenu1 != 3) && (nextMenu = MENU_NO_SCREEN_CHANGE, nextMenu1 == 2)) {
nextMenu = MENU_MAIN_SCREEN;
}
break;
@ -623,13 +623,13 @@ void sub_8035C1C(void)
}
void
SetMenuItems(struct MenuStruct *param_1, struct UnkTextStruct2 *unkData, s32 index, const struct UnkTextStruct2 *param_4, const struct MenuItem *menuItems, u8 param_6 ,u32 param_7, u32 unused_8)
SetMenuItems(struct MenuStruct *param_1, struct UnkTextStruct2 *unkData, s32 index, const struct UnkTextStruct2 *param_4, const struct MenuItem *menuItems, u8 param_6 ,u32 menuAction, u32 unused_8)
{
unkData[index] = *param_4;
ResetUnusedInputStruct();
sub_800641C(unkData,1,1);
if (param_6 != 0) {
sub_8012D60(&param_1[index],menuItems,0,0,param_7,index);
sub_8012D60(&param_1[index],menuItems,0,0,menuAction,index);
}
else {
sub_8012E04(&param_1[index],menuItems,0,0,0,index);
@ -757,7 +757,7 @@ s32 sub_8035DB4(u32 currMenu)
void DrawMainMenu(void)
{
s32 iVar3;
s32 index;
if(gUnknown_203B34C == NULL)
{
@ -765,9 +765,9 @@ void DrawMainMenu(void)
MemoryFill8((u8 *)gUnknown_203B34C, 0, sizeof(struct unkStruct_203B34C));
}
for(iVar3 = 0; iVar3 < 4; iVar3++)
for(index = 0; index < 4; index++)
{
gUnknown_203B34C->unk144[iVar3] = gUnknown_80E59C8;
gUnknown_203B34C->unk144[index] = gUnknown_80E59C8;
}
ResetUnusedInputStruct();

6
src/options_menu.c
View File

@ -12,7 +12,7 @@ struct unkStruct_203B25C
u32 state;
u32 chosenHintIndex;
struct GameOptions newOptions;
u32 unk18;
u32 menuAction;
struct MenuStruct unk1C;
struct MenuItem menuItems[8];
u16 unkAC[8];
@ -383,7 +383,7 @@ void sub_801DED0(void)
case 0:
case 1:
gUnknown_203B25C->unk1C.unk0 = gOthers_MenuOption;
sub_8012D60(&gUnknown_203B25C->unk1C,gUnknown_203B25C->menuItems,0,gUnknown_203B25C->unkAC,gUnknown_203B25C->unk18,0);
sub_8012D60(&gUnknown_203B25C->unk1C,gUnknown_203B25C->menuItems,0,gUnknown_203B25C->unkAC,gUnknown_203B25C->menuAction,0);
break;
case 3:
sub_801E3F0(0);
@ -454,7 +454,7 @@ void HandleOthersMenu(void)
menuAction = 0;
if (sub_8012FD8(&gUnknown_203B25C->unk1C) == '\0') {
sub_8013114(&gUnknown_203B25C->unk1C,&menuAction);
gUnknown_203B25C->unk18 = menuAction;
gUnknown_203B25C->menuAction = menuAction;
}
switch(menuAction)
{

6
src/wonder_mail_2_1.c
View File

@ -38,7 +38,7 @@ struct unkStruct_203B2F0
u8 fillD[0x10 - 0xD];
u32 unk10;
u8 fill14[0x68 - 0x14];
u32 unk68;
u32 menuAction;
struct MenuStruct unk6C;
struct MenuStruct unkBC;
struct MenuItem unk10C[8];
@ -411,7 +411,7 @@ bool8 InitializeJobListMenu(u32 r0)
else
{
gUnknown_203B2F0 = MemoryAlloc(sizeof(struct unkStruct_203B2F0), 0x8);
gUnknown_203B2F0->unk68 = 0;
gUnknown_203B2F0->menuAction = 0;
gUnknown_203B2F0->unk0 = r0;
SetJobListState(0);
return TRUE;
@ -495,7 +495,7 @@ void sub_802C9D8(void)
break;
case 2:
DrawJobListMenu();
sub_8012D60(&gUnknown_203B2F0->unk6C, gUnknown_203B2F0->unk10C, 0, 0, gUnknown_203B2F0->unk68, 2);
sub_8012D60(&gUnknown_203B2F0->unk6C, gUnknown_203B2F0->unk10C, 0, 0, gUnknown_203B2F0->menuAction, 2);
break;
case 3:
sub_802CBAC();