From ba13de9d83b13091eb7aaffa2bcf13f38701749f Mon Sep 17 00:00:00 2001 From: Ada <60364512+GreatArgorath@users.noreply.github.com> Date: Fri, 15 Apr 2022 13:56:24 +0100 Subject: [PATCH] Fixes magic numbers --- soh/src/code/z_message_PAL.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index c32e96e52..39ca6f1db 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -37,7 +37,9 @@ MessageTableEntry* sStaffMessageEntryTablePtr; char* _message_0xFFFC_nes; - +const int fastText = 5; +const int slowText = 1; +bool textSpeed = 1; //MessageTableEntry sNesMessageEntryTable[] = { //#define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \ @@ -956,9 +958,10 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) { } i = j - 1; if (CVar_GetS32("gFastText", 0) !=0) - msgCtx->textDrawPos = i + 5; + textSpeed = fastText; else - msgCtx->textDrawPos = i + 1; + textSpeed = slowText; + msgCtx->textDrawPos = i + textSpeed; if (character) {} } @@ -1152,9 +1155,10 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) { } if (msgCtx->textDelayTimer == 0) { if (CVar_GetS32("gFastText", 0) !=0) - msgCtx->textDrawPos = i + 5; + textSpeed = fastText; else - msgCtx->textDrawPos = i + 1; + textSpeed = slowText; + msgCtx->textDrawPos = i + textSpeed; msgCtx->textDelayTimer = msgCtx->textDelay; } else { msgCtx->textDelayTimer--;