summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/z_message_PAL.c96
1 files changed, 28 insertions, 68 deletions
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 4c690445a..8dac99c73 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -15,9 +15,6 @@
#include "soh/SaveManager.h"
#include "soh/ResourceManagerHelpers.h"
-// SOH [Enhancement] Text Speed which fills whole box in one frame
-#define TEXT_SPEED_INSTANT 6
-
// #region SOH [NTSC] - Allows custom messages to work on japanese
static bool sDisplayNextMessageAsEnglish = false;
static u8 sLastLanguage = LANGUAGE_ENG;
@@ -956,7 +953,6 @@ void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
u16 i;
u16 charTexIdx;
Gfx* gfx = *gfxP;
- int gTextSpeed, gSlowTextSpeed;
play->msgCtx.textPosX = R_TEXT_INIT_XPOS;
play->msgCtx.textPosY = R_TEXT_INIT_YPOS;
@@ -970,9 +966,6 @@ void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
msgCtx->unk_E3D0 = 0;
charTexIdx = 0;
- gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1);
- gSlowTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("SlowTextSpeed"), gTextSpeed);
-
for (i = 0; i < msgCtx->textDrawPos; i++) {
character = msgCtx->msgBufDecodedWide[i];
@@ -1012,11 +1005,7 @@ void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
msgCtx->textPosX += msgCtx->msgBufDecodedWide[++i];
break;
case MESSAGE_TEXTID_JPN:
- // #region SOH [General] Fixes softlock for higher text speeds
- if (gTextSpeed > 1) {
- msgCtx->textDrawPos = i + 1;
- }
- // #endregion
+ GameInteractor_Should(VB_FIX_TEXT_SPEED_SOFTLOCK, false, i + 1);
msgCtx->textboxEndType = TEXTBOX_ENDTYPE_HAS_NEXT;
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
@@ -1027,10 +1016,12 @@ void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
*gfxP = gfx;
return;
case MESSAGE_QUICKTEXT_ENABLE_JPN:
- if ((i + 1 == msgCtx->textDrawPos || (gTextSpeed > 1 && i + gTextSpeed >= msgCtx->textDrawPos)) &&
- (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
- (msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
- msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) {
+ if (GameInteractor_Should(VB_ENABLE_QUICKTEXT,
+ i + 1 == msgCtx->textDrawPos &&
+ (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
+ (msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
+ msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START)),
+ i)) {
j = i;
while (true) {
character = msgCtx->msgBufDecodedWide[j];
@@ -1043,7 +1034,8 @@ void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
break;
}
}
- if (j > msgCtx->textDrawPos) {
+
+ if (GameInteractor_Should(VB_FIX_TEXT_SPEED_SOFTLOCK, true, j)) {
i = j - 1;
msgCtx->textDrawPos = j;
}
@@ -1151,12 +1143,7 @@ void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
msgCtx->choiceTextId = msgCtx->textId;
msgCtx->stateTimer = 4;
msgCtx->choiceIndex = 0;
- if (CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0)) {
- if ((msgCtx->textId == 0x2066 || msgCtx->textId == 0x607B || msgCtx->textId == 0x10C2 ||
- msgCtx->textId == 0x10C6 || msgCtx->textId == 0x206A)) {
- msgCtx->choiceIndex = 1;
- }
- }
+ GameInteractor_Should(VB_OWL_CHOOSE_BETTER, false);
Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_ARROW);
}
break;
@@ -1184,11 +1171,7 @@ void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
*gfxP = gfx;
return;
case MESSAGE_OCARINA_JPN:
- // #region SOH [General] Fixes softlock for higher text speeds
- if (gTextSpeed > 1) {
- msgCtx->textDrawPos = i + 1;
- }
- // #endregion
+ GameInteractor_Should(VB_FIX_TEXT_SPEED_SOFTLOCK, false, i + 1);
if (i + 1 == msgCtx->textDrawPos) {
Message_HandleOcarina(play);
*gfxP = gfx;
@@ -1279,20 +1262,13 @@ void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
}
}
- if (gTextSpeed >= TEXT_SPEED_INSTANT) {
- msgCtx->textDrawPos = msgCtx->decodedTextLen + 1;
- } else if (msgCtx->textDelay == 0) {
- msgCtx->textDrawPos = i + gTextSpeed;
- if (msgCtx->textDrawPos > msgCtx->decodedTextLen) {
- msgCtx->textDrawPos = msgCtx->decodedTextLen + 1;
- }
+ if (GameInteractor_Should(VB_TEXT_CRAWL_FASTER, false, i)) {
+ // Logic handled within hooks
} else if (msgCtx->textDelayTimer == 0) {
msgCtx->textDrawPos = i + 1;
msgCtx->textDelayTimer = msgCtx->textDelay;
- } else if (msgCtx->textDelayTimer <= gSlowTextSpeed) {
- msgCtx->textDelayTimer = 0;
} else {
- msgCtx->textDelayTimer -= gSlowTextSpeed;
+ msgCtx->textDelayTimer--;
}
*gfxP = gfx;
}
@@ -1309,13 +1285,12 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
u16 i;
u16 sfxHi;
u16 charTexIdx;
- int gTextSpeed, gSlowTextSpeed;
Font* font = &play->msgCtx.font;
Gfx* gfx = *gfxP;
play->msgCtx.textPosX = R_TEXT_INIT_XPOS;
- if (sTextIsCredits == false) {
+ if (!sTextIsCredits) {
msgCtx->textPosY = R_TEXT_INIT_YPOS;
} else {
msgCtx->textPosY = YREG(1);
@@ -1332,9 +1307,6 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
msgCtx->unk_E3D0 = 0;
charTexIdx = 0;
- gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1);
- gSlowTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("SlowTextSpeed"), gTextSpeed);
-
for (i = 0; i < msgCtx->textDrawPos; i++) {
character = msgCtx->msgBufDecoded[i];
@@ -1384,10 +1356,12 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
*gfxP = gfx;
return;
case MESSAGE_QUICKTEXT_ENABLE:
- if ((i + 1 == msgCtx->textDrawPos || (gTextSpeed > 1 && i + gTextSpeed >= msgCtx->textDrawPos)) &&
- (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
- (msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
- msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) {
+ if (GameInteractor_Should(VB_ENABLE_QUICKTEXT,
+ i + 1 == msgCtx->textDrawPos &&
+ (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
+ (msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
+ msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START)),
+ i)) {
j = i;
while (true) {
lookAheadCharacter = msgCtx->msgBufDecoded[j];
@@ -1404,12 +1378,11 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
break;
}
}
- if (j > msgCtx->textDrawPos) {
+
+ if (GameInteractor_Should(VB_FIX_TEXT_SPEED_SOFTLOCK, true, j)) {
i = j - 1;
msgCtx->textDrawPos = j;
}
-
- if (character) {}
}
case MESSAGE_QUICKTEXT_DISABLE:
break;
@@ -1526,12 +1499,7 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
msgCtx->choiceTextId = msgCtx->textId;
msgCtx->stateTimer = 4;
msgCtx->choiceIndex = 0;
- if (CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0)) {
- if ((msgCtx->textId == 0x2066 || msgCtx->textId == 0x607B || msgCtx->textId == 0x10C2 ||
- msgCtx->textId == 0x10C6 || msgCtx->textId == 0x206A)) {
- msgCtx->choiceIndex = 1;
- }
- }
+ GameInteractor_Should(VB_OWL_CHOOSE_BETTER, false);
Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_ARROW);
}
break;
@@ -1559,11 +1527,7 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
*gfxP = gfx;
return;
case MESSAGE_OCARINA:
- // #region SOH [General] Fixes softlock for higher text speeds
- if (gTextSpeed > 1) {
- msgCtx->textDrawPos = i + 1;
- }
- // #endregion
+ GameInteractor_Should(VB_FIX_TEXT_SPEED_SOFTLOCK, false, i + 1);
if (i + 1 == msgCtx->textDrawPos) {
Message_HandleOcarina(play);
*gfxP = gfx;
@@ -1631,17 +1595,13 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
break;
}
}
- if (gTextSpeed >= TEXT_SPEED_INSTANT) {
- msgCtx->textDrawPos = msgCtx->decodedTextLen + 1;
- } else if (msgCtx->textDelay == 0) {
- msgCtx->textDrawPos = i + gTextSpeed;
+ if (GameInteractor_Should(VB_TEXT_CRAWL_FASTER, false, i)) {
+ // Logic handled within hooks
} else if (msgCtx->textDelayTimer == 0) {
msgCtx->textDrawPos = i + 1;
msgCtx->textDelayTimer = msgCtx->textDelay;
- } else if (msgCtx->textDelayTimer <= gSlowTextSpeed) {
- msgCtx->textDelayTimer = 0;
} else {
- msgCtx->textDelayTimer -= gSlowTextSpeed;
+ msgCtx->textDelayTimer--;
}
*gfxP = gfx;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 08:28:27 +0000