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.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 25efbaadd..93c632703 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -2713,6 +2713,9 @@ void Message_OpenText(PlayState* play, u16 textId) {
Font* font = &msgCtx->font;
s16 textBoxType;
+ bool loadFromMessageTable = true;
+ GameInteractor_ExecuteOnOpenText(&textId, &loadFromMessageTable);
+
sDisplayNextMessageAsEnglish = false;
if (msgCtx->msgMode == MSGMODE_NONE) {
@@ -2782,7 +2785,8 @@ void Message_OpenText(PlayState* play, u16 textId) {
gSaveContext.eventInf[0] = gSaveContext.eventInf[1] = gSaveContext.eventInf[2] = gSaveContext.eventInf[3] = 0;
}
- if (CustomMessage_RetrieveIfExists(play)) {
+ // RANDOTODO: Use this for ice trap messages
+ if (!loadFromMessageTable) {
osSyncPrintf("Found custom message");
if (gSaveContext.language == LANGUAGE_JPN) {
sDisplayNextMessageAsEnglish = true;