From a9049a261f74c8e8ad13df4f0dff02ad1245bc88 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Fri, 24 Feb 2023 09:07:32 -0800
Subject: [PATCH] match 8012E04 w/ jiang and more changes to UnkTextStruct2

---
 asm/code_8012A18.s            | 177 ----------------------------------
 asm/code_807CABC.s            |  64 ------------
 include/status_checks_1.h     |   1 +
 include/text.h                |   3 +-
 src/adventure_log.c           |   4 +-
 src/debug_menu.c              |   4 +-
 src/dungeon_ai_attack.c       |  30 ++++++
 src/friend_area_action_menu.c |  10 +-
 src/load_screen.c             |   8 +-
 src/mailbox.c                 |   8 +-
 src/main_menu.c               |  20 ++--
 src/makuhita_dojo.c           |   2 +-
 src/makuhita_dojo_1.c         |   4 +-
 src/menu_input.c              |  98 +++++++++++++++++++
 src/pelipper_board.c          |   8 +-
 src/personality_test.c        |   8 +-
 src/post_office_guide.c       |   4 +-
 src/save_menu.c               |   4 +-
 src/status_checks_1.c         |   2 +-
 src/thank_you_wonder_mail.c   |   6 +-
 src/trade_items_menu.c        |   6 +-
 src/wonder_mail.c             |   4 +-
 src/wonder_mail_2.c           |  16 +--
 src/wonder_mail_2_1.c         |  14 +--
 src/wonder_mail_3.c           |  10 +-
 src/wonder_mail_3_mid.c       |  14 +--
 src/wonder_mail_4.c           |   4 +-
 src/wonder_mail_5.c           |   4 +-
 src/wonder_mail_6.c           |   6 +-
 src/wonder_mail_802DF88.c     |   6 +-
 30 files changed, 219 insertions(+), 330 deletions(-)

diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index f534b9260..b2a7b4f86 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -229,181 +229,4 @@ _08012D50:
 	bx r0
 	thumb_func_end sub_8012D34
 
-	thumb_func_start sub_8012D60
-sub_8012D60:
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	adds r4, r0, 0
-	adds r5, r3, 0
-	ldr r7, [sp, 0x20]
-	movs r3, 0
-	movs r6, 0x1
-	negs r6, r6
-	mov r12, r3
-	ldr r0, [sp, 0x24]
-	str r0, [r4, 0x10]
-	str r1, [r4, 0x4]
-	str r2, [r4, 0x8]
-	cmp r2, 0
-	bne _08012D88
-	ldr r0, _08012E00
-	str r0, [r4, 0x8]
-_08012D88:
-	str r5, [r4, 0xC]
-	ldr r0, [r1]
-	adds r5, r4, 0
-	adds r5, 0x14
-	movs r2, 0x4C
-	adds r2, r4
-	mov r8, r2
-	movs r2, 0x4D
-	adds r2, r4
-	mov r9, r2
-	movs r2, 0x4E
-	adds r2, r4
-	mov r10, r2
-	cmp r0, 0
-	beq _08012DC6
-_08012DA6:
-	cmp r7, 0
-	blt _08012DB2
-	ldr r0, [r1, 0x4]
-	cmp r7, r0
-	bne _08012DB2
-	adds r6, r3, 0
-_08012DB2:
-	ldr r0, [r1]
-	ldrb r0, [r0]
-	cmp r0, 0x2A
-	bne _08012DBC
-	mov r12, r3
-_08012DBC:
-	adds r1, 0x8
-	adds r3, 0x1
-	ldr r0, [r1]
-	cmp r0, 0
-	bne _08012DA6
-_08012DC6:
-	cmp r6, 0
-	bge _08012DCC
-	mov r6, r12
-_08012DCC:
-	adds r0, r5, 0
-	adds r1, r3, 0
-	ldr r2, [sp, 0x24]
-	bl sub_8013134
-	strh r6, [r4, 0x2C]
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_80137B0
-	movs r0, 0x1
-	mov r1, r8
-	strb r0, [r1]
-	mov r2, r9
-	strb r0, [r2]
-	mov r1, r10
-	strb r0, [r1]
-	subs r0, 0x2
-	str r0, [r4, 0x48]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08012E00: .4byte gUnknown_80D47B8
-	thumb_func_end sub_8012D60
-
-	thumb_func_start sub_8012E04
-sub_8012E04:
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	adds r5, r0, 0
-	adds r7, r1, 0
-	mov r8, r2
-	mov r9, r3
-	ldr r3, [sp, 0x1C]
-	movs r1, 0
-	movs r6, 0x1
-	negs r6, r6
-	movs r4, 0
-	ldr r0, [r7]
-	cmp r0, 0
-	beq _08012E46
-	adds r2, r7, 0
-_08012E26:
-	cmp r3, 0
-	blt _08012E32
-	ldr r0, [r2, 0x4]
-	cmp r3, r0
-	bne _08012E32
-	adds r6, r1, 0
-_08012E32:
-	ldr r0, [r2]
-	ldrb r0, [r0]
-	cmp r0, 0x2A
-	bne _08012E3C
-	adds r4, r1, 0
-_08012E3C:
-	adds r2, 0x8
-	adds r1, 0x1
-	ldr r0, [r2]
-	cmp r0, 0
-	bne _08012E26
-_08012E46:
-	cmp r6, 0
-	bge _08012E4C
-	adds r6, r4, 0
-_08012E4C:
-	adds r4, r5, 0
-	adds r4, 0x14
-	adds r0, r4, 0
-	ldr r2, [sp, 0x20]
-	bl sub_8013134
-	strh r6, [r5, 0x2C]
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_80137B0
-	ldr r0, [sp, 0x20]
-	str r0, [r5, 0x10]
-	mov r0, r8
-	str r0, [r5, 0x8]
-	cmp r0, 0
-	bne _08012E72
-	ldr r0, _08012EA0
-	str r0, [r5, 0x8]
-_08012E72:
-	mov r0, r9
-	str r0, [r5, 0xC]
-	str r7, [r5, 0x4]
-	adds r1, r5, 0
-	adds r1, 0x4E
-	movs r0, 0
-	strb r0, [r1]
-	adds r0, r5, 0
-	adds r0, 0x4C
-	movs r1, 0x1
-	strb r1, [r0]
-	adds r0, 0x1
-	strb r1, [r0]
-	movs r0, 0x1
-	negs r0, r0
-	str r0, [r5, 0x48]
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08012EA0: .4byte gUnknown_80D47B8
-	thumb_func_end sub_8012E04
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/code_807CABC.s b/asm/code_807CABC.s
index 9735b7161..d97abc6c7 100644
--- a/asm/code_807CABC.s
+++ b/asm/code_807CABC.s
@@ -5,70 +5,6 @@
 
   	.text
   
-	thumb_func_start sub_807CABC
-sub_807CABC:
-	push {r4-r6,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	movs r6, 0
-	b _0807CADC
-_0807CAC6:
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _0807CB0A
-	ldr r1, _0807CB38
-	adds r0, r5, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0807CB0A
-	adds r6, 0x1
-_0807CADC:
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8070828
-	cmp r6, r0
-	bge _0807CB0A
-	ldr r5, [r4, 0x70]
-	adds r0, r5, 0
-	adds r0, 0x48
-	ldrb r1, [r0]
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r2, 0x1
-	movs r3, 0
-	bl sub_8055A00
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	bne _0807CAC6
-_0807CB0A:
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8057588
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _0807CB2A
-	ldr r0, [r4, 0x70]
-	adds r0, 0x48
-	ldrb r1, [r0]
-	adds r0, r4, 0
-	bl sub_806A9B4
-_0807CB2A:
-	adds r0, r4, 0
-	bl sub_806A1B0
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0807CB38: .4byte 0x00000159
-	thumb_func_end sub_807CABC
-
 	thumb_func_start sub_807CB3C
 sub_807CB3C:
 	push {r4-r7,lr}
diff --git a/include/status_checks_1.h b/include/status_checks_1.h
index 6d0c3e999..e469c6988 100644
--- a/include/status_checks_1.h
+++ b/include/status_checks_1.h
@@ -6,5 +6,6 @@
 bool8 HasNegativeStatus(struct Entity *pokemon);
 bool8 IsSleeping(struct Entity *pokemon);
 bool8 HasLowHealth(struct Entity *pokemon);
+s32 sub_8070828(struct Entity *pokemon, bool8 displayMessage);
 
 #endif
diff --git a/include/text.h b/include/text.h
index 6027d23d8..25ba15e78 100644
--- a/include/text.h
+++ b/include/text.h
@@ -21,7 +21,8 @@ struct UnkTextStruct2_sub
 };
 
 struct UnkTextStruct2 {
-    u8 fill00[0x08];
+    u8 fill00[0x04];
+    s32 unk4;
     struct UnkTextStruct2_sub unk08;
     s16 unk0c;
     s16 unkE;
diff --git a/src/adventure_log.c b/src/adventure_log.c
index 546134de4..a8b622116 100644
--- a/src/adventure_log.c
+++ b/src/adventure_log.c
@@ -23,7 +23,7 @@ extern struct AdventureLog *gAdventureLog;
 
 const struct UnkTextStruct2 gUnknown_80E1FF0 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x00, 0x00, 0x00, 0x00,
    0x00, 0x00,
    0x00, 0x00,
@@ -31,7 +31,7 @@ const struct UnkTextStruct2 gUnknown_80E1FF0 = {
 };
 const struct UnkTextStruct2 gUnknown_80E2008 = {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x1A, 0x04,
     0x06, 0x00,
diff --git a/src/debug_menu.c b/src/debug_menu.c
index 192845134..c5c8d6d4a 100644
--- a/src/debug_menu.c
+++ b/src/debug_menu.c
@@ -15,7 +15,7 @@ extern struct DebugMenu *gUnknown_203B3EC;
 const struct UnkTextStruct2 gUnknown_80E7D40 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -25,7 +25,7 @@ const struct UnkTextStruct2 gUnknown_80E7D40 =
 const struct UnkTextStruct2 gUnknown_80E7D58 = 
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x02, 0x00, 0x02, 0x00,
     0x09, 0x0b,
     0x0b, 0x00,
diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c
index 3234f2e19..9da995229 100644
--- a/src/dungeon_ai_attack.c
+++ b/src/dungeon_ai_attack.c
@@ -40,6 +40,13 @@ extern s32 gPotentialAttackTargetWeights[NUM_DIRECTIONS];
 extern u8 gPotentialAttackTargetDirections[NUM_DIRECTIONS];
 extern struct Entity *gPotentialTargets[NUM_DIRECTIONS];
 
+extern void sub_8055A00(struct Entity *, u8, u32, u32, u32);
+extern void sub_806A9B4(struct Entity *, u8);
+extern bool8 sub_8044B28(void);
+extern void sub_8057588(struct Entity *, u32);
+extern void sub_806A1B0(struct Entity *);
+
+
 void DecideAttack(struct Entity *pokemon)
 {
     struct EntityInfo *pokemonInfo = pokemon->info;
@@ -922,3 +929,26 @@ bool8 IsTargetInRange(struct Entity *pokemon, struct Entity *targetPokemon, s32
     }
     return FALSE;
 }
+
+void sub_807CABC(struct Entity *target)
+{
+  struct EntityInfo *entityInfo;
+  s32 counter;
+
+  counter = 0; 
+  while (1) {
+        if(counter >= sub_8070828(target, TRUE)) break;
+        entityInfo = target->info;
+        sub_8055A00(target,(entityInfo->action).actionUseIndex,1,0,0);
+        if(!EntityExists(target)) break;
+        if(sub_8044B28()) break;
+        if(entityInfo->unk159) break;
+        counter++;
+  }
+
+  sub_8057588(target,1);
+  if (EntityExists(target)) {
+    sub_806A9B4(target,(target->info->action).actionUseIndex);
+  }
+  sub_806A1B0(target);
+}
diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c
index 731513025..2f7ba3fe7 100644
--- a/src/friend_area_action_menu.c
+++ b/src/friend_area_action_menu.c
@@ -53,7 +53,7 @@ extern void sub_80276A8();
 const struct UnkTextStruct2 gUnknown_80DD6EC =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -64,7 +64,7 @@ const struct UnkTextStruct2 gUnknown_80DD6EC =
 const struct UnkTextStruct2 gUnknown_80DD704 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x13, 0x00, 0x04, 0x00,
     0x09, 0x03,
     0x03, 0x00,
@@ -74,7 +74,7 @@ const struct UnkTextStruct2 gUnknown_80DD704 =
 const struct UnkTextStruct2 gUnknown_80DD71C =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x14, 0x00, 0x04, 0x00,
     0x06, 0x03,
     0x03, 0x00,
@@ -84,7 +84,7 @@ const struct UnkTextStruct2 gUnknown_80DD71C =
 const struct UnkTextStruct2 gUnknown_80DD734 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x16, 0x00, 0x04, 0x00,
     0x06, 0x03,
     0x03, 0x00,
@@ -94,7 +94,7 @@ const struct UnkTextStruct2 gUnknown_80DD734 =
 const struct UnkTextStruct2 gUnknown_80DD74C =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x02, 0x00, 0x11, 0x00,
     0x1A, 0x02,
     0x02, 0x00,
diff --git a/src/load_screen.c b/src/load_screen.c
index 042cc9973..45b0f2a25 100644
--- a/src/load_screen.c
+++ b/src/load_screen.c
@@ -66,7 +66,7 @@ extern void sub_8007E20(s32, s32, s32, u32, u32, s32, u32);
 
 const struct UnkTextStruct2 gUnknown_80E75F8 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x00, 0x00, 0x00, 0x00,
    0x00, 0x00,
    0x00, 0x00,
@@ -75,7 +75,7 @@ const struct UnkTextStruct2 gUnknown_80E75F8 = {
 
 const struct UnkTextStruct2 gUnknown_80E7610 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x02, 0x00,
    0x1A, 0x0B,
    0x0B, 0x00,
@@ -86,7 +86,7 @@ const u8 gUnkData_80E7628[] = {0x20, 0x00, 0x00, 0x00};
 
 const struct UnkTextStruct2 gUnknown_80E762C = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x0F, 0x00,
    0x13, 0x03,
    0x03, 0x00,
@@ -131,7 +131,7 @@ const struct MenuItem gDeleteSaveConfirmMenuItems[3] =
 const struct UnkTextStruct2 gUnknown_80E7784 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x17, 0x00, 0x0F, 0x00,
     0x05, 0x03,
     0x03, 0x00,
diff --git a/src/mailbox.c b/src/mailbox.c
index 0c5d537e9..d511f9865 100644
--- a/src/mailbox.c
+++ b/src/mailbox.c
@@ -23,7 +23,7 @@ extern void sub_802E1AC(void);
 const struct UnkTextStruct2 gUnknown_80E0284 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -33,7 +33,7 @@ const struct UnkTextStruct2 gUnknown_80E0284 =
 const struct UnkTextStruct2 gUnknown_80E029C =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x03, 0x00, 0x03, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -43,7 +43,7 @@ const struct UnkTextStruct2 gUnknown_80E029C =
 const struct UnkTextStruct2 gUnknown_80E02B4 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x04, 0x00, 0x00, 0x00,
+    0x04,
     0x15, 0x00, 0x06, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -53,7 +53,7 @@ const struct UnkTextStruct2 gUnknown_80E02B4 =
 const struct UnkTextStruct2 gUnknown_80E02CC =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x04, 0x00, 0x00, 0x00,
+    0x04,
     0x15, 0x00, 0x0f, 0x00,
     0x06, 0x03,
     0x03, 0x00,
diff --git a/src/main_menu.c b/src/main_menu.c
index 080a60f07..03ea15cb5 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -95,7 +95,7 @@ static const u8 sUnknown_80E6070[];
 
 const struct UnkTextStruct2 gUnknown_80E59A8 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x00, 0x00, 0x00, 0x00,
    0x00, 0x00,
    0x00, 0x00,
@@ -106,7 +106,7 @@ static const char main_menu_fill[] = "pksdir0";
 
 const struct UnkTextStruct2 gUnknown_80E59C8 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x00, 0x00, 0x00, 0x00,
    0x00, 0x00,
    0x00, 0x00,
@@ -115,7 +115,7 @@ const struct UnkTextStruct2 gUnknown_80E59C8 = {
 
 const struct UnkTextStruct2 gUnknown_80E59E0 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x02, 0x00,
    0x0A, 0x03,
    0x03, 0x00,
@@ -131,7 +131,7 @@ const struct MenuItem gUnknown_80E59F8[] =
 
 const struct UnkTextStruct2 gUnknown_80E5A29 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x02, 0x00,
    0x0A, 0x02,
    0x02, 0x00,
@@ -146,7 +146,7 @@ const struct MenuItem gUnknown_80E5A44[] =
 
 const struct UnkTextStruct2 gUnknown_80E5A60 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03, 
    0x02, 0x00, 0x02, 0x00,
    0x0A, 0x08,
    0x08, 0x00,
@@ -155,7 +155,7 @@ const struct UnkTextStruct2 gUnknown_80E5A60 = {
 
 const struct UnkTextStruct2 gUnknown_80E5A78 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x02, 0x00,
    0x0B, 0x09,
    0x09, 0x00,
@@ -185,7 +185,7 @@ const struct MenuItem gUnknown_80E5AFC[] =
 
 const struct UnkTextStruct2 gUnknown_80E5B34 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x02, 0x00,
    0x0A, 0x08,
    0x08, 0x00,
@@ -215,7 +215,7 @@ const struct MenuItem gUnknown_80E5B8C[] =
 
 const struct UnkTextStruct2 gUnknown_80E5BC4 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x02, 0x00,
    0x0A, 0x08,
    0x08, 0x00,
@@ -245,7 +245,7 @@ const struct MenuItem gUnknown_80E5C18[] =
 
 const struct UnkTextStruct2 gUnknown_80E5C50 = { 
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x02, 0x00,
    0x0A, 0x03,
    0x03, 0x00,
@@ -268,7 +268,7 @@ const struct MenuItem gUnknown_80E5C9C[] =
 
 const struct UnkTextStruct2 gUnknown_80E5CB4 = {
    0x00, 0x00, 0x00, 0x00,
-   0x03, 0x00, 0x00, 0x00,
+   0x03,
    0x02, 0x00, 0x0F, 0x00,
    0x1A, 0x03,
    0x03, 0x00,
diff --git a/src/makuhita_dojo.c b/src/makuhita_dojo.c
index b34ccc3ee..b98f3a5ff 100644
--- a/src/makuhita_dojo.c
+++ b/src/makuhita_dojo.c
@@ -17,7 +17,7 @@ ALIGNED(4) const u8 gUnknown_80E0754[] = {0x83, 0xC0};
 static const u8 makuhita_dojo_fill[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80E0760 = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
diff --git a/src/makuhita_dojo_1.c b/src/makuhita_dojo_1.c
index e0fb0e1b0..290857ba8 100644
--- a/src/makuhita_dojo_1.c
+++ b/src/makuhita_dojo_1.c
@@ -36,7 +36,7 @@ static const u8 makuhita_dojo_fill[] = "pksdir0";
 
 const struct UnkTextStruct2 gUnknown_80E07EC = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -44,7 +44,7 @@ const struct UnkTextStruct2 gUnknown_80E07EC = {
 };
 const struct UnkTextStruct2 gUnknown_80E0804 = {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x0E, 0x0E,
     0x0E, 0x00,
diff --git a/src/menu_input.c b/src/menu_input.c
index c0149dec4..30f3e9ff6 100644
--- a/src/menu_input.c
+++ b/src/menu_input.c
@@ -22,6 +22,104 @@ void AddMenuCursorSprite(void *);
 
 void sub_8012EBC(struct MenuStruct *param_1);
 
+extern u32 gUnknown_80D47B8;
+extern void sub_8013134(u32 *, u32, u32);
+extern void sub_80137B0(u32 *, u32);
+
+extern s16 sub_8009614(u32, u32);
+
+void sub_8012D60(struct MenuStruct *param_1,struct MenuItem *menuItems,u32 *param_3,u16 *param_4,s32 param_5,
+                s32 index)
+{
+  const u8 *textPtr;
+  s32 counter;
+  s32 menuIndex;
+  s32 iVar1;
+  
+  counter = 0;
+  menuIndex = -1;
+  iVar1 = 0;
+  param_1->index = index;
+  param_1->menuItems = menuItems;
+  param_1->unk8 = param_3;
+  if (param_3 == 0) {
+    param_1->unk8 = &gUnknown_80D47B8;
+  }
+  param_1->unkC = param_4;
+  textPtr = menuItems->text;
+  if(textPtr)
+  {
+      while (textPtr != 0) {
+        if ((0 <= param_5) && (param_5 == menuItems->menuAction)) {
+          menuIndex = counter;
+        }
+        if (*menuItems->text == '*') {
+          iVar1 = counter;
+        }
+        menuItems++;
+        counter++;
+        textPtr = menuItems->text;
+      }
+  }
+  if (menuIndex < 0) {
+    menuIndex = iVar1;
+  }
+  sub_8013134(&param_1->unk14,counter,index);
+  param_1->menuIndex = menuIndex;
+  sub_80137B0(&param_1->unk14,0);
+  param_1->unk4C = 1;
+  param_1->unk4D = 1;
+  param_1->unk4E = 1;
+  param_1->menuAction = -1;
+}
+
+void sub_8012E04(struct MenuStruct *param_1,struct MenuItem *menuItems,u32 *param_3,u16 *param_4,s32 param_5,
+                s32 index)
+{
+  const u8 *textPtr;
+  s32 counter;
+  struct MenuItem *menuItemPtr;
+  s32 iVar1;
+  s32 menuIndex;
+  
+  counter = 0;
+  menuIndex = -1;
+  iVar1 = 0;
+  textPtr = menuItems->text;
+  if (textPtr) {
+    menuItemPtr = menuItems;
+    while (textPtr != NULL) {
+      if ((0 <= param_5) && (param_5 == menuItemPtr->menuAction)) {
+        menuIndex = counter;
+      }
+      if (*menuItemPtr->text == '*') {
+        iVar1 = counter;
+      }
+      menuItemPtr++;
+      counter++;
+      textPtr = menuItemPtr->text;
+    }
+  }
+    
+  if (menuIndex < 0) {
+    menuIndex = iVar1;
+  }
+  sub_8013134(&param_1->unk14,counter,index);
+  param_1->menuIndex = menuIndex;
+  sub_80137B0(&param_1->unk14,0);
+  param_1->index = index;
+  param_1->unk8 = param_3;
+  if (param_3 == 0) {
+    param_1->unk8 = &gUnknown_80D47B8;
+  }
+  param_1->unkC = param_4;
+  param_1->menuItems = menuItems;
+  param_1->unk4E = 0;
+  param_1->unk4C = 1;
+  param_1->unk4D = 1;
+  param_1->menuAction = -1;
+}
+
 void sub_8012EA4(struct MenuStruct *param_1, u32 r1)
 {
     param_1->unk4C = r1;
diff --git a/src/pelipper_board.c b/src/pelipper_board.c
index 1df26c3c0..abe2e395f 100644
--- a/src/pelipper_board.c
+++ b/src/pelipper_board.c
@@ -30,7 +30,7 @@ extern void SetPelipperBoardState(u32);
 const struct UnkTextStruct2 gUnknown_80E0330 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -40,7 +40,7 @@ const struct UnkTextStruct2 gUnknown_80E0330 =
 const struct UnkTextStruct2 gUnknown_80E0348 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x03, 0x00, 0x03, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -50,7 +50,7 @@ const struct UnkTextStruct2 gUnknown_80E0348 =
 const struct UnkTextStruct2 gUnknown_80E0360 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x04, 0x00, 0x00, 0x00,
+    0x04,
     0x15, 0x00, 0x06, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -60,7 +60,7 @@ const struct UnkTextStruct2 gUnknown_80E0360 =
 const struct UnkTextStruct2 gUnknown_80E0378 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x04, 0x00, 0x00, 0x00,
+    0x04,
     0x15, 0x00, 0x0f, 0x00,
     0x06, 0x03,
     0x03, 0x00,
diff --git a/src/personality_test.c b/src/personality_test.c
index 8937fb22d..9333b835c 100644
--- a/src/personality_test.c
+++ b/src/personality_test.c
@@ -357,7 +357,7 @@ const char * const gPersonalityTypeDescriptionTable[NUM_PERSONALITIES] =
 const struct UnkTextStruct2 gUnknown_80F4244 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x05, 0x00, 0x00, 0x00,
+    0x05,
     0x0C, 0x00, 0x06, 0x00,
     0x05, 0x05,
     0x05, 0x00,
@@ -383,7 +383,7 @@ const s16 gPartners[NUM_PARTNERS] =
 const struct UnkTextStruct2 gUnknown_80F4278 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -393,7 +393,7 @@ const struct UnkTextStruct2 gUnknown_80F4278 =
 const struct UnkTextStruct2 gUnknown_80F4290 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x09, 0x0B,
     0x0D, 0x00,
@@ -403,7 +403,7 @@ const struct UnkTextStruct2 gUnknown_80F4290 =
 const struct UnkTextStruct2 gUnknown_80F42A8 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x05, 0x00, 0x00, 0x00,
+    0x05,
     0x0E, 0x00, 0x04, 0x00,
     0x05, 0x05,
     0x05, 0x00,
diff --git a/src/post_office_guide.c b/src/post_office_guide.c
index a8740dc0e..1b11151e4 100644
--- a/src/post_office_guide.c
+++ b/src/post_office_guide.c
@@ -144,7 +144,7 @@ ALIGNED(4) const u8 wonder_mail_fill[] = _("pksdir0");
 const struct UnkTextStruct2 gUnknown_80E1EFC =
 {
     0, 0, 0, 0,
-    3, 0, 0, 0,
+    3, 
     0, 0, 0, 0,
     0, 0,
     0, 0,
@@ -156,7 +156,7 @@ const u8 gUnkData_80E1F14[] = {1, 0, 8, 0};
 const struct UnkTextStruct2 gUnknown_80E1F18 =
 {
     0, 0, 0, 0,
-    6, 0, 0, 0,
+    6,
     2, 0, 2, 0,
     0x14, 4,
     4, 0,
diff --git a/src/save_menu.c b/src/save_menu.c
index 040ff543d..185e159cf 100644
--- a/src/save_menu.c
+++ b/src/save_menu.c
@@ -31,7 +31,7 @@ extern struct unkStruct_203B360 *gUnknown_203B364;
 const struct UnkTextStruct2 gUnknown_80E6F20 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -41,7 +41,7 @@ const struct UnkTextStruct2 gUnknown_80E6F20 =
 const struct UnkTextStruct2 gUnknown_80E6F38 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x05, 0x00, 0x08, 0x00,
     0x15, 0x05,
     0x05, 0x00,
diff --git a/src/status_checks_1.c b/src/status_checks_1.c
index 3c1871027..028c78708 100644
--- a/src/status_checks_1.c
+++ b/src/status_checks_1.c
@@ -26,7 +26,7 @@ extern u8 *gUnknown_80F8968[];
 extern u8 *gUnknown_80F8988[];
 extern u8 gUnknown_8106FA4[];
 
-u8 sub_8070828(struct Entity *pokemon, bool8 displayMessage)
+s32 sub_8070828(struct Entity *pokemon, bool8 displayMessage)
 {
     bool8 flag;
 
diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c
index dd3ad4837..4ff865ea6 100644
--- a/src/thank_you_wonder_mail.c
+++ b/src/thank_you_wonder_mail.c
@@ -55,7 +55,7 @@ extern char gAvailablePokemonNames[0x50];
 const struct UnkTextStruct2 gUnknown_80DED48 =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x03, 0x00, 0x00, 0x00,
+        0x03,
         0x15, 0x00, 0x04, 0x00,
         0x06, 0x05,
         0x05, 0x00,
@@ -65,7 +65,7 @@ const struct UnkTextStruct2 gUnknown_80DED48 =
 const struct UnkTextStruct2 gUnknown_80DED60 =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x03, 0x00, 0x00, 0x00,
+        0x03,
         0x16, 0x00, 0x07, 0x00,
         0x06, 0x05,
         0x05, 0x00,
@@ -86,7 +86,7 @@ const struct MenuItem gUnknown_80DED78[3] =
 const struct UnkTextStruct2 gUnknown_80DEDA0 =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x03, 0x00, 0x00, 0x00,
+        0x03,
         0x00, 0x00, 0x00, 0x00,
         0x00, 0x00,
         0x00, 0x00,
diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c
index 2f5dc54b0..35e4b2fde 100644
--- a/src/trade_items_menu.c
+++ b/src/trade_items_menu.c
@@ -29,7 +29,7 @@ const struct MenuItem gUnknown_80E60D4[3] = {
 const struct UnkTextStruct2 gUnknown_80E60EC =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x15, 0x00, 0x04, 0x00,
     0x06, 0x05,
     0x05, 0x00,
@@ -46,7 +46,7 @@ const struct MenuItem gUnknown_80E6104[4] = {
 static const struct UnkTextStruct2 unused =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x16, 0x00, 0x09, 0x00,
     0x05, 0x03,
     0x03, 0x00,
@@ -63,7 +63,7 @@ const struct MenuItem gUnknown_80E6154[3] = {
 const struct UnkTextStruct2 gUnknown_80E6174 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x15, 0x00, 0x0D, 0x00,
     0x06, 0x04,
     0x04, 0x00,
diff --git a/src/wonder_mail.c b/src/wonder_mail.c
index 7244f2cf8..7f9ecbb8f 100644
--- a/src/wonder_mail.c
+++ b/src/wonder_mail.c
@@ -203,7 +203,7 @@ ALIGNED(4) const u8 SendWOPokemon[] = _("Send w/o Pokémon");
 const struct UnkTextStruct2 gUnknown_80DDACC =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x16, 0x00, 0x07, 0x00,
     0x06, 0x04,
     0x04, 0x00,
@@ -213,7 +213,7 @@ const struct UnkTextStruct2 gUnknown_80DDACC =
 const struct UnkTextStruct2 gUnknown_80DDAE4 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x16, 0x00, 0x06, 0x00,
     0x06, 0x04,
     0x04, 0x00,
diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c
index 8d930e095..6f4ed2bb3 100644
--- a/src/wonder_mail_2.c
+++ b/src/wonder_mail_2.c
@@ -199,7 +199,7 @@ ALIGNED(4) const char wonder_mail_2_fill[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80DFBD0 =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x03, 0x00, 0x00, 0x00,
+        0x03,
         0x00, 0x00, 0x00, 0x00,
         0x00, 0x00,
         0x00, 0x00,
@@ -211,7 +211,7 @@ const u8 gUnknown_80DFBE8[] = { 0x01, 0x00, 0x0C, 0x00 };
 const struct UnkTextStruct2 gUnknown_80DFBEC =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x06, 0x00, 0x00, 0x00,
+        0x06,
         0x02, 0x00, 0x02, 0x00,
         0x18, 0x0E,
         0x0E, 0x00,
@@ -224,7 +224,7 @@ ALIGNED(4) static const char wonder_mail_2_fill1[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80DFC18 =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x03, 0x00, 0x00, 0x00,
+        0x03,
         0x00, 0x00, 0x00, 0x00,
         0x00, 0x00,
         0x00, 0x00,
@@ -236,7 +236,7 @@ const u8 gUnkData_80DFC30[] = { 0x01, 0x00, 0x16, 0x00 };
 const struct UnkTextStruct2 gUnknown_80DFC34 =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x06, 0x00, 0x00, 0x00,
+        0x06,
         0x02, 0x00, 0x02, 0x00,
         0x1A, 0x10,
         0x10, 0x00,
@@ -250,7 +250,7 @@ ALIGNED(4) static const char wonder_mail_2_fill2[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80DFC5C =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x03, 0x00, 0x00, 0x00,
+        0x03,
         0x00, 0x00, 0x00, 0x00,
         0x00, 0x00,
         0x00, 0x00,
@@ -260,7 +260,7 @@ const struct UnkTextStruct2 gUnknown_80DFC5C =
 const struct UnkTextStruct2 gUnknown_80DFC74 =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x06, 0x00, 0x00, 0x00,
+        0x06,
         0x02, 0x00, 0x02, 0x00,
         0x18, 0x0E,
         0x0E, 0x00,
@@ -273,7 +273,7 @@ ALIGNED(4) static const char wonder_mail_2_fill3[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80DFC9C =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x03, 0x00, 0x00, 0x00,
+        0x03,
         0x00, 0x00, 0x00, 0x00,
         0x00, 0x00,
         0x00, 0x00,
@@ -283,7 +283,7 @@ const struct UnkTextStruct2 gUnknown_80DFC9C =
 const struct UnkTextStruct2 gUnknown_80DFCB4 =
 {
         0x00, 0x00, 0x00, 0x00,
-        0x06, 0x00, 0x00, 0x00,
+        0x06,
         0x02, 0x00, 0x02, 0x00,
         0x18, 0x0E,
         0x0E, 0x00,
diff --git a/src/wonder_mail_2_1.c b/src/wonder_mail_2_1.c
index 0ac2e7d04..1a55c3e46 100644
--- a/src/wonder_mail_2_1.c
+++ b/src/wonder_mail_2_1.c
@@ -54,7 +54,7 @@ u16 gUnknown_203B2EC;
 const struct UnkTextStruct2 gUnknown_80DFCE4 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -64,7 +64,7 @@ const struct UnkTextStruct2 gUnknown_80DFCE4 =
 const struct UnkTextStruct2 gUnknown_80DFCFC =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x18, 0x0E,
     0x0E, 0x00,
@@ -77,7 +77,7 @@ static const u8 wonder_mail_fill[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80DFD28 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -87,7 +87,7 @@ const struct UnkTextStruct2 gUnknown_80DFD28 =
 const struct UnkTextStruct2 gUnknown_80DFD40 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x04, 0x00, 0x00, 0x00,
+    0x04,
     0x15, 0x00, 0x06, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -97,7 +97,7 @@ const struct UnkTextStruct2 gUnknown_80DFD40 =
 const struct UnkTextStruct2 gUnknown_80DFD58 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x04, 0x00, 0x00, 0x00,
+    0x04,
     0x15, 0x00, 0x0f, 0x00,
     0x06, 0x03,
     0x03, 0x00,
@@ -111,7 +111,7 @@ static const u8 wonder_mail_fill0[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80DFD8C =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -121,7 +121,7 @@ const struct UnkTextStruct2 gUnknown_80DFD8C =
 const struct UnkTextStruct2 gUnknown_80DFDA4 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x18, 0x0e,
     0x0e, 0x00,
diff --git a/src/wonder_mail_3.c b/src/wonder_mail_3.c
index 8fd82a046..d8b84a849 100644
--- a/src/wonder_mail_3.c
+++ b/src/wonder_mail_3.c
@@ -12,7 +12,7 @@
 const struct UnkTextStruct2 gUnknown_80DFDD4 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -23,7 +23,7 @@ const struct UnkTextStruct2 gUnknown_80DFDD4 =
 const struct UnkTextStruct2 gUnknown_80DFDEC =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x03, 0x00, 0x03, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -33,7 +33,7 @@ const struct UnkTextStruct2 gUnknown_80DFDEC =
 const struct UnkTextStruct2 gUnknown_80DFE04 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x15, 0x00, 0x06, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -42,7 +42,7 @@ const struct UnkTextStruct2 gUnknown_80DFE04 =
 const struct UnkTextStruct2 gUnknown_80DFE1C =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x15, 0x00, 0x0f, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -53,7 +53,7 @@ const struct UnkTextStruct2 gUnknown_80DFE1C =
 const struct UnkTextStruct2 gUnknown_80DFE34 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x15, 0x00, 0x0f, 0x00,
     0x06, 0x03,
     0x03, 0x00,
diff --git a/src/wonder_mail_3_mid.c b/src/wonder_mail_3_mid.c
index f3ca04798..52b1f59c1 100644
--- a/src/wonder_mail_3_mid.c
+++ b/src/wonder_mail_3_mid.c
@@ -151,7 +151,7 @@ void HandleMissionReward(void);
 
 const struct UnkTextStruct2 gUnknown_80E03C4 = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -159,7 +159,7 @@ const struct UnkTextStruct2 gUnknown_80E03C4 = {
 };
 const struct UnkTextStruct2 gUnknown_80E03DC = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x03, 0x00, 0x03, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -167,7 +167,7 @@ const struct UnkTextStruct2 gUnknown_80E03DC = {
 };
 const struct UnkTextStruct2 gUnknown_80E03F4 = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x15, 0x00, 0x06, 0x00,
     0x07, 0x03,
     0x03, 0x00,
@@ -178,7 +178,7 @@ const u8 gUnknown_80E040C[] = "Send";
 static const u8 wonder_mail_fill[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80E041C = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -239,7 +239,7 @@ static const u8 wonder_mail_fill2[] = "pksdir0";
 
 const struct UnkTextStruct2 gUnknown_80E06FC = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -248,7 +248,7 @@ const struct UnkTextStruct2 gUnknown_80E06FC = {
 
 const struct UnkTextStruct2 gUnknown_80E0714 = {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x0E, 0x0E,
     0x0E, 0x00,
@@ -256,7 +256,7 @@ const struct UnkTextStruct2 gUnknown_80E0714 = {
 };
 const struct UnkTextStruct2 gUnknown_80E072C = {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x10, 0x10,
     0x10, 0x00,
diff --git a/src/wonder_mail_4.c b/src/wonder_mail_4.c
index 182858268..305475f5f 100644
--- a/src/wonder_mail_4.c
+++ b/src/wonder_mail_4.c
@@ -33,7 +33,7 @@ extern struct unkStruct_203B480 *gUnknown_203B480;
 
 const struct UnkTextStruct2 gUnknown_80E083C = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -42,7 +42,7 @@ const struct UnkTextStruct2 gUnknown_80E083C = {
 
 const struct UnkTextStruct2 gUnknown_80E0854 = {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x18, 0x11,
     0x11, 0x00,
diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c
index cf1e75690..bc06f252b 100644
--- a/src/wonder_mail_5.c
+++ b/src/wonder_mail_5.c
@@ -24,7 +24,7 @@ extern struct unkStruct_203B480 *gUnknown_203B480;
 
 const struct UnkTextStruct2 gUnknown_80E0900 = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -35,7 +35,7 @@ const u8 DATA_80E0918[] = {0x01, 0x00, 0x12, 0x00};
 
 const struct UnkTextStruct2 gUnknown_80E091C = {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x1A, 0x10,
     0x10, 0x00,
diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c
index 9264d8d9f..0768ea868 100644
--- a/src/wonder_mail_6.c
+++ b/src/wonder_mail_6.c
@@ -47,7 +47,7 @@ const struct MenuItem gUnknown_80E0968[] =
 
 const struct UnkTextStruct2 gUnknown_80E0990 = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -55,7 +55,7 @@ const struct UnkTextStruct2 gUnknown_80E0990 = {
 };
 const struct UnkTextStruct2 gUnknown_80E09A8 = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x13, 0x00, 0x0B, 0x00,
     0x08, 0x03,
     0x03, 0x00,
@@ -63,7 +63,7 @@ const struct UnkTextStruct2 gUnknown_80E09A8 = {
 };
 const struct UnkTextStruct2 gUnknown_80E09C0 = {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x11, 0x00, 0x0F, 0x00,
     0x07, 0x03,
     0x03, 0x00,
diff --git a/src/wonder_mail_802DF88.c b/src/wonder_mail_802DF88.c
index 7140140f4..35ecb8e56 100644
--- a/src/wonder_mail_802DF88.c
+++ b/src/wonder_mail_802DF88.c
@@ -54,7 +54,7 @@ extern u8 gUnknown_202DE58[];
 const struct UnkTextStruct2 gUnknown_80E016C =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -84,7 +84,7 @@ static const u8 wonder_mail_802DF88_fill[] = "pksdir0";
 const struct UnkTextStruct2 gUnknown_80E0248 =
 {
     0x00, 0x00, 0x00, 0x00,
-    0x03, 0x00, 0x00, 0x00,
+    0x03,
     0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
     0x00, 0x00,
@@ -96,7 +96,7 @@ const u8 UnkData_80E0260[] = {0x01, 0x00, 0x12, 0x00};
 const struct UnkTextStruct2 gUnknown_80E0264 = 
 {
     0x00, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x00, 0x00,
+    0x06,
     0x02, 0x00, 0x02, 0x00,
     0x1A, 0x10,
     0x10, 0x00,