From cde0ce878ce8344fe6149cb7015b6673bfb94bf3 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Fri, 29 Oct 2021 19:00:07 -0300
Subject: [PATCH] EXT_CTRL_CODE_SIZE -> EXT_CTRL_CODE_FONT

---
 gflib/string_util.c            | 4 ++--
 gflib/text.c                   | 8 ++++----
 gflib/text.h                   | 2 +-
 src/battle_controller_player.c | 2 +-
 src/unk_text_util_2.c          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gflib/string_util.c b/gflib/string_util.c
index b7485184a..4bf0d2ae9 100644
--- a/gflib/string_util.c
+++ b/gflib/string_util.c
@@ -386,7 +386,7 @@ u8 *StringBraille(u8 *dest, const u8 *src)
 {
     const u8 setBrailleFont[] = {
         EXT_CTRL_CODE_BEGIN,
-        EXT_CTRL_CODE_SIZE,
+        EXT_CTRL_CODE_FONT,
         6,
         EOS
     };
@@ -664,7 +664,7 @@ u8 GetExtCtrlCodeLength(u8 code)
         [EXT_CTRL_CODE_SHADOW]                 = 2,
         [EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW] = 4,
         [EXT_CTRL_CODE_PALETTE]                = 2,
-        [EXT_CTRL_CODE_SIZE]                   = 2,
+        [EXT_CTRL_CODE_FONT]                   = 2,
         [EXT_CTRL_CODE_RESET_SIZE]             = 1,
         [EXT_CTRL_CODE_PAUSE]                  = 2,
         [EXT_CTRL_CODE_PAUSE_UNTIL_PRESS]      = 1,
diff --git a/gflib/text.c b/gflib/text.c
index eb993c421..e3043230b 100644
--- a/gflib/text.c
+++ b/gflib/text.c
@@ -906,7 +906,7 @@ u16 RenderText(struct TextPrinter *textPrinter)
             case EXT_CTRL_CODE_PALETTE:
                 textPrinter->printerTemplate.currentChar++;
                 return 2;
-            case EXT_CTRL_CODE_SIZE:
+            case EXT_CTRL_CODE_FONT:
                 subStruct->glyphId = *textPrinter->printerTemplate.currentChar;
                 textPrinter->printerTemplate.currentChar++;
                 return 2;
@@ -1170,7 +1170,7 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
             case EXT_CTRL_CODE_HIGHLIGHT:
             case EXT_CTRL_CODE_SHADOW:
             case EXT_CTRL_CODE_PALETTE:
-            case EXT_CTRL_CODE_SIZE:
+            case EXT_CTRL_CODE_FONT:
             case EXT_CTRL_CODE_PAUSE:
             case EXT_CTRL_CODE_ESCAPE:
             case EXT_CTRL_CODE_SHIFT_TEXT:
@@ -1319,7 +1319,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
             case EXT_CTRL_CODE_SHIFT_DOWN:
                 ++str;
                 break;
-            case EXT_CTRL_CODE_SIZE:
+            case EXT_CTRL_CODE_FONT:
                 func = GetFontWidthFunc(*++str);
                 if (func == NULL)
                     return 0;
@@ -1449,7 +1449,7 @@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
                 shadowColor = strLocal[strPos++];
                 GenerateFontHalfRowLookupTable(fgColor, bgColor, shadowColor);
                 continue;
-            case EXT_CTRL_CODE_SIZE:
+            case EXT_CTRL_CODE_FONT:
                 fontId = strLocal[strPos++];
                 break;
             case EXT_CTRL_CODE_PLAY_BGM:
diff --git a/gflib/text.h b/gflib/text.h
index ee3dfa34c..9bb07580e 100644
--- a/gflib/text.h
+++ b/gflib/text.h
@@ -211,7 +211,7 @@
 #define EXT_CTRL_CODE_SHADOW                 0x03
 #define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x04
 #define EXT_CTRL_CODE_PALETTE                0x05
-#define EXT_CTRL_CODE_SIZE                   0x06
+#define EXT_CTRL_CODE_FONT                   0x06
 #define EXT_CTRL_CODE_RESET_SIZE             0x07
 #define EXT_CTRL_CODE_PAUSE                  0x08
 #define EXT_CTRL_CODE_PAUSE_UNTIL_PRESS      0x09
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index ac8babb60..f4e47b434 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -1500,7 +1500,7 @@ static void MoveSelectionDisplayMoveType(void)
 
     txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType);
     *(txtPtr)++ = EXT_CTRL_CODE_BEGIN;
-    *(txtPtr)++ = EXT_CTRL_CODE_SIZE;
+    *(txtPtr)++ = EXT_CTRL_CODE_FONT;
     *(txtPtr)++ = 1;
 
     StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]);
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index 3459dde85..a0eea575e 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -80,7 +80,7 @@ u16 Font6Func(struct TextPrinter *textPrinter)
                         case EXT_CTRL_CODE_PALETTE:
                             textPrinter->printerTemplate.currentChar++;
                             return 2;
-                        case EXT_CTRL_CODE_SIZE:
+                        case EXT_CTRL_CODE_FONT:
                             subStruct->glyphId = *textPrinter->printerTemplate.currentChar;
                             textPrinter->printerTemplate.currentChar++;
                             return 2;