summaryrefslogtreecommitdiff
path: root/src/text.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-19 01:04:35 -0400
committerGitHub <noreply@github.com>2020-08-19 01:04:35 -0400
commit5d6e7a31da8f018c1a69e9e57eca0657ec19c283 (patch)
tree3ce548fbada787a8d2dc686ef6612f06e2b9fc3a /src/text.c
parent9effc97f69d46af00e45420661a775c5977049c8 (diff)
parent3d96e954c845659f5184e99856ddf61ce1375b2f (diff)
Merge pull request #788 from kazblox/master
Fix NONMATCHINGs and actual English Debug support
Diffstat (limited to 'src/text.c')
-rw-r--r--src/text.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/text.c b/src/text.c
index dbf74ab61..d963045df 100644
--- a/src/text.c
+++ b/src/text.c
@@ -6,6 +6,7 @@
#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
+#include "start_menu.h"
enum
{
@@ -2078,7 +2079,7 @@ static u8 sub_8002FA0(struct Window *win, const u8 *text)
static u8 PrintNextChar(struct Window *win)
{
- u8 c = win->text[win->textIndex++];
+ u32 c = win->text[win->textIndex++];
// Handle special control characters
switch (c)
@@ -2106,6 +2107,12 @@ static u8 PrintNextChar(struct Window *win)
return HandleExtCtrlCode(win);
}
+// TODO: see if this is in rev1+
+#if (DEBUG && ENGLISH && REVISION == 0)
+ // Code related to the Murakawa task.
+ if ((gUnknown_Debug_03004BD0) && (!gUnknown_Debug_Murakawa2))
+ c = win->textMode + CHAR_0;
+#endif
sPrintGlyphFuncs[win->textMode](win, c);
return 1;
}