more menu decomp and merging of files

This commit is contained in:
Seth Barberee
2023-05-19 10:50:27 -07:00
parent 2d01cbd025
commit fae8e0cbfb
19 changed files with 344 additions and 569 deletions

View File

@@ -5,7 +5,7 @@ struct unkStruct_802C39C
/* 0xC */ u8 *playerName;
/* 0x10 */ s16 clientSpecies;
/* 0x12 */ s16 targetSpecies;
/* 0x14 */ u8 unk14;
/* 0x14 */ u8 targetItem;
/* 0x15 */ u8 fill15[0x2E - 0x15];
u8 unk2E;
u8 fill2F[0x34 - 0x2F];

View File

@@ -4,6 +4,7 @@
#include "menu.h"
#include "text.h"
#include "constants/mailbox.h"
#include "code_802C39C.h"
struct unkStruct_203B304
{
@@ -12,10 +13,7 @@ struct unkStruct_203B304
u32 fallbackState;
u8 mailboxIndex;
u8 mailIndex;
u32 unkC;
u8 fill10[0x50 - 0x10];
u8 unk50;
u8 fill51[0x64 - 0x51];
struct unkStruct_802C39C unkC;
u32 menuAction1;
u32 menuAction2;
struct MenuStruct unk6C;

View File

@@ -6,10 +6,7 @@ struct unkStruct_203B308
u32 state;
u32 unk4;
u8 jobIndex;
u32 unkC;
u8 fill10[0x50 - 0x10];
u8 unk50;
u8 fill51[0x64 - 0x51];
struct unkStruct_802C39C unkC;
u32 menuAction1;
u32 menuAction2;
struct MenuStruct unk6C;

View File

@@ -12,15 +12,14 @@
struct unkStruct_802F204
{
/* 0x0 */ u8 clientName[POKEMON_NAME_LENGTH]; // client name?
/* 0x0 */ u8 clientName[POKEMON_NAME_LENGTH];
/* 0xA */ u8 name2[POKEMON_NAME_LENGTH]; // target name?
/* 0x14 */ s16 unk14; // poke species (client??)
/* 0x14 */ s16 clientSpecies;
/* 0x16 */ u8 unk16;
/* 0x18 */ s32 moneyReward;
/* 0x1C */ u8 itemRewards[MAX_ITEM_REWARDS];
/* 0x1F */ u8 quantity;
/* 0x20 */ u8 friendAreaReward;
u8 fill21[0x24 - 0x21];
/* 0x24 */ u32 teamRankPtsReward;
};

View File

@@ -25,9 +25,7 @@ struct unkStruct_203B2F0
u32 state;
u8 unk8[0xC - 0x8];
u8 unkC;
u8 fillD[0x10 - 0xD];
u32 unk10;
u8 fill14[0x68 - 0x14];
struct unkStruct_802C39C unk10;
u32 menuAction;
struct MenuStruct unk6C;
struct MenuStruct unkBC;

View File

@@ -44,12 +44,7 @@ struct unkStruct_203B2F8
struct unkSubStruct_203B2F8 *mail;
u8 jobSlotIndex;
u8 fill11[0x14 - 0x11];
u32 unk14;
u8 fill18[0x58 - 0x18];
u8 unk58;
u8 fill59[0x64 - 0x59];
u8 *unk64;
u32 unk68;
struct unkStruct_802C39C unk14;
u32 menuAction1;
u32 menuAction2;
u32 menuAction3;