diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/wonder_mail.h | 28 | ||||
| -rw-r--r-- | include/felicity_bank.h | 5 | ||||
| -rw-r--r-- | include/gUnknown_203B460.h | 3 | ||||
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/kangaskhan_storage.h | 3 | ||||
| -rw-r--r-- | include/kecleon_items.h | 14 | ||||
| -rw-r--r-- | include/wonder_mail.h | 19 |
7 files changed, 65 insertions, 9 deletions
diff --git a/include/constants/wonder_mail.h b/include/constants/wonder_mail.h new file mode 100644 index 0000000..ab5a9ee --- /dev/null +++ b/include/constants/wonder_mail.h @@ -0,0 +1,28 @@ +#ifndef GUARD_CONSTANTS_WONDER_MAIL_H +#define GUARD_CONSTANTS_WONDER_MAIL_H + +enum MissionType +{ + HELP_POKE, + FIND_POKE, + ESCORT, + FIND_ITEM, + DELIVER_ITEM +}; + +enum RewardType +{ + MONEY, + MONEY_EXTRA, + ITEM, + ITEM_EXTRA, + BLANK_4, + MONEY1, + MONEY1_EXTRA, + ITEM1, + ITEM1_EXTRA, + FRIEND_AREA, + END_REWARDS +}; + +#endif //GUARD_CONSTANTS_WONDER_MAIL_H diff --git a/include/felicity_bank.h b/include/felicity_bank.h index d09843b..5b68d65 100644 --- a/include/felicity_bank.h +++ b/include/felicity_bank.h @@ -3,6 +3,7 @@ #include "file_system.h" #include "text.h" +#include "menu.h" struct unkStruct_203B204 { @@ -12,7 +13,9 @@ struct unkStruct_203B204 u32 unk8; u32 chosenAmount; u32 unk10; - u8 fill14[0x64 - 0x14]; + struct MenuItem unk14[5]; + u8 fill3C[0x54 - 0x3C]; + u16 unk54[8]; u32 unk64; u8 fill68[0x78 - 0x68]; u32 unk78; diff --git a/include/gUnknown_203B460.h b/include/gUnknown_203B460.h index bab85d8..7418bc1 100644 --- a/include/gUnknown_203B460.h +++ b/include/gUnknown_203B460.h @@ -17,8 +17,7 @@ struct subStruct_203B460 struct unkStruct_203B460 { struct ItemStruct_203B460 fill0[20]; - u16 unk50[0x10]; - u8 fill70[0x230 - 0x70]; + u16 unk50[0xF0]; struct subStruct_203B460 unk230[8]; struct subStruct_203B460 unk250[4]; // TODO: idk if this is identical struct or not.. Ghidra says sizes are same /* 0x260 */ s32 teamMoney; diff --git a/include/global.h b/include/global.h index b991d34..cc56a5e 100644 --- a/include/global.h +++ b/include/global.h @@ -5,6 +5,8 @@ #include "config.h" // We need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" +#include "constants/species.h" + // IDE support #if defined(__APPLE__) || defined(__CYGWIN__) #define _(x) x diff --git a/include/kangaskhan_storage.h b/include/kangaskhan_storage.h index 93f319c..3f1292a 100644 --- a/include/kangaskhan_storage.h +++ b/include/kangaskhan_storage.h @@ -2,6 +2,7 @@ #define KANGASKHAN_STORAGE_H #include "text.h" +#include "menu.h" struct unkStruct_203B208 { @@ -17,7 +18,7 @@ struct unkStruct_203B208 u32 unk18; u32 unk1C; u32 unk20; - u8 fill24[0x4C - 0x24]; + struct MenuItem unk24[5]; u16 unk4C[5]; u32 unk58; u8 unk5C[0xA8 - 0x5C]; diff --git a/include/kecleon_items.h b/include/kecleon_items.h index 321fcc3..5716ea3 100644 --- a/include/kecleon_items.h +++ b/include/kecleon_items.h @@ -3,25 +3,31 @@ #include "gUnknown_203B460.h" #include "text.h" +#include "menu.h" struct unkStruct_203B210 { // size: 0x148 u32 unk0; - u8 unk4; + bool8 unk4; u8 fill5[3]; u32 currState; u32 unkC; - s32 unk10; + s32 itemSellPrice; u32 unk14; u32 unk18; struct ItemStruct_203B460 unk1C; - u32 unk20; + u8 unk20; + u8 unk21; + u8 unk22; + u8 unk23; u32 unk24; u32 unk28; u32 unk2C; u32 unk30; - u8 fill34[0x84 - 0x34]; + struct MenuItem unk34[3]; + u8 fill4C[0x74 - 0x4C]; + u16 unk74[8]; u32 unk84; u8 fill88[0xD4 - 0x88]; struct OpenedFile *faceFile; diff --git a/include/wonder_mail.h b/include/wonder_mail.h index 0d58a20..1f9af3e 100644 --- a/include/wonder_mail.h +++ b/include/wonder_mail.h @@ -4,7 +4,24 @@ #include "file_system.h" #include "text.h" -#define PASSWORD_BUFFER_SIZE 0x36 +#define PASSWORD_BUFFER_SIZE 54 + +struct WonderMail +{ + /* 0x0 */ u8 mailType; // mail type + /* 0x1 */ u8 missionType; // mission type + /* 0x2 */ u8 unk2; + /* 0x3 */ u8 unk3; + /* 0x4 */ u8 dungeon; // dungeon + /* 0x5 */ u8 floor; // floor + /* 0x8 */ u32 unk8; + /* 0xC */ s16 clientPoke; // client pokemon + /* 0xE */ s16 targetPoke; // target + /* 0x10 */ u8 targetItem; // item to find/deliver + /* 0x11 */ u8 rewardType; // reward type + /* 0x12 */ u8 itemReward; // item reward + /* 0x13 */ u8 friendAreaReward; // friend area +}; struct WonderMailStruct_203B2C0 |