summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/personality_test.h18
-rw-r--r--include/felicity_bank.h3
-rw-r--r--include/friend_area_action_menu.h3
-rw-r--r--include/gUnknown_203B418.h4
-rw-r--r--include/gulpin_shop.h41
-rw-r--r--include/kecleon_items.h3
-rw-r--r--include/main_menu.h1
-rw-r--r--include/rescue_password_menu.h26
-rw-r--r--include/text.h11
-rw-r--r--include/trade_items_menu.h6
-rw-r--r--include/wonder_mail.h21
11 files changed, 123 insertions, 14 deletions
diff --git a/include/constants/personality_test.h b/include/constants/personality_test.h
index c711b3c..bd6f159 100644
--- a/include/constants/personality_test.h
+++ b/include/constants/personality_test.h
@@ -1,8 +1,24 @@
#ifndef GUARD_CONSTANTS_PERSONALITY_TEST_H
#define GUARD_CONSTANTS_PERSONALITY_TEST_H
+enum NaturePersonalities {
+ HARDY,
+ DOCILE,
+ BRAVE,
+ JOLLY,
+ IMPISH,
+ NAIVE,
+ TIMID,
+ HASTY,
+ SASSY,
+ CALM,
+ RELAXED,
+ LONELY,
+ QUIRKY,
+ NUM_PERSONALITIES
+};
+
#define NUM_PARTNERS 10
-#define NUM_PERSONALITIES 13
#define NUM_QUIZ_QUESTIONS 55
#define MAX_ASKED_QUESTIONS 8
diff --git a/include/felicity_bank.h b/include/felicity_bank.h
index 9c2ff13..078ebd5 100644
--- a/include/felicity_bank.h
+++ b/include/felicity_bank.h
@@ -13,8 +13,7 @@ struct unkStruct_203B204
u32 unk8;
u32 chosenAmount;
u32 unk10;
- struct MenuItem unk14[5];
- u8 fill3C[0x54 - 0x3C];
+ struct MenuItem unk14[8];
u16 unk54[8];
u32 unk64;
u8 fill68[0x78 - 0x68];
diff --git a/include/friend_area_action_menu.h b/include/friend_area_action_menu.h
index 371811f..e1d07ec 100644
--- a/include/friend_area_action_menu.h
+++ b/include/friend_area_action_menu.h
@@ -17,8 +17,7 @@ struct unkStruct_203B2BC
u16 unkA;
u32 unkC;
struct HeldItem unk10;
- u8 unk14;
- u8 fill15[3];
+ struct ItemSlot unk14;
struct unkSubStruct_203B2BC *unk18;
u32 unk1C;
u32 unk20;
diff --git a/include/gUnknown_203B418.h b/include/gUnknown_203B418.h
index 3b35a90..5323a6e 100644
--- a/include/gUnknown_203B418.h
+++ b/include/gUnknown_203B418.h
@@ -14,7 +14,9 @@ struct unkStruct_203B418
u8 unk7;
u8 fill8[0x11 - 8];
u8 unk11;
- u8 fill12[0xE23C - 0x12];
+ u8 fill12[0x16D - 0x12];
+ u8 unk16D;
+ u8 fill16E[0xE23C - 0x16E];
s16 unkE23C;
s16 unkE23E;
u8 fillE240[0xE265 - 0xE240];
diff --git a/include/gulpin_shop.h b/include/gulpin_shop.h
new file mode 100644
index 0000000..ffa65a1
--- /dev/null
+++ b/include/gulpin_shop.h
@@ -0,0 +1,41 @@
+#ifndef GUARD_GULPIN_SHOP_H
+#define GUARD_GULPIN_SHOP_H
+
+struct unkStruct_Gulpin
+{
+ u8 fill0[0x22];
+ u16 unk22;
+};
+
+struct unkStruct_203B26C
+{
+// size: 0x18C
+ u32 unk0;
+ s32 state;
+ u32 unk8;
+ s16 unkC;
+ u8 unkE;
+ struct unkStruct_Gulpin * unk10;
+ u32 unk14;
+ u32 unk18;
+ u16 unk1C;
+ u16 unk1E;
+ u32 unk20;
+ u32 unk24;
+ struct MenuItem unk28[8];
+ u16 unk68[8];
+ u32 unk78;
+ u8 fill7C[0x118 - 0x7C];
+ /* 0x118 */ struct OpenedFile *faceFile;
+ /* 0x11C */ u8 *faceData;
+ /* 0x120 */ u16 unk120;
+ u16 unk122;
+ u8 unk124;
+ u8 unk125;
+ u8 unk126;
+ u8 unk127;
+ struct OpenedFile **unk128;
+ struct UnkTextStruct2 unk12C[4];
+};
+
+#endif
diff --git a/include/kecleon_items.h b/include/kecleon_items.h
index 1dba655..7cea99a 100644
--- a/include/kecleon_items.h
+++ b/include/kecleon_items.h
@@ -25,8 +25,7 @@ struct unkStruct_203B210
u32 unk28;
u32 unk2C;
u32 unk30;
- struct MenuItem unk34[3];
- u8 fill4C[0x74 - 0x4C];
+ struct MenuItem unk34[8];
u16 unk74[8];
u32 unk84;
u8 fill88[0xD4 - 0x88];
diff --git a/include/main_menu.h b/include/main_menu.h
index 8a0b22d..3d72acb 100644
--- a/include/main_menu.h
+++ b/include/main_menu.h
@@ -18,6 +18,7 @@ enum MainMenuScreens
MENU_DEBUG = 16,
MENU_COMMUNICATION_1 = 19,
MENU_COMMUNICATION_2,
+ // NOTE: 0x1B - 0x22 used by Rescue Password Menu
MENU_DISPLAY_RESCUE_PASSWORD = 33,
MENU_RESCUE_PASSWORD_ENTRY,
MENU_DELETE_SAVE = 46,
diff --git a/include/rescue_password_menu.h b/include/rescue_password_menu.h
new file mode 100644
index 0000000..8781b1f
--- /dev/null
+++ b/include/rescue_password_menu.h
@@ -0,0 +1,26 @@
+#ifndef GUARD_RESCUE_PASSWORD_MENU_H
+#define GUARD_RESCUE_PASSWORD_MENU_H
+
+struct unkSprite
+{
+ u16 unk208;
+ u16 unk20A;
+ u16 unk20C;
+ u16 unk20E;
+};
+
+struct RescuePasswordMenu
+{
+ // size: 0x214
+ u32 currMenu;
+ u32 state;
+ u8 fill8[0x148 - 8];
+ struct UnkTextStruct2 unk148[4];
+ u8 fill1A8[0x208 - 0x1A8];
+
+ struct unkSprite unk208;
+
+ u32 unk210;
+};
+
+#endif
diff --git a/include/text.h b/include/text.h
index eda4f9a..eaf2ffc 100644
--- a/include/text.h
+++ b/include/text.h
@@ -10,8 +10,17 @@ struct UnkTextStruct1 {
u8 unk46;
};
+struct UnkTextStruct2_sub
+{
+ u8 unk0;
+ u8 unk1;
+ u8 unk2;
+ u8 unk3;
+};
+
struct UnkTextStruct2 {
- u8 fill00[0x0c];
+ u8 fill00[0x08];
+ struct UnkTextStruct2_sub unk08;
s16 unk0c;
s16 unkE;
s16 unk10;
diff --git a/include/trade_items_menu.h b/include/trade_items_menu.h
index 8b3b0a9..9ff1438 100644
--- a/include/trade_items_menu.h
+++ b/include/trade_items_menu.h
@@ -6,8 +6,10 @@
struct TradeSubStruct
{
- u8 itemIndex; // item id?
- u8 fill3[0x3];
+ union ItemIdx {
+ u8 itemIndex; // item id?
+ u32 itemIndex_u32;
+ } itemIdx;
u32 numItems; // number of items?
};
diff --git a/include/wonder_mail.h b/include/wonder_mail.h
index 7c36833..9593e3b 100644
--- a/include/wonder_mail.h
+++ b/include/wonder_mail.h
@@ -70,7 +70,9 @@ struct WonderMailStruct_203B2C4
u8 unk3E;
u32 unk40;
u32 linkError; // another link status
- u8 filler48[0x218 - 0x48];
+ u8 filler48[0x1B8 - 0x48];
+ struct unkStruct_8095228 unk1B8;
+ struct unkStruct_8095228 unk1E8;
s8 unk218;
u32 unk21C;
u8 filler220[0x30C - 0x220];
@@ -87,10 +89,23 @@ struct WonderMailStruct_203B2C4
u8 unk42D;
u8 unk42E;
u32 unk430;
- u8 padding3[0x534 - 0x434];
+ u8 formattedString[0x100];
s32 unk534;
u32 unk538;
- u8 fill53C[0x564 - 0x53C];
+ u8 unk53C[0xA];
+ u32 unk548;
+ u32 unk54C;
+ u16 unk550;
+ u8 unk552;
+ u8 unk553;
+ u32 unk554;
+ u8 unk558;
+ u8 unk559;
+ u8 unk55A;
+ u8 unk55B;
+ u8 unk55C;
+ u8 fill55C[0x560 - 0x55D];
+ u32 unk560;
};
void sub_8028B04(u32 r0);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:05:36 +0000