[iQue] Match z_message (#2435)

* [iQue] z_message: work around EGCS bug * [iQue] z_message: finish matching * Yabusame -> Horseback archery * Add missing PRINTF parameter * Collapse for loops * Better-looking macros * gold stars -> gold skulls
zeldaret · Jan 22, 2025 · 06904e1 · 06904e1
1 parent afa0842
commit 06904e1
Show file tree

Hide file tree

Showing 5 changed files with 335 additions and 221 deletions.
diff --git a/Makefile b/Makefile
@@ -579,7 +579,7 @@ EGCS_O_FILES += $(BUILD_DIR)/src/code/z_actor.o
 EGCS_O_FILES += $(BUILD_DIR)/src/code/z_common_data.o
 EGCS_O_FILES += $(BUILD_DIR)/src/code/z_construct.o
 EGCS_O_FILES += $(BUILD_DIR)/src/code/z_kanfont.o
-# EGCS_O_FILES += $(BUILD_DIR)/src/code/z_message.o
+EGCS_O_FILES += $(BUILD_DIR)/src/code/z_message.o
 EGCS_O_FILES += $(BUILD_DIR)/src/code/z_parameter.o
 EGCS_O_FILES += $(BUILD_DIR)/src/code/z_sram.o
 EGCS_O_FILES += $(BUILD_DIR)/src/overlays/actors/ovl_En_Mag/z_en_mag.o

diff --git a/include/z64interface.h b/include/z64interface.h
@@ -80,7 +80,7 @@ typedef struct InterfaceContext {
     /* 0x0134 */ u8*    doActionSegment;
     /* 0x0138 */ u8*    iconItemSegment;
     /* 0x013C */ u8*    mapSegment;
-    /* 0x0140 */ u8     mapPalette[32];
+    /* 0x0140 */ char   mapPalette[32];
     /* 0x0160 */ DmaRequest dmaRequest_160;
     /* 0x0180 */ DmaRequest dmaRequest_180;
     /* 0x01A0 */ char   unk_1A0[0x20];

diff --git a/include/z64message.h b/include/z64message.h
@@ -209,7 +209,7 @@ typedef struct Font {
         /* 0x3C88 */ u64 force_structure_alignment_font;
     };
     union {
-        /* 0xDC88 */ char msgBuf[1280];
+        /* 0xDC88 */ u8 msgBuf[1280];
         /* 0xDC88 */ u16 msgBufWide[640];
         /* 0xDC88 */ u64 force_structure_alignment_msg;
     };
@@ -255,7 +255,7 @@ typedef struct MessageContext {
     /* 0xE3E4 */ u8 textboxEndType; // original name : "select"
     /* 0xE3E5 */ u8 choiceIndex;
     /* 0xE3E6 */ u8 choiceNum; // textboxes that are not choice textboxes have a choiceNum of 1
-    /* 0xE3E7 */ u8 stateTimer;
+    /* 0xE3E7 */ char stateTimer;
     /* 0xE3E8 */ u16 textDelayTimer;
     /* 0xE3EA */ u16 textDelay;
     /* 0xE3EA */ u16 lastPlayedSong; // original references : "Ocarina_Flog" , "Ocarina_Free"

diff --git a/include/z64save.h b/include/z64save.h
@@ -212,7 +212,7 @@ typedef enum WorldMapArea {
 typedef struct SavePlayerData {
     /* 0x00  0x001C */ char newf[6]; // string "ZELDAZ"
     /* 0x06  0x0022 */ u16 deaths;
-    /* 0x08  0x0024 */ char playerName[8];
+    /* 0x08  0x0024 */ u8 playerName[8];
     /* 0x10  0x002C */ s16 n64ddFlag;
     /* 0x12  0x002E */ s16 healthCapacity; // "max_life"
     /* 0x14  0x0030 */ s16 health; // "now_life"