From fd8a2c948331f19d61e9b4392a6f6336f0bdd7a0 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Wed, 2 Nov 2022 11:50:47 -0400 Subject: [PATCH] Adds in-game menu for selecting a dungeon quest/randomizer (#1863) * Adds most visuals and interactions for quest select menu. * "Scrolling" menu, adds remaining sub/title textures, language support * Tweak: ENG, FRA, GER title to match the original style * ADD: Randomizer tex * TWEAK: Randomizer ZAPD extension format * Adds control stick prompts to the "scrolling" menu. * Adds third entry for Randomizer. * Bold text on randomizer subtitle. * Ensures the game won't allow selecting an unsupported quest. * Makes save files be created from the quest menu selection. * Removes the master quest and randomizer checkboxes (no longer needed). * Removes lock on MQ-only rando. * Skips quest select if only one quest is playable. * Adds ability to back out of quest select menu * Show seed icons while Randomizer is selected on Quest Select Menu. * Fixes custom hud colors and d-pad navigation. * Implements backing up from name entry to quest select. Also implements backwards rotations on the file select screen. Co-authored-by: PurpleHato --- .../gTitleRandomizerSubtitleTex.rgba32.png | Bin 0 -> 6971 bytes .../gFileSelPleaseChooseAQuestENGTex.ia8.png | Bin 0 -> 3682 bytes .../gFileSelPleaseChooseAQuestFRATex.ia8.png | Bin 0 -> 3852 bytes .../gFileSelPleaseChooseAQuestGERTex.ia8.png | Bin 0 -> 3666 bytes soh/include/z64.h | 25 + soh/soh/Enhancements/bootcommands.c | 5 - .../Enhancements/randomizer/randomizer.cpp | 36 +- soh/soh/GameMenuBar.cpp | 33 - soh/soh/SaveManager.cpp | 5 - soh/src/code/z_sram.c | 2 +- .../overlays/actors/ovl_En_Ossan/z_en_ossan.h | 17 - .../gamestates/ovl_file_choose/file_choose.h | 7 +- .../ovl_file_choose/z_file_choose.c | 948 ++++++++++++++---- .../ovl_file_choose/z_file_nameset_PAL.c | 9 +- 14 files changed, 787 insertions(+), 300 deletions(-) create mode 100644 OTRExporter/assets/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png create mode 100644 OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png create mode 100644 OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png create mode 100644 OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png diff --git a/OTRExporter/assets/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png b/OTRExporter/assets/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png new file mode 100644 index 0000000000000000000000000000000000000000..a61a058a8ac848b23010366cf497a29fbbc5ec0a GIT binary patch literal 6971 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 Jt=gUY{{wF#Q49b8 literal 0 HcmV?d00001 diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png b/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png new file mode 100644 index 0000000000000000000000000000000000000000..02ca600c2d90838979f3b8c34df878e2dae5c0cf GIT binary patch literal 3682 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 literal 0 HcmV?d00001 diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png b/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc17292b26f703123ee26b2ade96d2acfacaa13 GIT binary patch literal 3852 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 literal 0 HcmV?d00001 diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png b/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png new file mode 100644 index 0000000000000000000000000000000000000000..25f96cc2bd9398e4e5dcbe64e8bf8a7fd46018dd GIT binary patch literal 3666 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 literal 0 HcmV?d00001 diff --git a/soh/include/z64.h b/soh/include/z64.h index 274a293df..dada44b48 100644 --- a/soh/include/z64.h +++ b/soh/include/z64.h @@ -1322,6 +1322,23 @@ typedef struct { /* 0x00A8 */ View view; } OpeningContext; // size = 0x1D0 +typedef struct { + /* 0x00 */ u32 stickColorR; + /* 0x04 */ u32 stickColorG; + /* 0x08 */ u32 stickColorB; + /* 0x0C */ u32 stickColorA; + /* 0x10 */ f32 stickTexX; + /* 0x14 */ f32 stickTexY; + /* 0x18 */ u32 arrowColorR; + /* 0x1C */ u32 arrowColorG; + /* 0x20 */ u32 arrowColorB; + /* 0x24 */ u32 arrowColorA; + /* 0x28 */ f32 arrowTexX; + /* 0x2C */ f32 arrowTexY; + /* 0x30 */ f32 z; + /* 0x34 */ s32 isEnabled; +} StickDirectionPrompt; + typedef struct { /* 0x00000 */ GameState state; /* 0x000A4 */ Vtx* windowVtx; @@ -1392,6 +1409,14 @@ typedef struct { /* 0x1CAD2 */ s16 kbdY; /* 0x1CAD4 */ s16 newFileNameCharCount; /* 0x1CAD6 */ s16 unk_1CAD6[5]; + s16 logoAlpha; + s8 questType[3]; // 0 for Normal, 1 for MQ + StickDirectionPrompt stickLeftPrompt; + StickDirectionPrompt stickRightPrompt; + f32 arrowAnimTween; + f32 stickAnimTween; + u8 arrowAnimState; + u8 stickAnimState; } FileChooseContext; // size = 0x1CAE0 typedef enum { diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c index ff956105a..ebdda902e 100644 --- a/soh/soh/Enhancements/bootcommands.c +++ b/soh/soh/Enhancements/bootcommands.c @@ -27,11 +27,6 @@ void BootCommands_Init() CVar_RegisterS32("gHudColors", 0); //0 = N64 / 1 = NGC / 2 = Custom CVar_RegisterS32("gInvertYAxis", 1); CVar_RegisterS32("gTrailDuration", 4); // 4 = Default trail duration - if (ResourceMgr_GameHasMasterQuest() && !ResourceMgr_GameHasOriginal()) { - CVar_SetS32("gMasterQuest", 1); - } else if (!ResourceMgr_GameHasMasterQuest()) { - CVar_SetS32("gMasterQuest", 0); - } #if defined(__SWITCH__) || defined(__WIIU__) CVar_RegisterS32("gControlNav", 1); // always enable controller nav on switch/wii u #endif diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index eddd4cfb7..98e87178f 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -2590,42 +2590,30 @@ void DrawRandoEditor(bool& open) { return; } - if (OTRGlobals::Instance->HasMasterQuest() && !OTRGlobals::Instance->HasOriginal()) { - ImGui::Text("Coming Soon! Randomizer is currently not compatible with Master Quest Dungeons.\nFor now, please " - "generate an " - "OTR using a non-Master Quest rom to play the Randomizer"); - ImGui::End(); - return; - } - bool disableEditingRandoSettings = CVar_GetS32("gRandoGenerating", 0) || CVar_GetS32("gOnFileSelectNameEntry", 0); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableEditingRandoSettings); ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * (disableEditingRandoSettings ? 0.5f : 1.0f)); - UIWidgets::EnhancementCheckbox("Enable Randomizer", "gRandomizer"); - if (CVar_GetS32("gRandomizer", 0)) { - ImGui::Dummy(ImVec2(0.0f, 0.0f)); - if (ImGui::Button("Generate Seed")) { - if (CVar_GetS32("gRandoGenerating", 0) == 0) { - randoThread = std::thread(&GenerateRandomizerImgui); - } + ImGui::Dummy(ImVec2(0.0f, 0.0f)); + if (ImGui::Button("Generate Seed")) { + if (CVar_GetS32("gRandoGenerating", 0) == 0) { + randoThread = std::thread(&GenerateRandomizerImgui); } - ImGui::Dummy(ImVec2(0.0f, 0.0f)); - std::string spoilerfilepath = CVar_GetString("gSpoilerLog", ""); - ImGui::Text("Spoiler File: %s", spoilerfilepath.c_str()); - - // RANDOTODO settings presets - // std::string presetfilepath = CVar_GetString("gLoadedPreset", ""); - // ImGui::Text("Settings File: %s", presetfilepath.c_str()); } + ImGui::Dummy(ImVec2(0.0f, 0.0f)); + std::string spoilerfilepath = CVar_GetString("gSpoilerLog", ""); + ImGui::Text("Spoiler File: %s", spoilerfilepath.c_str()); + + // RANDOTODO settings presets + // std::string presetfilepath = CVar_GetString("gLoadedPreset", ""); + // ImGui::Text("Settings File: %s", presetfilepath.c_str()); UIWidgets::PaddedSeparator(); ImGuiWindow* window = ImGui::GetCurrentWindow(); static ImVec2 cellPadding(8.0f, 8.0f); - if (CVar_GetS32("gRandomizer", 0) && - ImGui::BeginTabBar("Randomizer Settings", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) { + if (ImGui::BeginTabBar("Randomizer Settings", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) { if (ImGui::BeginTabItem("World")) { ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding); if (ImGui::BeginTable("tableRandoWorld", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) { diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp index 1c04ba69c..9e9301df9 100644 --- a/soh/soh/GameMenuBar.cpp +++ b/soh/soh/GameMenuBar.cpp @@ -95,35 +95,6 @@ namespace GameMenuBar { Audio_SetGameVolume(SEQ_SFX, CVar_GetFloat("gFanfareVolume", 1)); } - bool MasterQuestCheckboxDisabled() { - return !(OTRGlobals::Instance->HasMasterQuest() && OTRGlobals::Instance->HasOriginal()) - || CVar_GetS32("gRandomizer", 0); - } - - std::string MasterQuestDisabledTooltip() { - std::string tooltip = ""; - if (CVar_GetS32("gRandomizer", 0)) { - tooltip = "This option is disabled because you have the Randomizer enabled.\nRandomizer has it's own " - "settings surrounding Master Quest dungeons\nthat you can set from the Randomizer Settings Menu."; - } - if (!OTRGlobals::Instance->HasOriginal()) { - tooltip = "This option is force-enabled because you have only loaded the\noot-mq.otr file. If you wish to " - "play the Original Quest,\nplease provide the oot.otr file."; - } - if (!OTRGlobals::Instance->HasMasterQuest()) { - tooltip = "This option is disabled because you have only loaded the\noot.otr file. If you wish to play " - "the Master Quest,\nplease proivde the oot-mq.otr file."; - } - return tooltip; - } - - UIWidgets::CheckboxGraphics MasterQuestDisabledGraphic() { - if (!OTRGlobals::Instance->HasOriginal()) { - return UIWidgets::CheckboxGraphics::Checkmark; - } - return UIWidgets::CheckboxGraphics::Cross; - } - void applyEnhancementPresetDefault(void) { // D-pad Support on Pause CVar_SetS32("gDpadPause", 0); @@ -1313,10 +1284,6 @@ namespace GameMenuBar { UIWidgets::Tooltip("Holding down B skips text"); UIWidgets::PaddedEnhancementCheckbox("Free Camera", "gFreeCamera", true, false); UIWidgets::Tooltip("Enables camera control\nNote: You must remap C buttons off of the right stick in the controller config menu, and map the camera stick to the right stick."); - UIWidgets::PaddedEnhancementCheckbox("Master Quest", "gMasterQuest", true, false, MasterQuestCheckboxDisabled(), MasterQuestDisabledTooltip().c_str(), MasterQuestDisabledGraphic()); - UIWidgets::Tooltip("Enables Master Quest.\n\nWhen checked, any non-rando save files you create will be " - "Master Quest save files. Master Quest save files will still have Master Quest dungeons " - "regardless of this setting and require oot-mq.otr to be present in order to play."); #ifdef __SWITCH__ UIWidgets::Spacer(0); diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index a9a7ba66b..f8ca5bfb4 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -56,8 +56,6 @@ SaveManager::SaveManager() { } void SaveManager::LoadRandomizerVersion1() { - if(!CVar_GetS32("gRandomizer", 0)) return; - for (int i = 0; i < ARRAY_COUNT(gSaveContext.itemLocations); i++) { SaveManager::Instance->LoadStruct("get" + std::to_string(i), [&]() { SaveManager::Instance->LoadData("rgID", gSaveContext.itemLocations[i].get.rgID); @@ -482,9 +480,6 @@ void SaveManager::InitFileNormal() { gSaveContext.magicLevel = 0; gSaveContext.infTable[29] = 1; gSaveContext.sceneFlags[5].swch = 0x40000000; - - gSaveContext.isMasterQuest = CVar_GetS32("gMasterQuest", 0) && !CVar_GetS32("gRandomizer", 0); - //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT) } diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index fed23dcf3..61e8fecbb 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -297,7 +297,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { gSaveContext.playerName[offset] = Save_GetSaveMetaInfo(fileChooseCtx->buttonIndex)->playerName[offset]; } - if (CVar_GetS32("gRandomizer", 0) && strnlen(CVar_GetString("gSpoilerLog", ""), 1) != 0 && + if (fileChooseCtx->questType[fileChooseCtx->buttonIndex] == 2 && strnlen(CVar_GetString("gSpoilerLog", ""), 1) != 0 && !((Save_GetSaveMetaInfo(fileChooseCtx->buttonIndex)->requiresMasterQuest && !ResourceMgr_GameHasMasterQuest()) || (Save_GetSaveMetaInfo(fileChooseCtx->buttonIndex)->requiresMasterQuest && !ResourceMgr_GameHasOriginal()))) { // Set N64DD Flags for save file diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index 1dddce504..dfc7ac97f 100644 --- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -14,23 +14,6 @@ typedef void (*EnOssanInitFunc)(struct EnOssan*, GlobalContext*); typedef s16 (*EnOssanGetGirlAParamsFunc)(s16); typedef void (*EnOssanStateFunc)(struct EnOssan*, GlobalContext*, Player*); -typedef struct { - /* 0x00 */ u32 stickColorR; - /* 0x04 */ u32 stickColorG; - /* 0x08 */ u32 stickColorB; - /* 0x0C */ u32 stickColorA; - /* 0x10 */ f32 stickTexX; - /* 0x14 */ f32 stickTexY; - /* 0x18 */ u32 arrowColorR; - /* 0x1C */ u32 arrowColorG; - /* 0x20 */ u32 arrowColorB; - /* 0x24 */ u32 arrowColorA; - /* 0x28 */ f32 arrowTexX; - /* 0x2C */ f32 arrowTexY; - /* 0x30 */ f32 z; - /* 0x34 */ s32 isEnabled; -} StickDirectionPrompt; // size = 0x38 - #define ColChanMix(c1, c2, m) (c1 - (s32)(c2 * m)) & 0xFF typedef struct EnOssan { diff --git a/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h b/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h index 93f4efb76..0abf7583a 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h +++ b/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h @@ -55,7 +55,12 @@ typedef enum { /* 37 */ CM_OPTIONS_MENU, /* 38 */ CM_START_OPTIONS, /* 39 */ CM_OPTIONS_TO_MAIN, - /* 40 */ CM_UNUSED_DELAY + /* 40 */ CM_UNUSED_DELAY, + CM_ROTATE_TO_QUEST_MENU, + CM_QUEST_MENU, + CM_START_QUEST_MENU, + CM_QUEST_TO_MAIN, + CM_NAME_ENTRY_TO_QUEST_MENU, } ConfigMode; typedef enum { diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index e816670a5..4b1dec055 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -7,6 +7,180 @@ #include #include "soh/frame_interpolation.h" #include +#include "objects/object_mag/object_mag.h" +#include "objects/gameplay_keep/gameplay_keep.h" + +#define NORMAL_QUEST 0 +#define MASTER_QUEST 1 +#define RANDOMIZER_QUEST 2 +#define MIN_QUEST (ResourceMgr_GameHasOriginal() ? NORMAL_QUEST : MASTER_QUEST) +u8 getMaxQuest() { + if ((strnlen(CVar_GetString("gSpoilerLog", ""), 1) != 0)) { + return RANDOMIZER_QUEST; + } + + if (ResourceMgr_GameHasMasterQuest()) { + return MASTER_QUEST; + } + + return NORMAL_QUEST; +} +#define MAX_QUEST getMaxQuest() + +void FileChoose_DrawTextureI8(GraphicsContext* gfxCtx, const void* texture, s16 texWidth, s16 texHeight, s16 rectLeft, s16 rectTop, + s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) { + OPEN_DISPS(gfxCtx); + gDPLoadTextureBlock(POLY_OPA_DISP++, texture, G_IM_FMT_I, G_IM_SIZ_8b, texWidth, texHeight, 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); + + gSPTextureRectangle(POLY_OPA_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2, + G_TX_RENDERTILE, 0, 0, dsdx, dtdy); + + CLOSE_DISPS(gfxCtx); +} + +void FileChoose_DrawRawImageRGBA32(GraphicsContext* gfxCtx, s16 centerX, s16 centerY, const char* source, u32 width, u32 height) { + u8* curTexture; + s32 textureCount; + u32 rectLeft; + u32 rectTop; + u32 textureHeight; + s32 remainingSize; + s32 textureSize; + s32 pad; + s32 i; + + OPEN_DISPS(gfxCtx); + + source = ResourceMgr_LoadFileRaw(source); + + curTexture = source; + rectLeft = centerX - (width / 2); + rectTop = centerY - (height / 2); + textureHeight = 4096 / (width << 2); + remainingSize = (width * height) << 2; + textureSize = (width * textureHeight) << 2; + textureCount = remainingSize / textureSize; + if ((remainingSize % textureSize) != 0) { + textureCount += 1; + } + + gDPSetTileCustom(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, textureHeight, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + remainingSize -= textureSize; + + for (i = 0; i < textureCount; i++) { + gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, curTexture); + + gDPLoadSync(POLY_OPA_DISP++); + gDPLoadTile(POLY_OPA_DISP++, G_TX_LOADTILE, 0, 0, (width - 1) << 2, (textureHeight - 1) << 2); + + gSPTextureRectangle(POLY_OPA_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + (s32)width) << 2, + (rectTop + textureHeight) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + + curTexture += textureSize; + rectTop += textureHeight; + + if ((remainingSize - textureSize) < 0) { + if (remainingSize > 0) { + textureHeight = remainingSize / (s32)(width << 2); + remainingSize -= textureSize; + + gDPSetTileCustom(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, textureHeight, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOLOD); + } + } else { + remainingSize -= textureSize; + } + } + CLOSE_DISPS(gfxCtx); +} + +void FileChoose_DrawImageRGBA32(GraphicsContext* gfxCtx, s16 centerX, s16 centerY, const char* source, u32 width, u32 height) { + u8* curTexture; + s32 textureCount; + u32 rectLeft; + u32 rectTop; + u32 textureHeight; + s32 remainingSize; + s32 textureSize; + s32 pad; + s32 i; + + OPEN_DISPS(gfxCtx); + + source = ResourceMgr_LoadTexByName(source); + + curTexture = source; + rectLeft = centerX - (width / 2); + rectTop = centerY - (height / 2); + textureHeight = 4096 / (width << 2); + remainingSize = (width * height) << 2; + textureSize = (width * textureHeight) << 2; + textureCount = remainingSize / textureSize; + if ((remainingSize % textureSize) != 0) { + textureCount += 1; + } + + gDPSetTileCustom(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, textureHeight, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + remainingSize -= textureSize; + + for (i = 0; i < textureCount; i++) { + gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, curTexture); + + gDPLoadSync(POLY_OPA_DISP++); + gDPLoadTile(POLY_OPA_DISP++, G_TX_LOADTILE, 0, 0, (width - 1) << 2, (textureHeight - 1) << 2); + + gSPTextureRectangle(POLY_OPA_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + (s32)width) << 2, + (rectTop + textureHeight) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + + curTexture += textureSize; + rectTop += textureHeight; + + if ((remainingSize - textureSize) < 0) { + if (remainingSize > 0) { + textureHeight = remainingSize / (s32)(width << 2); + remainingSize -= textureSize; + + gDPSetTileCustom(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, textureHeight, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOLOD); + } + } else { + remainingSize -= textureSize; + } + } + CLOSE_DISPS(gfxCtx); +} + +void FileChoose_DrawTextRec(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a, f32 x, f32 y, f32 z, s32 s, s32 t, + f32 dx, f32 dy) { + f32 unk; + s32 ulx, uly, lrx, lry; + f32 w, h; + s32 dsdx, dtdy; + + OPEN_DISPS(gfxCtx); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, r, g, b, a); + + w = 8.0f * z; + h = 12.0f * z; + unk = (1.0f / z) * 1024; + dsdx = unk * dx; + dtdy = dy * unk; + + ulx = (x - w) * 4.0f; + uly = (y - h) * 4.0f; + lrx = (x + w) * 4.0f; + lry = (y + h) * 4.0f; + gSPTextureRectangle(POLY_OPA_DISP++, ulx, uly, lrx, lry, G_TX_RENDERTILE, s, t, dsdx, dtdy); + CLOSE_DISPS(gfxCtx); +} static s16 sUnused = 106; @@ -212,7 +386,7 @@ void DrawSeedHashSprites(FileChooseContext* this) { gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - if (this->windowRot == 0) { + if (this->windowRot == 0 || (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == RANDOMIZER_QUEST)) { if (this->selectMode == SM_CONFIRM_FILE) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, this->fileInfoAlpha[this->buttonIndex]); @@ -229,7 +403,7 @@ void DrawSeedHashSprites(FileChooseContext* this) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, this->fileButtonAlpha[this->buttonIndex]); - if (CVar_GetS32("gRandomizer", 0) && strnlen(CVar_GetString("gSpoilerLog", ""), 1) != 0 && fileSelectSpoilerFileLoaded) { + if (strnlen(CVar_GetString("gSpoilerLog", ""), 1) != 0 && fileSelectSpoilerFileLoaded) { u16 xStart = 64; for (unsigned int i = 0; i < 5; i++) { SpriteLoad(this, GetSeedTexture(gSaveContext.seedIcons[i])); @@ -306,18 +480,25 @@ void FileChoose_UpdateMainMenu(GameState* thisx) { if (this->buttonIndex <= FS_BTN_MAIN_FILE_3) { if (!Save_GetSaveMetaInfo(this->buttonIndex)->valid) { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - this->configMode = CM_ROTATE_TO_NAME_ENTRY; - CVar_SetS32("gOnFileSelectNameEntry", 1); - this->kbdButton = FS_KBD_BTN_NONE; - this->charPage = FS_CHAR_PAGE_ENG; - this->kbdX = 0; - this->kbdY = 0; - this->charIndex = 0; - this->charBgAlpha = 0; - this->newFileNameCharCount = 0; - this->nameEntryBoxPosX = 120; - this->nameEntryBoxAlpha = 0; - memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName, &emptyName, 8); + this->prevConfigMode = this->configMode; + if (MIN_QUEST != MAX_QUEST) { + this->configMode = CM_ROTATE_TO_QUEST_MENU; + } else { + this->configMode = CM_ROTATE_TO_NAME_ENTRY; + this->questType[this->buttonIndex] = MIN_QUEST; + CVar_SetS32("gOnFileSelectNameEntry", 1); + this->kbdButton = FS_KBD_BTN_NONE; + this->charPage = FS_CHAR_PAGE_ENG; + this->kbdX = 0; + this->kbdY = 0; + this->charIndex = 0; + this->charBgAlpha = 0; + this->newFileNameCharCount = 0; + this->nameEntryBoxPosX = 120; + this->nameEntryBoxAlpha = 0; + memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName, &emptyName, 8); + } + this->logoAlpha = 0; } else if(!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(this->buttonIndex))) { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } @@ -399,6 +580,126 @@ void FileChoose_UpdateMainMenu(GameState* thisx) { } } +void FileChoose_UpdateStickDirectionPromptAnim(GameState* thisx) { + FileChooseContext* this = (FileChooseContext*)thisx; + f32 arrowAnimTween; + f32 new_var3; // likely fake temp + s32 new_var2 = 155; // likely fake temp + f32 stickAnimTween; + + arrowAnimTween = this->arrowAnimTween; + stickAnimTween = this->stickAnimTween; + if (this->arrowAnimState == 0) { + arrowAnimTween += 0.027f; + if (arrowAnimTween > 1.0f) { + arrowAnimTween = 1.0f; + this->arrowAnimState = 1; + } + + } else { + arrowAnimTween -= 0.027f; + if (arrowAnimTween < 0.0f) { + arrowAnimTween = 0.0f; + this->arrowAnimState = 0; + } + } + + this->arrowAnimTween = arrowAnimTween; + if (this->stickAnimState == 0) { + stickAnimTween += 0.027f; + if (stickAnimTween > 1.0f) { + stickAnimTween = 1.0f; + this->stickAnimState = 1; + } + + } else { + stickAnimTween = 0.0f; + this->stickAnimState = 0; + } + + this->stickAnimTween = stickAnimTween; + this->stickLeftPrompt.arrowColorR = (u8)(155 - ((s32)(75.0f * arrowAnimTween))); + this->stickLeftPrompt.arrowColorG = (u8)(new_var2 - (s32)(55.0f * arrowAnimTween)); + new_var3 = (75.0f * arrowAnimTween); + this->stickLeftPrompt.arrowColorB = (u8)(255 - ((s32)(75.0f * arrowAnimTween))); + this->stickLeftPrompt.arrowColorA = (u8)(200 - ((s32)(50.0f * arrowAnimTween))); + this->stickRightPrompt.arrowColorR = (u8)(new_var2 - (s32)new_var3); + this->stickRightPrompt.arrowColorG = (u8)(155 - (s32)new_var3); + this->stickRightPrompt.arrowColorB = (u8)(255 - ((s32)(75.0f * arrowAnimTween))); + this->stickRightPrompt.arrowColorA = (u8)(200 - ((s32)(50.0f * arrowAnimTween))); + this->stickRightPrompt.arrowTexX = 260.0f; + this->stickLeftPrompt.arrowTexX = 63.0f; + this->stickRightPrompt.stickTexX = 244.0f; + this->stickLeftPrompt.stickTexX = 79.0f; + this->stickRightPrompt.stickTexX += (8.0f * stickAnimTween); + this->stickLeftPrompt.stickTexX -= (8.0f * stickAnimTween); + this->stickLeftPrompt.arrowTexY = this->stickRightPrompt.arrowTexY = 135.0f; + this->stickLeftPrompt.stickTexY = this->stickRightPrompt.stickTexY = 139.0f; +} + +void FileChoose_StartQuestMenu(GameState* thisx) { + FileChooseContext* this = (FileChooseContext*)thisx; + + this->logoAlpha += 25; + + if (this->logoAlpha >= 255) { + this->logoAlpha = 255; + this->configMode = CM_QUEST_MENU; + } +} + +void FileChoose_UpdateQuestMenu(GameState* thisx) { + static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E }; + FileChoose_UpdateStickDirectionPromptAnim(thisx); + FileChooseContext* this = (FileChooseContext*)thisx; + Input* input = &this->state.input[0]; + s8 i = 0; + bool dpad = CVar_GetS32("gDpadText", 0);(dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP)); + + if (ABS(this->stickRelX) > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DRIGHT))) { + if (this->stickRelX > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DRIGHT))) { + this->questType[this->buttonIndex] += 1; + } else if (this->stickRelX < -30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT))) { + this->questType[this->buttonIndex] -= 1; + } + + if (this->questType[this->buttonIndex] > MAX_QUEST) { + this->questType[this->buttonIndex] = MIN_QUEST; + } else if (this->questType[this->buttonIndex] < MIN_QUEST) { + this->questType[this->buttonIndex] = MAX_QUEST; + } + + Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + + if (CHECK_BTN_ALL(input->press.button, BTN_A)) { + Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + gSaveContext.isMasterQuest = this->questType[this->buttonIndex] == MASTER_QUEST; + gSaveContext.n64ddFlag = this->questType[this->buttonIndex] == RANDOMIZER_QUEST; + osSyncPrintf("Selected Dungeon Quest: %d\n", gSaveContext.isMasterQuest); + this->prevConfigMode = this->configMode; + this->configMode = CM_ROTATE_TO_NAME_ENTRY; + this->logoAlpha = 0; + CVar_SetS32("gOnFileSelectNameEntry", 1); + this->kbdButton = FS_KBD_BTN_NONE; + this->charPage = FS_CHAR_PAGE_ENG; + this->kbdX = 0; + this->kbdY = 0; + this->charIndex = 0; + this->charBgAlpha = 0; + this->newFileNameCharCount = 0; + this->nameEntryBoxPosX = 120; + this->nameEntryBoxAlpha = 0; + memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName, &emptyName, 8); + return; + } + + if (CHECK_BTN_ALL(input->press.button, BTN_B)) { + this->configMode = CM_QUEST_TO_MAIN; + return; + } +} + /** * Update function for `CM_UNUSED_31` */ @@ -431,9 +732,12 @@ void FileChoose_RotateToNameEntry(GameState* thisx) { this->windowRot += VREG(16); - if (this->windowRot >= 314.0f) { + if (MIN_QUEST == MAX_QUEST && this->windowRot >= 314.0f) { this->windowRot = 314.0f; this->configMode = CM_START_NAME_ENTRY; + } else if (this->windowRot >= 628.0f) { + this->windowRot = 628.0f; + this->configMode = CM_START_NAME_ENTRY; } } @@ -458,12 +762,43 @@ void FileChoose_RotateToOptions(GameState* thisx) { */ void FileChoose_RotateToMain(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; + if (this->configMode == CM_QUEST_TO_MAIN || (MIN_QUEST == MAX_QUEST && this->configMode == CM_NAME_ENTRY_TO_MAIN) || + this->configMode == CM_OPTIONS_TO_MAIN) { + this->windowRot -= VREG(16); - this->windowRot += VREG(16); + if (this->windowRot <= 0.0f) { + this->windowRot = 0.0f; + this->configMode = CM_MAIN_MENU; + } + } - if (this->windowRot >= 628.0f) { - this->windowRot = 0.0f; - this->configMode = CM_MAIN_MENU; + if (this->configMode == CM_NAME_ENTRY_TO_MAIN && this->prevConfigMode == CM_MAIN_MENU) { + this->windowRot += VREG(16); + + if (this->windowRot >= 942.0f || (MIN_QUEST == MAX_QUEST && this->windowRot >= 628.0f)) { + this->windowRot = 0.0f; + this->configMode = CM_MAIN_MENU; + } + } +} + +void FileChoose_RotateToQuest(GameState* thisx) { + FileChooseContext* this = (FileChooseContext*)thisx; + + if (this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU) { + this->windowRot -= VREG(16); + + if (this->windowRot <= 314.0f) { + this->windowRot = 314.0f; + this->configMode = CM_START_QUEST_MENU; + } + } else { + this->windowRot += VREG(16); + + if (this->windowRot >= 314.0f) { + this->windowRot = 314.0f; + this->configMode = CM_START_QUEST_MENU; + } } } @@ -488,7 +823,9 @@ static void (*gConfigModeUpdateFuncs[])(GameState*) = { FileChoose_StartNameEntry, FileChoose_RotateToMain, FileChoose_RotateToOptions, FileChoose_UpdateOptionsMenu, FileChoose_StartOptions, FileChoose_RotateToMain, - FileChoose_UnusedCMDelay, + FileChoose_UnusedCMDelay, FileChoose_RotateToQuest, + FileChoose_UpdateQuestMenu, FileChoose_StartQuestMenu, + FileChoose_RotateToMain, FileChoose_RotateToQuest, }; /** @@ -1011,6 +1348,18 @@ static void* sOptionsButtonTextures[] = { gFileSelOptionsButtonENGTex, }; +const char* FileChoose_GetQuestChooseTitleTexName(Language lang) { + switch (lang) { + case LANGUAGE_ENG: + default: + return "assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex"; + case LANGUAGE_FRA: + return "assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex"; + case LANGUAGE_GER: + return "assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex"; + } +} + /** * Draw most window contents including buttons, labels, and icons. * Does not include anything from the keyboard and settings windows. @@ -1023,6 +1372,11 @@ void FileChoose_DrawWindowContents(GameState* thisx) { s16 quadVtxIndex; s16 isActive; s16 pad; + char* tex = (this->configMode == CM_QUEST_MENU || this->configMode == CM_ROTATE_TO_NAME_ENTRY || + this->configMode == CM_START_QUEST_MENU || this->configMode == CM_QUEST_TO_MAIN || + this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU) + ? ResourceMgr_LoadFileRaw(FileChoose_GetQuestChooseTitleTexName(gSaveContext.language)) + : sTitleLabels[gSaveContext.language][this->titleLabel]; Color_RGB8 Background_Color = { this->windowColor[0], this->windowColor[1], this->windowColor[2] }; OPEN_DISPS(this->state.gfxCtx); @@ -1034,235 +1388,317 @@ void FileChoose_DrawWindowContents(GameState* thisx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[0]); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); gSPVertex(POLY_OPA_DISP++, this->windowContentVtx, 4, 0); - gDPLoadTextureBlock(POLY_OPA_DISP++, sTitleLabels[gSaveContext.language][this->titleLabel], G_IM_FMT_IA, + gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_IA, G_IM_SIZ_8b, 128, 16, 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); gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); // draw next title label - gDPPipeSync(POLY_OPA_DISP++); - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[1]); - gDPLoadTextureBlock(POLY_OPA_DISP++, sTitleLabels[gSaveContext.language][this->nextTitleLabel], G_IM_FMT_IA, - G_IM_SIZ_8b, 128, 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); + if ((this->configMode == CM_QUEST_MENU) || (this->configMode == CM_START_QUEST_MENU) || + this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU) { + // draw control stick prompts. + if (MIN_QUEST != MAX_QUEST) { + func_800944C4(this->state.gfxCtx); + gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowCursorTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 24, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD, + G_TX_NOLOD); + FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.arrowColorR, + this->stickLeftPrompt.arrowColorG, this->stickLeftPrompt.arrowColorB, + this->stickLeftPrompt.arrowColorA, this->stickLeftPrompt.arrowTexX, + this->stickLeftPrompt.arrowTexY, this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f); + FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.arrowColorR, + this->stickRightPrompt.arrowColorG, this->stickRightPrompt.arrowColorB, + this->stickRightPrompt.arrowColorA, this->stickRightPrompt.arrowTexX, + this->stickRightPrompt.arrowTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f); + gDPLoadTextureBlock(POLY_OPA_DISP++, gControlStickTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD, + G_TX_NOLOD); + FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.stickColorR, + this->stickLeftPrompt.stickColorG, this->stickLeftPrompt.stickColorB, + this->stickLeftPrompt.stickColorA, this->stickLeftPrompt.stickTexX, + this->stickLeftPrompt.stickTexY, this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f); + FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.stickColorR, + this->stickRightPrompt.stickColorG, this->stickRightPrompt.stickColorB, + this->stickRightPrompt.stickColorA, this->stickRightPrompt.stickTexX, + this->stickRightPrompt.stickTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f); + } + switch (this->questType[this->buttonIndex]) { + case NORMAL_QUEST: + default: + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha); + FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024, 1024); + FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024, 1024); + FileChoose_DrawImageRGBA32(this->state.gfxCtx, 160, 135, gTitleZeldaShieldLogoTex, 160, 160); + break; - temp = 4; - - gDPPipeSync(POLY_OPA_DISP++); - - // draw file info box (large box when a file is selected) - for (fileIndex = 0; fileIndex < 3; fileIndex++, temp += 20) { + case MASTER_QUEST: + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha); + FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024, 1024); + FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024, 1024); + FileChoose_DrawImageRGBA32(this->state.gfxCtx, 160, 135, gTitleZeldaShieldLogoMQTex, 160, 160); + FileChoose_DrawImageRGBA32(this->state.gfxCtx, 182, 180, "__OTR__objects/object_mag/gTitleMasterQuestSubtitleTex", 128, 32); + break; + + case RANDOMIZER_QUEST: + DrawSeedHashSprites(this); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha); + FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024, 1024); + FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024, 1024); + FileChoose_DrawImageRGBA32(this->state.gfxCtx, 160, 135, ResourceMgr_GameHasOriginal() ? gTitleZeldaShieldLogoTex : gTitleZeldaShieldLogoMQTex, 160, 160); + FileChoose_DrawRawImageRGBA32(this->state.gfxCtx, 182, 180, "assets/objects/object_mag/gTitleRandomizerSubtitleTex", 128, 32); + break; + } + } else if (this->configMode != CM_ROTATE_TO_NAME_ENTRY) { gDPPipeSync(POLY_OPA_DISP++); - - if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->fileInfoAlpha[fileIndex]); - } else { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, Background_Color.r, Background_Color.g, Background_Color.b, this->fileInfoAlpha[fileIndex]); - } - gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[temp], 20, 0); - - for (quadVtxIndex = 0, i = 0; i < 5; i++, quadVtxIndex += 4) { - gDPLoadTextureBlock(POLY_OPA_DISP++, sFileInfoBoxTextures[i], G_IM_FMT_IA, G_IM_SIZ_16b, - sFileInfoBoxPartWidths[i], 56, 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); - gSP1Quadrangle(POLY_OPA_DISP++, quadVtxIndex, quadVtxIndex + 2, quadVtxIndex + 3, quadVtxIndex + 1, 0); - } - } - - for (i = 0; i < 3; i++, temp += 20) { - // draw file button - gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[temp], 20, 0); - - isActive = 0; - - if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i)) && Save_GetSaveMetaInfo(i)->valid) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[1][0], sWindowContentColors[1][1], - sWindowContentColors[1][2], this->fileButtonAlpha[i]); - } else if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, - CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, - CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->fileButtonAlpha[i]); - } else { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], sWindowContentColors[isActive][1], - sWindowContentColors[isActive][2], this->fileButtonAlpha[i]); - } - - gDPLoadTextureBlock(POLY_OPA_DISP++, sFileButtonTextures[gSaveContext.language][i], G_IM_FMT_IA, G_IM_SIZ_16b, - 64, 16, 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); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[1]); + gDPLoadTextureBlock(POLY_OPA_DISP++, sTitleLabels[gSaveContext.language][this->nextTitleLabel], G_IM_FMT_IA, + G_IM_SIZ_8b, 128, 16, 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); gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); - // draw file name box - if (CVar_GetS32("gHudColors", 1) == 2 && FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->nameBoxAlpha[i]); - } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[1][0], sWindowContentColors[1][1], - sWindowContentColors[1][2], this->nameBoxAlpha[i]); - } else { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], sWindowContentColors[isActive][1], - sWindowContentColors[isActive][2], this->nameBoxAlpha[i]); + temp = 4; + + gDPPipeSync(POLY_OPA_DISP++); + + // draw file info box (large box when a file is selected) + for (fileIndex = 0; fileIndex < 3; fileIndex++, temp += 20) { + gDPPipeSync(POLY_OPA_DISP++); + + if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->fileInfoAlpha[fileIndex]); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, Background_Color.r, Background_Color.g, Background_Color.b, + this->fileInfoAlpha[fileIndex]); + } + gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[temp], 20, 0); + + for (quadVtxIndex = 0, i = 0; i < 5; i++, quadVtxIndex += 4) { + gDPLoadTextureBlock(POLY_OPA_DISP++, sFileInfoBoxTextures[i], G_IM_FMT_IA, G_IM_SIZ_16b, + sFileInfoBoxPartWidths[i], 56, 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); + gSP1Quadrangle(POLY_OPA_DISP++, quadVtxIndex, quadVtxIndex + 2, quadVtxIndex + 3, quadVtxIndex + 1, 0); + } } - gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelNameBoxTex, G_IM_FMT_IA, G_IM_SIZ_16b, 108, 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, 4, 6, 7, 5, 0); + for (i = 0; i < 3; i++, temp += 20) { + // draw file button + gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[temp], 20, 0); - // draw rando label - if (Save_GetSaveMetaInfo(i)->randoSave) { + isActive = 0; + + if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i)) && Save_GetSaveMetaInfo(i)->valid) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[1][0], sWindowContentColors[1][1], + sWindowContentColors[1][2], this->fileButtonAlpha[i]); + } else if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->fileButtonAlpha[i]); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], + sWindowContentColors[isActive][1], sWindowContentColors[isActive][2], + this->fileButtonAlpha[i]); + } + + gDPLoadTextureBlock(POLY_OPA_DISP++, sFileButtonTextures[gSaveContext.language][i], G_IM_FMT_IA, + G_IM_SIZ_16b, 64, 16, 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); + gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); + + // draw file name box if (CVar_GetS32("gHudColors", 1) == 2 && FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->nameAlpha[i]); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->nameBoxAlpha[i]); } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[1][0], sWindowContentColors[1][1], sWindowContentColors[1][2], this->nameBoxAlpha[i]); } else { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], sWindowContentColors[isActive][1], sWindowContentColors[isActive][2], - this->nameAlpha[i]); + this->nameBoxAlpha[i]); } - gDPLoadTextureBlock(POLY_OPA_DISP++, ResourceMgr_LoadFileRaw("assets/textures/title_static/gFileSelRANDButtonTex"), G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 0, + + gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelNameBoxTex, G_IM_FMT_IA, G_IM_SIZ_16b, 108, 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0); - } - //Draw MQ label - if (Save_GetSaveMetaInfo(i)->requiresMasterQuest && !Save_GetSaveMetaInfo(i)->randoSave && Save_GetSaveMetaInfo(i)->valid) { + gSP1Quadrangle(POLY_OPA_DISP++, 4, 6, 7, 5, 0); + + // draw rando label + if (Save_GetSaveMetaInfo(i)->randoSave) { + if (CVar_GetS32("gHudColors", 1) == 2 && FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->nameAlpha[i]); + } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[1][0], sWindowContentColors[1][1], + sWindowContentColors[1][2], this->nameBoxAlpha[i]); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], + sWindowContentColors[isActive][1], sWindowContentColors[isActive][2], + this->nameAlpha[i]); + } + gDPLoadTextureBlock(POLY_OPA_DISP++, + ResourceMgr_LoadFileRaw("assets/textures/title_static/gFileSelRANDButtonTex"), + G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 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); + gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0); + } + // Draw MQ label + if (Save_GetSaveMetaInfo(i)->requiresMasterQuest && !Save_GetSaveMetaInfo(i)->randoSave && + Save_GetSaveMetaInfo(i)->valid) { + if (CVar_GetS32("gHudColors", 1) == 2 && FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->nameAlpha[i]); + } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[1][0], sWindowContentColors[1][1], + sWindowContentColors[1][2], this->nameBoxAlpha[i]); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], + sWindowContentColors[isActive][1], sWindowContentColors[isActive][2], + this->nameAlpha[i]); + } + gDPLoadTextureBlock(POLY_OPA_DISP++, + ResourceMgr_LoadFileRaw("assets/textures/title_static/gFileSelMQButtonTex"), + G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 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); + gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0); + } + + // draw connectors if (CVar_GetS32("gHudColors", 1) == 2 && FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->nameAlpha[i]); - } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->connectorAlpha[i]); + } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i)) && Save_GetSaveMetaInfo(i)->valid) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[1][0], sWindowContentColors[1][1], - sWindowContentColors[1][2], this->nameBoxAlpha[i]); + sWindowContentColors[1][2], this->fileButtonAlpha[i]); } else { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], sWindowContentColors[isActive][1], sWindowContentColors[isActive][2], - this->nameAlpha[i]); + this->connectorAlpha[i]); } - gDPLoadTextureBlock(POLY_OPA_DISP++, ResourceMgr_LoadFileRaw("assets/textures/title_static/gFileSelMQButtonTex"), G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 0, + gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelConnectorTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0); + gSP1Quadrangle(POLY_OPA_DISP++, 12, 14, 15, 13, 0); + + if (Save_GetSaveMetaInfo(i)->randoSave || Save_GetSaveMetaInfo(i)->requiresMasterQuest) { + gSP1Quadrangle(POLY_OPA_DISP++, 16, 18, 19, 17, 0); + } } - // draw connectors - if (CVar_GetS32("gHudColors", 1) == 2 && FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->connectorAlpha[i]); - } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i)) && Save_GetSaveMetaInfo(i)->valid) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[1][0], sWindowContentColors[1][1], - sWindowContentColors[1][2], this->fileButtonAlpha[i]); - } else { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], sWindowContentColors[isActive][1], - sWindowContentColors[isActive][2], this->connectorAlpha[i]); + // draw file info + for (fileIndex = 0; fileIndex < 3; fileIndex++) { + isActive = 0; + FileChoose_DrawFileInfo(&this->state, fileIndex, isActive); } - gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelConnectorTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, 12, 14, 15, 13, 0); - if (Save_GetSaveMetaInfo(i)->randoSave || Save_GetSaveMetaInfo(i)->requiresMasterQuest) { - gSP1Quadrangle(POLY_OPA_DISP++, 16, 18, 19, 17, 0); - } - } - - // draw file info - for (fileIndex = 0; fileIndex < 3; fileIndex++) { - isActive = 0; - FileChoose_DrawFileInfo(&this->state, fileIndex, isActive); - } - - gDPPipeSync(POLY_OPA_DISP++); - gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, - ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); - gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[0x274], 20, 0); - - // draw primary action buttons (copy/erase) - for (quadVtxIndex = 0, i = 0; i < 2; i++, quadVtxIndex += 4) { - gDPPipeSync(POLY_OPA_DISP++); - - if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->actionButtonAlpha[i]); - } else { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2], - this->actionButtonAlpha[i]); - } - gDPLoadTextureBlock(POLY_OPA_DISP++, sActionButtonTextures[gSaveContext.language][i], G_IM_FMT_IA, G_IM_SIZ_16b, - 64, 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, quadVtxIndex, quadVtxIndex + 2, quadVtxIndex + 3, quadVtxIndex + 1, 0); - } - - gDPPipeSync(POLY_OPA_DISP++); - - // draw confirm buttons (yes/quit) - for (quadVtxIndex = 0, i = 0; i < 2; i++, quadVtxIndex += 4) { - temp = this->confirmButtonTexIndices[i]; - - if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->confirmButtonAlpha[i]); - } else { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2], - this->confirmButtonAlpha[i]); - } - gDPLoadTextureBlock(POLY_OPA_DISP++, sActionButtonTextures[gSaveContext.language][temp], G_IM_FMT_IA, - G_IM_SIZ_16b, 64, 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, quadVtxIndex, quadVtxIndex + 2, quadVtxIndex + 3, quadVtxIndex + 1, 0); - } - - // draw options button - gDPPipeSync(POLY_OPA_DISP++); - - if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->optionButtonAlpha); - } else { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2], - this->optionButtonAlpha); - } - gDPLoadTextureBlock(POLY_OPA_DISP++, sOptionsButtonTextures[gSaveContext.language], G_IM_FMT_IA, G_IM_SIZ_16b, 64, - 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0); - - // draw highlight over currently selected button - if (((this->menuMode == FS_MENU_MODE_CONFIG) && - ((this->configMode == CM_MAIN_MENU) || (this->configMode == CM_SELECT_COPY_SOURCE) || - (this->configMode == CM_SELECT_COPY_DEST) || (this->configMode == CM_COPY_CONFIRM) || - (this->configMode == CM_ERASE_SELECT) || (this->configMode == CM_ERASE_CONFIRM))) || - ((this->menuMode == FS_MENU_MODE_SELECT) && (this->selectMode == SM_CONFIRM_FILE))) { - gDPPipeSync(POLY_OPA_DISP++); - gDPSetCombineLERP(POLY_OPA_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, 0, - PRIMITIVE, 0); - - if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->highlightColor[3]); - } else { - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->highlightColor[0], this->highlightColor[1], - this->highlightColor[2], this->highlightColor[3]); - } - gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelBigButtonHighlightTex, G_IM_FMT_I, G_IM_SIZ_8b, 72, 24, 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); - gSP1Quadrangle(POLY_OPA_DISP++, 12, 14, 15, 13, 0); - } - - // draw warning labels - if (this->warningLabel > FS_WARNING_NONE) { gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->emptyFileTextAlpha); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); - gDPLoadTextureBlock(POLY_OPA_DISP++, sWarningLabels[gSaveContext.language][this->warningLabel], G_IM_FMT_IA, - G_IM_SIZ_8b, 128, 16, 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); - gSP1Quadrangle(POLY_OPA_DISP++, 16, 18, 19, 17, 0); + gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[0x274], 20, 0); + + // draw primary action buttons (copy/erase) + for (quadVtxIndex = 0, i = 0; i < 2; i++, quadVtxIndex += 4) { + gDPPipeSync(POLY_OPA_DISP++); + + if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->actionButtonAlpha[i]); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2], + this->actionButtonAlpha[i]); + } + gDPLoadTextureBlock(POLY_OPA_DISP++, sActionButtonTextures[gSaveContext.language][i], G_IM_FMT_IA, + G_IM_SIZ_16b, 64, 16, 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); + gSP1Quadrangle(POLY_OPA_DISP++, quadVtxIndex, quadVtxIndex + 2, quadVtxIndex + 3, quadVtxIndex + 1, 0); + } + + gDPPipeSync(POLY_OPA_DISP++); + + // draw confirm buttons (yes/quit) + for (quadVtxIndex = 0, i = 0; i < 2; i++, quadVtxIndex += 4) { + temp = this->confirmButtonTexIndices[i]; + + if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->confirmButtonAlpha[i]); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2], + this->confirmButtonAlpha[i]); + } + gDPLoadTextureBlock(POLY_OPA_DISP++, sActionButtonTextures[gSaveContext.language][temp], G_IM_FMT_IA, + G_IM_SIZ_16b, 64, 16, 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); + gSP1Quadrangle(POLY_OPA_DISP++, quadVtxIndex, quadVtxIndex + 2, quadVtxIndex + 3, quadVtxIndex + 1, 0); + } + + // draw options button + gDPPipeSync(POLY_OPA_DISP++); + + if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->optionButtonAlpha); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2], + this->optionButtonAlpha); + } + gDPLoadTextureBlock(POLY_OPA_DISP++, sOptionsButtonTextures[gSaveContext.language], G_IM_FMT_IA, G_IM_SIZ_16b, + 64, 16, 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); + gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0); + + // draw highlight over currently selected button + if (((this->menuMode == FS_MENU_MODE_CONFIG) && + ((this->configMode == CM_MAIN_MENU) || (this->configMode == CM_SELECT_COPY_SOURCE) || + (this->configMode == CM_SELECT_COPY_DEST) || (this->configMode == CM_COPY_CONFIRM) || + (this->configMode == CM_ERASE_SELECT) || (this->configMode == CM_ERASE_CONFIRM))) || + ((this->menuMode == FS_MENU_MODE_SELECT) && (this->selectMode == SM_CONFIRM_FILE))) { + gDPPipeSync(POLY_OPA_DISP++); + gDPSetCombineLERP(POLY_OPA_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, + 0, PRIMITIVE, 0); + + if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, + CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->highlightColor[3]); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->highlightColor[0], this->highlightColor[1], + this->highlightColor[2], this->highlightColor[3]); + } + gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelBigButtonHighlightTex, G_IM_FMT_I, G_IM_SIZ_8b, 72, 24, 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); + gSP1Quadrangle(POLY_OPA_DISP++, 12, 14, 15, 13, 0); + } + + // draw warning labels + if (this->warningLabel > FS_WARNING_NONE) { + gDPPipeSync(POLY_OPA_DISP++); + gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->emptyFileTextAlpha); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); + gDPLoadTextureBlock(POLY_OPA_DISP++, sWarningLabels[gSaveContext.language][this->warningLabel], G_IM_FMT_IA, + G_IM_SIZ_8b, 128, 16, 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); + gSP1Quadrangle(POLY_OPA_DISP++, 16, 18, 19, 17, 0); + } + + gDPPipeSync(POLY_OPA_DISP++); + gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + + CLOSE_DISPS(this->state.gfxCtx); } - - gDPPipeSync(POLY_OPA_DISP++); - gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); - - CLOSE_DISPS(this->state.gfxCtx); } void FileChoose_ConfigModeDraw(GameState* thisx) { @@ -1292,7 +1728,8 @@ void FileChoose_ConfigModeDraw(GameState* thisx) { FrameInterpolation_RecordOpenChild(this, this->configMode); - if ((this->configMode != CM_NAME_ENTRY) && (this->configMode != CM_START_NAME_ENTRY)) { + if ((this->configMode != CM_NAME_ENTRY) && (this->configMode != CM_START_NAME_ENTRY) && + (this->configMode != CM_QUEST_MENU) && this->configMode != CM_NAME_ENTRY_TO_QUEST_MENU) { gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); @@ -1308,7 +1745,13 @@ void FileChoose_ConfigModeDraw(GameState* thisx) { Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY); if (this->windowRot != 0) { - Matrix_RotateX(this->windowRot / 100.0f, MTXMODE_APPLY); + if (this->configMode == CM_ROTATE_TO_QUEST_MENU || + (this->configMode >= CM_MAIN_TO_OPTIONS && this->configMode <= CM_OPTIONS_TO_MAIN) || + MIN_QUEST == MAX_QUEST || this->configMode == CM_QUEST_TO_MAIN) { + Matrix_RotateX(this->windowRot / 100.0f, MTXMODE_APPLY); + } else { + Matrix_RotateX((this->windowRot - 942.0f) / 100.0f, MTXMODE_APPLY); + } } gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), @@ -1343,7 +1786,11 @@ void FileChoose_ConfigModeDraw(GameState* thisx) { Matrix_Translate(0.0f, 0.0f, -93.6f, MTXMODE_NEW); Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY); - Matrix_RotateX((this->windowRot - 314.0f) / 100.0f, MTXMODE_APPLY); + if (MIN_QUEST == MAX_QUEST) { + Matrix_RotateX((this->windowRot - 314.0f) / 100.0f, MTXMODE_APPLY); + } else { + Matrix_RotateX((this->windowRot - 628.0f) / 100.0f, MTXMODE_APPLY); + } gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -1395,6 +1842,42 @@ void FileChoose_ConfigModeDraw(GameState* thisx) { FileChoose_DrawOptions(&this->state); } + // draw quest menu + if ((this->configMode == CM_QUEST_MENU) || (this->configMode == CM_ROTATE_TO_QUEST_MENU) || + (this->configMode == CM_ROTATE_TO_NAME_ENTRY) || this->configMode == CM_QUEST_TO_MAIN || + this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU) { + // window + gDPPipeSync(POLY_OPA_DISP++); + gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->windowAlpha); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2], + this->windowAlpha); + } + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); + + Matrix_Translate(0.0f, 0.0f, -93.6f, MTXMODE_NEW); + Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY); + Matrix_RotateX((this->windowRot - 314.0f) / 100.0f, MTXMODE_APPLY); + + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0); + gSPDisplayList(POLY_OPA_DISP++, gFileSelWindow1DL); + + gSPVertex(POLY_OPA_DISP++, &this->windowVtx[32], 32, 0); + gSPDisplayList(POLY_OPA_DISP++, gFileSelWindow2DL); + + gSPVertex(POLY_OPA_DISP++, &this->windowVtx[64], 16, 0); + gSPDisplayList(POLY_OPA_DISP++, gFileSelWindow3DL); + + gDPPipeSync(POLY_OPA_DISP++); + + FileChoose_DrawWindowContents(&this->state); + } + gDPPipeSync(POLY_OPA_DISP++); FileChoose_SetView(this, 0.0f, 0.0f, 64.0f); @@ -2080,6 +2563,41 @@ void FileChoose_InitContext(GameState* thisx) { this->unk_1CAD6[3] = 8; this->unk_1CAD6[4] = 10; + this->stickLeftPrompt.stickColorR = 200; + this->stickLeftPrompt.stickColorG = 200; + this->stickLeftPrompt.stickColorB = 200; + this->stickLeftPrompt.stickColorA = 180; + this->stickLeftPrompt.stickTexX = 79; + this->stickLeftPrompt.stickTexY = 139; + this->stickLeftPrompt.arrowColorR = 155; + this->stickLeftPrompt.arrowColorG = 155; + this->stickLeftPrompt.arrowColorB = 255; + this->stickLeftPrompt.arrowColorA = 200; + this->stickLeftPrompt.arrowTexX = 63; + this->stickLeftPrompt.arrowTexY = 135; + this->stickLeftPrompt.z = 1; + this->stickLeftPrompt.isEnabled = false; + + this->stickRightPrompt.stickColorR = 200; + this->stickRightPrompt.stickColorG = 200; + this->stickRightPrompt.stickColorB = 200; + this->stickRightPrompt.stickColorA = 180; + this->stickRightPrompt.stickTexX = 244; + this->stickRightPrompt.stickTexY = 139; + this->stickRightPrompt.arrowColorR = 155; + this->stickRightPrompt.arrowColorG = 155; + this->stickRightPrompt.arrowColorB = 255; + this->stickRightPrompt.arrowColorA = 200; + this->stickRightPrompt.arrowTexX = 260; + this->stickRightPrompt.arrowTexY = 135; + this->stickRightPrompt.z = 1; + this->stickRightPrompt.isEnabled = false; + + this->arrowAnimState = 0; + this->stickAnimState = 0; + this->arrowAnimTween = 0; + this->stickAnimTween = 0; + ShrinkWindow_SetVal(0); gSaveContext.skyboxTime = 0; @@ -2119,6 +2637,10 @@ void FileChoose_Init(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; size_t size = (u32)_title_staticSegmentRomEnd - (u32)_title_staticSegmentRomStart; s32 pad; + this->logoAlpha = 0; + this->questType[0] = MIN_QUEST; + this->questType[1] = MIN_QUEST; + this->questType[2] = MIN_QUEST; fileSelectSpoilerFileLoaded = false; isFastFileIdIncompatible = 0; CVar_SetS32("gOnFileSelectNameEntry", 0); diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index 358ab35f6..42ced48e1 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -390,7 +390,12 @@ void FileChoose_DrawNameEntry(GameState* thisx) { if (this->newFileNameCharCount < 0) { this->newFileNameCharCount = 0; - this->configMode = CM_NAME_ENTRY_TO_MAIN; + if (this->prevConfigMode == CM_QUEST_MENU) { + this->configMode = CM_NAME_ENTRY_TO_QUEST_MENU; + } else { + this->configMode = CM_NAME_ENTRY_TO_MAIN; + } + this->prevConfigMode = CM_NAME_ENTRY; CVar_SetS32("gOnFileSelectNameEntry", 0); } else { for (i = this->newFileNameCharCount; i < 7; i++) { @@ -464,6 +469,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) { dayTime = ((void)0, gSaveContext.dayTime); Sram_InitSave(this); gSaveContext.dayTime = dayTime; + this->prevConfigMode = CM_MAIN_MENU; this->configMode = CM_NAME_ENTRY_TO_MAIN; CVar_SetS32("gOnFileSelectNameEntry", 0); CVar_SetS32("gNewFileDropped", 0); @@ -687,6 +693,7 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) { if (CHECK_BTN_ALL(input->press.button, BTN_B)) { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + this->prevConfigMode = this->configMode; this->configMode = CM_OPTIONS_TO_MAIN; osSyncPrintf("ＳＡＶＥ"); Save_SaveGlobal();