From 54d77c71f17f530e6bf0c9d75fb76cf3f951da17 Mon Sep 17 00:00:00 2001 From: Roman971 <32455037+Roman971@users.noreply.github.com> Date: Sun, 28 Nov 2021 14:48:17 +0100 Subject: [PATCH] Improve gfxprint documentation and strings (#1028) * Improve gfxprint documentation and strings * Add GFXP_UNUSED_CHAR and rename bss variable --- include/functions.h | 24 +- include/z64.h | 33 +- src/code/db_camera.c | 128 ++--- src/code/gfxprint.c | 183 +++---- src/code/z_debug.c | 34 +- src/code/z_kankyo.c | 15 +- src/code/z_moji.c | 2 +- src/overlays/gamestates/ovl_select/z_select.c | 452 +++++++++++------- .../misc/ovl_kaleido_scope/z_kaleido_debug.c | 24 +- 9 files changed, 508 insertions(+), 387 deletions(-) diff --git a/include/functions.h b/include/functions.h index 82453df409..b7476be20a 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2124,21 +2124,15 @@ void func_800FA3DC(void); u8 func_800FAD34(void); void func_800FADF8(void); void func_800FAEB4(void); -void GfxPrint_InitDlist(GfxPrint*); -void GfxPrint_SetColor(GfxPrint*, u32, u32, u32, u32); -void GfxPrint_SetPosPx(GfxPrint*, s32, s32); -void GfxPrint_SetPos(GfxPrint*, s32, s32); -void GfxPrint_SetBasePosPx(GfxPrint*, s32, s32); -void GfxPrint_PrintCharImpl(GfxPrint*, u8); -void GfxPrint_PrintChar(GfxPrint*, u8); -void GfxPrint_PrintStringWithSize(GfxPrint*, const void*, size_t, size_t); -GfxPrint* GfxPrint_Callback(GfxPrint*, const char*, size_t); -void GfxPrint_Init(GfxPrint*); -void GfxPrint_Destroy(GfxPrint*); -void GfxPrint_Open(GfxPrint*, Gfx*); -Gfx* GfxPrint_Close(GfxPrint*); -s32 GfxPrint_VPrintf(GfxPrint*, const char*, va_list); -s32 GfxPrint_Printf(GfxPrint*, const char*, ...); +void GfxPrint_SetColor(GfxPrint* this, u32 r, u32 g, u32 b, u32 a); +void GfxPrint_SetPosPx(GfxPrint* this, s32 x, s32 y); +void GfxPrint_SetPos(GfxPrint* this, s32 x, s32 y); +void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y); +void GfxPrint_Init(GfxPrint* this); +void GfxPrint_Destroy(GfxPrint* this); +void GfxPrint_Open(GfxPrint* this, Gfx* dList); +Gfx* GfxPrint_Close(GfxPrint* this); +s32 GfxPrint_Printf(GfxPrint* this, const char* fmt, ...); void func_800FBCE0(); void func_800FBFD8(void); void* Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd); diff --git a/include/z64.h b/include/z64.h index d8eb8551c8..97453721b1 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1511,26 +1511,35 @@ typedef struct { /* 0x38 */ void(*inputCallback)(); } FaultDrawer; // size = 0x3C -typedef struct GfxPrint { - /* 0x00 */ struct GfxPrint* (*callback)(struct GfxPrint*, const char*, size_t); - /* 0x04 */ Gfx* dlist; +typedef struct { + /* 0x00 */ PrintCallback callback; + /* 0x04 */ Gfx* dList; /* 0x08 */ u16 posX; /* 0x0A */ u16 posY; /* 0x0C */ u16 baseX; /* 0x0E */ u8 baseY; - /* 0x0F */ u8 flag; + /* 0x0F */ u8 flags; /* 0x10 */ Color_RGBA8_u32 color; /* 0x14 */ char unk_14[0x1C]; // unused } GfxPrint; // size = 0x30 -typedef enum { - GFXPRINT_FLAG1 = 1, - GFXPRINT_USE_RGBA16 = 2, - GFXPRINT_FLAG4 = 4, - GFXPRINT_UPDATE_MODE = 8, - GFXPRINT_FLAG64 = 0x40, - GFXPRINT_OPEN = 0x80 -} GfxPrintFlag; +#define GFXP_UNUSED "\x8E" +#define GFXP_UNUSED_CHAR 0x8E +#define GFXP_HIRAGANA "\x8D" +#define GFXP_HIRAGANA_CHAR 0x8D +#define GFXP_KATAKANA "\x8C" +#define GFXP_KATAKANA_CHAR 0x8C +#define GFXP_RAINBOW_ON "\x8B" +#define GFXP_RAINBOW_ON_CHAR 0x8B +#define GFXP_RAINBOW_OFF "\x8A" +#define GFXP_RAINBOW_OFF_CHAR 0x8A + +#define GFXP_FLAG_HIRAGANA (1 << 0) +#define GFXP_FLAG_RAINBOW (1 << 1) +#define GFXP_FLAG_SHADOW (1 << 2) +#define GFXP_FLAG_UPDATE (1 << 3) +#define GFXP_FLAG_ENLARGE (1 << 6) +#define GFXP_FLAG_OPEN (1 << 7) typedef struct StackEntry { /* 0x00 */ struct StackEntry* next; diff --git a/src/code/db_camera.c b/src/code/db_camera.c index f686a7f37a..51112b7817 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -3,71 +3,75 @@ static GlobalContext* sGlobalCtx; -char* D_8012CEE0[] = { "\x8Cｷ-ﾌﾚ-ﾑ\x8Dｶﾞ" }; -const char* D_8012CEE4 = "\x8Dﾀﾘﾏｾﾝ｡"; -const char* D_8012CEE8 = "\x8Dｻｲｾｲﾃﾞｷﾏｾﾝ"; -const char* D_8012CEEC = "\x8Dｻｲｾｲｼｭｳﾘｮｳ"; -const char* D_8012CEF0 = "\x8Dｻｲｾｲﾁｭｳ!"; +// TODO: cleanup these arrays and UB access +char* D_8012CEE0[] = { GFXP_KATAKANA "ｷ-ﾌﾚ-ﾑ" GFXP_HIRAGANA "ｶﾞ" }; +char* D_8012CEE4 = GFXP_HIRAGANA "ﾀﾘﾏｾﾝ｡"; +char* D_8012CEE8 = GFXP_HIRAGANA "ｻｲｾｲﾃﾞｷﾏｾﾝ"; +char* D_8012CEEC = GFXP_HIRAGANA "ｻｲｾｲｼｭｳﾘｮｳ"; +char* D_8012CEF0 = GFXP_HIRAGANA "ｻｲｾｲﾁｭｳ!"; -const char* D_8012CEF4 = "DEMO CAMERA TOOL"; -const char* D_8012CEF8[] = { "\x8Dﾓｳﾊｲﾘﾏｾﾝ", "\x8Dﾄｳﾛｸ ﾃﾝﾒ", "\x8Dﾍﾝｺｳ / " }; -const char* D_8012CF04 = "> >"; -const char* D_8012CF08 = "< <"; -const char* D_8012CF0C = "< >"; -const char* D_8012CF10 = "\x8C*ﾌﾟﾚｲﾔ-*"; -const char* D_8012CF14 = "\x8C\Eﾓ-ﾄﾞ\x8D ｿｳﾀｲ"; -const char* D_8012CF18[] = { "\x8C\Eﾓ-ﾄﾞ\x8Dｾﾞｯﾀｲ", "\x8Dｶﾞﾒﾝ\x8C ﾃﾞﾓ", "\x8Dｶﾞﾒﾝ ﾌﾂｳ" }; -const char* D_8012CF24[] = { "\x8DPｼﾞｶﾝ MAX", "\x8Cﾘﾝｸ\x8D ｷｵｸ", "\x8Cﾘﾝｸ\x8D ﾑｼ" }; -const char* D_8012CF30 = "\x8D*ﾐﾃﾙｲﾁ*"; -const char* D_8012CF34 = "\x8C*ｶﾒﾗ\x8Dｲﾁ*"; -const char* D_8012CF38 = "DEBUG CAMERA"; -const char* D_8012CF3C = "\x8Cｾﾝﾀ-/ﾛｯｸ"; -const char* D_8012CF40 = "\x8Cｾﾝﾀ-/ﾌﾘ-"; +char* D_8012CEF4 = "DEMO CAMERA TOOL"; +char* D_8012CEF8[] = { GFXP_HIRAGANA "ﾓｳﾊｲﾘﾏｾﾝ", GFXP_HIRAGANA "ﾄｳﾛｸ ﾃﾝﾒ", GFXP_HIRAGANA "ﾍﾝｺｳ / " }; +char* D_8012CF04 = "> >"; +char* D_8012CF08 = "< <"; +char* D_8012CF0C = "< >"; +char* D_8012CF10 = GFXP_KATAKANA "*ﾌﾟﾚｲﾔ-*"; +char* D_8012CF14 = GFXP_KATAKANA "Eﾓ-ﾄﾞ" GFXP_HIRAGANA " ｿｳﾀｲ"; +char* D_8012CF18[] = { GFXP_KATAKANA "Eﾓ-ﾄﾞ" GFXP_HIRAGANA "ｾﾞｯﾀｲ", GFXP_HIRAGANA "ｶﾞﾒﾝ" GFXP_KATAKANA " ﾃﾞﾓ", + GFXP_HIRAGANA "ｶﾞﾒﾝ ﾌﾂｳ" }; +char* D_8012CF24[] = { GFXP_HIRAGANA "Pｼﾞｶﾝ MAX", GFXP_KATAKANA "ﾘﾝｸ" GFXP_HIRAGANA " ｷｵｸ", + GFXP_KATAKANA "ﾘﾝｸ" GFXP_HIRAGANA " ﾑｼ" }; +char* D_8012CF30 = GFXP_HIRAGANA "*ﾐﾃﾙｲﾁ*"; +char* D_8012CF34 = GFXP_KATAKANA "*ｶﾒﾗ" GFXP_HIRAGANA "ｲﾁ*"; +char* D_8012CF38 = "DEBUG CAMERA"; +char* D_8012CF3C = GFXP_KATAKANA "ｾﾝﾀ-/ﾛｯｸ"; +char* D_8012CF40 = GFXP_KATAKANA "ｾﾝﾀ-/ﾌﾘ-"; -const char* D_8012CF44 = "DEMO CONTROL"; -const char* D_8012CF48 = "\x8Cﾒﾓﾘ\x8Dｶﾞﾀﾘﾏｾﾝ"; -const char* D_8012CF4C = "p"; -const char* D_8012CF50[] = { "e", "s", "l", "c" }; +char* D_8012CF44 = "DEMO CONTROL"; +char* D_8012CF48 = GFXP_KATAKANA "ﾒﾓﾘ" GFXP_HIRAGANA "ｶﾞﾀﾘﾏｾﾝ"; +char* D_8012CF4C = "p"; +char* D_8012CF50[] = { "e", "s", "l", "c" }; -const char* D_8012CF60[] = { "\x8Cﾒﾓﾘﾊﾟｯｸ" }; // "Mempak" -const char* D_8012CF64 = "\x8Cｾｰﾌﾞ"; // "Save" -const char* D_8012CF68 = "\x8Cﾛｰﾄﾞ"; // "Load" -const char* D_8012CF6C = "\x8Cｸﾘｱ-"; // "Clear" -const char* D_8012CF70 = "\x8Dｦﾇｶﾅｲﾃﾞﾈ"; +char* D_8012CF60[] = { GFXP_KATAKANA "ﾒﾓﾘﾊﾟｯｸ" }; // "Mempak" +char* D_8012CF64 = GFXP_KATAKANA "ｾｰﾌﾞ"; // "Save" +char* D_8012CF68 = GFXP_KATAKANA "ﾛｰﾄﾞ"; // "Load" +char* D_8012CF6C = GFXP_KATAKANA "ｸﾘｱ-"; // "Clear" +char* D_8012CF70 = GFXP_HIRAGANA "ｦﾇｶﾅｲﾃﾞﾈ"; -const char* D_8012CF74 = "FREE BYTE"; -const char* D_8012CF78 = "NEED BYTE"; -const char* D_8012CF7C = "\x8C*ﾒﾓﾘ-ﾊﾟｯｸ*"; -const char* D_8012CF80 = "\x8Dｦﾐﾂｹﾗﾚﾏｾﾝ"; -char* D_8012CF84 = "\x8Cﾌｧｲﾙ \x8Dｦ"; -const char* D_8012CF88[] = { "\x8Dｼﾃﾓｲｲﾃﾞｽｶ?", "\x8Dｹﾞﾝｻﾞｲﾍﾝｼｭｳﾁｭｳﾉ", "\x8Cﾌｧｲﾙ\x8Dﾊﾊｷｻﾚﾏｽ" }; -const char* D_8012CF94 = "\x8Dﾊｲ"; -const char* D_8012CF98 = "\x8Dｲｲｴ"; -const char* D_8012CF9C[] = { "\x8Dｼﾃｲﾏｽ", "\x8Dｳﾜｶﾞｷ" }; -const char* D_8012CFA4 = "\x8Dｼﾏｼﾀ"; -const char* D_8012CFA8 = "USE BYTE"; -const char* D_8012CFAC = "\x8Dﾆｼｯﾊﾟｲ"; +char* D_8012CF74 = "FREE BYTE"; +char* D_8012CF78 = "NEED BYTE"; +char* D_8012CF7C = GFXP_KATAKANA "*ﾒﾓﾘ-ﾊﾟｯｸ*"; +char* D_8012CF80 = GFXP_HIRAGANA "ｦﾐﾂｹﾗﾚﾏｾﾝ"; +char* D_8012CF84 = GFXP_KATAKANA "ﾌｧｲﾙ " GFXP_HIRAGANA "ｦ"; +char* D_8012CF88[] = { GFXP_HIRAGANA "ｼﾃﾓｲｲﾃﾞｽｶ?", GFXP_HIRAGANA "ｹﾞﾝｻﾞｲﾍﾝｼｭｳﾁｭｳﾉ", + GFXP_KATAKANA "ﾌｧｲﾙ" GFXP_HIRAGANA "ﾊﾊｷｻﾚﾏｽ" }; +char* D_8012CF94 = GFXP_HIRAGANA "ﾊｲ"; +char* D_8012CF98 = GFXP_HIRAGANA "ｲｲｴ"; +char* D_8012CF9C[] = { GFXP_HIRAGANA "ｼﾃｲﾏｽ", GFXP_HIRAGANA "ｳﾜｶﾞｷ" }; +char* D_8012CFA4 = GFXP_HIRAGANA "ｼﾏｼﾀ"; +char* D_8012CFA8 = "USE BYTE"; +char* D_8012CFAC = GFXP_HIRAGANA "ﾆｼｯﾊﾟｲ"; -const char* D_8012CFB0 = "\x8C\Eﾓ-ﾄﾞ\x8D ｺﾃｲ"; -char D_8012CFB4[] = "\x8Cﾌﾚ-ﾑ "; -char D_8012CFC4[] = "\x8Cｷ- / "; -char D_8012CFD0[] = "\x8D(ｾﾝﾀ-ﾃﾝ)\0\0\0\0\0"; -char D_8012CFE4[] = "\x8D(ｹﾞﾝﾃﾝ)\0\0\0\0\0\0"; -char D_8012CFF8[] = "\x8C(ﾌﾟﾚｲﾔ-)\0\0\0\0\0"; -char D_8012D00C[] = "\x8D(ｲﾁｱﾜｾ)\0\0\0\0\0\0"; -char D_8012D020[] = "\x8D(ｾｯﾃｲ)\0\0\0\0\0\0\0\0"; -char D_8012D034[] = "\x8D(ｷｬｯｶﾝ)\0\0\0\0\0\0"; -char D_8012D048[] = "\x8CﾎﾟｲﾝﾄNo. \0\0\0"; -char D_8012D05C[] = "\x8Dｶﾞｶｸ \0\0\0"; -char D_8012D070[] = "\x8CNﾌﾚ-ﾑ \0\0\0\0"; -char D_8012D084[] = "\x8DZｶｲﾃﾝ \0\0\0"; -char D_8012D098[] = "\x8Cﾓ-ﾄﾞ \0\0\0\0"; -char D_8012D0AC[] = " R\x8Dﾁｭｳｼﾝ \0\0\0"; +char* D_8012CFB0 = GFXP_KATAKANA "Eﾓ-ﾄﾞ" GFXP_HIRAGANA " ｺﾃｲ"; +char D_8012CFB4[] = GFXP_KATAKANA "ﾌﾚ-ﾑ "; +char D_8012CFC4[] = GFXP_KATAKANA "ｷ- / "; +char D_8012CFD0[] = GFXP_HIRAGANA "(ｾﾝﾀ-ﾃﾝ)\0\0\0\0\0"; +char D_8012CFE4[] = GFXP_HIRAGANA "(ｹﾞﾝﾃﾝ)\0\0\0\0\0\0"; +char D_8012CFF8[] = GFXP_KATAKANA "(ﾌﾟﾚｲﾔ-)\0\0\0\0\0"; +char D_8012D00C[] = GFXP_HIRAGANA "(ｲﾁｱﾜｾ)\0\0\0\0\0\0"; +char D_8012D020[] = GFXP_HIRAGANA "(ｾｯﾃｲ)\0\0\0\0\0\0\0\0"; +char D_8012D034[] = GFXP_HIRAGANA "(ｷｬｯｶﾝ)\0\0\0\0\0\0"; +char D_8012D048[] = GFXP_KATAKANA "ﾎﾟｲﾝﾄNo. \0\0\0"; +char D_8012D05C[] = GFXP_HIRAGANA "ｶﾞｶｸ \0\0\0"; +char D_8012D070[] = GFXP_KATAKANA "Nﾌﾚ-ﾑ \0\0\0\0"; +char D_8012D084[] = GFXP_HIRAGANA "Zｶｲﾃﾝ \0\0\0"; +char D_8012D098[] = GFXP_KATAKANA "ﾓ-ﾄﾞ \0\0\0\0"; +char D_8012D0AC[] = " R" GFXP_HIRAGANA "ﾁｭｳｼﾝ \0\0\0"; -char D_8012D0C0[] = "\x8DPｼﾞｶﾝ \0\0"; -char D_8012D0D4[] = "\x8Dｷｮﾘ \0"; -char D_8012D0E4[] = "\x8DXｶｲﾃﾝ \0\0"; -char D_8012D0F8[] = "\x8DYｶｲﾃﾝ \0\0"; +char D_8012D0C0[] = GFXP_HIRAGANA "Pｼﾞｶﾝ \0\0"; +char D_8012D0D4[] = GFXP_HIRAGANA "ｷｮﾘ \0"; +char D_8012D0E4[] = GFXP_HIRAGANA "Xｶｲﾃﾝ \0\0"; +char D_8012D0F8[] = GFXP_HIRAGANA "Yｶｲﾃﾝ \0\0"; #define ACTION_E 0 #define ACTION_SAVE 1 @@ -1713,9 +1717,9 @@ void DbCamera_PrintAllCuts(Camera* cam) { osSyncPrintf("@@@\n@@@\n@@@/* ****** spline point data ** finish! ***** */\n@@@\n"); } -char D_8012D114[] = "\x8Cﾌﾚ-ﾑ "; -char D_8012D128[] = "\x8Cﾄ-ﾀﾙ "; -char D_8012D13C[] = "\x8Cｷ- / "; +char D_8012D114[] = GFXP_KATAKANA "ﾌﾚ-ﾑ "; +char D_8012D128[] = GFXP_KATAKANA "ﾄ-ﾀﾙ "; +char D_8012D13C[] = GFXP_KATAKANA "ｷ- / "; s32 func_800B91B0(Camera* cam, DbCamera* dbCamera) { s32 pointCount; diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c index b526de9be3..3917d440ae 100644 --- a/src/code/gfxprint.c +++ b/src/code/gfxprint.c @@ -1,9 +1,5 @@ #include "global.h" -// .bss -u8 D_801755F0; - -// .data u16 sGfxPrintFontTLUT[64] = { 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, @@ -12,12 +8,12 @@ u16 sGfxPrintFontTLUT[64] = { 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, }; -u16 sGfxPrintUnkTLUT[16] = { +u16 sGfxPrintRainbowTLUT[16] = { 0xF801, 0xFBC1, 0xFFC1, 0x07C1, 0x0421, 0x003F, 0x803F, 0xF83F, 0xF801, 0xFBC1, 0xFFC1, 0x07C1, 0x0421, 0x003F, 0x803F, 0xF83F, }; -u8 sGfxPrintUnkData[8] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 }; +u8 sGfxPrintRainbowData[8] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 }; u8 sGfxPrintFontData[(16 * 256) / 2] = { 0x00, 0xDF, 0xFD, 0x00, 0x0A, 0xEE, 0xFF, 0xA0, 0x0D, 0xF2, 0x2D, 0xD0, 0x06, 0x61, 0x1D, 0xC0, 0x01, 0x12, 0x2D, @@ -130,38 +126,41 @@ u8 sGfxPrintFontData[(16 * 256) / 2] = { 0x1B, 0xAA, 0x40, 0x21, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -void GfxPrint_InitDlist(GfxPrint* this) { +// Can be used to set GFXP_FLAG_ENLARGE by default +static u8 sDefaultSpecialFlags; + +void GfxPrint_Setup(GfxPrint* this) { s32 width = 16; s32 height = 256; s32 i; - gDPPipeSync(this->dlist++); - gDPSetOtherMode(this->dlist++, + gDPPipeSync(this->dList++); + gDPSetOtherMode(this->dList++, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_IA16 | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2); - gDPSetCombineMode(this->dlist++, G_CC_DECALRGBA, G_CC_DECALRGBA); - gDPLoadTextureBlock_4b(this->dlist++, sGfxPrintFontData, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPSetCombineMode(this->dList++, G_CC_DECALRGBA, G_CC_DECALRGBA); + gDPLoadTextureBlock_4b(this->dList++, sGfxPrintFontData, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gDPLoadTLUT(this->dlist++, 64, 256, sGfxPrintFontTLUT); + gDPLoadTLUT(this->dList++, 64, 256, sGfxPrintFontTLUT); for (i = 1; i < 4; i++) { - gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2, i, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, + gDPSetTile(this->dList++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2, i, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(this->dlist++, i * 2, 0, 0, 60, 1020); + gDPSetTileSize(this->dList++, i * 2, 0, 0, 60, 1020); } - gDPSetColor(this->dlist++, G_SETPRIMCOLOR, this->color.rgba); + gDPSetColor(this->dList++, G_SETPRIMCOLOR, this->color.rgba); - gDPLoadMultiTile_4b(this->dlist++, sGfxPrintUnkData, 0, 1, G_IM_FMT_CI, 2, 8, 0, 0, 1, 7, 4, + gDPLoadMultiTile_4b(this->dList++, sGfxPrintRainbowData, 0, 1, G_IM_FMT_CI, 2, 8, 0, 0, 1, 7, 4, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 1, 3, G_TX_NOLOD, G_TX_NOLOD); - gDPLoadTLUT(this->dlist++, 16, 320, sGfxPrintUnkTLUT); + gDPLoadTLUT(this->dList++, 16, 320, sGfxPrintRainbowTLUT); for (i = 1; i < 4; i++) { - gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2 + 1, 4, G_TX_NOMIRROR | G_TX_WRAP, 3, + gDPSetTile(this->dList++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2 + 1, 4, G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 1, G_TX_NOLOD); - gDPSetTileSize(this->dlist++, i * 2 + 1, 0, 0, 4, 28); + gDPSetTileSize(this->dList++, i * 2 + 1, 0, 0, 4, 28); } } @@ -170,64 +169,64 @@ void GfxPrint_SetColor(GfxPrint* this, u32 r, u32 g, u32 b, u32 a) { this->color.g = g; this->color.b = b; this->color.a = a; - gDPPipeSync(this->dlist++); - gDPSetColor(this->dlist++, G_SETPRIMCOLOR, this->color.rgba); + gDPPipeSync(this->dList++); + gDPSetColor(this->dList++, G_SETPRIMCOLOR, this->color.rgba); } void GfxPrint_SetPosPx(GfxPrint* this, s32 x, s32 y) { - this->posX = this->baseX + (x << 2); - this->posY = this->baseY + (y << 2); + this->posX = this->baseX + (x * 4); + this->posY = this->baseY + (y * 4); } void GfxPrint_SetPos(GfxPrint* this, s32 x, s32 y) { - GfxPrint_SetPosPx(this, x << 3, y << 3); + GfxPrint_SetPosPx(this, x * 8, y * 8); } void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y) { - this->baseX = x << 2; - this->baseY = y << 2; + this->baseX = x * 4; + this->baseY = y * 4; } void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) { u32 tile = (c & 0xFF) * 2; - if (this->flag & GFXPRINT_UPDATE_MODE) { - this->flag &= ~GFXPRINT_UPDATE_MODE; + if (this->flags & GFXP_FLAG_UPDATE) { + this->flags &= ~GFXP_FLAG_UPDATE; - gDPPipeSync(this->dlist++); - if (this->flag & GFXPRINT_USE_RGBA16) { - gDPSetTextureLUT(this->dlist++, G_TT_RGBA16); - gDPSetCycleType(this->dlist++, G_CYC_2CYCLE); - gDPSetRenderMode(this->dlist++, G_RM_OPA_CI, G_RM_XLU_SURF2); - gDPSetCombineMode(this->dlist++, G_CC_INTERFERENCE, G_CC_PASS2); + gDPPipeSync(this->dList++); + if (this->flags & GFXP_FLAG_RAINBOW) { + gDPSetTextureLUT(this->dList++, G_TT_RGBA16); + gDPSetCycleType(this->dList++, G_CYC_2CYCLE); + gDPSetRenderMode(this->dList++, G_RM_OPA_CI, G_RM_XLU_SURF2); + gDPSetCombineMode(this->dList++, G_CC_INTERFERENCE, G_CC_PASS2); } else { - gDPSetTextureLUT(this->dlist++, G_TT_IA16); - gDPSetCycleType(this->dlist++, G_CYC_1CYCLE); - gDPSetRenderMode(this->dlist++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineMode(this->dlist++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); + gDPSetTextureLUT(this->dList++, G_TT_IA16); + gDPSetCycleType(this->dList++, G_CYC_1CYCLE); + gDPSetRenderMode(this->dList++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + gDPSetCombineMode(this->dList++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); } } - if (this->flag & GFXPRINT_FLAG4) { - gDPSetColor(this->dlist++, G_SETPRIMCOLOR, 0); + if (this->flags & GFXP_FLAG_SHADOW) { + gDPSetColor(this->dList++, G_SETPRIMCOLOR, 0); - if (this->flag & GFXPRINT_FLAG64) { - gSPTextureRectangle(this->dlist++, (this->posX + 4) << 1, (this->posY + 4) << 1, (this->posX + 4 + 32) << 1, + if (this->flags & GFXP_FLAG_ENLARGE) { + gSPTextureRectangle(this->dList++, (this->posX + 4) << 1, (this->posY + 4) << 1, (this->posX + 4 + 32) << 1, (this->posY + 4 + 32) << 1, tile, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1 << 9, 1 << 9); } else { - gSPTextureRectangle(this->dlist++, this->posX + 4, this->posY + 4, this->posX + 4 + 32, this->posY + 4 + 32, + gSPTextureRectangle(this->dList++, this->posX + 4, this->posY + 4, this->posX + 4 + 32, this->posY + 4 + 32, tile, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1 << 10, 1 << 10); } - gDPSetColor(this->dlist++, G_SETPRIMCOLOR, this->color.rgba); + gDPSetColor(this->dList++, G_SETPRIMCOLOR, this->color.rgba); } - if (this->flag & GFXPRINT_FLAG64) { - gSPTextureRectangle(this->dlist++, (this->posX) << 1, (this->posY) << 1, (this->posX + 32) << 1, + if (this->flags & GFXP_FLAG_ENLARGE) { + gSPTextureRectangle(this->dList++, (this->posX) << 1, (this->posY) << 1, (this->posX + 32) << 1, (this->posY + 32) << 1, tile, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1 << 9, 1 << 9); } else { - gSPTextureRectangle(this->dlist++, this->posX, this->posY, this->posX + 32, this->posY + 32, tile, + gSPTextureRectangle(this->dList++, this->posX, this->posY, this->posX + 32, this->posY + 32, tile, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1 << 10, 1 << 10); } @@ -238,11 +237,11 @@ void GfxPrint_PrintChar(GfxPrint* this, u8 c) { u8 charParam = c; if (c == ' ') { - this->posX += 0x20; - } else if (c > 0x20 && c < 0x7F) { + this->posX += 32; + } else if (c > ' ' && c < 0x7F) { GfxPrint_PrintCharImpl(this, charParam); } else if (c >= 0xA0 && c < 0xE0) { - if (this->flag & GFXPRINT_FLAG1) { + if (this->flags & GFXP_FLAG_HIRAGANA) { if (c < 0xC0) { charParam = c - 0x20; } else { @@ -252,91 +251,94 @@ void GfxPrint_PrintChar(GfxPrint* this, u8 c) { GfxPrint_PrintCharImpl(this, charParam); } else { switch (c) { - case 0: + case '\0': break; case '\n': - this->posY += 0x20; + this->posY += 32; case '\r': this->posX = this->baseX; break; case '\t': do { - GfxPrint_PrintCharImpl(this, 0x20); + GfxPrint_PrintCharImpl(this, ' '); } while ((this->posX - this->baseX) % 256); break; - case 0x8D: - this->flag |= GFXPRINT_FLAG1; + case GFXP_HIRAGANA_CHAR: + this->flags |= GFXP_FLAG_HIRAGANA; break; - case 0x8C: - this->flag &= ~GFXPRINT_FLAG1; + case GFXP_KATAKANA_CHAR: + this->flags &= ~GFXP_FLAG_HIRAGANA; break; - case 0x8B: - this->flag |= GFXPRINT_USE_RGBA16; - this->flag |= GFXPRINT_UPDATE_MODE; + case GFXP_RAINBOW_ON_CHAR: + this->flags |= GFXP_FLAG_RAINBOW; + this->flags |= GFXP_FLAG_UPDATE; break; - case 0x8A: - this->flag &= ~GFXPRINT_USE_RGBA16; - this->flag |= GFXPRINT_UPDATE_MODE; + case GFXP_RAINBOW_OFF_CHAR: + this->flags &= ~GFXP_FLAG_RAINBOW; + this->flags |= GFXP_FLAG_UPDATE; break; - case 0x8E: + case GFXP_UNUSED_CHAR: default: break; } } } -void GfxPrint_PrintStringWithSize(GfxPrint* this, const void* buffer, size_t charSize, size_t charCount) { +void GfxPrint_PrintStringWithSize(GfxPrint* this, const void* buffer, u32 charSize, u32 charCount) { const char* str = (const char*)buffer; - size_t count = charSize * charCount; + u32 count = charSize * charCount; - while (count) { - GfxPrint_PrintChar(this, *str++); + while (count != 0) { + GfxPrint_PrintChar(this, *(str++)); count--; } } void GfxPrint_PrintString(GfxPrint* this, const char* str) { - while (*str) { + while (*str != '\0') { GfxPrint_PrintChar(this, *(str++)); } } -GfxPrint* GfxPrint_Callback(GfxPrint* this, const char* str, size_t size) { +void* GfxPrint_Callback(void* arg, const char* str, u32 size) { + GfxPrint* this = arg; + GfxPrint_PrintStringWithSize(this, str, sizeof(char), size); + return this; } void GfxPrint_Init(GfxPrint* this) { - this->flag &= ~GFXPRINT_OPEN; + this->flags &= ~GFXP_FLAG_OPEN; - this->callback = &GfxPrint_Callback; - this->dlist = NULL; + this->callback = GfxPrint_Callback; + this->dList = NULL; this->posX = 0; this->posY = 0; this->baseX = 0; this->baseY = 0; this->color.rgba = 0; - this->flag &= ~GFXPRINT_FLAG1; - this->flag &= ~GFXPRINT_USE_RGBA16; - this->flag |= GFXPRINT_FLAG4; - this->flag |= GFXPRINT_UPDATE_MODE; + this->flags &= ~GFXP_FLAG_HIRAGANA; + this->flags &= ~GFXP_FLAG_RAINBOW; + this->flags |= GFXP_FLAG_SHADOW; + this->flags |= GFXP_FLAG_UPDATE; - if ((D_801755F0 & GFXPRINT_FLAG64)) { - this->flag |= GFXPRINT_FLAG64; //? dsdx/dtdy + if (sDefaultSpecialFlags & GFXP_FLAG_ENLARGE) { + this->flags |= GFXP_FLAG_ENLARGE; } else { - this->flag &= ~GFXPRINT_FLAG64; + this->flags &= ~GFXP_FLAG_ENLARGE; } } void GfxPrint_Destroy(GfxPrint* this) { } -void GfxPrint_Open(GfxPrint* this, Gfx* dlist) { - if (!(this->flag & GFXPRINT_OPEN)) { - this->flag |= GFXPRINT_OPEN; - this->dlist = dlist; - GfxPrint_InitDlist(this); +void GfxPrint_Open(GfxPrint* this, Gfx* dList) { + if (!(this->flags & GFXP_FLAG_OPEN)) { + this->flags |= GFXP_FLAG_OPEN; + this->dList = dList; + GfxPrint_Setup(this); } else { osSyncPrintf("gfxprint_open:２重オープンです\n"); } @@ -345,15 +347,16 @@ void GfxPrint_Open(GfxPrint* this, Gfx* dlist) { Gfx* GfxPrint_Close(GfxPrint* this) { Gfx* ret; - this->flag &= ~GFXPRINT_OPEN; - gDPPipeSync(this->dlist++); - ret = this->dlist; - this->dlist = NULL; + this->flags &= ~GFXP_FLAG_OPEN; + gDPPipeSync(this->dList++); + ret = this->dList; + this->dList = NULL; + return ret; } s32 GfxPrint_VPrintf(GfxPrint* this, const char* fmt, va_list args) { - return PrintUtils_VPrintf((PrintCallback*)&this->callback, fmt, args); + return PrintUtils_VPrintf(&this->callback, fmt, args); } s32 GfxPrint_Printf(GfxPrint* this, const char* fmt, ...) { diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 21b0fee3ee..2949f0ef95 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -79,7 +79,7 @@ void func_8006376C(u8 x, u8 y, u8 colorId, const char* text) { } // Draw Text -void func_80063828(GfxPrint* gfxPrint) { +void func_80063828(GfxPrint* printer) { s32 i; Color_RGBA8* color; PrintTextBuffer* buffer; @@ -92,9 +92,9 @@ void func_80063828(GfxPrint* gfxPrint) { text = buffer->text; color = &printTextColors[buffer->colorId]; - GfxPrint_SetColor(gfxPrint, color->r, color->g, color->b, color->a); - GfxPrint_SetPos(gfxPrint, buffer->x, buffer->y); - GfxPrint_Printf(gfxPrint, "%s", text); + GfxPrint_SetColor(printer, color->r, color->g, color->b, color->a); + GfxPrint_SetPos(printer, buffer->x, buffer->y); + GfxPrint_Printf(printer, "%s", text); i += 1; } while (i < D_8011E0B0); } @@ -186,7 +186,7 @@ void func_8006390C(Input* input) { } // Draw Memory Viewer -void func_80063C04(GfxPrint* gfxPrint) { +void func_80063C04(GfxPrint* printer) { s32 i; s32 page = (gGameInfo->regPage * REG_PER_PAGE) - REG_PER_PAGE; s32 regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE; @@ -197,16 +197,16 @@ void func_80063C04(GfxPrint* gfxPrint) { name[0] = 'R'; name[1] = regChar[gGameInfo->regGroup]; // r_group type char name[2] = '\0'; - GfxPrint_SetColor(gfxPrint, 0, 128, 128, 128); + GfxPrint_SetColor(printer, 0, 128, 128, 128); for (i = 0; i != REG_PER_PAGE; i++) { if (i == gGameInfo->regCur) { - GfxPrint_SetColor(gfxPrint, 0, 255, 255, 255); + GfxPrint_SetColor(printer, 0, 255, 255, 255); } - GfxPrint_SetPos(gfxPrint, 3, i + 5); - GfxPrint_Printf(gfxPrint, "%s%02d%6d", &name, page + i, gGameInfo->data[i + regGroup]); + GfxPrint_SetPos(printer, 3, i + 5); + GfxPrint_Printf(printer, "%s%02d%6d", &name, page + i, gGameInfo->data[i + regGroup]); if (i == gGameInfo->regCur) { - GfxPrint_SetColor(gfxPrint, 0, 128, 128, 128); + GfxPrint_SetColor(printer, 0, 128, 128, 128); } } } @@ -214,27 +214,27 @@ void func_80063C04(GfxPrint* gfxPrint) { void func_80063D7C(GraphicsContext* gfxCtx) { Gfx* sp7C; Gfx* sp78; - GfxPrint gfxPrint; + GfxPrint printer; Gfx* tempRet; OPEN_DISPS(gfxCtx, "../z_debug.c", 628); - GfxPrint_Init(&gfxPrint); + GfxPrint_Init(&printer); sp78 = POLY_OPA_DISP; tempRet = Graph_GfxPlusOne(POLY_OPA_DISP); gSPDisplayList(OVERLAY_DISP++, tempRet); - GfxPrint_Open(&gfxPrint, tempRet); + GfxPrint_Open(&printer, tempRet); if ((OREG(0) == 1) || (OREG(0) == 8)) { - func_80063828(&gfxPrint); + func_80063828(&printer); } if (gGameInfo->regPage != 0) { - func_80063C04(&gfxPrint); + func_80063C04(&printer); } D_8011E0B0 = 0; - sp7C = GfxPrint_Close(&gfxPrint); + sp7C = GfxPrint_Close(&printer); gSPEndDisplayList(sp7C++); Graph_BranchDlist(sp78, sp7C); POLY_OPA_DISP = sp7C; @@ -243,5 +243,5 @@ void func_80063D7C(GraphicsContext* gfxCtx) { CLOSE_DISPS(gfxCtx, "../z_debug.c", 664); - GfxPrint_Destroy(&gfxPrint); + GfxPrint_Destroy(&printer); } diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 8136ae0005..736666ffc2 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -777,8 +777,7 @@ void Environment_DisableUnderwaterLights(GlobalContext* globalCtx) { void Environment_PrintDebugInfo(GlobalContext* globalCtx, Gfx** gfx) { GfxPrint printer; - u32 time; - s32 pad; + s32 pad[2]; GfxPrint_Init(&printer); GfxPrint_Open(&printer, *gfx); @@ -793,8 +792,7 @@ void Environment_PrintDebugInfo(GlobalContext* globalCtx, Gfx** gfx) { GfxPrint_Printf(&printer, "%s", "ZELDATIME "); GfxPrint_SetColor(&printer, 255, 255, 255, 64); - time = gSaveContext.dayTime; - GfxPrint_Printf(&printer, "%02d", (u8)(24 * 60 / (f32)0x10000 * time / 60.0f)); + GfxPrint_Printf(&printer, "%02d", (u8)(24 * 60 / (f32)0x10000 * ((void)0, gSaveContext.dayTime) / 60.0f)); if ((gSaveContext.dayTime & 0x1F) >= 0x10 || gTimeIncrement >= 6) { GfxPrint_Printf(&printer, "%s", ":"); @@ -802,16 +800,14 @@ void Environment_PrintDebugInfo(GlobalContext* globalCtx, Gfx** gfx) { GfxPrint_Printf(&printer, "%s", " "); } - time = gSaveContext.dayTime; - GfxPrint_Printf(&printer, "%02d", (s16)(24 * 60 / (f32)0x10000 * time) % 60); + GfxPrint_Printf(&printer, "%02d", (s16)(24 * 60 / (f32)0x10000 * ((void)0, gSaveContext.dayTime)) % 60); GfxPrint_SetColor(&printer, 255, 255, 55, 64); GfxPrint_SetPos(&printer, 22, 9); GfxPrint_Printf(&printer, "%s", "VRBOXTIME "); GfxPrint_SetColor(&printer, 255, 255, 255, 64); - time = ((void)0, gSaveContext.skyboxTime); - GfxPrint_Printf(&printer, "%02d", (u8)(24 * 60 / (f32)0x10000 * time / 60.0f)); + GfxPrint_Printf(&printer, "%02d", (u8)(24 * 60 / (f32)0x10000 * ((void)0, gSaveContext.skyboxTime) / 60.0f)); if ((((void)0, gSaveContext.skyboxTime) & 0x1F) >= 0x10 || gTimeIncrement >= 6) { GfxPrint_Printf(&printer, "%s", ":"); @@ -819,8 +815,7 @@ void Environment_PrintDebugInfo(GlobalContext* globalCtx, Gfx** gfx) { GfxPrint_Printf(&printer, "%s", " "); } - time = ((void)0, gSaveContext.skyboxTime); - GfxPrint_Printf(&printer, "%02d", (s16)(45.0f / 2048.0f * time) % 60); + GfxPrint_Printf(&printer, "%02d", (s16)(24 * 60 / (f32)0x10000 * ((void)0, gSaveContext.skyboxTime)) % 60); GfxPrint_SetColor(&printer, 55, 255, 255, 64); GfxPrint_SetPos(&printer, 22, 6); diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 9c51031463..2709082378 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -82,7 +82,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { /** * Does not work as is in most cases. * Can work if the render mode, combiner and possibly other settings are set correctly. - * For example this works with the render mode used in `GfxPrint_InitDlist`, + * For example this works with the render mode used in `GfxPrint_Setup`, * and `G_CC_MODULATEI_PRIM` for both combiner cycles. */ void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) { diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index a1046401c1..430abb5e2b 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -40,155 +40,260 @@ void Select_LoadGame(SelectContext* this, s32 entranceIndex) { SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext); } -// "Translation" ("Actual name") +// "Translation" (Actual name) static SceneSelectEntry sScenes[] = { - { " 1:SPOT00", Select_LoadGame, 0x00CD }, // "1: SPOT00" (Hyrule Field) - { " 2:SPOT01", Select_LoadGame, 0x00DB }, // "2: SPOT01" (Kakariko Village) - { " 3:SPOT02", Select_LoadGame, 0x00E4 }, // "3: SPOT02" (Graveyard) - { " 4:SPOT03", Select_LoadGame, 0x00EA }, // "4: SPOT03" (Zora's River) - { " 5:SPOT04", Select_LoadGame, 0x00EE }, // "5: SPOT04" (Kokiri Forest) - { " 6:SPOT05", Select_LoadGame, 0x00FC }, // "6: SPOT05" (Sacred Forest Meadow) - { " 7:SPOT06", Select_LoadGame, 0x0102 }, // "7: SPOT06" (Lake Hylia) - { " 8:SPOT07", Select_LoadGame, 0x0108 }, // "8: SPOT07" (Zora's Domain) - { " 9:SPOT08", Select_LoadGame, 0x010E }, // "9: SPOT08" (Zora's Fountain) - { "10:SPOT09", Select_LoadGame, 0x0117 }, // "10: SPOT09" (Gerudo Valley) - { "11:SPOT10", Select_LoadGame, 0x011E }, // "11: SPOT10" (Lost Woods) - { "12:SPOT11", Select_LoadGame, 0x0123 }, // "12: SPOT11" (Desert Colossus) - { "13:SPOT12", Select_LoadGame, 0x0129 }, // "13: SPOT12" (Gerudo's Fortress) - { "14:SPOT13", Select_LoadGame, 0x0130 }, // "14: SPOT13" (Haunted Wasteland) - { "15:SPOT15", Select_LoadGame, 0x0138 }, // "15: SPOT15" (Hyrule Castle) - { "16:SPOT16", Select_LoadGame, 0x013D }, // "16: SPOT16" (Death Mountain Trail) - { "17:SPOT17", Select_LoadGame, 0x0147 }, // "17: SPOT17" (Death Mountain Crater) - { "18:SPOT18", Select_LoadGame, 0x014D }, // "18: SPOT18" (Goron City) - { "19:SPOT20", Select_LoadGame, 0x0157 }, // "19: SPOT20" (Lon Lon Ranch) - { "20:\x8Dﾄｷﾉﾏ", Select_LoadGame, 0x0053 }, // "20: Chamber of Time" (Temple Of Time) - { "21:\x8Dｹﾝｼﾞｬﾉﾏ", Select_LoadGame, 0x006B }, // "21: Chamber of the Sages" (Chamber of the Sages) - { "22:\x8Dｼｬﾃｷｼﾞｮｳ", Select_LoadGame, 0x003B }, // "22: Target Range" (Shooting Gallery) - { "23:\x8Cﾊｲﾗﾙ\x8Dﾆﾜ\x8Cｹﾞｰﾑ", Select_LoadGame, 0x007A }, // "23: Hyrule Garden Game" (Hyrule Garden Minigame) - { "24:\x8Dﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ", Select_LoadGame, 0x031C }, // "24: Grave Dive Hole" (Grave (Redead)) - { "25:\x8Dﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ 2", Select_LoadGame, 0x004B }, // "25: Grave Dive Hole 2" (Grave (Fairy's Fountain)) - { "26:\x8Dｵｳｹ ﾉ ﾊｶｱﾅ", Select_LoadGame, 0x002D }, // "26: Royal Family's Grave" (Royal Family's Tomb) - { "27:\x8Dﾀﾞｲﾖｳｾｲﾉｲｽﾞﾐ", Select_LoadGame, - 0x0315 }, // "27: Great Fairy's Fountain" (Great Fairy's Fountain (Upgrades)) - { "28:\x8Dﾄﾋﾞｺﾐ ﾖｳｾｲ ｱﾅ", Select_LoadGame, 0x036D }, // "28: Fairy Dive Hole" (Fairy's Fountain (Healing Fairies)) - { "29:\x8Dﾏﾎｳｾｷ ﾖｳｾｲﾉｲｽﾞﾐ", Select_LoadGame, - 0x0371 }, // "29: Magic Stone Fairy's Fountain" (Great Fairy's Fountain (Spells)) - { "30:\x8Cｶﾞﾉﾝ\x8Dｻｲｼｭｳｾﾝ", Select_LoadGame, 0x043F }, // "30: Final Battle With Ganon" (Battle With Ganon) - { "31:\x8Cﾊｲﾗﾙ\x8Dﾅｶﾆﾜ", Select_LoadGame, 0x0400 }, // "31: Hyrule Inner Garden" (Castle Courtyard) - { "32:\x8Dﾂﾘﾎﾞﾘ", Select_LoadGame, 0x045F }, // "32: Fishing" (Fishing Pond) - { "33:\x8Cﾎﾞﾑﾁｭｳﾎﾞｰﾘﾝｸﾞ", Select_LoadGame, 0x0507 }, // "33: Bombchu Bowling" (Bombchu Bowling Alley) - { "34:\x8Cﾛﾝﾛﾝ\x8Dﾎﾞｸｼﾞｮｳ ｿｳｺ 1", Select_LoadGame, 0x004F }, // "34: Lon Lon Ranch - Storehouse 1" (Talon's House) - { "35:\x8Cﾛﾝﾛﾝ\x8Dﾎﾞｸｼﾞｮｳ ｿｳｺ 2", Select_LoadGame, 0x05D0 }, // "35: Lon Lon Ranch - Storehouse 2" (Ranch Silo) - { "36:\x8Dﾐﾊﾘ ｺﾞﾔ", Select_LoadGame, 0x007E }, // "36: Lookout Hut" (Guard House) - { "37:\x8Dﾏﾎｳ ﾉ ｸｽﾘﾔ", Select_LoadGame, 0x0072 }, // "37: Magic Potion Shop" (Granny's Potion Shop) - { "38:\x8Dﾀｶﾗﾊﾞｺﾔ", Select_LoadGame, 0x0063 }, // "38: Treasure Chest Shop" (Treasure Chest Game) - { "39:\x8Dｷﾝ \x8Cｽﾀﾙﾁｭﾗ ﾊｳｽ", Select_LoadGame, 0x0550 }, // "39: Gold Skulltula House" (House of Skulltula) - { "40:\x8Dｼﾞｮｳｶﾏﾁ ｲﾘｸﾞﾁ", Select_LoadGame, 0x0033 }, // "40: Castle Town - Entrance" (Market Entrance) - { "41:\x8Dｼﾞｮｳｶﾏﾁ", Select_LoadGame, 0x00B1 }, // "41: Castle Town" (Market) - { "42:\x8Dｳﾗﾛｼﾞ", Select_LoadGame, 0x00AD }, // "42: Back Alley" (Back Alley) - { "43:\x8Dﾄｷﾉｼﾝﾃﾞﾝ ﾏｴ", Select_LoadGame, 0x0171 }, // "43: In Front of the Temple of Time" (Temple of Time Exterior) - { "44:\x8Dﾘﾝｸﾉｲｴ", Select_LoadGame, 0x00BB }, // "44: Link's House" (Link's House) - { "45:\x8Cｶｶﾘｺ\x8Dﾑﾗﾉﾅｶﾞﾔ", Select_LoadGame, 0x02FD }, // "45: Kakariko Village Row House" (Carpenter Boss's House) - { "46:\x8Dｳﾗﾛｼﾞﾉ ｲｴ", Select_LoadGame, 0x043B }, // "46: Back Alley House" (Back Alley House (Man in Green)) - { "47:\x8Dｺｷﾘﾉﾑﾗ ﾓﾉｼﾘｷｮｳﾀﾞｲﾉｲｴ", Select_LoadGame, - 0x00C9 }, // "47: Kokiri Village - Know-It-All Brothers' House" (Know-It-All Brothers' House) - { "48:\x8Dｺｷﾘﾉﾑﾗ ﾌﾀｺﾞﾉｲｴ", Select_LoadGame, 0x009C }, // "48: Kokiri Village - Twins' House" (Twins' House) - { "49:\x8Dｺｷﾘﾉﾑﾗ \x8Cﾐﾄﾞ\x8Dﾉｲｴ", Select_LoadGame, 0x0433 }, // "49: Kokiri Village - Mido's House" (Mido's House) - { "50:\x8Dｺｷﾘﾉﾑﾗ \x8Cｻﾘｱ\x8Dﾉｲｴ", Select_LoadGame, 0x0437 }, // "50: Kokiri Village - Saria's House" (Saria's House) - { "51:\x8Dｳﾏｺﾞﾔ", Select_LoadGame, 0x02F9 }, // "51: Stable" (Stable) - { "52:\x8Dﾊｶﾓﾘﾉｲｴ", Select_LoadGame, 0x030D }, // "52: Grave Keeper's House" (Gravekeeper's Hut) - { "53:\x8Dｳﾗﾛｼﾞ ｲﾇｵﾊﾞｻﾝﾉｲｴ", Select_LoadGame, 0x0398 }, // "53: Back Alley - Dog Lady's House" (Back Alley House) - { "54:\x8Dｶｶﾘｺﾑﾗ \x8Cｲﾝﾊﾟ\x8Dﾉｲｴ", Select_LoadGame, - 0x039C }, // "54: Kakariko Village - Impa's House" (Impa's House) - { "55:\x8Cﾊｲﾘｱ\x8D ｹﾝｷｭｳｼﾞｮ", Select_LoadGame, 0x0043 }, // "55: Hylia Laboratory" (Lakeside Laboratory) - { "56:\x8Cﾃﾝﾄ", Select_LoadGame, 0x03A0 }, // "56: Tent" (Carpenters' Tent) - { "57:\x8Dﾀﾃﾉﾐｾ", Select_LoadGame, 0x00B7 }, // "57: Shield Shop" (Bazaar) - { "58:\x8Dｺｷﾘｿﾞｸﾉﾐｾ", Select_LoadGame, 0x00C1 }, // "58: Kokiri Shop" (Kokiri Shop) - { "59:\x8Cｺﾞﾛﾝ\x8Dﾉﾐｾ", Select_LoadGame, 0x037C }, // "59: Goron Shop" (Goron Shop) - { "60:\x8Cｿﾞｰﾗ\x8Dﾉﾐｾ", Select_LoadGame, 0x0380 }, // "60: Zora Shop" (Zora Shop) - { "61:\x8Cｶｶﾘｺ\x8Dﾑﾗ ｸｽﾘﾔ", Select_LoadGame, - 0x0384 }, // "61: Kakariko Village - Potion Shop" (Kakariko Potion Shop) - { "62:\x8Dｼﾞｮｳｶﾏﾁ ｸｽﾘﾔ", Select_LoadGame, 0x0388 }, // "62: Castle Town - Potion Shop" (Market Potion Shop) - { "63:\x8Dｳﾗﾛｼﾞ ﾖﾙﾉﾐｾ", Select_LoadGame, 0x0390 }, // "63: Back Alley - Night Shop" (Bombchu Shop) - { "64:\x8Dｵﾒﾝﾔ", Select_LoadGame, 0x0530 }, // "64: Mask Shop" (Happy Mask Shop) - { "65:\x8Cｹﾞﾙﾄﾞ\x8Dﾉｼｭｳﾚﾝｼﾞｮｳ", Select_LoadGame, 0x0008 }, // "65: Gerudo Training Area" (Gerudo Training Ground) - { "66:\x8Dﾖｳｾｲﾉｷﾉ \x8Cﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0000 }, // "66: Fairy Tree Dungeon" (Inside the Deku Tree) - { "67:\x8Dﾖｳｾｲﾉｷﾉ \x8Cﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, 0x040F }, // "67: Fairy Tree Dungeon - Boss" (Gohma's Lair) - { "68:\x8Cﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0004 }, // "68: Dondogo Dungeon" (Dodongo's Cavern) - { "69:\x8Cﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, 0x040B }, // "69: Dondogo Dungeon - Boss" (King Dodongo's Lair) - { "70:\x8Dｷｮﾀﾞｲｷﾞｮ \x8Cﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0028 }, // "70: Giant Fish Dungeon" (Inside Jabu-Jabu's Belly) - { "71:\x8Dｷｮﾀﾞｲｷﾞｮ \x8Cﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, 0x0301 }, // "71: Giant Fish Dungeon - Boss" (Barinade's Lair) - { "72:\x8Dﾓﾘﾉｼﾝﾃﾞﾝ", Select_LoadGame, 0x0169 }, // "72: Forest Temple" (Forest Temple) - { "73:\x8Dﾓﾘﾉｼﾝﾃﾞﾝ \x8Cﾎﾞｽ", Select_LoadGame, 0x000C }, // "73: Forest Temple - Boss" (Phantom Ganon's Lair) - { "74:\x8Dｲﾄﾞｼﾀ \x8Cﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0098 }, // "74: Dungeon Below the Well" (Bottom of the Well) - { "75:\x8Dﾊｶｼﾀ \x8Cﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0037 }, // "75: Dungeon Beneath the Graves" (Shadow Temple) - { "76:\x8Dﾊｶｼﾀ \x8Cﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, - 0x0413 }, // "76: Dungeon Beneath the Graves - Boss" (Bongo Bongo's Lair) - { "77:\x8Dﾋﾉｼﾝﾃﾞﾝ", Select_LoadGame, 0x0165 }, // "77: Fire Temple" (Fire Temple) - { "78:\x8Dﾋﾉｼﾝﾃﾞﾝ \x8Cﾎﾞｽ", Select_LoadGame, 0x0305 }, // "78: Fire Temple - Boss" (Volvagia's Lair) - { "79:\x8Dﾐｽﾞﾉｼﾝﾃﾞﾝ", Select_LoadGame, 0x0010 }, // "79: Water Temple" (Water Temple) - { "80:\x8Dﾐｽﾞﾉｼﾝﾃﾞﾝ \x8Cﾎﾞｽ", Select_LoadGame, 0x0417 }, // "80: Water Temple - Boss" (Morpha's Lair) - { "81:\x8Dｼﾞｬｼﾝｿﾞｳ \x8Cﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0082 }, // "81: Evil Goddess Statue Dungeon" (Spirit Temple) - { "82:\x8Dｼﾞｬｼﾝｿﾞｳ \x8Cﾀﾞﾝｼﾞｮﾝ ｱｲｱﾝﾅｯｸ", Select_LoadGame, - 0x008D }, // "82: Evil Goddess Statue Dungeon - Iron Knuckle" (Iron Knuckle's Lair) - { "83:\x8Dｼﾞｬｼﾝｿﾞｳ \x8Cﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, - 0x05EC }, // "83: Evil Goddess Statue Dungeon - Boss" (Twinrova's Lair) - { "84:\x8Cｶﾞﾉﾝ\x8Dﾉﾄｳ", Select_LoadGame, 0x041B }, // "84: Ganon's Tower" (Ganon's Tower) - { "85:\x8Cｶﾞﾉﾝ\x8Dﾉﾄｳ\x8Cﾎﾞｽ", Select_LoadGame, 0x041F }, // "85: Ganon's Tower - Boss" (Ganondorf's Lair) - { "86:\x8Dｺｵﾘﾉﾄﾞｳｸﾂ", Select_LoadGame, 0x0088 }, // "86: Ice Cavern" (Ice Cavern) - { "87:\x8Dﾊｶｼﾀ\x8Cﾘﾚｰ", Select_LoadGame, 0x044F }, // "87: Relay Beneath the Graves" (Dampé's Grave) - { "88:\x8Cｶﾞﾉﾝ\x8Dﾁｶ \x8Cﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, - 0x0467 }, // "88: Ganon's Basement Dungeon" (Inside Ganon's Castle) - { "89:\x8Cｶﾞﾉﾝ\x8Dｻｲｼｭｳｾﾝ \x8Cﾃﾞﾓ & ﾊﾞﾄﾙ", Select_LoadGame, - 0x0517 }, // "89: Final Battle With Ganon - Cutscene & Battle" (Ganondorf's Death Scene & Tower Escape Exterior) - { "90:\x8Cｶﾞﾉﾝ\x8Dﾉﾄｳ ｿﾉｺﾞ 1", Select_LoadGame, - 0x0179 }, // "90: Ganon's Tower Aftermath 1" (Escaping Ganon's Tower 1) - { "91:\x8Cｶﾞﾉﾝ\x8Dﾉﾄｳ ｿﾉｺﾞ 2", Select_LoadGame, - 0x01B5 }, // "91: Ganon's Tower Aftermath 2" (Escaping Ganon's Tower 2) - { "92:\x8Cｶﾞﾉﾝ\x8Dﾉﾄｳ ｿﾉｺﾞ 3", Select_LoadGame, - 0x03DC }, // "92: Ganon's Tower Aftermath 3" (Escaping Ganon's Tower 3) - { "93:\x8Cｶﾞﾉﾝ\x8Dﾉﾄｳ ｿﾉｺﾞ 4", Select_LoadGame, - 0x03E4 }, // "93: Ganon's Tower Aftermath 4" (Escaping Ganon's Tower 4) - { "94:\x8Cｶﾞﾉﾝ\x8Dﾁｶ ｿﾉｺﾞ", Select_LoadGame, 0x056C }, // "94: Ganon's Basement Aftermath" (Escaping Ganon's Castle) - { "95:\x8Cｹﾞﾙﾄﾞ\x8Dﾂｳﾛ 1-2", Select_LoadGame, 0x0486 }, // "95: Gerudo Passage 1-2" (Thieves' Hideout 1) - { "96:\x8Cｹﾞﾙﾄﾞ\x8Dﾂｳﾛ 3-4 9-10", Select_LoadGame, 0x048E }, // "96: Gerudo Passage 3-4 9-10" (Thieves' Hideout 2) - { "97:\x8Cｹﾞﾙﾄﾞ\x8Dﾂｳﾛ 5-6", Select_LoadGame, 0x0496 }, // "97: Gerudo Passage 5-6" (Thieves' Hideout 3) - { "98:\x8Cｹﾞﾙﾄﾞ\x8Dﾂｳﾛ 7-8", Select_LoadGame, 0x049E }, // "98: Gerudo Passage 7-8" (Thieves' Hideout 4) - { "99:\x8Cｹﾞﾙﾄﾞ\x8Dﾂｳﾛ 11-12", Select_LoadGame, 0x04AE }, // "99: Gerudo Passage 11-12" (Thieves' Hideout 5) - { "100:\x8Cｹﾞﾙﾄﾞ\x8Dﾂｳﾛ 13", Select_LoadGame, 0x0570 }, // "100: Gerudo Passage 13" (Thieves' Hideout 6) - { "101:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 0", Select_LoadGame, 0x003F }, // "101: Hidden Dive Hole 0" (Grotto 0 - Gossip Stone & Chest) - { "102:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 1", Select_LoadGame, - 0x0598 }, // "102: Hidden Dive Hole 1" (Grotto 1 - Skulltula & Gold Skulltula) - { "103:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 2", Select_LoadGame, - 0x059C }, // "103: Hidden Dive Hole 2" (Grotto 2 - Business Scrub & Heart Piece) - { "104:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 3", Select_LoadGame, 0x05A0 }, // "104: Hidden Dive Hole 3" (Grotto 3 - Redeads) - { "105:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 4", Select_LoadGame, 0x05A4 }, // "105: Hidden Dive Hole 4" (Grotto 4 - 3 Business Scrubs) - { "106:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 5", Select_LoadGame, - 0x05A8 }, // "106: Hidden Dive Hole 5" (Grotto 5 - Gossip Stone, Skulltula, Cow) - { "107:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 6", Select_LoadGame, 0x05AC }, // "107: Hidden Dive Hole 6" (Grotto 6 - Octorok) - { "108:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 7", Select_LoadGame, - 0x05B0 }, // "108: Hidden Dive Hole 7" (Grotto 7 - Business Scrub & Deku Nut Upgrade) - { "109:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 8", Select_LoadGame, 0x05B4 }, // "109: Hidden Dive Hole 8" (Grotto 8 - 2 Wolfos) - { "110:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 9", Select_LoadGame, 0x05B8 }, // "110: Hidden Dive Hole 9" (Grotto 9 - Bombable Walls) - { "111:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 10", Select_LoadGame, 0x05BC }, // "111: Hidden Dive Hole 10" (Grotto 10 - 2 Business Scrubs) - { "112:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 11", Select_LoadGame, - 0x05C0 }, // "112: Hidden Dive Hole 11" (Grotto 11 - Tektite & Heart Piece) - { "113:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 12", Select_LoadGame, 0x05C4 }, // "113: Hidden Dive Hole 12" (Grotto 12 - Deku Stage) - { "114:\x8Dｶｸｼﾄﾋﾞｺﾐｱﾅ 13", Select_LoadGame, 0x05FC }, // "114: Hidden Dive Hole 13" (Grotto 13 - Rupees & Cow) - { "115:\x8Cﾊｲﾗﾙ ﾃﾞﾓ", Select_LoadGame, 0x00A0 }, // "115: Hyrule Cutscenes" (Cutscene Map) - { "116:\x8Dﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ\x8Cﾜｰﾌﾟ)", Select_LoadGame, - 0x0520 }, // "116: Special Room (Treasure Chest Warp)" (Ganondorf Test Room) - { "117:\x8Dｻｻ\x8Cﾃｽﾄ", Select_LoadGame, 0x0018 }, // "117: Sasaki Test" (Sasa Test) - { "118:\x8Cﾃｽﾄﾏｯﾌﾟ", Select_LoadGame, 0x0094 }, // "118: Test Map" (Jungle Gym) - { "119:\x8Cﾃｽﾄﾙｰﾑ", Select_LoadGame, 0x0024 }, // "119: Test Room" (Treasure Chest Room) - { "120:\x8Dﾁｭｳ\x8Cｽﾀﾛﾌｫｽ\x8Dﾍﾞﾔ", Select_LoadGame, 0x001C }, // "120: Stalfos Miniboss Room" (Stalfos Miniboss Room) - { "121:\x8Cﾎﾞｽｽﾀﾛﾌｫｽ\x8Dﾍﾞﾔ", Select_LoadGame, 0x0020 }, // "121: Boss Stalfos Room" (Stalfos Boss Room) - { "122:Sutaru", Select_LoadGame, 0x0047 }, // "122: Stal" (Sutaru) - { "123:jikkenjyou", Select_LoadGame, 0x02EA }, // "123: Test Area" (Shooting Gallery) - { "124:depth\x8Cﾃｽﾄ", Select_LoadGame, 0x00B6 }, // "124: Depth Test" (Depth Test) - { "125:\x8Cﾊｲﾗﾙ\x8Dﾆﾜ\x8Cｹﾞｰﾑ2", Select_LoadGame, - 0x0076 }, // "125: Hyrule Garden Game 2" (Early Hyrule Garden Game) - { "title", (void*)Select_LoadTitle, 0x0000 }, // "title" (Title Screen) + // "1: SPOT00" (Hyrule Field) + { " 1:SPOT00", Select_LoadGame, 0x00CD }, + // "2: SPOT01" (Kakariko Village) + { " 2:SPOT01", Select_LoadGame, 0x00DB }, + // "3: SPOT02" (Graveyard) + { " 3:SPOT02", Select_LoadGame, 0x00E4 }, + // "4: SPOT03" (Zora's River) + { " 4:SPOT03", Select_LoadGame, 0x00EA }, + // "5: SPOT04" (Kokiri Forest) + { " 5:SPOT04", Select_LoadGame, 0x00EE }, + // "6: SPOT05" (Sacred Forest Meadow) + { " 6:SPOT05", Select_LoadGame, 0x00FC }, + // "7: SPOT06" (Lake Hylia) + { " 7:SPOT06", Select_LoadGame, 0x0102 }, + // "8: SPOT07" (Zora's Domain) + { " 8:SPOT07", Select_LoadGame, 0x0108 }, + // "9: SPOT08" (Zora's Fountain) + { " 9:SPOT08", Select_LoadGame, 0x010E }, + // "10: SPOT09" (Gerudo Valley) + { "10:SPOT09", Select_LoadGame, 0x0117 }, + // "11: SPOT10" (Lost Woods) + { "11:SPOT10", Select_LoadGame, 0x011E }, + // "12: SPOT11" (Desert Colossus) + { "12:SPOT11", Select_LoadGame, 0x0123 }, + // "13: SPOT12" (Gerudo's Fortress) + { "13:SPOT12", Select_LoadGame, 0x0129 }, + // "14: SPOT13" (Haunted Wasteland) + { "14:SPOT13", Select_LoadGame, 0x0130 }, + // "15: SPOT15" (Hyrule Castle) + { "15:SPOT15", Select_LoadGame, 0x0138 }, + // "16: SPOT16" (Death Mountain Trail) + { "16:SPOT16", Select_LoadGame, 0x013D }, + // "17: SPOT17" (Death Mountain Crater) + { "17:SPOT17", Select_LoadGame, 0x0147 }, + // "18: SPOT18" (Goron City) + { "18:SPOT18", Select_LoadGame, 0x014D }, + // "19: SPOT20" (Lon Lon Ranch) + { "19:SPOT20", Select_LoadGame, 0x0157 }, + // "20: Chamber of Time" (Temple Of Time) + { "20:" GFXP_HIRAGANA "ﾄｷﾉﾏ", Select_LoadGame, 0x0053 }, + // "21: Chamber of the Sages" (Chamber of the Sages) + { "21:" GFXP_HIRAGANA "ｹﾝｼﾞｬﾉﾏ", Select_LoadGame, 0x006B }, + // "22: Target Range" (Shooting Gallery) + { "22:" GFXP_HIRAGANA "ｼｬﾃｷｼﾞｮｳ", Select_LoadGame, 0x003B }, + // "23: Hyrule Garden Game" (Hyrule Garden Minigame) + { "23:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ", Select_LoadGame, 0x007A }, + // "24: Grave Dive Hole" (Grave (Redead)) + { "24:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ", Select_LoadGame, 0x031C }, + // "25: Grave Dive Hole 2" (Grave (Fairy's Fountain)) + { "25:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ 2", Select_LoadGame, 0x004B }, + // "26: Royal Family's Grave" (Royal Family's Tomb) + { "26:" GFXP_HIRAGANA "ｵｳｹ ﾉ ﾊｶｱﾅ", Select_LoadGame, 0x002D }, + // "27: Great Fairy's Fountain" (Great Fairy's Fountain (Upgrades)) + { "27:" GFXP_HIRAGANA "ﾀﾞｲﾖｳｾｲﾉｲｽﾞﾐ", Select_LoadGame, 0x0315 }, + // "28: Fairy Dive Hole" (Fairy's Fountain (Healing Fairies)) + { "28:" GFXP_HIRAGANA "ﾄﾋﾞｺﾐ ﾖｳｾｲ ｱﾅ", Select_LoadGame, 0x036D }, + // "29: Magic Stone Fairy's Fountain" (Great Fairy's Fountain (Spells)) + { "29:" GFXP_HIRAGANA "ﾏﾎｳｾｷ ﾖｳｾｲﾉｲｽﾞﾐ", Select_LoadGame, 0x0371 }, + // "30: Final Battle With Ganon" (Battle With Ganon) + { "30:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ", Select_LoadGame, 0x043F }, + // "31: Hyrule Inner Garden" (Castle Courtyard) + { "31:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾅｶﾆﾜ", Select_LoadGame, 0x0400 }, + // "32: Fishing" (Fishing Pond) + { "32:" GFXP_HIRAGANA "ﾂﾘﾎﾞﾘ", Select_LoadGame, 0x045F }, + // "33: Bombchu Bowling" (Bombchu Bowling Alley) + { "33:" GFXP_KATAKANA "ﾎﾞﾑﾁｭｳﾎﾞｰﾘﾝｸﾞ", Select_LoadGame, 0x0507 }, + // "34: Lon Lon Ranch - Storehouse 1" (Talon's House) + { "34:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 1", Select_LoadGame, 0x004F }, + // "35: Lon Lon Ranch - Storehouse 2" (Ranch Silo) + { "35:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 2", Select_LoadGame, 0x05D0 }, + // "36: Lookout Hut" (Guard House) + { "36:" GFXP_HIRAGANA "ﾐﾊﾘ ｺﾞﾔ", Select_LoadGame, 0x007E }, + // "37: Magic Potion Shop" (Granny's Potion Shop) + { "37:" GFXP_HIRAGANA "ﾏﾎｳ ﾉ ｸｽﾘﾔ", Select_LoadGame, 0x0072 }, + // "38: Treasure Chest Shop" (Treasure Chest Game) + { "38:" GFXP_HIRAGANA "ﾀｶﾗﾊﾞｺﾔ", Select_LoadGame, 0x0063 }, + // "39: Gold Skulltula House" (House of Skulltula) + { "39:" GFXP_HIRAGANA "ｷﾝ " GFXP_KATAKANA "ｽﾀﾙﾁｭﾗ ﾊｳｽ", Select_LoadGame, 0x0550 }, + // "40: Castle Town - Entrance" (Market Entrance) + { "40:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｲﾘｸﾞﾁ", Select_LoadGame, 0x0033 }, + // "41: Castle Town" (Market) + { "41:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ", Select_LoadGame, 0x00B1 }, + // "42: Back Alley" (Back Alley) + { "42:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ", Select_LoadGame, 0x00AD }, + // "43: In Front of the Temple of Time" (Temple of Time Exterior) + { "43:" GFXP_HIRAGANA "ﾄｷﾉｼﾝﾃﾞﾝ ﾏｴ", Select_LoadGame, 0x0171 }, + // "44: Link's House" (Link's House) + { "44:" GFXP_HIRAGANA "ﾘﾝｸﾉｲｴ", Select_LoadGame, 0x00BB }, + // "45: Kakariko Village Row House" (Carpenter Boss's House) + { "45:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗﾉﾅｶﾞﾔ", Select_LoadGame, 0x02FD }, + // "46: Back Alley House" (Back Alley House (Man in Green)) + { "46:" GFXP_HIRAGANA "ｳﾗﾛｼﾞﾉ ｲｴ", Select_LoadGame, 0x043B }, + // "47: Kokiri Village - Know-It-All Brothers' House" (Know-It-All Brothers' House) + { "47:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾓﾉｼﾘｷｮｳﾀﾞｲﾉｲｴ", Select_LoadGame, 0x00C9 }, + // "48: Kokiri Village - Twins' House" (Twins' House) + { "48:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾌﾀｺﾞﾉｲｴ", Select_LoadGame, 0x009C }, + // "49: Kokiri Village - Mido's House" (Mido's House) + { "49:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ﾐﾄﾞ" GFXP_HIRAGANA "ﾉｲｴ", Select_LoadGame, 0x0433 }, + // "50: Kokiri Village - Saria's House" (Saria's House) + { "50:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ｻﾘｱ" GFXP_HIRAGANA "ﾉｲｴ", Select_LoadGame, 0x0437 }, + // "51: Stable" (Stable) + { "51:" GFXP_HIRAGANA "ｳﾏｺﾞﾔ", Select_LoadGame, 0x02F9 }, + // "52: Grave Keeper's House" (Gravekeeper's Hut) + { "52:" GFXP_HIRAGANA "ﾊｶﾓﾘﾉｲｴ", Select_LoadGame, 0x030D }, + // "53: Back Alley - Dog Lady's House" (Back Alley House) + { "53:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ｲﾇｵﾊﾞｻﾝﾉｲｴ", Select_LoadGame, 0x0398 }, + // "54: Kakariko Village - Impa's House" (Impa's House) + { "54:" GFXP_HIRAGANA "ｶｶﾘｺﾑﾗ " GFXP_KATAKANA "ｲﾝﾊﾟ" GFXP_HIRAGANA "ﾉｲｴ", Select_LoadGame, 0x039C }, + // "55: Hylia Laboratory" (Lakeside Laboratory) + { "55:" GFXP_KATAKANA "ﾊｲﾘｱ" GFXP_HIRAGANA " ｹﾝｷｭｳｼﾞｮ", Select_LoadGame, 0x0043 }, + // "56: Tent" (Carpenters' Tent) + { "56:" GFXP_KATAKANA "ﾃﾝﾄ", Select_LoadGame, 0x03A0 }, + // "57: Shield Shop" (Bazaar) + { "57:" GFXP_HIRAGANA "ﾀﾃﾉﾐｾ", Select_LoadGame, 0x00B7 }, + // "58: Kokiri Shop" (Kokiri Shop) + { "58:" GFXP_HIRAGANA "ｺｷﾘｿﾞｸﾉﾐｾ", Select_LoadGame, 0x00C1 }, + // "59: Goron Shop" (Goron Shop) + { "59:" GFXP_KATAKANA "ｺﾞﾛﾝ" GFXP_HIRAGANA "ﾉﾐｾ", Select_LoadGame, 0x037C }, + // "60: Zora Shop" (Zora Shop) + { "60:" GFXP_KATAKANA "ｿﾞｰﾗ" GFXP_HIRAGANA "ﾉﾐｾ", Select_LoadGame, 0x0380 }, + // "61: Kakariko Village - Potion Shop" (Kakariko Potion Shop) + { "61:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗ ｸｽﾘﾔ", Select_LoadGame, 0x0384 }, + // "62: Castle Town - Potion Shop" (Market Potion Shop) + { "62:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｸｽﾘﾔ", Select_LoadGame, 0x0388 }, + // "63: Back Alley - Night Shop" (Bombchu Shop) + { "63:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ﾖﾙﾉﾐｾ", Select_LoadGame, 0x0390 }, + // "64: Mask Shop" (Happy Mask Shop) + { "64:" GFXP_HIRAGANA "ｵﾒﾝﾔ", Select_LoadGame, 0x0530 }, + // "65: Gerudo Training Area" (Gerudo Training Ground) + { "65:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾉｼｭｳﾚﾝｼﾞｮｳ", Select_LoadGame, 0x0008 }, + // "66: Fairy Tree Dungeon" (Inside the Deku Tree) + { "66:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0000 }, + // "67: Fairy Tree Dungeon - Boss" (Gohma's Lair) + { "67:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, 0x040F }, + // "68: Dondogo Dungeon" (Dodongo's Cavern) + { "68:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0004 }, + // "69: Dondogo Dungeon - Boss" (King Dodongo's Lair) + { "69:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, 0x040B }, + // "70: Giant Fish Dungeon" (Inside Jabu-Jabu's Belly) + { "70:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0028 }, + // "71: Giant Fish Dungeon - Boss" (Barinade's Lair) + { "71:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, 0x0301 }, + // "72: Forest Temple" (Forest Temple) + { "72:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ", Select_LoadGame, 0x0169 }, + // "73: Forest Temple - Boss" (Phantom Ganon's Lair) + { "73:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", Select_LoadGame, 0x000C }, + // "74: Dungeon Below the Well" (Bottom of the Well) + { "74:" GFXP_HIRAGANA "ｲﾄﾞｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0098 }, + // "75: Dungeon Beneath the Graves" (Shadow Temple) + { "75:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0037 }, + // "76: Dungeon Beneath the Graves - Boss" (Bongo Bongo's Lair) + { "76:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, 0x0413 }, + // "77: Fire Temple" (Fire Temple) + { "77:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ", Select_LoadGame, 0x0165 }, + // "78: Fire Temple - Boss" (Volvagia's Lair) + { "78:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", Select_LoadGame, 0x0305 }, + // "79: Water Temple" (Water Temple) + { "79:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ", Select_LoadGame, 0x0010 }, + // "80: Water Temple - Boss" (Morpha's Lair) + { "80:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", Select_LoadGame, 0x0417 }, + // "81: Evil Goddess Statue Dungeon" (Spirit Temple) + { "81:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0082 }, + // "82: Evil Goddess Statue Dungeon - Iron Knuckle" (Iron Knuckle's Lair) + { "82:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ｱｲｱﾝﾅｯｸ", Select_LoadGame, 0x008D }, + // "83: Evil Goddess Statue Dungeon - Boss" (Twinrova's Lair) + { "83:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", Select_LoadGame, 0x05EC }, + // "84: Ganon's Tower" (Ganon's Tower) + { "84:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ", Select_LoadGame, 0x041B }, + // "85: Ganon's Tower - Boss" (Ganondorf's Lair) + { "85:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ" GFXP_KATAKANA "ﾎﾞｽ", Select_LoadGame, 0x041F }, + // "86: Ice Cavern" (Ice Cavern) + { "86:" GFXP_HIRAGANA "ｺｵﾘﾉﾄﾞｳｸﾂ", Select_LoadGame, 0x0088 }, + // "87: Relay Beneath the Graves" (Dampé's Grave) + { "87:" GFXP_HIRAGANA "ﾊｶｼﾀ" GFXP_KATAKANA "ﾘﾚｰ", Select_LoadGame, 0x044F }, + // "88: Ganon's Basement Dungeon" (Inside Ganon's Castle) + { "88:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", Select_LoadGame, 0x0467 }, + // "89: Final Battle With Ganon - Cutscene & Battle" (Ganondorf's Death Scene & Tower Escape Exterior) + { "89:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ " GFXP_KATAKANA "ﾃﾞﾓ & ﾊﾞﾄﾙ", Select_LoadGame, 0x0517 }, + // "90: Ganon's Tower Aftermath 1" (Escaping Ganon's Tower 1) + { "90:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 1", Select_LoadGame, 0x0179 }, + // "91: Ganon's Tower Aftermath 2" (Escaping Ganon's Tower 2) + { "91:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 2", Select_LoadGame, 0x01B5 }, + // "92: Ganon's Tower Aftermath 3" (Escaping Ganon's Tower 3) + { "92:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 3", Select_LoadGame, 0x03DC }, + // "93: Ganon's Tower Aftermath 4" (Escaping Ganon's Tower 4) + { "93:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 4", Select_LoadGame, 0x03E4 }, + // "94: Ganon's Basement Aftermath" (Escaping Ganon's Castle) + { "94:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ ｿﾉｺﾞ", Select_LoadGame, 0x056C }, + // "95: Gerudo Passage 1-2" (Thieves' Hideout 1) + { "95:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 1-2", Select_LoadGame, 0x0486 }, + // "96: Gerudo Passage 3-4 9-10" (Thieves' Hideout 2) + { "96:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 3-4 9-10", Select_LoadGame, 0x048E }, + // "97: Gerudo Passage 5-6" (Thieves' Hideout 3) + { "97:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 5-6", Select_LoadGame, 0x0496 }, + // "98: Gerudo Passage 7-8" (Thieves' Hideout 4) + { "98:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 7-8", Select_LoadGame, 0x049E }, + // "99: Gerudo Passage 11-12" (Thieves' Hideout 5) + { "99:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 11-12", Select_LoadGame, 0x04AE }, + // "100: Gerudo Passage 13" (Thieves' Hideout 6) + { "100:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 13", Select_LoadGame, 0x0570 }, + // "101: Hidden Dive Hole 0" (Grotto 0 - Gossip Stone & Chest) + { "101:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 0", Select_LoadGame, 0x003F }, + // "102: Hidden Dive Hole 1" (Grotto 1 - Skulltula & Gold Skulltula) + { "102:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 1", Select_LoadGame, 0x0598 }, + // "103: Hidden Dive Hole 2" (Grotto 2 - Business Scrub & Heart Piece) + { "103:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 2", Select_LoadGame, 0x059C }, + // "104: Hidden Dive Hole 3" (Grotto 3 - Redeads) + { "104:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 3", Select_LoadGame, 0x05A0 }, + // "105: Hidden Dive Hole 4" (Grotto 4 - 3 Business Scrubs) + { "105:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 4", Select_LoadGame, 0x05A4 }, + // "106: Hidden Dive Hole 5" (Grotto 5 - Gossip Stone, Skulltula, Cow) + { "106:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 5", Select_LoadGame, 0x05A8 }, + // "107: Hidden Dive Hole 6" (Grotto 6 - Octorok) + { "107:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 6", Select_LoadGame, 0x05AC }, + // "108: Hidden Dive Hole 7" (Grotto 7 - Business Scrub & Deku Nut Upgrade) + { "108:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 7", Select_LoadGame, 0x05B0 }, + // "109: Hidden Dive Hole 8" (Grotto 8 - 2 Wolfos) + { "109:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 8", Select_LoadGame, 0x05B4 }, + // "110: Hidden Dive Hole 9" (Grotto 9 - Bombable Walls) + { "110:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 9", Select_LoadGame, 0x05B8 }, + // "111: Hidden Dive Hole 10" (Grotto 10 - 2 Business Scrubs) + { "111:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 10", Select_LoadGame, 0x05BC }, + // "112: Hidden Dive Hole 11" (Grotto 11 - Tektite & Heart Piece) + { "112:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 11", Select_LoadGame, 0x05C0 }, + // "113: Hidden Dive Hole 12" (Grotto 12 - Deku Stage) + { "113:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 12", Select_LoadGame, 0x05C4 }, + // "114: Hidden Dive Hole 13" (Grotto 13 - Rupees & Cow) + { "114:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 13", Select_LoadGame, 0x05FC }, + // "115: Hyrule Cutscenes" (Cutscene Map) + { "115:" GFXP_KATAKANA "ﾊｲﾗﾙ ﾃﾞﾓ", Select_LoadGame, 0x00A0 }, + // "116: Special Room (Treasure Chest Warp)" (Ganondorf Test Room) + { "116:" GFXP_HIRAGANA "ﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ" GFXP_KATAKANA "ﾜｰﾌﾟ)", Select_LoadGame, 0x0520 }, + // "117: Sasaki Test" (Sasa Test) + { "117:" GFXP_HIRAGANA "ｻｻ" GFXP_KATAKANA "ﾃｽﾄ", Select_LoadGame, 0x0018 }, + // "118: Test Map" (Jungle Gym) + { "118:" GFXP_KATAKANA "ﾃｽﾄﾏｯﾌﾟ", Select_LoadGame, 0x0094 }, + // "119: Test Room" (Treasure Chest Room) + { "119:" GFXP_KATAKANA "ﾃｽﾄﾙｰﾑ", Select_LoadGame, 0x0024 }, + // "120: Stalfos Miniboss Room" (Stalfos Miniboss Room) + { "120:" GFXP_HIRAGANA "ﾁｭｳ" GFXP_KATAKANA "ｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", Select_LoadGame, 0x001C }, + // "121: Boss Stalfos Room" (Stalfos Boss Room) + { "121:" GFXP_KATAKANA "ﾎﾞｽｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", Select_LoadGame, 0x0020 }, + // "122: Stal" (Sutaru) + { "122:Sutaru", Select_LoadGame, 0x0047 }, + // "123: Test Area" (Shooting Gallery) + { "123:jikkenjyou", Select_LoadGame, 0x02EA }, + // "124: Depth Test" (Depth Test) + { "124:depth" GFXP_KATAKANA "ﾃｽﾄ", Select_LoadGame, 0x00B6 }, + // "125: Hyrule Garden Game 2" (Early Hyrule Garden Game) + { "125:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ2", Select_LoadGame, 0x0076 }, + // "title" (Title Screen) + { "title", (void*)Select_LoadTitle, 0x0000 }, }; void Select_UpdateMenu(SelectContext* this) { @@ -426,19 +531,30 @@ void Select_PrintMenu(SelectContext* this, GfxPrint* printer) { } static const char* sLoadingMessages[] = { - "\x8Dｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", // "Please wait a minute", - "\x8Dﾁｮｯﾄ ﾏｯﾃﾈ", // "Hold on a sec", - "\x8Cｳｪｲﾄ ｱ ﾓｰﾒﾝﾄ", // "Wait a moment", - "\x8Cﾛｰﾄﾞ\x8Dﾁｭｳ", // "Loading", - "\x8Dﾅｳ ﾜｰｷﾝｸﾞ", // "Now working", - "\x8Dｲﾏ ﾂｸｯﾃﾏｽ", // "Now creating", - "\x8Dｺｼｮｳｼﾞｬﾅｲﾖ", // "It's not broken", - "\x8Cｺｰﾋｰ ﾌﾞﾚｲｸ", // "Coffee Break", - "\x8C" - "Bﾒﾝｦｾｯﾄｼﾃｸﾀﾞｻｲ", // "Please set B side", - "\x8Dｼﾞｯﾄ\x8Cｶﾞﾏﾝ\x8Dﾉ\x8Cｺ\x8Dﾃﾞｱｯﾀ", // "Be patient, now", - "\x8Dｲﾏｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", // "Please wait just a minute", - "\x8Dｱﾜﾃﾅｲｱﾜﾃﾅｲ｡ﾋﾄﾔｽﾐﾋﾄﾔｽﾐ｡", // "Don't worry, don't worry. Take a break, take a break", + // "Please wait a minute" + GFXP_HIRAGANA "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", + // "Hold on a sec" + GFXP_HIRAGANA "ﾁｮｯﾄ ﾏｯﾃﾈ", + // "Wait a moment" + GFXP_KATAKANA "ｳｪｲﾄ ｱ ﾓｰﾒﾝﾄ", + // "Loading" + GFXP_KATAKANA "ﾛｰﾄﾞ" GFXP_HIRAGANA "ﾁｭｳ", + // "Now working" + GFXP_HIRAGANA "ﾅｳ ﾜｰｷﾝｸﾞ", + // "Now creating" + GFXP_HIRAGANA "ｲﾏ ﾂｸｯﾃﾏｽ", + // "It's not broken" + GFXP_HIRAGANA "ｺｼｮｳｼﾞｬﾅｲﾖ", + // "Coffee Break" + GFXP_KATAKANA "ｺｰﾋｰ ﾌﾞﾚｲｸ", + // "Please set B side" + GFXP_KATAKANA "Bﾒﾝｦｾｯﾄｼﾃｸﾀﾞｻｲ", + // "Be patient, now" + GFXP_HIRAGANA "ｼﾞｯﾄ" GFXP_KATAKANA "ｶﾞﾏﾝ" GFXP_HIRAGANA "ﾉ" GFXP_KATAKANA "ｺ" GFXP_HIRAGANA "ﾃﾞｱｯﾀ", + // "Please wait just a minute" + GFXP_HIRAGANA "ｲﾏｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", + // "Don't worry, don't worry. Take a break, take a break." + GFXP_HIRAGANA "ｱﾜﾃﾅｲｱﾜﾃﾅｲ｡ﾋﾄﾔｽﾐﾋﾄﾔｽﾐ｡", }; void Select_PrintLoadingMessage(SelectContext* this, GfxPrint* printer) { @@ -451,10 +567,8 @@ void Select_PrintLoadingMessage(SelectContext* this, GfxPrint* printer) { } static const char* sAgeLabels[] = { - "\x8D" - "17(ﾜｶﾓﾉ)", // "17(young)" - "\x8D" - "5(ﾜｶｽｷﾞ)", // "5(very young)" + GFXP_HIRAGANA "17(ﾜｶﾓﾉ)", // "17(young)" + GFXP_HIRAGANA "5(ﾜｶｽｷﾞ)", // "5(very young)" }; void Select_PrintAgeSetting(SelectContext* this, GfxPrint* printer, s32 age) { @@ -471,12 +585,12 @@ void Select_PrintCutsceneSetting(SelectContext* this, GfxPrint* printer, u16 csI switch (csIndex) { case 0: - label = "\x8D ﾖﾙ \x8Cｺﾞﾛﾝ"; + label = GFXP_HIRAGANA " ﾖﾙ " GFXP_KATAKANA "ｺﾞﾛﾝ"; gSaveContext.dayTime = 0; break; case 0x8000: // clang-format off - gSaveContext.dayTime = 0x8000; label = "\x8Dｵﾋﾙ \x8Cｼﾞｬﾗ"; + gSaveContext.dayTime = 0x8000; label = GFXP_HIRAGANA "ｵﾋﾙ " GFXP_KATAKANA "ｼﾞｬﾗ"; // clang-format on break; case 0xFFF0: @@ -517,7 +631,7 @@ void Select_PrintCutsceneSetting(SelectContext* this, GfxPrint* printer, u16 csI }; gSaveContext.skyboxTime = gSaveContext.dayTime; - GfxPrint_Printf(printer, "Stage:\x8C%s", label); + GfxPrint_Printf(printer, "Stage:" GFXP_KATAKANA "%s", label); } void Select_DrawMenu(SelectContext* this) { @@ -531,6 +645,7 @@ void Select_DrawMenu(SelectContext* this) { SET_FULLSCREEN_VIEWPORT(&this->view); func_800AAA50(&this->view, 0xF); func_80094140(gfxCtx); + printer = alloca(sizeof(GfxPrint)); GfxPrint_Init(printer); GfxPrint_Open(printer, POLY_OPA_DISP); @@ -554,6 +669,7 @@ void Select_DrawLoadingScreen(SelectContext* this) { SET_FULLSCREEN_VIEWPORT(&this->view); func_800AAA50(&this->view, 0xF); func_80094140(gfxCtx); + printer = alloca(sizeof(GfxPrint)); GfxPrint_Init(printer); GfxPrint_Open(printer, POLY_OPA_DISP); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index 8156fc0737..a9b9eb6188 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -43,35 +43,35 @@ void KaleidoScope_DrawDebugEditorText(Gfx** gfxp) { GfxPrint_SetPos(&printer, 4, 2); GfxPrint_SetColor(&printer, 255, 60, 0, 255); - GfxPrint_Printf(&printer, "%s", "\x8Cﾙﾋﾟｰ"); // "Rupee" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾙﾋﾟｰ"); // "Rupee" GfxPrint_SetPos(&printer, 15, 2); - GfxPrint_Printf(&printer, "%s", "\x8Cﾊｰﾄ"); // "Heart" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾊｰﾄ"); // "Heart" GfxPrint_SetPos(&printer, 26, 3); GfxPrint_Printf(&printer, "%s", "/4"); GfxPrint_SetPos(&printer, 4, 5); - GfxPrint_Printf(&printer, "%s", "\x8Cｱｲﾃﾑ"); // "Item" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｱｲﾃﾑ"); // "Item" GfxPrint_SetPos(&printer, 4, 13); GfxPrint_Printf(&printer, "%s", "KEY"); GfxPrint_SetPos(&printer, 4, 15); - GfxPrint_Printf(&printer, "%s", "\x8Dｿｳﾋﾞ"); // "Equipment" + GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ｿｳﾋﾞ"); // "Equipment" GfxPrint_SetPos(&printer, 23, 14); - GfxPrint_Printf(&printer, "%s", "\x8Cｹﾝ"); // "Sword" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｹﾝ"); // "Sword" GfxPrint_SetPos(&printer, 23, 15); - GfxPrint_Printf(&printer, "%s", "\x8Cﾀﾃ"); // "Shield" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾀﾃ"); // "Shield" GfxPrint_SetPos(&printer, 4, 17); GfxPrint_Printf(&printer, "%s", "MAP"); GfxPrint_SetPos(&printer, 4, 19); - GfxPrint_Printf(&printer, "%s", "\x8Dﾌｳｲﾝ"); // "Seal" + GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ﾌｳｲﾝ"); // "Seal" GfxPrint_SetPos(&printer, 20, 19); - GfxPrint_Printf(&printer, "%s", "\x8Dｾｲﾚｲｾｷ"); // "Spiritual Stone" + GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ｾｲﾚｲｾｷ"); // "Spiritual Stone" GfxPrint_SetPos(&printer, 4, 21); - GfxPrint_Printf(&printer, "%s", "\x8Cｵｶﾘﾅ"); // "Ocarina" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｵｶﾘﾅ"); // "Ocarina" GfxPrint_SetPos(&printer, 4, 24); - GfxPrint_Printf(&printer, "%s", "\x8Cｺﾚｸﾄ"); // "Collect" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｺﾚｸﾄ"); // "Collect" GfxPrint_SetPos(&printer, 14, 24); - GfxPrint_Printf(&printer, "%s", "\x8Cｷﾝｽﾀ"); // "Skulltula" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｷﾝｽﾀ"); // "Skulltula" GfxPrint_SetPos(&printer, 23, 24); - GfxPrint_Printf(&printer, "%s", "\x8Cｶｹﾗ"); // "Gold Token" + GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｶｹﾗ"); // "Gold Token" GfxPrint_SetPos(&printer, 28, 24); GfxPrint_Printf(&printer, "%s", "/4");