From 1f9bf023a08df21cf1099e11f432d6c643343d13 Mon Sep 17 00:00:00 2001 From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> Date: Sun, 1 Jun 2025 17:10:49 +0200 Subject: [PATCH] Document kaleido debug menu (#2506) * Document kaleido debug menu * Fix BSS * bss * Address reviews * bss * add #pragma increment_block_number to z_parameter and let CI do its thing * bss * buffer -> digitBuf * reformat comments on sSectionPositions. trick clang-format into not ruining the array by adding // comments on their own line * rename to KaleidoScope_DrawInventoryEditor --------- Co-authored-by: Dragorn421 --- include/z64pause.h | 9 +- src/boot/z_std_dma.c | 4 +- src/code/flg_set.c | 2 +- src/code/main.c | 2 +- src/code/z_bgcheck.c | 2 +- src/code/z_camera.c | 2 +- src/code/z_kaleido_scope_call.c | 2 +- src/code/z_kaleido_setup.c | 4 +- src/code/z_parameter.c | 6 +- src/code/z_player_lib.c | 4 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 4 +- .../misc/ovl_kaleido_scope/z_kaleido_debug.c | 422 ++++++++++++------ .../misc/ovl_kaleido_scope/z_kaleido_item.c | 2 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 15 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 2 +- 15 files changed, 314 insertions(+), 168 deletions(-) diff --git a/include/z64pause.h b/include/z64pause.h index da0e56038a..24f53a93d8 100644 --- a/include/z64pause.h +++ b/include/z64pause.h @@ -79,11 +79,18 @@ typedef enum PauseState { /* 19 */ PAUSE_STATE_RESUME_GAMEPLAY // Handles returning to normal gameplay once the pause menu is visually closed } PauseState; +typedef enum PauseDebugState { + /* 0 */ PAUSE_DEBUG_STATE_CLOSED, + /* 1 */ PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING, + /* 2 */ PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN, + /* 3 */ PAUSE_DEBUG_STATE_FLAG_SET_OPEN +} PauseDebugState; + #define IS_PAUSE_STATE_GAMEOVER(pauseCtx) \ (((pauseCtx)->state >= PAUSE_STATE_GAME_OVER_START) && ((pauseCtx)->state <= PAUSE_STATE_GAME_OVER_FINISH)) #define IS_PAUSED(pauseCtx) \ - (((pauseCtx)->state != PAUSE_STATE_OFF) || ((pauseCtx)->debugState != 0)) + (((pauseCtx)->state != PAUSE_STATE_OFF) || ((pauseCtx)->debugState != PAUSE_DEBUG_STATE_CLOSED)) // Sub-states of PAUSE_STATE_MAIN typedef enum PauseMainState { diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index f38edf74a4..7678168549 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -45,8 +45,8 @@ #include "z64dma.h" #include "z64thread.h" -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:86" \ - "pal-1.0:84 pal-1.1:84" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:82" \ + "pal-1.0:80 pal-1.1:80" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; diff --git a/src/code/flg_set.c b/src/code/flg_set.c index 88f32a3e4e..efc044074a 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -184,7 +184,7 @@ void FlagSet_Update(PlayState* play) { } if (CHECK_BTN_ALL(input->press.button, BTN_L)) { - play->pauseCtx.debugState = 0; + play->pauseCtx.debugState = PAUSE_DEBUG_STATE_CLOSED; } CLOSE_DISPS(gfxCtx, "../flg_set.c", 241); diff --git a/src/code/main.c b/src/code/main.c index 9bd722f9ce..902e624aa6 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -44,7 +44,7 @@ extern struct IrqMgr gIrqMgr; #include "z64thread.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ique-cn:0 ntsc-1.0:54 ntsc-1.1:54 ntsc-1.2:54 pal-1.0:52 pal-1.1:52" + "ique-cn:0 ntsc-1.0:51 ntsc-1.1:51 ntsc-1.2:51 pal-1.0:49 pal-1.1:49" extern u8 _buffersSegmentEnd[]; diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 945051552a..65ff40ee46 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -14,7 +14,7 @@ #include "z64player.h" #include "z64skin_matrix.h" -#pragma increment_block_number "ntsc-1.0:152 ntsc-1.1:152 ntsc-1.2:152" +#pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144" u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList); void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector); diff --git a/src/code/z_camera.c b/src/code/z_camera.c index cf18c3634a..cf5ed30730 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -3661,7 +3661,7 @@ s32 Camera_KeepOn3(Camera* camera) { } #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ique-cn:128 ntsc-1.0:86 ntsc-1.1:86 ntsc-1.2:86 pal-1.0:86 pal-1.1:86" + "ique-cn:128 ntsc-1.0:83 ntsc-1.1:83 ntsc-1.2:83 pal-1.0:83 pal-1.1:83" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 2707db8265..1e225eb670 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -1,4 +1,4 @@ -#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80 ique-cn:80" \ +#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80 ique-cn:64" \ "ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96" #include "libu64/debug.h" diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 2cffb853f5..6401f3fef3 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -79,7 +79,7 @@ void KaleidoSetup_Update(PlayState* play) { if (CHECK_BTN_ALL(input->cur.button, BTN_L) && CHECK_BTN_ALL(input->press.button, BTN_CUP)) { if (DEBUG_FEATURES && BREG(0)) { - pauseCtx->debugState = 3; + pauseCtx->debugState = PAUSE_DEBUG_STATE_FLAG_SET_OPEN; } } else if (CHECK_BTN_ALL(input->press.button, BTN_START)) { // The start button was pressed, pause @@ -134,7 +134,7 @@ void KaleidoSetup_Init(PlayState* play) { PauseContext* pauseCtx = &play->pauseCtx; pauseCtx->state = PAUSE_STATE_OFF; - pauseCtx->debugState = 0; + pauseCtx->debugState = PAUSE_DEBUG_STATE_CLOSED; pauseCtx->eye.x = pauseCtx->eye.y = 0.0f; pauseCtx->eye.z = 64.0f; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index b6d5c911a2..6ae3959c86 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -29,6 +29,8 @@ #include "assets/textures/do_action_static/do_action_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" +#pragma increment_block_number "gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" + typedef struct RestrictionFlags { /* 0x00 */ u8 sceneId; /* 0x01 */ u8 flags1; @@ -3221,7 +3223,7 @@ void Interface_Draw(PlayState* play) { gSPSegment(OVERLAY_DISP++, 0x08, interfaceCtx->iconItemSegment); gSPSegment(OVERLAY_DISP++, 0x0B, interfaceCtx->mapSegment); - if (pauseCtx->debugState == 0) { + if (pauseCtx->debugState == PAUSE_DEBUG_STATE_CLOSED) { Interface_InitVertices(play); func_8008A994(interfaceCtx); Health_DrawMeter(play); @@ -4026,7 +4028,7 @@ void Interface_Draw(PlayState* play) { } #if DEBUG_FEATURES - if (pauseCtx->debugState == 3) { + if (pauseCtx->debugState == PAUSE_DEBUG_STATE_FLAG_SET_OPEN) { FlagSet_Update(play); } #endif diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 6e18ae1ccd..3ce2143c5b 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -17,8 +17,8 @@ #include "assets/objects/object_link_boy/object_link_boy.h" #include "assets/objects/object_link_child/object_link_child.h" -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "pal-1.0:0 pal-1.1:0" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 pal-1.0:0" \ + "pal-1.1:0" typedef struct BowSlingshotStringData { /* 0x00 */ Gfx* dList; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 58929bd248..7f3c3eb85b 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -37,8 +37,8 @@ #include "cic6105.h" #endif -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:0" \ - "ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:128" \ + "ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 a8433e9f2e..b849ca74b4 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -6,35 +6,165 @@ #include "gfx_setupdl.h" #include "gfxalloc.h" #include "printf.h" +#include "translation.h" #include "z64play.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" +typedef enum DebugSection { + /* 0x00 */ SECTION_RUPEES, + /* 0x01 */ SECTION_HEALTH_CAPACITY, + /* 0x02 */ SECTION_CURRENT_HEALTH, + /* 0x03 */ SECTION_FIRST_INVENTORY_SLOT, + /* 0x1A */ SECTION_LAST_INVENTORY_SLOT = 0x1A, + /* 0x1B */ SECTION_FIRST_KEY_COUNT, + /* 0x2B */ SECTION_LAST_KEY_COUNT = 0x2B, + /* 0x2C */ SECTION_FIRST_UPGRADE, + /* 0x33 */ SECTION_LAST_UPGRADE = 0x33, + /* 0x34 */ SECTION_FIRST_EQUIPMENT, + /* 0x37 */ SECTION_LAST_EQUIPMENT = 0x37, + /* 0x38 */ SECTION_FIRST_DUNGEON_ITEMS, + /* 0x43 */ SECTION_LAST_DUNGEON_ITEMS = 0x43, + /* 0x44 */ SECTION_FIRST_MEDALLION, + /* 0x49 */ SECTION_LAST_MEDALLION = 0x49, + /* 0x4A */ SECTION_FIRST_SONG, + /* 0x55 */ SECTION_LAST_SONG = 0x55, + /* 0x56 */ SECTION_FIRST_SPIRITUAL_STONE, + /* 0x58 */ SECTION_LAST_SPIRITUAL_STONE = 0x58, + /* 0x59 */ SECTION_STONE_OF_AGONY, + /* 0x5A */ SECTION_GERUDO_CARD, + /* 0x5B */ SECTION_SKULL_TOKENS, + /* 0x5C */ SECTION_HEART_PIECES, + /* 0x5D */ SECTION_MAX +} DebugSection; + // Positions of each input section in the editor -static u16 sSectionPositions[][2] = { - { 64, 15 }, { 144, 15 }, { 170, 15 }, { 78, 35 }, { 104, 35 }, { 130, 35 }, { 156, 35 }, { 182, 35 }, - { 208, 35 }, { 78, 50 }, { 104, 50 }, { 130, 50 }, { 156, 50 }, { 182, 50 }, { 208, 50 }, { 78, 65 }, - { 104, 65 }, { 130, 65 }, { 156, 65 }, { 182, 65 }, { 208, 65 }, { 78, 80 }, { 104, 80 }, { 130, 80 }, - { 156, 80 }, { 182, 80 }, { 208, 80 }, { 78, 98 }, { 88, 98 }, { 98, 98 }, { 108, 98 }, { 118, 98 }, - { 128, 98 }, { 138, 98 }, { 148, 98 }, { 158, 98 }, { 168, 98 }, { 178, 98 }, { 188, 98 }, { 198, 98 }, - { 208, 98 }, { 218, 98 }, { 228, 98 }, { 238, 98 }, { 78, 115 }, { 90, 115 }, { 102, 115 }, { 114, 115 }, - { 126, 115 }, { 138, 115 }, { 150, 115 }, { 162, 115 }, { 202, 115 }, { 214, 115 }, { 226, 115 }, { 238, 115 }, - { 78, 132 }, { 90, 132 }, { 102, 132 }, { 114, 132 }, { 126, 132 }, { 138, 132 }, { 150, 132 }, { 162, 132 }, - { 174, 132 }, { 186, 132 }, { 198, 132 }, { 210, 132 }, { 78, 149 }, { 90, 149 }, { 102, 149 }, { 114, 149 }, - { 126, 149 }, { 138, 149 }, { 78, 166 }, { 90, 166 }, { 102, 166 }, { 114, 166 }, { 126, 166 }, { 138, 166 }, - { 150, 166 }, { 162, 166 }, { 174, 166 }, { 186, 166 }, { 198, 166 }, { 210, 166 }, { 210, 149 }, { 222, 149 }, - { 234, 149 }, { 78, 185 }, { 90, 185 }, { 145, 185 }, { 210, 185 }, +static u16 sSectionPositions[SECTION_MAX][2] = { + { 64, 15 }, // SECTION_RUPEES + { 144, 15 }, // SECTION_HEALTH_CAPACITY + { 170, 15 }, // SECTION_CURRENT_HEALTH + + { 78, 35 }, // SECTION_FIRST_INVENTORY_SLOT + { 104, 35 }, + { 130, 35 }, + { 156, 35 }, + { 182, 35 }, + { 208, 35 }, + // + { 78, 50 }, + { 104, 50 }, + { 130, 50 }, + { 156, 50 }, + { 182, 50 }, + { 208, 50 }, + // + { 78, 65 }, + { 104, 65 }, + { 130, 65 }, + { 156, 65 }, + { 182, 65 }, + { 208, 65 }, + // + { 78, 80 }, + { 104, 80 }, + { 130, 80 }, + { 156, 80 }, + { 182, 80 }, + { 208, 80 }, // SECTION_LAST_INVENTORY_SLOT + + { 78, 98 }, // SECTION_FIRST_KEY_COUNT + { 88, 98 }, + { 98, 98 }, + { 108, 98 }, + { 118, 98 }, + { 128, 98 }, + { 138, 98 }, + { 148, 98 }, + { 158, 98 }, + { 168, 98 }, + { 178, 98 }, + { 188, 98 }, + { 198, 98 }, + { 208, 98 }, + { 218, 98 }, + { 228, 98 }, + { 238, 98 }, // SECTION_LAST_KEY_COUNT + + { 78, 115 }, // SECTION_FIRST_UPGRADE + { 90, 115 }, + { 102, 115 }, + { 114, 115 }, + { 126, 115 }, + { 138, 115 }, + { 150, 115 }, + { 162, 115 }, // SECTION_LAST_UPGRADE + + { 202, 115 }, // SECTION_FIRST_EQUIPMENT + { 214, 115 }, + { 226, 115 }, + { 238, 115 }, // SECTION_LAST_EQUIPMENT + + { 78, 132 }, // SECTION_FIRST_DUNGEON_ITEMS + { 90, 132 }, + { 102, 132 }, + { 114, 132 }, + { 126, 132 }, + { 138, 132 }, + { 150, 132 }, + { 162, 132 }, + { 174, 132 }, + { 186, 132 }, + { 198, 132 }, + { 210, 132 }, // SECTION_LAST_DUNGEON_ITEMS + + { 78, 149 }, // SECTION_FIRST_MEDALLION + { 90, 149 }, + { 102, 149 }, + { 114, 149 }, + { 126, 149 }, + { 138, 149 }, // SECTION_LAST_MEDALLION + + { 78, 166 }, // SECTION_FIRST_SONG + { 90, 166 }, + { 102, 166 }, + { 114, 166 }, + { 126, 166 }, + { 138, 166 }, + { 150, 166 }, + { 162, 166 }, + { 174, 166 }, + { 186, 166 }, + { 198, 166 }, + { 210, 166 }, // SECTION_LAST_SONG + + { 210, 149 }, // SECTION_FIRST_SPIRITUAL_STONE + { 222, 149 }, + { 234, 149 }, // SECTION_LAST_SPIRITUAL_STONE + + { 78, 185 }, // SECTION_STONE_OF_AGONY + { 90, 185 }, // SECTION_GERUDO_CARD + { 145, 185 }, // SECTION_SKULL_TOKENS + { 210, 185 }, // SECTION_HEART_PIECES }; // First section of each row in the editor (starting from the top) static u16 sRowFirstSections[] = { - 0x00, 0x03, 0x1B, 0x2C, 0x34, 0x38, 0x44, 0x4A, 0x56, 0x59, 0x5C, + SECTION_RUPEES, SECTION_FIRST_INVENTORY_SLOT, SECTION_FIRST_KEY_COUNT, + SECTION_FIRST_UPGRADE, SECTION_FIRST_EQUIPMENT, SECTION_FIRST_DUNGEON_ITEMS, + SECTION_FIRST_MEDALLION, SECTION_FIRST_SONG, SECTION_FIRST_SPIRITUAL_STONE, + SECTION_STONE_OF_AGONY, SECTION_HEART_PIECES, }; -// Maximum value of each upgrade type static u8 sMaxUpgradeValues[] = { - 3, 3, 3, 2, 2, 3, 3, 3, + /* UPG_QUIVER */ 3, + /* UPG_BOMB_BAG */ 3, + /* UPG_STRENGTH */ 3, + /* UPG_SCALE */ 2, + /* UPG_WALLET */ 2, + /* UPG_BULLET_BAG */ 3, + /* UPG_DEKU_STICKS */ 3, + /* UPG_DEKU_NUTS */ 3, }; // Item ID corresponding to each slot, aside from bottles and trade items @@ -44,7 +174,7 @@ static s16 sSlotItems[] = { ITEM_BOOMERANG, ITEM_LENS_OF_TRUTH, ITEM_MAGIC_BEAN, ITEM_HAMMER, ITEM_ARROW_LIGHT, ITEM_NAYRUS_LOVE, }; -void KaleidoScope_DrawDebugEditorText(Gfx** gfxP) { +void KaleidoScope_DrawInventoryEditorText(Gfx** gfxP) { GfxPrint printer; s32 pad[2]; @@ -53,35 +183,35 @@ void KaleidoScope_DrawDebugEditorText(Gfx** gfxP) { GfxPrint_SetPos(&printer, 4, 2); GfxPrint_SetColor(&printer, 255, 60, 0, 255); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾙﾋﾟｰ"); // "Rupee" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ﾙﾋﾟｰ", "Rupee")); GfxPrint_SetPos(&printer, 15, 2); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾊｰﾄ"); // "Heart" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ﾊｰﾄ", "Heart")); GfxPrint_SetPos(&printer, 26, 3); GfxPrint_Printf(&printer, "%s", "/4"); GfxPrint_SetPos(&printer, 4, 5); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｱｲﾃﾑ"); // "Item" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｱｲﾃﾑ", "Item")); GfxPrint_SetPos(&printer, 4, 13); GfxPrint_Printf(&printer, "%s", "KEY"); GfxPrint_SetPos(&printer, 4, 15); - GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ｿｳﾋﾞ"); // "Equipment" + GfxPrint_Printf(&printer, "%s", T(GFXP_HIRAGANA "ｿｳﾋﾞ", "Equipment")); GfxPrint_SetPos(&printer, 23, 14); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｹﾝ"); // "Sword" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｹﾝ", "Sword")); GfxPrint_SetPos(&printer, 23, 15); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ﾀﾃ"); // "Shield" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ﾀﾃ", "Shield")); GfxPrint_SetPos(&printer, 4, 17); GfxPrint_Printf(&printer, "%s", "MAP"); GfxPrint_SetPos(&printer, 4, 19); - GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ﾌｳｲﾝ"); // "Seal" + GfxPrint_Printf(&printer, "%s", T(GFXP_HIRAGANA "ﾌｳｲﾝ", "Seal")); GfxPrint_SetPos(&printer, 20, 19); - GfxPrint_Printf(&printer, "%s", GFXP_HIRAGANA "ｾｲﾚｲｾｷ"); // "Spiritual Stone" + GfxPrint_Printf(&printer, "%s", T(GFXP_HIRAGANA "ｾｲﾚｲｾｷ", "Spiritual Stone")); GfxPrint_SetPos(&printer, 4, 21); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｵｶﾘﾅ"); // "Ocarina" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｵｶﾘﾅ", "Ocarina")); GfxPrint_SetPos(&printer, 4, 24); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｺﾚｸﾄ"); // "Collect" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｺﾚｸﾄ", "Collect")); GfxPrint_SetPos(&printer, 14, 24); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｷﾝｽﾀ"); // "Skulltula" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｷﾝｽﾀ", "Skulltula")); GfxPrint_SetPos(&printer, 23, 24); - GfxPrint_Printf(&printer, "%s", GFXP_KATAKANA "ｶｹﾗ"); // "Gold Token" + GfxPrint_Printf(&printer, "%s", T(GFXP_KATAKANA "ｶｹﾗ", "Gold Token")); GfxPrint_SetPos(&printer, 28, 24); GfxPrint_Printf(&printer, "%s", "/4"); @@ -101,8 +231,8 @@ void KaleidoScope_DrawDigit(PlayState* play, s32 digit, s32 rectLeft, s32 rectTo CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_debug.c", 220); } -void KaleidoScope_DrawDebugEditor(PlayState* play) { - static s16 curSection = 0; +void KaleidoScope_DrawInventoryEditor(PlayState* play) { + static s16 curSection = SECTION_RUPEES; static s16 curRow = 0; static s32 prevDBtnInput = 0; static s32 heldDBtnTimer = 0; @@ -110,7 +240,8 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { Input* input = &play->state.input[0]; Gfx* gfx; Gfx* gfxRef; - s16 spD8[4]; + // Used for both storing the digits of the drawn numbers and digit positions + s16 digitBuf[4]; s16 slot; s16 i; s16 j; @@ -137,7 +268,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gfx = Gfx_Open(gfxRef); gSPDisplayList(OVERLAY_DISP++, gfx); - KaleidoScope_DrawDebugEditorText(&gfx); + KaleidoScope_DrawInventoryEditorText(&gfx); gSPEndDisplayList(gfx++); Gfx_Close(gfxRef, gfx); @@ -154,162 +285,162 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); // Rupees - spD8[0] = spD8[1] = spD8[2] = 0; - spD8[3] = gSaveContext.save.info.playerData.rupees; - while (spD8[3] >= 1000) { - spD8[0]++; - spD8[3] -= 1000; + digitBuf[0] = digitBuf[1] = digitBuf[2] = 0; + digitBuf[3] = gSaveContext.save.info.playerData.rupees; + while (digitBuf[3] >= 1000) { + digitBuf[0]++; + digitBuf[3] -= 1000; } - while (spD8[3] >= 100) { - spD8[1]++; - spD8[3] -= 100; + while (digitBuf[3] >= 100) { + digitBuf[1]++; + digitBuf[3] -= 100; } - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } for (i = 0, x = 68; i < 4; i++, x += 10) { - KaleidoScope_DrawDigit(play, spD8[i], x, 15); + KaleidoScope_DrawDigit(play, digitBuf[i], x, 15); } // Health capacity - spD8[2] = 0; - spD8[3] = gSaveContext.save.info.playerData.healthCapacity / 0x10; - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + digitBuf[2] = 0; + digitBuf[3] = gSaveContext.save.info.playerData.healthCapacity / 0x10; + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } - KaleidoScope_DrawDigit(play, spD8[2], 146, 15); - KaleidoScope_DrawDigit(play, spD8[3], 156, 15); + KaleidoScope_DrawDigit(play, digitBuf[2], 146, 15); + KaleidoScope_DrawDigit(play, digitBuf[3], 156, 15); // Health - spD8[2] = 0; - spD8[3] = gSaveContext.save.info.playerData.health / 0x10; - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + digitBuf[2] = 0; + digitBuf[3] = gSaveContext.save.info.playerData.health / 0x10; + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } - KaleidoScope_DrawDigit(play, spD8[2], 172, 15); - KaleidoScope_DrawDigit(play, spD8[3], 182, 15); + KaleidoScope_DrawDigit(play, digitBuf[2], 172, 15); + KaleidoScope_DrawDigit(play, digitBuf[3], 182, 15); // Inventory for (slot = 0, i = 0, y = 35; i < 4; i++, y += 15) { for (j = 0, x = 78; j < 6; j++, slot++, x += 26) { - spD8[2] = 0; + digitBuf[2] = 0; if ((slot <= SLOT_BOW) || (slot == SLOT_SLINGSHOT) || (slot == SLOT_BOMBCHU) || (slot == SLOT_MAGIC_BEAN)) { - spD8[3] = AMMO(gAmmoItems[slot]); + digitBuf[3] = AMMO(gAmmoItems[slot]); } else if (slot == SLOT_OCARINA) { - spD8[3] = gSaveContext.save.info.inventory.items[slot]; + digitBuf[3] = gSaveContext.save.info.inventory.items[slot]; } else { - spD8[3] = gSaveContext.save.info.inventory.items[slot]; + digitBuf[3] = gSaveContext.save.info.inventory.items[slot]; } - if (spD8[3] != ITEM_NONE) { - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + if (digitBuf[3] != ITEM_NONE) { + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } } else { - spD8[2] = spD8[3] = 0; + digitBuf[2] = digitBuf[3] = 0; } - KaleidoScope_DrawDigit(play, spD8[2], x, y); - KaleidoScope_DrawDigit(play, spD8[3], x + 10, y); + KaleidoScope_DrawDigit(play, digitBuf[2], x, y); + KaleidoScope_DrawDigit(play, digitBuf[3], x + 10, y); } } // Keys - for (spD8[1] = 78, i = 0; i < 17; i++) { - spD8[2] = 0; + for (digitBuf[1] = 78, i = 0; i < 17; i++) { + digitBuf[2] = 0; - if ((spD8[3] = gSaveContext.save.info.inventory.dungeonKeys[i]) >= 0) { - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + if ((digitBuf[3] = gSaveContext.save.info.inventory.dungeonKeys[i]) >= 0) { + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } } else { - spD8[2] = spD8[3] = 0; + digitBuf[2] = digitBuf[3] = 0; } - KaleidoScope_DrawDigit(play, spD8[3], spD8[1], 98); - spD8[1] += 10; + KaleidoScope_DrawDigit(play, digitBuf[3], digitBuf[1], 98); + digitBuf[1] += 10; } // Upgrades - for (spD8[1] = 78, i = 0; i < 8; i++, spD8[1] += 12) { - KaleidoScope_DrawDigit(play, CUR_UPG_VALUE(i), spD8[1], 115); + for (digitBuf[1] = 78, i = 0; i < 8; i++, digitBuf[1] += 12) { + KaleidoScope_DrawDigit(play, CUR_UPG_VALUE(i), digitBuf[1], 115); } // Equipment - for (spD8[1] = 202, i = 0; i < 4; i++, spD8[1] += 12) { - KaleidoScope_DrawDigit(play, ALL_EQUIP_VALUE(i), spD8[1], 115); + for (digitBuf[1] = 202, i = 0; i < 4; i++, digitBuf[1] += 12) { + KaleidoScope_DrawDigit(play, ALL_EQUIP_VALUE(i), digitBuf[1], 115); } // Dungeon Items - for (spD8[1] = 78, i = 0; i < 12; i++, spD8[1] += 12) { - spD8[2] = gSaveContext.save.info.inventory.dungeonItems[i] & gEquipMasks[0]; - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 132); + for (digitBuf[1] = 78, i = 0; i < 12; i++, digitBuf[1] += 12) { + digitBuf[2] = gSaveContext.save.info.inventory.dungeonItems[i] & gEquipMasks[0]; + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 132); } // Medallions - for (spD8[1] = 78, i = 0; i < 6; i++, spD8[1] += 12) { - spD8[2] = 0; + for (digitBuf[1] = 78, i = 0; i < 6; i++, digitBuf[1] += 12) { + digitBuf[2] = 0; if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST + i)) { - spD8[2] = 1; + digitBuf[2] = 1; } - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 149); + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 149); } // Spiritual Stones - for (spD8[1] = 210, i = 0; i < 3; i++, spD8[1] += 12) { - spD8[2] = 0; + for (digitBuf[1] = 210, i = 0; i < 3; i++, digitBuf[1] += 12) { + digitBuf[2] = 0; if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD + i)) { - spD8[2] = 1; + digitBuf[2] = 1; } - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 149); + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 149); } // Songs - for (spD8[1] = 78, i = 0; i < 12; i++, spD8[1] += 12) { - spD8[2] = 0; + for (digitBuf[1] = 78, i = 0; i < 12; i++, digitBuf[1] += 12) { + digitBuf[2] = 0; if (CHECK_QUEST_ITEM(QUEST_SONG_MINUET + i)) { - spD8[2] = 1; + digitBuf[2] = 1; } - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 166); + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 166); } // Other Quest Items - for (spD8[1] = 78, i = 0; i < 2; i++, spD8[1] += 12) { - spD8[2] = 0; + for (digitBuf[1] = 78, i = 0; i < 2; i++, digitBuf[1] += 12) { + digitBuf[2] = 0; if (CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY + i)) { - spD8[2] = 1; + digitBuf[2] = 1; } - KaleidoScope_DrawDigit(play, spD8[2], spD8[1], 185); + KaleidoScope_DrawDigit(play, digitBuf[2], digitBuf[1], 185); } // GS Tokens - spD8[3] = gSaveContext.save.info.inventory.gsTokens; - spD8[1] = 0; - spD8[2] = 0; - while (spD8[3] >= 100) { - spD8[1]++; - spD8[3] -= 100; + digitBuf[3] = gSaveContext.save.info.inventory.gsTokens; + digitBuf[1] = 0; + digitBuf[2] = 0; + while (digitBuf[3] >= 100) { + digitBuf[1]++; + digitBuf[3] -= 100; } - while (spD8[3] >= 10) { - spD8[2]++; - spD8[3] -= 10; + while (digitBuf[3] >= 10) { + digitBuf[2]++; + digitBuf[3] -= 10; } - KaleidoScope_DrawDigit(play, spD8[1], 145, 185); - KaleidoScope_DrawDigit(play, spD8[2], 155, 185); - KaleidoScope_DrawDigit(play, spD8[3], 165, 185); + KaleidoScope_DrawDigit(play, digitBuf[1], 145, 185); + KaleidoScope_DrawDigit(play, digitBuf[2], 155, 185); + KaleidoScope_DrawDigit(play, digitBuf[3], 165, 185); // Heart Pieces (X / 4) KaleidoScope_DrawDigit( @@ -341,18 +472,18 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } curSection = sRowFirstSections[curRow]; } else if (CHECK_BTN_ANY(dBtnInput, BTN_DLEFT)) { - if (--curSection < 0) { - curSection = 0x5C; + if (--curSection < SECTION_RUPEES) { + curSection = SECTION_HEART_PIECES; } } else if (CHECK_BTN_ANY(dBtnInput, BTN_DRIGHT)) { - if (++curSection > 0x5C) { - curSection = 0; + if (++curSection > SECTION_HEART_PIECES) { + curSection = SECTION_RUPEES; } } // Handles the logic to change values based on the selected section switch (curSection) { - case 0: + case SECTION_RUPEES: if (CHECK_BTN_ALL(input->press.button, BTN_CUP)) { gSaveContext.save.info.playerData.rupees -= 100; if (gSaveContext.save.info.playerData.rupees < 0) { @@ -376,7 +507,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } break; - case 1: + case SECTION_HEALTH_CAPACITY: if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.playerData.healthCapacity -= 0x10; if (gSaveContext.save.info.playerData.healthCapacity < 0x30) { @@ -391,7 +522,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } break; - case 2: + case SECTION_CURRENT_HEALTH: if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { Health_ChangeBy(play, -4); } else if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { @@ -403,7 +534,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } break; - case 0x5C: + case SECTION_HEART_PIECES: if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { if ((((gSaveContext.save.info.inventory.questItems & 0xF0000000) & 0xF0000000) >> QUEST_HEART_PIECE_COUNT) != 0) { @@ -418,8 +549,8 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { break; default: - if (curSection < 0x1B) { - i = curSection - 3; + if (curSection <= SECTION_LAST_INVENTORY_SLOT) { + i = curSection - SECTION_FIRST_INVENTORY_SLOT; if ((i <= SLOT_BOW) || (i == SLOT_SLINGSHOT) || (i == SLOT_BOMBCHU) || (i == SLOT_MAGIC_BEAN)) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP)) { Inventory_DeleteItem(gAmmoItems[i], SLOT(gAmmoItems[i])); @@ -552,16 +683,16 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } } } - } else if (curSection < 0x2C) { + } else if (curSection <= SECTION_LAST_KEY_COUNT) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { - i = curSection - 0x1B; + i = curSection - SECTION_FIRST_KEY_COUNT; gSaveContext.save.info.inventory.dungeonKeys[i]--; if (gSaveContext.save.info.inventory.dungeonKeys[i] < 0) { gSaveContext.save.info.inventory.dungeonKeys[i] = -1; } } else if (CHECK_BTN_ALL(input->press.button, BTN_CDOWN) || CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { - i = curSection - 0x1B; + i = curSection - SECTION_FIRST_KEY_COUNT; if (gSaveContext.save.info.inventory.dungeonKeys[i] < 0) { gSaveContext.save.info.inventory.dungeonKeys[i] = 1; } else { @@ -572,9 +703,9 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } } } else { - if (curSection < 0x38) { - i = curSection - 0x2C; - if ((curSection >= 0x2C) && (curSection < 0x34)) { + if (curSection <= SECTION_LAST_EQUIPMENT) { + i = curSection - SECTION_FIRST_UPGRADE; + if ((curSection >= SECTION_FIRST_UPGRADE) && (curSection <= SECTION_LAST_UPGRADE)) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { if (CUR_UPG_VALUE(i) != 0) { @@ -587,7 +718,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } } } else { - i = curSection - 0x34; // 0 <= i < 4 + i = curSection - SECTION_FIRST_EQUIPMENT; // 0 <= i < 4 if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.inventory.equipment ^= OWNED_EQUIP_FLAG_ALT(i, 0); } @@ -601,8 +732,8 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gSaveContext.save.info.inventory.equipment ^= OWNED_EQUIP_FLAG_ALT(i, 3); } } - } else if (curSection < 0x44) { - i = curSection - 0x38; + } else if (curSection <= SECTION_LAST_DUNGEON_ITEMS) { + i = curSection - SECTION_FIRST_DUNGEON_ITEMS; if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.inventory.dungeonItems[i] ^= 4; } @@ -612,7 +743,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { gSaveContext.save.info.inventory.dungeonItems[i] ^= 1; } - } else if (curSection == 0x5B) { + } else if (curSection == SECTION_SKULL_TOKENS) { if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.inventory.gsTokens++; #if PLATFORM_N64 @@ -627,8 +758,8 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gSaveContext.save.info.inventory.gsTokens = 0; } } - } else if (curSection < 0x5C) { - i = curSection - 0x44; + } else if (curSection < SECTION_HEART_PIECES) { + i = curSection - SECTION_FIRST_MEDALLION; if (CHECK_BTN_ALL(input->press.button, BTN_CUP) || CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { gSaveContext.save.info.inventory.questItems ^= gBitFlags[i]; } @@ -643,23 +774,28 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { gDPSetCombineMode(POLY_OPA_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 200, 120); - if (curSection == 0) { + if (curSection == SECTION_RUPEES) { + // 4 digit long box gDPFillRectangle(POLY_OPA_DISP++, sSectionPositions[curSection][0], sSectionPositions[curSection][1], sSectionPositions[curSection][0] + 45, sSectionPositions[curSection][1] + 16); - } else if ((curSection >= 0x1B) || (curSection == 0x5B)) { + } else if ((curSection >= SECTION_FIRST_KEY_COUNT) || (curSection == SECTION_SKULL_TOKENS)) { + // 1 digit long box gDPFillRectangle(POLY_OPA_DISP++, sSectionPositions[curSection][0] - 2, sSectionPositions[curSection][1], sSectionPositions[curSection][0] + 14, sSectionPositions[curSection][1] + 16); } else { + // 2 digit long box gDPFillRectangle(POLY_OPA_DISP++, sSectionPositions[curSection][0] - 4, sSectionPositions[curSection][1], sSectionPositions[curSection][0] + 24, sSectionPositions[curSection][1] + 16); } // Handles exiting the inventory editor with the L button - // The editor is opened with `debugState` set to 1, and becomes closable after a frame once `debugState` is set to 2 - if (pauseCtx->debugState == 1) { - pauseCtx->debugState = 2; - } else if ((pauseCtx->debugState == 2) && CHECK_BTN_ALL(input->press.button, BTN_L)) { - pauseCtx->debugState = 0; + // The editor is opened with `debugState` set to PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING, + // and becomes closable after a frame once `debugState` is set to PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN + if (pauseCtx->debugState == PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING) { + pauseCtx->debugState = PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN; + } else if ((pauseCtx->debugState == PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN) && + CHECK_BTN_ALL(input->press.button, BTN_L)) { + pauseCtx->debugState = PAUSE_DEBUG_STATE_CLOSED; } CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_debug.c", 861); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 4a9389e9ce..96524d29ba 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -385,7 +385,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { index = cursorSlot * 4; // required to match? KaleidoScope_SetCursorPos(pauseCtx, index, pauseCtx->itemVtx); - if ((pauseCtx->debugState == 0) && (pauseCtx->state == PAUSE_STATE_MAIN) && + if ((pauseCtx->debugState == PAUSE_DEBUG_STATE_CLOSED) && (pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { if (CHECK_BTN_ANY(input->press.button, BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT)) { if (CHECK_AGE_REQ_SLOT(cursorSlot) && (cursorItem != ITEM_SOLD_OUT)) { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index 79a5d05193..f2f1966c9e 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -1103,9 +1103,9 @@ void KaleidoScope_SetupPageSwitch(PauseContext* pauseCtx, u8 pt) { } void KaleidoScope_HandlePageToggles(PauseContext* pauseCtx, Input* input) { - if ((pauseCtx->debugState == 0) && CHECK_BTN_ALL(input->press.button, BTN_L)) { + if ((pauseCtx->debugState == PAUSE_DEBUG_STATE_CLOSED) && CHECK_BTN_ALL(input->press.button, BTN_L)) { #if DEBUG_FEATURES - pauseCtx->debugState = 1; + pauseCtx->debugState = PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING; #endif return; } @@ -3397,7 +3397,7 @@ void KaleidoScope_Draw(PlayState* play) { gSPSegment(POLY_OPA_DISP++, 0x0C, pauseCtx->iconItemAltSegment); gSPSegment(POLY_OPA_DISP++, 0x0D, pauseCtx->iconItemLangSegment); - if (pauseCtx->debugState == 0) { + if (pauseCtx->debugState == PAUSE_DEBUG_STATE_CLOSED) { KaleidoScope_SetView(pauseCtx, pauseCtx->eye.x, pauseCtx->eye.y, pauseCtx->eye.z); Gfx_SetupDL_42Opa(play->state.gfxCtx); @@ -3419,8 +3419,9 @@ void KaleidoScope_Draw(PlayState* play) { KaleidoScope_DrawGameOver(play); } - if ((pauseCtx->debugState == 1) || (pauseCtx->debugState == 2)) { - KaleidoScope_DrawDebugEditor(play); + if ((pauseCtx->debugState == PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPENING) || + (pauseCtx->debugState == PAUSE_DEBUG_STATE_INVENTORY_EDITOR_OPEN)) { + KaleidoScope_DrawInventoryEditor(play); } CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3254); @@ -4312,7 +4313,7 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->alpha = 0; } } else { - pauseCtx->debugState = 0; + pauseCtx->debugState = PAUSE_DEBUG_STATE_CLOSED; pauseCtx->state = PAUSE_STATE_RESUME_GAMEPLAY; pauseCtx->itemPagePitch = pauseCtx->equipPagePitch = pauseCtx->mapPagePitch = pauseCtx->questPagePitch = 160.0f; @@ -4655,7 +4656,7 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->alpha = 0; } } else { - pauseCtx->debugState = 0; + pauseCtx->debugState = PAUSE_DEBUG_STATE_CLOSED; pauseCtx->state = PAUSE_STATE_RESUME_GAMEPLAY; pauseCtx->questPagePitch = 160.0f; pauseCtx->mapPagePitch = 160.0f; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index fcc84c5395..8c5d583887 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -220,7 +220,7 @@ typedef enum ItemQuad { void KaleidoScope_DrawQuestStatus(struct PlayState* play, GraphicsContext* gfxCtx); s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point); -void KaleidoScope_DrawDebugEditor(struct PlayState* play); +void KaleidoScope_DrawInventoryEditor(struct PlayState* play); void KaleidoScope_DrawPlayerWork(struct PlayState* play); void KaleidoScope_DrawEquipment(struct PlayState* play); void KaleidoScope_SetCursorPos(PauseContext* pauseCtx, u16 index, Vtx* vtx);