From a3b5af17eabb255e983e61c6306e30f27de82524 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 19 Nov 2017 22:48:46 +0100
Subject: berry blender is done

---
 src/text.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/text.c')

diff --git a/src/text.c b/src/text.c
index 8108a6867..7d688801c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -190,7 +190,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca
     gTempTextPrinter.japanese = 0;
 
     GenerateFontHalfRowLookupTable(textSubPrinter->fontColor_h, textSubPrinter->bgColor, textSubPrinter->shadowColor);
-    if (speed != 0xFF && speed != 0x0)
+    if (speed != TEXT_SPEED_FF && speed != 0x0)
     {
         --gTempTextPrinter.text_speed;
         gTextPrinters[textSubPrinter->windowId] = gTempTextPrinter;
@@ -204,7 +204,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca
                 break;
         }
 
-        if (speed != 0xFF)
+        if (speed != TEXT_SPEED_FF)
           CopyWindowToVram(gTempTextPrinter.subPrinter.windowId, 2);
         gTextPrinters[textSubPrinter->windowId].sub_union.sub.active = 0;
     }
-- 
cgit v1.2.3


From ef18d3b8ec2ec0e0c0d7f4c48c9da921e34c5b02 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 23 Nov 2017 11:23:05 -0500
Subject: Decompile asm/unk_text_util.s

---
 src/text.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/text.c')

diff --git a/src/text.c b/src/text.c
index 8108a6867..4ebe5a422 100644
--- a/src/text.c
+++ b/src/text.c
@@ -13,7 +13,7 @@ extern void CopyWindowToVram(u8 windowId, u8 mode);
 extern u16 Font6Func(struct TextPrinter *textPrinter);
 extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
 extern void PlaySE(u16 songNum);
-extern u8* sub_81AFC74(u8 a1);
+extern u8* UnkTextUtil_GetPtrI(u8 a1);
 
 EWRAM_DATA struct TextPrinter gTempTextPrinter = {0};
 EWRAM_DATA struct TextPrinter gTextPrinters[NUM_TEXT_PRINTERS] = {0};
@@ -2932,7 +2932,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
                 }
             case 0xF7:
                 if (bufferPointer == NULL)
-                    bufferPointer = sub_81AFC74(*++str);
+                    bufferPointer = UnkTextUtil_GetPtrI(*++str);
                 while (*bufferPointer != 0xFF)
                 {
                     glyphWidth = func(*bufferPointer++, isJapanese);
-- 
cgit v1.2.3