z_message progress (#701)

* 8 functions matching, 1 non-matching, 45 untouched * match func_801518B0 * match func_8014CC14 * matching 8 func, 1 non-matching * matched func_80148CBC * matched func_80156758 * matched func_80147564 * matched func_80151BB4 * matched func80152EC0/Message_Spawn_Song_Effect * matched func_80151C9C * WIP func_80148B98 * WIP func_80151938 * matched func_80151938 * matched func_80148B98 * matched func_80147734 * matched func_80147624 * WIP func_8014EBC * match func_801518B0 * matched func_80147564 * matched func80152EC0/Message_Spawn_Song_Effect * matched func_80151C9C * WIP func_80148B98 * matched func_80151938 * matched func_80148B98 * matched func_80147734 * matched func_80147624 * WIP#2 func_8014EBC * matched func_80149EBC * WIP func_8014CCB4 * matched func_8014CCB4 * matched func_80151A68 * WIP func_8014D62C * fix func_8015A68 signature * z_message_nes & z_message_staff progress * z_message_nes & z_message_staff renaming * documenting z_message * cleaning & renaming * documenting MessageContext * matched func_80151A68 * format * naming convention fix * re-add func_80147564 * apply renaming of Message_ShouldAdvanceSilent on the whole project * re-format, add clang-format off/on in z_message.c needed for matching * rename staff => credits; add renames in actorfixer. * change rupees array to ascii * remove useless comments * change MessageContext.decodedBuffer to a union * remove decodedBuffer from actorfixer * applied AngheloAlf suggestions & ran sfxconvert on z_message.c * rename message_struct => message_data_static; revert decodedBuffer as union creating differences. * use true/false instead of 1/0 * use SET_FULLSCREEN_VIEWPORT macro in func_80152c64 * AngheloAlf suggestions. * extract assign from dayTime calculation for readability in Message_LoadTimeNES * remove bss_reordering from osFlash, idle & boot_main to typedef MessageTableEntry in message_data_static & make decodedBuffer an union. * remove useless casts * Changes hexa to ascii chars when it's meaningful; add comments to func_8014CCB4 to show what hexa constant means. * Hensldm suggestions * ran actorfixer on new changes; fix new bss reordering error introduced with rebase * use new TIME_TO_MINUTES_F macro * re-ran format.sh * hensldm suggestions #2 + overall cleaning * remove useless parenthesis * Update include/message_data_static.h Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * actorfixer and format * more fixes Co-authored-by: Andzura <andzura@andzura.fr> Co-authored-by: abaud <adrien.baud@inria.fr> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2026-05-27 08:04:36 -04:00 · 2022-03-27 17:09:47 +02:00
parent 02cb971616
commit 4f3202fd7e
116 changed files with 1377 additions and 574 deletions
@@ -1055,7 +1055,7 @@ void Cutscene_Command_Textbox(GlobalContext* globalCtx, CutsceneContext* csCtx,
            dialogState = Message_GetState(&globalCtx->msgCtx);
            if ((dialogState != 2) && (dialogState != 0) && (dialogState != 7) && (dialogState != 8)) {
                csCtx->frames--;
-                if ((dialogState == 4) && func_80147624(globalCtx)) {
+                if ((dialogState == 4) && Message_ShouldAdvance(globalCtx)) {
                    if (globalCtx->msgCtx.choiceIndex == 0) {
                        if (cmd->base == 0x33BD) {
                            func_8019F230();
@@ -1093,7 +1093,7 @@ void Cutscene_Command_Textbox(GlobalContext* globalCtx, CutsceneContext* csCtx,
                    }
                }

-                if (dialogState == 5 && func_80147624(globalCtx) != 0) {
+                if (dialogState == 5 && Message_ShouldAdvance(globalCtx) != 0) {
                    func_80152434(globalCtx, cmd->base);
                }
            }
@@ -1,14 +1,111 @@
 #include "global.h"
+#include "message_data_static.h"

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147520.s")
+#if 0

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147564.s")
+s16 D_801D02D8[15] = {
+    ACTOR_OCEFF_WIPE5, ACTOR_OCEFF_WIPE5, // Sonata of Awakening Effect, Sonata of Awakening Effect
+    ACTOR_OCEFF_WIPE5, ACTOR_OCEFF_WIPE5, // Sonata of Awakening Effect, Sonata of Awakening Effect
+    ACTOR_OCEFF_WIPE5, ACTOR_OCEFF_WIPE5, // Sonata of Awakening Effect, Sonata of Awakening Effect
+    ACTOR_OCEFF_WIPE,  ACTOR_OCEFF_WIPE7, // Song of Time Effect, Song of Healing Effect
+    ACTOR_OCEFF_WIPE2, ACTOR_OCEFF_WIPE6, // Epona's Song Effect, Song of Soaring Effect
+    ACTOR_OCEFF_STORM, ACTOR_OCEFF_SPOT,  // Song of Storms Effect II [?], Sun's Song Effect
+    ACTOR_OCEFF_WIPE, ACTOR_OCEFF_WIPE,   // Song of Time Effect, Song of Time Effect
+    ACTOR_OCEFF_WIPE4                     // Scarecrow's Song Effect 
+};
+s32 D_801D02F8[15] = { 0,1,2,3,4,0,1,0,0,0,0,0,1,1,0 };

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147624.s")
+#endif

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147734.s")
+extern u16 D_801C6AB8[];
+extern u16 D_801C6B28[];
+extern s16 D_801D02D8[];
+extern s32 D_801D02F8[];
+extern s16 D_801F6B0C;
+extern s16 D_801F6B0E;
+extern s16 D_801F6B10;
+extern s16 D_801F6B12;
+extern s16 D_801F6B14;
+extern s16 D_801F6B16;
+extern s16 D_801F6B18;
+extern s16 D_801F6B1A;
+extern s16 D_801F6B1C;
+extern s16 D_801F6B1E;
+extern s16 D_801F6B20;
+extern s16 D_801F6B22;
+extern MessageTableEntry D_801C6B98[];
+extern MessageTableEntry D_801CFB08[];

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801477B4.s")
+void func_80147520(void) {
+    D_801CFC98 = 0xFF;
+    D_801CFCA4[0] = D_801CFCA4[1] = D_801CFCA4[2] = D_801CFCA4[3] = D_801CFCA4[4] = D_801CFCA4[5] = D_801CFCA4[6] =
+        D_801CFCA4[7] = D_801CFCA4[8] = 0;
+}
+
+void func_80147564(GlobalContext* globalCtx) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+
+    msgCtx->unk1204A[0] = 0xBD;
+    msgCtx->unk1204A[1] = 0xB8;
+    msgCtx->unk1204A[2] = 0xB3;
+    msgCtx->unk1204A[3] = 0xAE;
+    msgCtx->unk1204A[4] = 0xA9;
+    func_80147520();
+    D_801F6B0C = 0x50;
+    D_801F6B10 = 0x96;
+    D_801F6B0E = 0xFF;
+    D_801F6B12 = 0xA;
+    D_801F6B16 = 0xA;
+    D_801F6B14 = 0xA;
+    D_801F6B18 = 0xFF;
+    D_801F6B1C = 0xFF;
+    D_801F6B1A = 0x32;
+    D_801F6B1E = 0xA;
+    D_801F6B22 = 0xA;
+    D_801F6B20 = 0xA;
+}
+
+s32 Message_ShouldAdvance(GlobalContext* globalCtx) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    Input* controller = CONTROLLER1(globalCtx);
+
+    if ((msgCtx->unk12020 == 0x10) || (msgCtx->unk12020 == 0x11)) {
+        if (CHECK_BTN_ALL(controller->press.button, BTN_A)) {
+            play_sound(NA_SE_SY_MESSAGE_PASS);
+        }
+        return CHECK_BTN_ALL(controller->press.button, BTN_A);
+    } else {
+        if (CHECK_BTN_ALL(controller->press.button, BTN_A) || CHECK_BTN_ALL(controller->press.button, BTN_B) ||
+            CHECK_BTN_ALL(controller->press.button, BTN_CUP)) {
+            play_sound(NA_SE_SY_MESSAGE_PASS);
+        }
+        return CHECK_BTN_ALL(controller->press.button, BTN_A) || CHECK_BTN_ALL(controller->press.button, BTN_B) ||
+               CHECK_BTN_ALL(controller->press.button, BTN_CUP);
+    }
+}
+
+s32 Message_ShouldAdvanceSilent(GlobalContext* globalCtx) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    Input* controller = CONTROLLER1(globalCtx);
+
+    if (msgCtx->unk12020 == 0x10 || msgCtx->unk12020 == 0x11) {
+        return CHECK_BTN_ALL(controller->press.button, BTN_A);
+    } else {
+        return CHECK_BTN_ALL(controller->press.button, BTN_A) || CHECK_BTN_ALL(controller->press.button, BTN_B) ||
+               CHECK_BTN_ALL(controller->press.button, BTN_CUP);
+    }
+}
+
+void func_801477B4(GlobalContext* globalCtx) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+
+    if (globalCtx->msgCtx.unk11F10 != 0) {
+        msgCtx->unk12023 = 2;
+        msgCtx->msgMode = 0x43;
+        msgCtx->unk12020 = 0;
+        play_sound(NA_SE_PL_WALK_GROUND - SFX_FLAG);
+    }
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80147818.s")

@@ -16,9 +113,51 @@

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148558.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148B98.s")
+#ifdef NON_MATCHING
+void func_80148B98(GlobalContext* globalCtx, u8 arg1) {
+    static s16 held = 0;
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    Input* curInput = CONTROLLER1(globalCtx);

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148CBC.s")
+    if ((curInput->rel.stick_y > 29) && held == 0) {
+        held = 1;
+        msgCtx->choiceIndex--;
+        if (msgCtx->choiceIndex > 128) {
+            msgCtx->choiceIndex = 0;
+        } else {
+            play_sound(NA_SE_SY_CURSOR);
+        }
+        return;
+    } else if ((curInput->rel.stick_y < -29) && held == 0) {
+        held = 1;
+        msgCtx->choiceIndex++;
+        if (msgCtx->choiceIndex > arg1) {
+            msgCtx->choiceIndex = arg1;
+        } else {
+            play_sound(NA_SE_SY_CURSOR);
+        }
+        return;
+    } else {
+        if (ABS_ALT(curInput->rel.stick_y) < 30) {
+            held = 0;
+        }
+    }
+}
+#else
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148B98.s")
+#endif
+
+void func_80148CBC(GlobalContext* globalCtx, UNK_PTR puParm2, u8 arg2) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+
+    msgCtx->unk11FF4 = 0x30;
+    if (arg2 == 1) {
+        msgCtx->unk11FF6 = msgCtx->unk11FFE[1 + msgCtx->choiceIndex];
+    } else {
+        msgCtx->unk11FF6 = msgCtx->unk11FFE[msgCtx->choiceIndex];
+    }
+    func_80147818(globalCtx, puParm2, msgCtx->unk11FF4, msgCtx->unk11FF6);
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80148D64.s")

@@ -34,7 +173,33 @@

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80149C18.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80149EBC.s")
+void Message_FindMessage(GlobalContext* globalCtx, u16 textId) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    Font* font = &msgCtx->font;
+    MessageTableEntry* msgEntry = msgCtx->messageEntryTable;
+    const char* segment = msgEntry->segment;
+    const char* foundSegment;
+    const char* nextSegment;
+
+    while (msgEntry->textId != 0xFFFF) {
+        if (msgEntry->textId == textId) {
+            foundSegment = msgEntry->segment;
+            msgEntry++;
+            nextSegment = msgEntry->segment;
+            font->messageStart = foundSegment - segment;
+            font->messageEnd = nextSegment - foundSegment;
+            return;
+        }
+        msgEntry++;
+    }
+
+    msgEntry = msgCtx->messageEntryTable;
+    foundSegment = msgEntry->segment;
+    msgEntry++;
+    nextSegment = msgEntry->segment;
+    font->messageStart = foundSegment - segment;
+    font->messageEnd = nextSegment - foundSegment;
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80149F74.s")

@@ -44,9 +209,43 @@

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014C70C.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014CC14.s")
+void Message_LoadChar(GlobalContext* globalCtx, u16 codePointIndex, s32* offset, f32* arg3, s16 decodedBufPos) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    s32 temp1 = *offset;
+    f32 temp2 = *arg3;

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014CCB4.s")
+    Font_LoadChar(globalCtx, codePointIndex, temp1);
+    msgCtx->decodedBuffer.wchar[decodedBufPos] = codePointIndex;
+    temp1 += FONT_CHAR_TEX_SIZE;
+    temp2 += (16.0f * msgCtx->unk12098);
+    *offset = temp1;
+    *arg3 = temp2;
+}
+
+// Message_LoadRupees JPN ?
+void func_8014CCB4(GlobalContext* globalCtx, s16* decodedBufPos, s32* offset, f32* arg3) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    s16 t = *decodedBufPos;
+    s32 k = *offset;
+    f32 f = *arg3;
+
+    Font_LoadChar(globalCtx, 0x838B, k); // 0x838b = ル in JISX0213
+    k += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.wchar[t] = 0x838B;
+    t += 1;
+    Font_LoadChar(globalCtx, 0x8373, k); // 0x8373 = ピ in JISX0213
+    k += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.wchar[t] = 0x8373;
+    t += 1;
+    Font_LoadChar(globalCtx, 0x815C, k); // Ox815C = ― in JISX0213
+    k += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.wchar[t] = 0x815C;
+
+    f += 16.0f * msgCtx->unk12098 * 3.0f;
+    *decodedBufPos = t;
+    *offset = k;
+    *arg3 = f;
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014CDF0.s")

@@ -54,7 +253,62 @@

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014D304.s")

+#ifdef NON_EQUIVALENT
+extern u16* D_801D0188;
+extern s16* D_801D0250;
+
+void func_8014D62C(GlobalContext* arg0, s32* arg1, f32* arg2, s16* arg3) {
+    f32 sp3C;
+    s16 temp_s0;
+    s16 temp_s1;
+    s16 temp_s1_2;
+    s16 temp_s6;
+    s32 temp_s2;
+    s32 temp_s2_2;
+    u16* temp_v0;
+    s16 phi_v0;
+    s16 phi_s0;
+    s16 phi_s1;
+    s32 phi_s2;
+    s16 phi_s1_2;
+    s32 phi_s2_2;
+
+    temp_s1 = *arg3;
+    temp_s2 = *arg1;
+    sp3C = *arg2;
+    if ((func_8010A0A4(arg0) != 0) || (arg0->sceneNum == 0x4F)) {
+        phi_v0 = 0xA;
+    } else {
+        phi_v0 = arg0->pauseCtx.unk_238[4];
+    }
+    temp_s6 = *(&D_801D0250 + (phi_v0 * 2));
+    phi_s0 = 0;
+    phi_s1_2 = temp_s1;
+    phi_s2_2 = temp_s2;
+    if ((s32)temp_s6 > 0) {
+        phi_s1 = temp_s1;
+        phi_s2 = temp_s2;
+        do {
+            temp_v0 = (phi_v0 * 0x12) + &D_801D0188 + (phi_s0 * 2);
+            (arg0 + 0x4908 + (phi_s1 * 2))->decodedBuffer = (u16)*temp_v0;
+            Font_LoadChar(arg0, *temp_v0, phi_s2);
+            temp_s0 = phi_s0 + 1;
+            temp_s1_2 = phi_s1 + 1;
+            temp_s2_2 = phi_s2 + 0x80;
+            phi_s0 = temp_s0;
+            phi_s1 = temp_s1_2;
+            phi_s2 = temp_s2_2;
+            phi_s1_2 = temp_s1_2;
+            phi_s2_2 = temp_s2_2;
+        } while ((s32)temp_s0 < (s32)temp_s6);
+    }
+    *arg3 = phi_s1_2 - 1;
+    *arg1 = phi_s2_2;
+    *arg2 = sp3C + ((f32)(temp_s6 - 1) * (16.0f * arg0->msgCtx.unk12098));
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014D62C.s")
+#endif

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8014D7B4.s")

@@ -64,46 +318,239 @@

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801514B0.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/Message_StartTextbox.s")
+void Message_StartTextbox(GlobalContext* globalCtx, u16 textId, Actor* Actor) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151938.s")
+    msgCtx->ocarinaAction = 0xFFFF;
+    func_80150D08(globalCtx, textId);
+    msgCtx->unkActor = Actor;
+    msgCtx->msgMode = 1;
+    msgCtx->unk12023 = 0;
+    msgCtx->unk12024 = 0;
+    globalCtx->msgCtx.ocarinaMode = 0;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151A68.s")
+void func_80151938(GlobalContext* globalCtx, u16 textId) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151BB4.s")
+    msgCtx->unk11F10 = 0;
+    func_80150D08(globalCtx, textId);
+    func_80150A84(globalCtx);
+    msgCtx->msgMode = 5;
+    msgCtx->unk12023 = 8;
+    msgCtx->unk12024 = 0;

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151C9C.s")
+    if (interfaceCtx->unk_222 == 0) {
+        if (textId != 0x1B93) {
+            func_8011552C(globalCtx, 0x10);
+        } else if (textId != 0xF8) {
+            func_8011552C(globalCtx, 6);
+        }
+    }
+    msgCtx->unk1203C = msgCtx->unk1203A;
+
+    if (globalCtx->pauseCtx.unk_1F0 != 0) {
+        msgCtx->unk12004 = 0x22;
+        msgCtx->unk12006 = 0x15E;
+        func_80149C18(globalCtx);
+        msgCtx->unk12023 = 1;
+    }
+}
+
+void func_80151A68(GlobalContext* globalCtx, u16 textId) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+
+    msgCtx->unk11F10 = 0;
+    func_80150D08(globalCtx, textId);
+    func_80150A84(globalCtx);
+    func_8015B198(globalCtx);
+    msgCtx->msgMode = 0x45;
+    msgCtx->unk12024 = 0;
+    msgCtx->unk1203C = msgCtx->unk1203A = msgCtx->unk1201E = 0;
+    msgCtx->unk12023 = 0x1E;
+
+    // Day/Dawn/Night.. Messages
+    if ((msgCtx->currentTextId >= 0x1BB2) && (msgCtx->currentTextId < 0x1BB7)) {
+        XREG(74) = 0x6A;
+        XREG(75) = 0;
+        XREG(77) = 0x58;
+        XREG(76) = 0x44;
+    } else {
+        XREG(74) = 0x42;
+        XREG(75) = 0x1E;
+        XREG(77) = 0x3C;
+        XREG(76) = 0x1C;
+        msgCtx->unk11F1A[0] = msgCtx->unk11F1A[1] = msgCtx->unk11F1A[2] = 0;
+        Interface_ChangeAlpha(1);
+    }
+}
+
+void func_80151BB4(GlobalContext* globalCtx, u8 arg1) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    u8 temp = arg1;
+
+    if (CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
+        if ((gSaveContext.weekEventReg[D_801C6B28[arg1] >> 8] & (u8)D_801C6B28[arg1]) == 0) {
+            msgCtx->unk120B2[msgCtx->unk120B1] = temp;
+            msgCtx->unk120B1++;
+        }
+    } else if (arg1 >= 20) {
+        if ((gSaveContext.weekEventReg[D_801C6B28[arg1] >> 8] & (u8)D_801C6B28[arg1]) == 0) {
+            msgCtx->unk120B2[msgCtx->unk120B1] = temp;
+            msgCtx->unk120B1++;
+        }
+    }
+}
+
+u32 func_80151C9C(GlobalContext* globalCtx) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    u8 flag;
+
+    while (true) {
+        if (msgCtx->unk120B1 == 0) {
+            return 0;
+        }
+        msgCtx->unk120B1--;
+
+        if ((gSaveContext.weekEventReg[D_801C6B28[msgCtx->unk120B2[msgCtx->unk120B1]] >> 8] &
+             (u8)D_801C6B28[msgCtx->unk120B2[msgCtx->unk120B1]]) == 0) {
+            flag = gSaveContext.weekEventReg[D_801C6B28[msgCtx->unk120B2[msgCtx->unk120B1]] >> 8];
+            gSaveContext.weekEventReg[D_801C6B28[msgCtx->unk120B2[msgCtx->unk120B1]] >> 8] =
+                flag | (u8)D_801C6B28[msgCtx->unk120B2[msgCtx->unk120B1]];
+            if ((D_801C6AB8[msgCtx->unk120B2[msgCtx->unk120B1]] != 0) && CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
+                func_80151938(globalCtx, D_801C6AB8[msgCtx->unk120B2[msgCtx->unk120B1]]);
+                play_sound(NA_SE_SY_SCHEDULE_WRITE);
+                return 1;
+            }
+        }
+    }
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80151DA4.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152434.s")
+void func_80152434(GlobalContext* globalCtx, u16 arg2) {
+    globalCtx->msgCtx.unk12046 = 0;
+    func_80151DA4(globalCtx, arg2);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152464.s")
+void func_80152464(GlobalContext* globalCtx, u16 arg1) {
+    globalCtx->msgCtx.unk12046 = 1;
+    func_80151DA4(globalCtx, arg1);
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/Message_GetState.s")

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8015268C.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152C64.s")
+void func_80152C64(View* view) {
+    SET_FULLSCREEN_VIEWPORT(view);
+    func_8013FBC8(view);
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152CAC.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152EC0.s")
+// Spawn song effect?
+void func_80152EC0(GlobalContext* globalCtx) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    Player* player = GET_PLAYER(globalCtx);
+
+    if (1) {}
+    if ((msgCtx->songPlayed < 0x17) && (msgCtx->songPlayed != 0xE) &&
+        ((msgCtx->ocarinaAction < 0x43) || (msgCtx->ocarinaAction >= 0x47))) {
+        msgCtx->unk120B0 = 1;
+        if (msgCtx->songPlayed != 0x16) {
+            Actor_Spawn(&globalCtx->actorCtx, globalCtx, D_801D02D8[msgCtx->songPlayed], player->actor.world.pos.x,
+                        player->actor.world.pos.y, player->actor.world.pos.z, 0, 0, 0, D_801D02F8[msgCtx->songPlayed]);
+            return;
+        }
+        Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_OCEFF_WIPE4, player->actor.world.pos.x,
+                    player->actor.world.pos.y, player->actor.world.pos.z, 0, 0, 0, 0);
+    }
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80152FB8.s")

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80153750.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80153E7C.s")
+void func_80153E7C(GlobalContext* globalCtx, void* arg1) {
+    if ((gSaveContext.language == 0) && (globalCtx->msgCtx.unk12090 == 0)) {
+        func_8014ADBC(globalCtx, arg1);
+        return;
+    }
+    if (globalCtx->msgCtx.unk12090 != 0) {
+        func_8015E7EC(globalCtx, arg1);
+        return;
+    }
+    func_8015966C(globalCtx, arg1, 0);
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80153EF0.s")

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801541D4.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_80156758.s")
+void func_80156758(GlobalContext* globalCtx) {
+    Gfx* nextDisplayList;
+    Gfx* polyOpa;
+    GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
+
+    OPEN_DISPS(gfxCtx);
+    polyOpa = POLY_OPA_DISP;
+    nextDisplayList = Graph_GfxPlusOne(polyOpa);
+    gSPDisplayList(OVERLAY_DISP++, nextDisplayList);
+
+    if ((globalCtx->msgCtx.currentTextId != 0x5E6) || (func_801690CC(globalCtx) == 0)) {
+        func_801541D4(globalCtx, &nextDisplayList);
+    }
+
+    gSPEndDisplayList(nextDisplayList++);
+    Graph_BranchDlist(polyOpa, nextDisplayList);
+    POLY_OPA_DISP = nextDisplayList;
+    CLOSE_DISPS(gfxCtx);
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_8015680C.s")

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/func_801586A4.s")
+void func_801586A4(GlobalContext* globalCtx) {
+    globalCtx->msgCtx.messageEntryTableNes = D_801C6B98;
+    globalCtx->msgCtx.messageTableStaff = D_801CFB08;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message/Message_Init.s")
+void Message_Init(GlobalContext* globalCtx) {
+    Font* font;
+    MessageContext* messageCtx = &globalCtx->msgCtx;
+
+    func_801586A4(globalCtx);
+    globalCtx->msgCtx.ocarinaMode = 0;
+    messageCtx->msgMode = 0;
+    messageCtx->unk11F10 = 0;
+    messageCtx->currentTextId = 0;
+    messageCtx->unk12020 = 0;
+    messageCtx->choiceIndex = 0;
+    messageCtx->ocarinaAction = messageCtx->unk11FF2 = 0;
+    messageCtx->unk1201E = 0xFF;
+    View_Init(&messageCtx->view, globalCtx->state.gfxCtx);
+    messageCtx->unk11EF8 = THA_AllocEndAlign16(&globalCtx->state.heap, 0x13C00);
+    font = &globalCtx->msgCtx.font;
+    Font_LoadOrderedFont(&globalCtx->msgCtx.font);
+    font->unk_11D88 = 0;
+    messageCtx->unk12090 = messageCtx->unk12092 = 0;
+    messageCtx->unk12094 = 0;
+    messageCtx->unk1209C = 0;
+    messageCtx->unk120A0 = 0;
+    messageCtx->unk12068 = 0x34;
+    messageCtx->unk1206A = 0x24;
+    messageCtx->unk120B0 = 0;
+    messageCtx->unk120BE = 0;
+    messageCtx->unk120C0 = 0;
+    messageCtx->unk120C2 = 0;
+    messageCtx->unk120C4 = 0;
+    messageCtx->unk120C8 = 0;
+    messageCtx->unk120CA = 0;
+    messageCtx->unk120CC = 0;
+    messageCtx->unk120CE = 0;
+    messageCtx->unk120D0 = 0;
+    messageCtx->unk120D2 = 0;
+    messageCtx->unk120D4 = 0;
+    messageCtx->unk120D6 = 0;
+}
@@ -1,18 +1,280 @@
 #include "global.h"
+#include "message_data_static.h"

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_nes/func_801588D0.s")
+#if 0

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_nes/func_80158988.s")
+//fontWidth
+extern f32 D_801D0470[159];

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_nes/func_80158A24.s")
+//rupeesTextLocalization
+u8 D_801D06F0[4][8] = { { "rupee(s)" }, //EN
+                        { "rubin(e)" }, //DE
+                        { "rubis"    }, //FR
+                        { "rupia(s)" }  //SPA 
+                        };

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_nes/func_80158C04.s")
+// rupeesTextLength
+u8 D_801D0710[4] = {8,8,5,8};

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_nes/func_80158D98.s")
+//TextArea
+char D_801D0714[11][16] = {
+                                    "Great Bay Coast",
+                                    "Zora Cape",
+                                    "Snowhead",
+                                    "Mountain Village",
+                                    "Clock Town",
+                                    "Milk Road",
+                                    "Woodfall",
+                                    "Southern Swamp",
+                                    "Ikana Canyon",
+                                    "Stone Tower",
+                                    "Entrance"
+                                };

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_nes/func_80158FB0.s")
+//TextAreaLength
+s16 D_801D07C4[11] = {15,9,8,16,10,9,8,14,12,11,8};

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_nes/func_8015926C.s")
+#endif
+
+extern f32 D_801D0470[159];
+extern u8 D_801D06F0[4][8];
+extern u8 D_801D0710[4];
+extern u8 D_801D0714[11][16];
+extern s16 D_801D07C4[11];
+
+void Message_FindMessageNES(GlobalContext* globalCtx, u16 textId) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    Font* font = &msgCtx->font;
+    MessageTableEntry* msgEntry = msgCtx->messageEntryTableNes;
+    const char* segment = msgEntry->segment;
+    const char* foundSegment;
+    const char* nextSegment;
+
+    while (msgEntry->textId != 0xFFFF) {
+        if (msgEntry->textId == textId) {
+            foundSegment = msgEntry->segment;
+            msgEntry++;
+            nextSegment = msgEntry->segment;
+            font->messageStart = foundSegment - segment;
+            font->messageEnd = nextSegment - foundSegment;
+            return;
+        }
+        msgEntry++;
+    }
+
+    msgEntry = msgCtx->messageEntryTableNes;
+    foundSegment = msgEntry->segment;
+    msgEntry++;
+    nextSegment = msgEntry->segment;
+    font->messageStart = foundSegment - segment;
+    font->messageEnd = nextSegment - foundSegment;
+}
+
+void Message_LoadCharNES(GlobalContext* globalCtx, u8 codePointIndex, s32* offset, f32* arg3, s16 decodedBufPos) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    s32 temp1 = *offset;
+    f32 temp2 = *arg3;
+
+    Font_LoadCharNES(globalCtx, codePointIndex, temp1);
+    msgCtx->decodedBuffer.schar[decodedBufPos] = codePointIndex;
+    temp1 += FONT_CHAR_TEX_SIZE;
+    temp2 += (16.0f * msgCtx->unk12098);
+    *offset = temp1;
+    *arg3 = temp2;
+}
+
+void Message_LoadPluralRupeesNES(GlobalContext* globalCtx, s16* decodedBufPos, s32* offset, f32* arg3) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    s16 p = *decodedBufPos;
+    s32 o = *offset;
+    f32 f = *arg3;
+
+    msgCtx->decodedBuffer.schar[p] = 0x20;
+    p++;
+    Font_LoadCharNES(globalCtx, 'R', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'R';
+    p++;
+    Font_LoadCharNES(globalCtx, 'u', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'u';
+    p++;
+    Font_LoadCharNES(globalCtx, 'p', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'p';
+    p++;
+    Font_LoadCharNES(globalCtx, 'e', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'e';
+    p++;
+    Font_LoadCharNES(globalCtx, 'e', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'e';
+    p++;
+    Font_LoadCharNES(globalCtx, 's', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 's';
+
+    f += 16.0f * msgCtx->unk12098 * 6.0f;
+    *decodedBufPos = p;
+    *offset = o;
+    *arg3 = f;
+}
+
+void Message_LoadLocalizedRupeesNES(GlobalContext* globalCtx, s16* decodedBufPos, s32* offset, f32* arg3) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    s16 p = *decodedBufPos;
+    s32 o = *offset;
+    f32 f = *arg3;
+    u8 j;
+
+    msgCtx->decodedBuffer.schar[p] = ' ';
+    p++;
+
+    for (j = 0; j < D_801D0710[gSaveContext.language - 1]; j++) {
+        Font_LoadCharNES(globalCtx, D_801D06F0[gSaveContext.language - 1][j], o);
+        msgCtx->decodedBuffer.schar[p] = D_801D06F0[gSaveContext.language - 1][j];
+        o += FONT_CHAR_TEX_SIZE;
+        p++;
+    }
+
+    p--;
+    f += 16.0f * msgCtx->unk12098 * (D_801D0710[gSaveContext.language - 1] + 1);
+    *decodedBufPos = p;
+    *offset = o;
+    *arg3 = f;
+}
+
+void Message_LoadRupeesNES(GlobalContext* globalCtx, s16* decodedBufPos, s32* offset, f32* arg3, s16 singular) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    s16 p = *decodedBufPos;
+    s32 o = *offset;
+    f32 f = *arg3;
+
+    msgCtx->decodedBuffer.schar[p] = ' ';
+    p++;
+    Font_LoadCharNES(globalCtx, 'R', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'R';
+    p++;
+    Font_LoadCharNES(globalCtx, 'u', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'u';
+    p++;
+    Font_LoadCharNES(globalCtx, 'p', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'p';
+    p++;
+    Font_LoadCharNES(globalCtx, 'e', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'e';
+    p++;
+    Font_LoadCharNES(globalCtx, 'e', o);
+    o += FONT_CHAR_TEX_SIZE;
+    msgCtx->decodedBuffer.schar[p] = 'e';
+
+    if (singular != 1) {
+        p++;
+        Font_LoadCharNES(globalCtx, 's', o);
+        o += FONT_CHAR_TEX_SIZE;
+        msgCtx->decodedBuffer.schar[p] = 's';
+        f += 16.0f * msgCtx->unk12098 * 6.0f;
+    } else {
+        f += 16.0f * msgCtx->unk12098 * 5.0f;
+    }
+
+    *decodedBufPos = p;
+    *offset = o;
+    *arg3 = f;
+}
+
+void Message_LoadTimeNES(GlobalContext* globalCtx, u8 arg1, s32* offset, f32* arg3, s16* decodedBufPos) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    s16 p = *decodedBufPos;
+    s32 o = *offset;
+    f32 f = *arg3;
+    u32 dayTime;
+    s16 digits[4];
+    f32 timeInMinutes;
+    s32 day;
+    s16 i;
+
+    if (arg1 == 0xCF) {
+        day = gSaveContext.day;
+        dayTime = 0x40000 - ((day % 5) << 16) - (u16)(-0x4000 + gSaveContext.time);
+    } else {
+        dayTime = 0x10000 - (u16)(-0x4000 + gSaveContext.time);
+    }
+    timeInMinutes = TIME_TO_MINUTES_F(dayTime);
+
+    digits[0] = 0;
+    digits[1] = (timeInMinutes / 60.0f);
+    while (digits[1] >= 10) {
+        digits[0]++;
+        digits[1] -= 10;
+    }
+
+    digits[2] = 0;
+    digits[3] = (s32)timeInMinutes % 60;
+    while (digits[3] >= 10) {
+        digits[2]++;
+        digits[3] -= 10;
+    }
+
+    for (i = 0; i < 4; i++) {
+        Font_LoadCharNES(globalCtx, digits[i] + '0', o);
+        o += FONT_CHAR_TEX_SIZE;
+        msgCtx->decodedBuffer.schar[p] = digits[i] + '0';
+        p++;
+        if (i == 1) {
+            Font_LoadCharNES(globalCtx, ':', o);
+            o += FONT_CHAR_TEX_SIZE;
+            msgCtx->decodedBuffer.schar[p] = ':';
+            p++;
+        }
+    }
+
+    f += 5.0f * (16.0f * msgCtx->unk12098);
+    *decodedBufPos = p - 1;
+    *offset = o;
+    *arg3 = f;
+}
+
+void Message_LoadAreaTextNES(GlobalContext* globalCtx, s32* offset, f32* arg2, s16* decodedBufPos) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    s16 p = *decodedBufPos;
+    s32 o = *offset;
+    f32 f = *arg2;
+    s16 i;
+    u8 currentChar;
+    s16 currentArea;
+    s16 stringLimit;
+
+    if ((func_8010A0A4(globalCtx) != 0) || (globalCtx->sceneNum == SCENE_SECOM)) {
+        currentArea = 10;
+    } else {
+        currentArea = globalCtx->pauseCtx.unk_238[4];
+    }
+    stringLimit = D_801D07C4[currentArea];
+
+    for (i = 0; i < stringLimit; i++) {
+        msgCtx->decodedBuffer.schar[p] = D_801D0714[currentArea][i];
+        currentChar = msgCtx->decodedBuffer.schar[p];
+        if (currentChar != ' ') {
+            Font_LoadCharNES(globalCtx, D_801D0714[currentArea][i], o);
+            o += FONT_CHAR_TEX_SIZE;
+        }
+        currentChar = msgCtx->decodedBuffer.schar[p];
+        p++;
+        f += (D_801D0470[currentChar - ' '] * msgCtx->unk12098);
+    }
+
+    p--;
+    f += (stringLimit - 1) * (16.0f * msgCtx->unk12098);
+    *decodedBufPos = p;
+    *offset = o;
+    *arg2 = f;
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message_nes/func_80159438.s")

@@ -1,6 +1,27 @@
 #include "global.h"
+#include "message_data_static.h"

-#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_staff/func_8015E750.s")
+void Message_FindCreditsMessage(GlobalContext* globalCtx, u16 textId) {
+    MessageContext* msgCtx = &globalCtx->msgCtx;
+    Font* font = &msgCtx->font;
+    MessageTableEntry* msgEntry = msgCtx->messageTableStaff;
+    const char* segment = msgEntry->segment;
+    const char* foundSegment;
+    const char* nextSegment;
+
+    while (msgEntry->textId != 0xFFFF) {
+        if (msgEntry->textId == textId) {
+            foundSegment = msgEntry->segment;
+            font->charBuf[font->unk_11D88][0] = msgEntry->typePos;
+            msgEntry++;
+            nextSegment = msgEntry->segment;
+            font->messageStart = foundSegment - segment;
+            font->messageEnd = nextSegment - foundSegment;
+            return;
+        }
+        msgEntry++;
+    }
+}

 #pragma GLOBAL_ASM("asm/non_matchings/code/z_message_staff/func_8015E7EC.s")