From 68a21d228bdc3df3bbc87d416bd39154b5a93254 Mon Sep 17 00:00:00 2001
From: gheskett <gheskett@gmail.com>
Date: Mon, 26 Jul 2021 04:10:18 -0500
Subject: [PATCH] Some colored text fixes

---
 src/game/ingame_menu.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c
index ce25a4ab..039b5164 100644
--- a/src/game/ingame_menu.c
+++ b/src/game/ingame_menu.c
@@ -299,11 +299,9 @@ void print_generic_string(s16 x, s16 y, const u8 *str) {
                     }
                     else if (str[strPos] >= 0x10) {
                         customColor = 2;
+                        strPos = colorLoop - 8;
                         if (str[strPos] == 0x9F)
                             strPos = colorLoop;
-                        else
-                            strPos = colorLoop - 8;
-                        break;
                         break;
                     }
                     if ((8 - (colorLoop - strPos)) % 2 == 0) {
@@ -883,10 +881,9 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l
                     }
                     else if (str[strIdx] >= 0x10) {
                         customColor = 2;
+                        strIdx = colorLoop - 8;
                         if (str[strIdx] == 0x9F)
                             strIdx = colorLoop;
-                        else
-                            strIdx = colorLoop - 8;
                         break;
                     }
                     if ((8 - (colorLoop - strIdx)) % 2 == 0) {