From 97bbb326b8c94e0fc90bceb4e5dea1b80f86822f Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sat, 20 Oct 2018 19:53:41 -0500
Subject: GameClear nonsense

---
 include/load_save.h                   | 2 +-
 include/script_pokemon_util_80F87D8.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/load_save.h b/include/load_save.h
index 5fb5f6c42..b8b27ade5 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -17,7 +17,7 @@ void SetSaveBlocksPointers(u16 offset);
 void MoveSaveBlocks_ResetHeap(void);
 u32 GetSecretBase2Field_9(void);
 void ClearSecretBase2Field_9(void);
-void sub_8076D48(void);
+void SetSecretBase2Field_9(void);
 void sub_8076D5C(void);
 void sav2_gender2_inplace_and_xFE(void);
 void SavePlayerParty(void);
diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h
index 68aec7eb6..7c2a1ff66 100644
--- a/include/script_pokemon_util_80F87D8.h
+++ b/include/script_pokemon_util_80F87D8.h
@@ -4,5 +4,6 @@
 
 u16 sub_80F903C(void);
 void ReducePlayerPartyToThree(void);
+void HealPlayerParty(void);
 
 #endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
-- 
cgit v1.2.3


From 6d0d69f3a5c83ae44fbbc5d29e384306ea031ab4 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 4 Nov 2018 23:09:10 +0100
Subject: Match Render Text

---
 include/text.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/text.h b/include/text.h
index f677f2ced..23873ce54 100644
--- a/include/text.h
+++ b/include/text.h
@@ -120,7 +120,7 @@ enum {
     FONTATTR_COLOR_SHADOW
 };
 
-struct TextPrinterSubStruct
+struct TextPrinterSubSubStruct
 {
     u8 font_type:4;  // 0x14
     u8 font_type_upper:1;
@@ -130,6 +130,11 @@ struct TextPrinterSubStruct
     u8 field_1_top:1;
     u8 frames_visible_counter;
     u8 field_3;
+};
+
+struct TextPrinterSubStruct
+{
+    struct TextPrinterSubSubStruct sub;
     u8 field_4; // 0x18
     u8 field_5;
     u8 field_6;
@@ -216,7 +221,7 @@ extern u8 gStringVar3[];
 extern u8 gStringVar4[];
 
 u8 gUnknown_03002F84;
-u8 gUnknown_03002F90[0x20];
+u8 gUnknown_03002F90[];
 u8 gUnknown_03002FB0[0x20];
 u8 gUnknown_03002FD0[0x20];
 u8 gUnknown_03002FF0[0x20];
-- 
cgit v1.2.3


From 487a6c2b2c641a9b022ec47f809ac4a3e68f8ac7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 5 Nov 2018 21:42:12 +0100
Subject: this file is

---
 include/text.h | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'include')

diff --git a/include/text.h b/include/text.h
index 23873ce54..db0d48bfc 100644
--- a/include/text.h
+++ b/include/text.h
@@ -120,7 +120,7 @@ enum {
     FONTATTR_COLOR_SHADOW
 };
 
-struct TextPrinterSubSubStruct
+struct TextPrinterSubStruct
 {
     u8 font_type:4;  // 0x14
     u8 font_type_upper:1;
@@ -129,16 +129,6 @@ struct TextPrinterSubSubStruct
     u8 field_1_upmid:2;
     u8 field_1_top:1;
     u8 frames_visible_counter;
-    u8 field_3;
-};
-
-struct TextPrinterSubStruct
-{
-    struct TextPrinterSubSubStruct sub;
-    u8 field_4; // 0x18
-    u8 field_5;
-    u8 field_6;
-    u8 active;
 };
 
 struct TextSubPrinter // TODO: Better name
@@ -164,14 +154,14 @@ struct TextPrinter
 
     void (*callback)(struct TextSubPrinter *, u16); // 0x10
 
-    union {
+    union __attribute__((packed)) {
         struct TextPrinterSubStruct sub;
-
-        u8 sub_fields[8];
+        u8 sub_fields[7];
     } sub_union;
 
+    u8 active;
     u8 state;       // 0x1C
-    u8 text_speed;
+    u8 textSpeed;
     u8 delayCounter;
     u8 scrollDistance;
     u8 minLetterSpacing;  // 0x20
@@ -213,6 +203,16 @@ typedef struct {
     u8 flag_3:1;
 } TextFlags;
 
+struct Struct_03002F90
+{
+    u8 unk0[0x20];
+    u8 unk20[0x20];
+    u8 unk40[0x20];
+    u8 unk60[0x20];
+    u8 unk80;
+    u8 unk81;
+};
+
 extern TextFlags gTextFlags;
 
 extern u8 gStringVar1[];
@@ -220,12 +220,8 @@ extern u8 gStringVar2[];
 extern u8 gStringVar3[];
 extern u8 gStringVar4[];
 
-u8 gUnknown_03002F84;
-u8 gUnknown_03002F90[];
-u8 gUnknown_03002FB0[0x20];
-u8 gUnknown_03002FD0[0x20];
-u8 gUnknown_03002FF0[0x20];
-u8 gGlyphDimensions[0x2];
+extern u8 gUnknown_03002F84;
+extern struct Struct_03002F90 gUnknown_03002F90;
 
 void SetFontsPointer(const struct FontInfo *fonts);
 void DeactivateAllTextPrinters(void);
-- 
cgit v1.2.3


From 6d38431c330a79d97bfb72fdaaaa65901ce0fa64 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 6 Nov 2018 10:44:48 -0600
Subject: Begin cleaning text.c

---
 include/menu.h |  6 +++---
 include/text.h | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'include')

diff --git a/include/menu.h b/include/menu.h
index d105eb5ec..9becfc582 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -27,7 +27,7 @@ void sub_81973A4(void);
 void NewMenuHelpers_DrawDialogueFrame(u8, u8);
 void sub_819746C(u8 windowId, bool8 copyToVram);
 void NewMenuHelpers_DrawStdWindowFrame(u8, u8);
-u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
+u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
 void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
 void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
 void sub_8197434(u8 windowId, bool8 copyToVram);
@@ -35,7 +35,7 @@ void SetStandardWindowBorderStyle(u8 a0, u8 a1);
 void sub_8197930(void);
 u8 GetPlayerTextSpeed(void);
 void sub_81978B0(u16 arg0);
-void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16));
+void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16));
 void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
 void sub_8198070(u8 windowId, bool8 copyToVram);
 void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
@@ -83,7 +83,7 @@ void sub_819A344(u8 a0, u8 *dest, u8 color);
 void RemoveMapNamePopUpWindow(void);
 u8 GetMapNamePopUpWindowId(void);
 u8 AddMapNamePopUpWindow(void);
-void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing);
+void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing);
 void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
 void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP);
 void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram);
diff --git a/include/text.h b/include/text.h
index db0d48bfc..658a32147 100644
--- a/include/text.h
+++ b/include/text.h
@@ -122,18 +122,18 @@ enum {
 
 struct TextPrinterSubStruct
 {
-    u8 font_type:4;  // 0x14
-    u8 font_type_upper:1;
+    u8 glyphId:4;  // 0x14
+    bool8 hasPrintBeenSpedUp:1;
     u8 font_type_5:3;
-    u8 field_1:5;
-    u8 field_1_upmid:2;
-    u8 field_1_top:1;
+    u8 downArrowDelay:5;
+    u8 downArrowYPosIdx:2;
+    bool8 hasGlyphIdBeenSet:1;
     u8 frames_visible_counter;
 };
 
-struct TextSubPrinter // TODO: Better name
+struct TextPrinterTemplate
 {
-    const u8* current_text_offset;
+    const u8* currentChar;
     u8 windowId;
     u8 fontId;
     u8 x;
@@ -150,9 +150,9 @@ struct TextSubPrinter // TODO: Better name
 
 struct TextPrinter
 {
-    struct TextSubPrinter subPrinter;
+    struct TextPrinterTemplate printerTemplate;
 
-    void (*callback)(struct TextSubPrinter *, u16); // 0x10
+    void (*callback)(struct TextPrinterTemplate *, u16); // 0x10
 
     union __attribute__((packed)) {
         struct TextPrinterSubStruct sub;
@@ -197,7 +197,7 @@ struct KeypadIcon
 };
 
 typedef struct {
-    u8 flag_0:1;
+    u8 canABSpeedUpPrint:1;
     u8 flag_1:1;
     u8 flag_2:1;
     u8 flag_3:1;
@@ -225,8 +225,8 @@ extern struct Struct_03002F90 gUnknown_03002F90;
 
 void SetFontsPointer(const struct FontInfo *fonts);
 void DeactivateAllTextPrinters(void);
-u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
-bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
+u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
+bool16 AddTextPrinter(struct TextPrinterTemplate *template, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
 void RunTextPrinters(void);
 bool16 IsTextPrinterActive(u8 id);
 u32 RenderFont(struct TextPrinter *textPrinter);
-- 
cgit v1.2.3


From f8d337e491f531285f6067e2e7f39a8d606036d6 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 6 Nov 2018 11:30:21 -0600
Subject: Finish cleaning up text.c

---
 include/menu.h |  2 +-
 include/text.h | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'include')

diff --git a/include/menu.h b/include/menu.h
index 9becfc582..bc62eddf6 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -33,7 +33,7 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
 void sub_8197434(u8 windowId, bool8 copyToVram);
 void SetStandardWindowBorderStyle(u8 a0, u8 a1);
 void sub_8197930(void);
-u8 GetPlayerTextSpeed(void);
+u8 GetPlayerTextSpeedDelay(void);
 void sub_81978B0(u16 arg0);
 void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16));
 void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
diff --git a/include/text.h b/include/text.h
index 658a32147..4946f1c5f 100644
--- a/include/text.h
+++ b/include/text.h
@@ -114,7 +114,7 @@ enum {
     FONTATTR_MAX_LETTER_HEIGHT,
     FONTATTR_LETTER_SPACING,
     FONTATTR_LINE_SPACING,
-    FONTATTR_COLOR_LOWNIBBLE,   // dunno what this is yet
+    FONTATTR_UNKNOWN,   // dunno what this is yet
     FONTATTR_COLOR_FOREGROUND,
     FONTATTR_COLOR_BACKGROUND,
     FONTATTR_COLOR_SHADOW
@@ -124,11 +124,11 @@ struct TextPrinterSubStruct
 {
     u8 glyphId:4;  // 0x14
     bool8 hasPrintBeenSpedUp:1;
-    u8 font_type_5:3;
+    u8 unk:3;
     u8 downArrowDelay:5;
     u8 downArrowYPosIdx:2;
     bool8 hasGlyphIdBeenSet:1;
-    u8 frames_visible_counter;
+    u8 autoScrollDelay;
 };
 
 struct TextPrinterTemplate
@@ -142,7 +142,7 @@ struct TextPrinterTemplate
     u8 currentY;
     u8 letterSpacing;
     u8 lineSpacing;
-    u8 fontColor_l:4;   // 0xC
+    u8 unk:4;   // 0xC
     u8 fgColor:4;
     u8 bgColor:4;
     u8 shadowColor:4;
@@ -156,8 +156,8 @@ struct TextPrinter
 
     union __attribute__((packed)) {
         struct TextPrinterSubStruct sub;
-        u8 sub_fields[7];
-    } sub_union;
+        u8 fields[7];
+    } subUnion;
 
     u8 active;
     u8 state;       // 0x1C
@@ -175,7 +175,7 @@ struct FontInfo
     u8 maxLetterHeight;
     u8 letterSpacing;
     u8 lineSpacing;
-    u8 fontColor_l:4;
+    u8 unk:4;
     u8 fgColor:4;
     u8 bgColor:4;
     u8 shadowColor:4;
@@ -185,22 +185,22 @@ extern const struct FontInfo *gFonts;
 
 struct GlyphWidthFunc
 {
-    u32 font_id;
+    u32 fontId;
     u32 (*func)(u16 glyphId, bool32 isJapanese);
 };
 
 struct KeypadIcon
 {
-    u16 tile_offset;
+    u16 tileOffset;
     u8 width;
     u8 height;
 };
 
 typedef struct {
-    u8 canABSpeedUpPrint:1;
-    u8 flag_1:1;
-    u8 flag_2:1;
-    u8 flag_3:1;
+    bool8 canABSpeedUpPrint:1;
+    bool8 useAlternateDownArrow:1;
+    bool8 autoScroll:1;
+    bool8 forceMidTextSpeed:1;
 } TextFlags;
 
 struct Struct_03002F90
-- 
cgit v1.2.3