unify wonder mail structs

pret · Jul 27, 2024 · f0f6985 · f0f6985
1 parent 58fe051
commit f0f6985
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 201 deletions.
diff --git a/include/wonder_mail_802C4C8.h b/include/wonder_mail_802C4C8.h
@@ -1,22 +1,8 @@
 #ifndef GUARD_WONDER_MAIL_802C4C8_H
 #define GUARD_WONDER_MAIL_802C4C8_H
 
-#include "constants/mailbox.h"
-#include "structs/menu.h"
 #include "structs/str_text.h"
 
-// TODO: UNIFY
-// size: 0xA8
-struct unkStruct_203B2E8
-{
-    /* 0x0 */ u8 pelipperBoardSlots[MAX_ACCEPTED_JOBS];
-    /* 0x8 */ MenuInputStruct input;
-    u32 unk3C;
-    UnkTextStruct2 *unk40;
-    UnkTextStruct2 unk44[4];
-    UnkTextStruct2_sub2 unkA4;
-};
-
 void DrawJobListMenu(void);
 bool8 HasNoAcceptedJobs(void);
 u8 GetPelipperBoardSlotIndex(void);

diff --git a/include/wonder_mail_802CDD4.h b/include/wonder_mail_802CDD4.h
@@ -4,17 +4,6 @@
 #include "structs/menu.h"
 #include "structs/str_text.h"
 
-// TODO: UNIFY
-// size: 0xA0
-typedef struct unkStruct_203B2F4
-{
-    MenuInputStruct input;
-    u32 unk34;
-    UnkTextStruct2 *unk38;
-    UnkTextStruct2 unk3C[4];
-    UnkTextStruct2_sub2 unk9C;
-} unkStruct_203B2F4;
-
 bool8 sub_802CDD4(u32);
 u32 sub_802CE5C(bool8);
 u8 sub_802CEBC(void);

diff --git a/src/wonder_mail_802C4C8.c b/src/wonder_mail_802C4C8.c
@@ -8,13 +8,14 @@
 #include "memory.h"
 #include "menu_input.h"
 #include "pokemon_mail.h"
+#include "wonder_mail_802C10C.h"
 #include "structs/str_802C39C.h"
 #include "structs/str_wonder_mail.h"
 #include "text1.h"
 #include "text2.h"
 #include "wonder_mail_802C4C8.h"
 
-static EWRAM_DATA_2 struct unkStruct_203B2E8* gUnknown_203B2E8 = {0};
+static EWRAM_DATA_2 struct unkStruct_203B2E0* gUnknown_203B2E8 = {0};
 static EWRAM_DATA_2 u16 gUnknown_203B2EC = {0};
 
 #include "data/wonder_mail_802C4C8.h"
@@ -28,23 +29,23 @@ bool8 sub_802C4C8(s32 a0, UnkTextStruct2_sub *a1, u32 a2)
     if (HasNoAcceptedJobs())
         return FALSE;
 
-    gUnknown_203B2E8 = MemoryAlloc(sizeof(struct unkStruct_203B2E8), 8);
-    gUnknown_203B2E8->unk3C = a0;
-    gUnknown_203B2E8->unk40 = &gUnknown_203B2E8->unk44[a0];
-    sub_8006518(gUnknown_203B2E8->unk44);
+    gUnknown_203B2E8 = MemoryAlloc(sizeof(struct unkStruct_203B2E0), 8);
+    gUnknown_203B2E8->unk8.s0.unk34 = a0;
+    gUnknown_203B2E8->unk8.s0.unk38 = &gUnknown_203B2E8->unk8.s0.unk3C[a0];
+    sub_8006518(gUnknown_203B2E8->unk8.s0.unk3C);
 
-    gUnknown_203B2E8->unk44[gUnknown_203B2E8->unk3C] = sUnknown_80DFCFC;
-    gUnknown_203B2E8->unk40->unk14 = &gUnknown_203B2E8->unkA4;
+    gUnknown_203B2E8->unk8.s0.unk3C[gUnknown_203B2E8->unk8.s0.unk34] = sUnknown_80DFCFC;
+    gUnknown_203B2E8->unk8.s0.unk38->unk14 = &gUnknown_203B2E8->unk8.unk9C;
 
     if (a1 != NULL)
-        gUnknown_203B2E8->unk44[gUnknown_203B2E8->unk3C].unk8 = *a1;
+        gUnknown_203B2E8->unk8.s0.unk3C[gUnknown_203B2E8->unk8.s0.unk34].unk8 = *a1;
 
-    sub_8012D34(gUnknown_203B2E8->unk40, a2);
+    sub_8012D34(gUnknown_203B2E8->unk8.s0.unk38, a2);
     ResetUnusedInputStruct();
-    sub_800641C(gUnknown_203B2E8->unk44, TRUE, TRUE);
-    sub_8013848(&gUnknown_203B2E8->input, CountAcceptedJobs(), a2, a0);
-    gUnknown_203B2E8->input.menuIndex = gUnknown_203B2EC;
-    sub_8013984(&gUnknown_203B2E8->input);
+    sub_800641C(gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE);
+    sub_8013848(&gUnknown_203B2E8->unk8.s0.input, CountAcceptedJobs(), a2, a0);
+    gUnknown_203B2E8->unk8.s0.input.menuIndex = gUnknown_203B2EC;
+    sub_8013984(&gUnknown_203B2E8->unk8.s0.input);
     sub_802C6DC();
     DrawJobListMenu();
     return TRUE;
@@ -53,11 +54,11 @@ bool8 sub_802C4C8(s32 a0, UnkTextStruct2_sub *a1, u32 a2)
 u32 sub_802C598(bool8 a0)
 {
     if (!a0) {
-        sub_8013660(&gUnknown_203B2E8->input);
+        sub_8013660(&gUnknown_203B2E8->unk8.s0.input);
         return 0;
     }
 
-    switch (GetKeyPress(&gUnknown_203B2E8->input)) {
+    switch (GetKeyPress(&gUnknown_203B2E8->unk8.s0.input)) {
         case INPUT_B_BUTTON:
             PlayMenuSoundEffect(1);
             return 2;
@@ -69,7 +70,7 @@ u32 sub_802C598(bool8 a0)
             return 4;
     }
 
-    if (sub_80138B8(&gUnknown_203B2E8->input, 1)) {
+    if (sub_80138B8(&gUnknown_203B2E8->unk8.s0.input, 1)) {
         sub_802C6DC();
         DrawJobListMenu();
         return 1;
@@ -79,91 +80,42 @@ u32 sub_802C598(bool8 a0)
 
 u8 GetPelipperBoardSlotIndex(void)
 {
-    return gUnknown_203B2E8->pelipperBoardSlots[(gUnknown_203B2E8->input.unk1E * gUnknown_203B2E8->input.unk1C) + gUnknown_203B2E8->input.menuIndex];
+    return gUnknown_203B2E8->pelipperBoardSlots[(gUnknown_203B2E8->unk8.s0.input.unk1E * gUnknown_203B2E8->unk8.s0.input.unk1C) + gUnknown_203B2E8->unk8.s0.input.menuIndex];
 }
 
 void sub_802C640(bool8 cursorSprite)
 {
     ResetUnusedInputStruct();
-    sub_800641C(gUnknown_203B2E8->unk44, FALSE, FALSE);
-    gUnknown_203B2E8->input.unk22 = CountAcceptedJobs();
-    sub_8013984(&gUnknown_203B2E8->input);
+    sub_800641C(gUnknown_203B2E8->unk8.s0.unk3C, FALSE, FALSE);
+    gUnknown_203B2E8->unk8.s0.input.unk22 = CountAcceptedJobs();
+    sub_8013984(&gUnknown_203B2E8->unk8.s0.input);
     sub_802C6DC();
     DrawJobListMenu();
 
     if (cursorSprite)
-        AddMenuCursorSprite(&gUnknown_203B2E8->input);
+        AddMenuCursorSprite(&gUnknown_203B2E8->unk8.s0.input);
 }
 
 void sub_802C688(void)
 {
     if (gUnknown_203B2E8 != NULL) {
-        gUnknown_203B2EC = gUnknown_203B2E8->input.menuIndex;
-        gUnknown_203B2E8->unk44[gUnknown_203B2E8->unk3C] = sUnknown_80DFCE4;
+        gUnknown_203B2EC = gUnknown_203B2E8->unk8.s0.input.menuIndex;
+        gUnknown_203B2E8->unk8.s0.unk3C[gUnknown_203B2E8->unk8.s0.unk34] = sUnknown_80DFCE4;
         ResetUnusedInputStruct();
-        sub_800641C(gUnknown_203B2E8->unk44, TRUE, TRUE);
+        sub_800641C(gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE);
         MemoryFree(gUnknown_203B2E8);
         gUnknown_203B2E8 = NULL;
     }
 }
 
-NAKED
 static void sub_802C6DC(void)
 {
-    asm_unified("\tpush {r4,lr}\n"
-    "\tldr r4, _0802C74C\n"
-    "\tldr r0, [r4]\n"
-    "\tldrh r1, [r0, 0x28]\n"
-    "\tadds r0, 0xA4\n"
-    "\tmovs r2, 0\n"
-    "\tstrb r1, [r0]\n"
-    "\tldr r0, [r4]\n"
-    "\tldrh r1, [r0, 0x26]\n"
-    "\tadds r0, 0xA5\n"
-    "\tstrb r1, [r0]\n"
-    "\tldr r0, [r4]\n"
-    "\tadds r0, 0xA6\n"
-    "\tmovs r1, 0xC\n"
-    "\tstrb r1, [r0]\n"
-    "\tldr r0, [r4]\n"
-    "\tadds r0, 0xA7\n"
-    "\tstrb r2, [r0]\n"
-    "\tldr r0, [r4]\n"
-    "\tmovs r1, 0x22\n"
-    "\tldrsh r0, [r0, r1]\n"
-    "\tmovs r1, 0x18\n"
-    "\tbl sub_8009614\n"
-    "\tadds r0, 0x2\n"
-    "\tlsls r0, 16\n"
-    "\tldr r2, [r4]\n"
-    "\tldr r3, [r2, 0x3C]\n"
-    "\tlsls r1, r3, 1\n"
-    "\tadds r1, r3\n"
-    "\tlsls r1, 3\n"
-    "\tadds r1, r2, r1\n"
-    "\tadds r1, 0x52\n"
-    "\tasrs r3, r0, 16\n"
-    "\tlsrs r0, 16\n"
-    "\tstrh r0, [r1]\n"
-    "\tldr r1, [r2, 0x3C]\n"
-    "\tlsls r0, r1, 1\n"
-    "\tadds r0, r1\n"
-    "\tlsls r0, 3\n"
-    "\tadds r2, r0\n"
-    "\tadds r3, 0x2\n"
-    "\tadds r2, 0x54\n"
-    "\tstrh r3, [r2]\n"
-    "\tbl ResetUnusedInputStruct\n"
-    "\tldr r0, [r4]\n"
-    "\tadds r0, 0x44\n"
-    "\tmovs r1, 0x1\n"
-    "\tmovs r2, 0x1\n"
-    "\tbl sub_800641C\n"
-    "\tpop {r4}\n"
-    "\tpop {r0}\n"
-    "\tbx r0\n"
-    "\t.align 2, 0\n"
-"_0802C74C: .4byte gUnknown_203B2E8");
+    gUnknown_203B2E8->unk8.unk9C.f0 = gUnknown_203B2E8->unk8.s0.input.unk20;
+    gUnknown_203B2E8->unk8.unk9C.f1 = gUnknown_203B2E8->unk8.s0.input.unk1E;
+    gUnknown_203B2E8->unk8.unk9C.f2 = 12;
+    gUnknown_203B2E8->unk8.unk9C.f3 = 0;
+
+    SUB_8009614_CALL(gUnknown_203B2E8->unk8.s0);
 }
 
 void DrawJobListMenu(void)
@@ -174,26 +126,26 @@ void DrawJobListMenu(void)
     s32 x;
     unkStruct_802C39C local;
 
-    sub_8008C54(gUnknown_203B2E8->unk3C);
-    sub_80073B8(gUnknown_203B2E8->unk3C);
-    r4 = gUnknown_203B2E8->input.unk1E * 8;
+    sub_8008C54(gUnknown_203B2E8->unk8.s0.unk34);
+    sub_80073B8(gUnknown_203B2E8->unk8.s0.unk34);
+    r4 = gUnknown_203B2E8->unk8.s0.input.unk1E * 8;
     x = r4;
     x += 10;
-    PrintStringOnWindow(x, 0, sJobList, gUnknown_203B2E8->unk3C, 0);
+    PrintStringOnWindow(x, 0, sJobList, gUnknown_203B2E8->unk8.s0.unk34, 0);
 
     r4 += 4;
-    x = r4 + (gUnknown_203B2E8->unkA4.f2 * 8);
-    sub_8012BC4(x, 0, gUnknown_203B2E8->input.unk1E + 1, 2, 7, gUnknown_203B2E8->unk3C);
+    x = r4 + (gUnknown_203B2E8->unk8.unk9C.f2 * 8);
+    sub_8012BC4(x, 0, gUnknown_203B2E8->unk8.s0.input.unk1E + 1, 2, 7, gUnknown_203B2E8->unk8.s0.unk34);
 
-    for (i = 0;  i < gUnknown_203B2E8->input.unk1A; i++) {
-        mail = GetJobSlotInfo(gUnknown_203B2E8->pelipperBoardSlots[(gUnknown_203B2E8->input.unk1E * gUnknown_203B2E8->input.unk1C) + i]);
-        local.unk0[0] = gUnknown_203B2E8->unk3C;
-        local.y = sub_8013800(&gUnknown_203B2E8->input, i);
+    for (i = 0;  i < gUnknown_203B2E8->unk8.s0.input.unk1A; i++) {
+        mail = GetJobSlotInfo(gUnknown_203B2E8->pelipperBoardSlots[(gUnknown_203B2E8->unk8.s0.input.unk1E * gUnknown_203B2E8->unk8.s0.input.unk1C) + i]);
+        local.unk0[0] = gUnknown_203B2E8->unk8.s0.unk34;
+        local.y = sub_8013800(&gUnknown_203B2E8->unk8.s0.input, i);
         sub_803B35C(mail, &local);
         CreateRescueTitle(&local);
     }
 
-    sub_80073E0(gUnknown_203B2E8->unk3C);
+    sub_80073E0(gUnknown_203B2E8->unk8.s0.unk34);
 }
 
 static s32 CountAcceptedJobs(void)