diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp index f7cc97993..f9fc85cdb 100644 --- a/soh/soh/GameMenuBar.cpp +++ b/soh/soh/GameMenuBar.cpp @@ -94,12 +94,14 @@ namespace GameMenuBar { } void applyEnhancementPresetDefault(void) { - // D-pad Support on Pause and File Select - CVar_SetS32("gDpadPauseName", 0); - // D-pad Support in Ocarina and Text Choice - CVar_SetS32("gDpadOcarinaText", 0); - // D-pad Support for Browsing Shop Items - CVar_SetS32("gDpadShop", 0); + // D-pad Support on Pause + CVar_SetS32("gDpadPause", 0); + // D-pad Support in text and file select + CVar_SetS32("gDpadText", 0); + // Play Ocarina with D-pad + CVar_SetS32("gDpadOcarina", 0); + // Play Ocarina with Right Stick + CVar_SetS32("gRStickOcarina", 0); // D-pad as Equip Items CVar_SetS32("gDpadEquips", 0); // Allow the cursor to be on any slot @@ -108,6 +110,14 @@ namespace GameMenuBar { CVar_SetS32("gDpadNoDropOcarinaInput", 0); // Answer Navi Prompt with L Button CVar_SetS32("gNaviOnL", 0); + // Invert Camera X Axis + CVar_SetS32("gInvertXAxis", 0); + // Invert Camera Y Axis + CVar_SetS32("gInvertYAxis", 0); + // Right Stick Aiming + CVar_SetS32("gRightStickAiming", 0); + // Auto-Center First Person View + CVar_SetS32("gAutoCenterView", 0); // Text Speed (1 to 5) CVar_SetS32("gTextSpeed", 1); @@ -242,6 +252,8 @@ namespace GameMenuBar { CVar_SetS32("gInjectSkulltulaCount", 0); // Pull grave during the day CVar_SetS32("gDayGravePull", 0); + // Pull out Ocarina to Summon Scarecrow + CVar_SetS32("gSkipScarecrow", 0); // Blue Fire Arrows CVar_SetS32("gBlueFireArrows", 0); // Sunlight Arrows @@ -295,20 +307,27 @@ namespace GameMenuBar { // Bombchus out of bounds CVar_SetS32("gBombchusOOB", 0); + // Restore old Gold Skulltula cutscene CVar_SetS32("gGsCutscene", 0); // Autosave CVar_SetS32("gAutosave", 0); } void applyEnhancementPresetVanillaPlus(void) { - // D-pad Support in Ocarina and Text Choice - CVar_SetS32("gDpadOcarinaText", 1); - // D-pad Support for Browsing Shop Items - CVar_SetS32("gDpadShop", 1); + // D-pad Support on Pause + CVar_SetS32("gDpadPause", 1); + // D-pad Support in text and file select + CVar_SetS32("gDpadText", 1); + // Play Ocarina with D-pad + CVar_SetS32("gDpadOcarina", 1); + // Play Ocarina with Right Stick + CVar_SetS32("gRStickOcarina", 1); // D-pad as Equip Items CVar_SetS32("gDpadEquips", 1); // Prevent Dropped Ocarina Inputs CVar_SetS32("gDpadNoDropOcarinaInput", 1); + // Right Stick Aiming + CVar_SetS32("gRightStickAiming", 1); // Text Speed (1 to 5) CVar_SetS32("gTextSpeed", 5); @@ -344,6 +363,8 @@ namespace GameMenuBar { CVar_SetS32("gGravediggingTourFix", 1); // Fix Deku Nut upgrade CVar_SetS32("gDekuNutUpgradeFix", 1); + // Fix Navi text HUD position + CVar_SetS32("gNaviTextFix", 1); // Red Ganon blood CVar_SetS32("gRedGanonBlood", 1); @@ -361,7 +382,7 @@ namespace GameMenuBar { // Biggoron Forge Time (0 to 3) CVar_SetS32("gForgeTime", 0); // Vine/Ladder Climb speed (+0 to +12) - CVar_SetS32("gClimbSpeed", 1); + CVar_SetS32("gClimbSpeed", 3); // Faster Heavy Block Lift CVar_SetS32("gFasterHeavyBlockLift", 1); // No Forced Navi @@ -382,6 +403,8 @@ namespace GameMenuBar { CVar_SetS32("gFastBoomerang", 1); // Mask Select in Inventory CVar_SetS32("gMaskSelect", 1); + // Always Win Goron Pot + CVar_SetS32("gGoronPot", 1); // Always Win Dampe Digging CVar_SetS32("gDampeWin", 1); @@ -390,8 +413,8 @@ namespace GameMenuBar { // Equipment Toggle CVar_SetS32("gEquipmentCanBeRemoved", 1); - // Count Golden Skulltulas - CVar_SetS32("gInjectSkulltulaCount", 1); + // Link's Cow in Both Time Periods + CVar_SetS32("gCowOfTime", 1); // Enable 3D Dropped items/projectiles CVar_SetS32("gNewDrops", 1); @@ -418,7 +441,7 @@ namespace GameMenuBar { // Pull grave during the day CVar_SetS32("gDayGravePull", 1); // Pull out Ocarina to Summon Scarecrow - CVar_SetS32("gSkipScarecrow", 0); + CVar_SetS32("gSkipScarecrow", 1); // Pause link animation (0 to 16) CVar_SetS32("gPauseLiveLink", 16); @@ -667,13 +690,14 @@ namespace GameMenuBar { ImGui::PopStyleVar(3); ImGui::PopStyleColor(1); - // TODO mutual exclusions -- There should be some system to prevent conclifting enhancements from being selected - UIWidgets::PaddedEnhancementCheckbox("D-pad Support on Pause and File Select", "gDpadPauseName"); - UIWidgets::Tooltip("Enables Pause and File Select screen navigation with the D-pad\nIf used with D-pad as Equip Items, you must hold C-Up to equip instead of navigate"); - UIWidgets::PaddedEnhancementCheckbox("D-pad Support in Text Choice", "gDpadText", true, false); - UIWidgets::PaddedEnhancementCheckbox("D-pad Support for Browsing Shop Items", "gDpadShop", true, false); + UIWidgets::PaddedEnhancementCheckbox("D-pad Support on Pause Screen", "gDpadPause", true, false); + UIWidgets::Tooltip("Navigate Pause with the D-pad\nIf used with D-pad as Equip Items, you must hold C-Up to equip instead of navigate\n" + "To make the cursor only move a single space no matter how long a direction is held, manually set gDpadHoldChange to 0"); + UIWidgets::PaddedEnhancementCheckbox("D-pad Support in Text Boxes", "gDpadText", true, false); + UIWidgets::Tooltip("Navigate choices in text boxes, shop item selection, and the file select / name entry screens with the D-pad\n" + "To make the cursor only move a single space during name entry no matter how long a direction is held, manually set gDpadHoldChange to 0"); UIWidgets::PaddedEnhancementCheckbox("D-pad as Equip Items", "gDpadEquips", true, false); - UIWidgets::Tooltip("Allows the D-pad to be used as extra C buttons"); + UIWidgets::Tooltip("Equip items and equipment on the D-pad\nIf used with D-pad on Pause Screen, you must hold C-Up to equip instead of navigate"); UIWidgets::PaddedEnhancementCheckbox("Allow the cursor to be on any slot", "gPauseAnyCursor", true, false); UIWidgets::Tooltip("Allows the cursor on the pause menu to be over any slot\nSimilar to Rando and Spaceworld 97"); UIWidgets::PaddedEnhancementCheckbox("Answer Navi Prompt with L Button", "gNaviOnL", true, false); diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 1e154ef3b..0939e411f 100644 --- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -951,7 +951,7 @@ s32 EnOssan_FacingShopkeeperDialogResult(EnOssan* this, GlobalContext* globalCtx void EnOssan_State_FacingShopkeeper(EnOssan* this, GlobalContext* globalCtx, Player* player) { Input* input = &globalCtx->state.input[0]; u8 nextIndex; - bool dpad = CVar_GetS32("gDpadShop", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CHOICE) && !EnOssan_TestEndInteraction(this, globalCtx, &globalCtx->state.input[0])) { @@ -1030,7 +1030,7 @@ void EnOssan_CursorUpDown(EnOssan* this, GlobalContext* globalCtx) { Input* input = &globalCtx->state.input[0]; u8 curTemp = this->cursorIndex; u8 curScanTemp; - bool dpad = CVar_GetS32("gDpadShop", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if ((this->stickAccumY < 0) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) { curTemp &= 0xFE; @@ -1183,7 +1183,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, GlobalContext* globalCtx, Play u8 prevIndex = this->cursorIndex; s32 c; s32 d; - bool dpad = CVar_GetS32("gDpadShop", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if (!EnOssan_ReturnItemToShelf(this)) { osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); @@ -1243,7 +1243,7 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, GlobalContext* globalCtx, Pla s32 pad[2]; u8 prevIndex; u8 nextIndex; - bool dpad = CVar_GetS32("gDpadShop", 0); + bool dpad = CVar_GetS32("gDpadText", 0); prevIndex = this->cursorIndex; if (!EnOssan_ReturnItemToShelf(this)) { 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 9a54ec350..d086f69c4 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 @@ -394,7 +394,7 @@ void FileChoose_UpdateMainMenu(GameState* thisx) { static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E }; FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if (CVar_GetS32("gRandoGenerating", 0) != 0 && generating == 0) { generating = 1; @@ -1591,7 +1591,7 @@ void FileChoose_FadeInFileInfo(GameState* thisx) { void FileChoose_ConfirmFile(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if (CHECK_BTN_ALL(input->press.button, BTN_START) || (CHECK_BTN_ALL(input->press.button, BTN_A))) { if (this->confirmButtonIndex == FS_BTN_CONFIRM_YES) { @@ -1897,7 +1897,7 @@ void FileChoose_Main(GameState* thisx) { this->stickRelX = input->rel.stick_x; this->stickRelY = input->rel.stick_y; - if (CVar_GetS32("gDpadHoldChange", 1) && CVar_GetS32("gDpadPauseName", 0)) { + if (CVar_GetS32("gDpadHoldChange", 1) && CVar_GetS32("gDpadText", 0)) { if (CHECK_BTN_ALL(input->cur.button, BTN_DLEFT)) { if (CHECK_BTN_ALL(input->press.button, BTN_DLEFT)) { this->inputTimerX = 10; diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index 8cba502b5..8ca49b33a 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -61,7 +61,7 @@ void FileChoose_SetupCopySource(GameState* thisx) { void FileChoose_SelectCopySource(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if (((this->buttonIndex == FS_BTN_COPY_QUIT) && CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) || CHECK_BTN_ALL(input->press.button, BTN_B)) { @@ -173,7 +173,7 @@ void FileChoose_SetupCopyDest2(GameState* thisx) { void FileChoose_SelectCopyDest(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if (((this->buttonIndex == FS_BTN_COPY_QUIT) && CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) || CHECK_BTN_ALL(input->press.button, BTN_B)) { @@ -357,7 +357,7 @@ void FileChoose_CopyConfirm(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; u16 dayTime; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if (((this->buttonIndex != FS_BTN_CONFIRM_YES) && CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) || CHECK_BTN_ALL(input->press.button, BTN_B)) { @@ -675,7 +675,7 @@ void FileChoose_SetupEraseSelect(GameState* thisx) { void FileChoose_EraseSelect(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if (((this->buttonIndex == FS_BTN_COPY_QUIT) && CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) || CHECK_BTN_ALL(input->press.button, BTN_B)) { @@ -812,7 +812,7 @@ void FileChoose_SetupEraseConfirm2(GameState* thisx) { void FileChoose_EraseConfirm(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); if (((this->buttonIndex != FS_BTN_CONFIRM_YES) && CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) || CHECK_BTN_ALL(input->press.button, BTN_B)) { 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 e1a0aae74..5a9550827 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 @@ -533,7 +533,7 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; s16 prevKbdX; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); this->kbdButton = 99; @@ -678,7 +678,7 @@ static u8 sSelectedSetting; void FileChoose_UpdateOptionsMenu(GameState* thisx) { FileChooseContext* this = (FileChooseContext*)thisx; Input* input = &this->state.input[0]; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadText", 0); 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); diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index db0c10360..b002074a9 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -82,7 +82,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx s16 pad2; s16 phi_s0_2; s16 sp208[3]; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadPause", 0); OPEN_DISPS(gfxCtx); diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 23f60d75f..1b37c5433 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -176,7 +176,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) { s16 cursorX; s16 cursorY; s16 oldCursorPoint; - bool dpad = (CVar_GetS32("gDpadPauseName", 0) && !CHECK_BTN_ALL(input->cur.button, BTN_CUP)); + bool dpad = (CVar_GetS32("gDpadPause", 0) && !CHECK_BTN_ALL(input->cur.button, BTN_CUP)); OPEN_DISPS(globalCtx->state.gfxCtx); @@ -503,7 +503,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) { KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->equipVtx); u16 buttonsToCheck = BTN_A | BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT; - if (CVar_GetS32("gDpadEquips", 0) && (!CVar_GetS32("gDpadPauseName", 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) { + if (CVar_GetS32("gDpadEquips", 0) && (!CVar_GetS32("gDpadPause", 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) { buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT; } diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index e5d816d67..9e133b150 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -97,7 +97,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) { s16 cursorY; s16 oldCursorPoint; s16 moveCursorResult; - bool dpad = (CVar_GetS32("gDpadPauseName", 0) && !CHECK_BTN_ALL(input->cur.button, BTN_CUP)); + bool dpad = (CVar_GetS32("gDpadPause", 0) && !CHECK_BTN_ALL(input->cur.button, BTN_CUP)); OPEN_DISPS(globalCtx->state.gfxCtx); @@ -386,7 +386,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) { gSelectingMask = cursorSlot == SLOT_TRADE_CHILD; } u16 buttonsToCheck = BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT; - if (CVar_GetS32("gDpadEquips", 0) && (!CVar_GetS32("gDpadPauseName", 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) { + if (CVar_GetS32("gDpadEquips", 0) && (!CVar_GetS32("gDpadPause", 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) { buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT; } if (CHECK_BTN_ANY(input->press.button, buttonsToCheck)) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c index 9e9d2791e..028d7d82c 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c @@ -52,7 +52,7 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC s16 stepG; s16 stepB; u16 rgba16; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadPause", 0); OPEN_DISPS(gfxCtx); @@ -419,7 +419,7 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx s16 stepR; s16 stepG; s16 stepB; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadPause", 0); OPEN_DISPS(gfxCtx); diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c index bfb4897d8..bc41fddba 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c @@ -7,7 +7,7 @@ void KaleidoScope_UpdatePrompt(GlobalContext* globalCtx) { Input* input = &globalCtx->state.input[0]; s8 relStickX = input->rel.stick_x; s16 step; - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadPause", 0); if (((pauseCtx->state == 7) && (pauseCtx->unk_1EC == 1)) || (pauseCtx->state == 0xE) || (pauseCtx->state == 0x10)) { if ((pauseCtx->promptChoice == 0) && ((relStickX >= 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)))) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 923dafba7..a4a5c725f 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -963,7 +963,7 @@ void KaleidoScope_HandlePageToggles(PauseContext* pauseCtx, Input* input) { return; } - bool dpad = CVar_GetS32("gDpadPauseName", 0); + bool dpad = CVar_GetS32("gDpadPause", 0); if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) { if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->cur.button, BTN_DLEFT))) { pauseCtx->pageSwitchTimer++; @@ -1176,7 +1176,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { } } - if (CVar_GetS32("gDpadHoldChange", 1) && CVar_GetS32("gDpadPauseName", 0)) { + if (CVar_GetS32("gDpadHoldChange", 1) && CVar_GetS32("gDpadPause", 0)) { if (CHECK_BTN_ALL(input->cur.button, BTN_DLEFT)) { if (CHECK_BTN_ALL(input->press.button, BTN_DLEFT)) { D_8082AD44 = XREG(8);