summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--soh/soh/Enhancements/bootcommands.c2
-rw-r--r--soh/src/code/padmgr.c13
-rw-r--r--soh/src/code/z_kaleido_setup.c15
-rw-r--r--soh/src/code/z_play.c9
-rw-r--r--soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c6
5 files changed, 27 insertions, 18 deletions
diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index 05a682101..385a544a6 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -26,6 +26,8 @@ void BootCommands_Init()
CVarClear("gOnFileSelectNameEntry"); // Clear when soh is killed on the file name entry page
CVarClear("gBetterDebugWarpScreenMQMode");
CVarClear("gBetterDebugWarpScreenMQModeScene");
+ CVarClear("gCheatEasyPauseBufferLastInputs");
+ CVarClear("gCheatEasyPauseBufferTimer");
#if defined(__SWITCH__) || defined(__WIIU__)
CVarRegisterInteger("gControlNav", 1); // always enable controller nav on switch/wii u
#endif
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index 81227f11e..b8d8d8b05 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -287,6 +287,13 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
Fault_AddHungupAndCrash(__FILE__, __LINE__);
}
+ // When 3 frames are left on easy pause buffer, re-apply the last held inputs to the prev inputs
+ // to compute the pressed difference. This makes it so previously held inputs are continued as "held",
+ // but new inputs when unpausing are "pressed" out of the pause menu.
+ if (CVarGetInteger("gCheatEasyPauseBufferTimer", 0) == 3) {
+ input->prev.button = CVarGetInteger("gCheatEasyPauseBufferLastInputs", 0);
+ }
+
buttonDiff = input->prev.button ^ input->cur.button;
input->press.button |= (u16)(buttonDiff & input->cur.button);
input->rel.button |= (u16)(buttonDiff & input->prev.button);
@@ -298,12 +305,6 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
uint8_t rumble = (padMgr->rumbleEnable[0] > 0);
OTRControllerCallback(rumble);
- if (CVarGetInteger("gPauseBufferBlockInputFrame", 0)) {
- ControllerBlockGameInput(PAUSE_BUFFER_INPUT_BLOCK_ID);
- } else {
- ControllerUnblockGameInput(PAUSE_BUFFER_INPUT_BLOCK_ID);
- }
-
PadMgr_UnlockPadData(padMgr);
}
diff --git a/soh/src/code/z_kaleido_setup.c b/soh/src/code/z_kaleido_setup.c
index 94cb91d49..a335c2460 100644
--- a/soh/src/code/z_kaleido_setup.c
+++ b/soh/src/code/z_kaleido_setup.c
@@ -18,15 +18,24 @@ void KaleidoSetup_Update(PlayState* play) {
play->shootingGalleryStatus <= 1 && gSaveContext.magicState != 8 && gSaveContext.magicState != 9 &&
(play->sceneNum != SCENE_BOWLING || !Flags_GetSwitch(play, 0x38))) {
- if (CVarGetInteger("gCheatEasyPauseBufferFrameAdvance", 0) == 2 && !CHECK_BTN_ALL(input->press.button, BTN_START)) {
- CVarSetInteger("gCheatEasyPauseBufferFrameAdvance", 0);
+ u8 easyPauseBufferEnabled = CVarGetInteger("gCheatEasyPauseBufferEnabled", 0);
+ u8 easyPauseBufferTimer = CVarGetInteger("gCheatEasyPauseBufferTimer", 0);
+
+ // If start is not seen as pressed on the 2nd to last frame then we should end the easy frame advance flow
+ if (easyPauseBufferEnabled && easyPauseBufferTimer == 2 &&
+ !CHECK_BTN_ALL(input->press.button, BTN_START)) {
+ CVarSetInteger("gCheatEasyPauseBufferTimer", 0);
}
if (CHECK_BTN_ALL(input->cur.button, BTN_L) && CHECK_BTN_ALL(input->press.button, BTN_CUP)) {
if (BREG(0)) {
pauseCtx->debugState = 3;
}
- } else if ((CHECK_BTN_ALL(input->press.button, BTN_START) && !CVarGetInteger("gCheatEasyPauseBufferFrameAdvance", 0)) || CVarGetInteger("gCheatEasyPauseBufferFrameAdvance", 0) == 1) {
+ } else if ((CHECK_BTN_ALL(input->press.button, BTN_START) && (!easyPauseBufferEnabled || !easyPauseBufferTimer)) ||
+ (easyPauseBufferEnabled && easyPauseBufferTimer == 1)) { // Force Kaleido open when easy pause buffer reaches 0
+ // Remember last held buttons for pause buffer cheat (minus start so easy frame advance works)
+ CVarSetInteger("gCheatEasyPauseBufferLastInputs", input->cur.button & ~(BTN_START));
+
gSaveContext.unk_13EE = gSaveContext.unk_13EA;
if (CHECK_BTN_ALL(input->cur.button, BTN_L))
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 935b8b690..f6c6ed4d9 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -1754,12 +1754,11 @@ time_t Play_GetRealTime() {
void Play_Main(GameState* thisx) {
PlayState* play = (PlayState*)thisx;
- if (CVarGetInteger("gCheatEasyPauseBufferFrameAdvance", 0)) {
- CVarSetInteger("gCheatEasyPauseBufferFrameAdvance", CVarGetInteger("gCheatEasyPauseBufferFrameAdvance", 0) - 1);
- }
- if (CVarGetInteger("gPauseBufferBlockInputFrame", 0)) {
- CVarSetInteger("gPauseBufferBlockInputFrame", CVarGetInteger("gPauseBufferBlockInputFrame", 0) - 1);
+ // Decrease the easy pause buffer timer every frame
+ if (CVarGetInteger("gCheatEasyPauseBufferTimer", 0) > 0) {
+ CVarSetInteger("gCheatEasyPauseBufferTimer", CVarGetInteger("gCheatEasyPauseBufferTimer", 0) - 1);
}
+
if (play->envCtx.unk_EE[2] == 0 && CVarGetInteger("gLetItSnow", 0)) {
play->envCtx.unk_EE[3] = 64;
Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_OBJECT_KANKYO, 0, 0, 0, 0, 0, 0, 3, 0);
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 e8478e00a..7802f304b 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
@@ -3649,10 +3649,8 @@ void KaleidoScope_Update(PlayState* play)
if (CHECK_BTN_ALL(input->press.button, BTN_START) ||
(CHECK_BTN_ALL(input->press.button, BTN_B) && gSaveContext.isBossRush)) {
if (CVarGetInteger("gCheatEasyPauseBufferEnabled", 0) || CVarGetInteger("gCheatEasyInputBufferingEnabled", 0)) {
- CVarSetInteger("gPauseBufferBlockInputFrame", 9);
- }
- if (CVarGetInteger("gCheatEasyPauseBufferEnabled", 0)) {
- CVarSetInteger("gCheatEasyPauseBufferFrameAdvance", 13);
+ // Easy pause buffer is 13 frames, 12 for kaledio to end, and one more to advance a single frame
+ CVarSetInteger("gCheatEasyPauseBufferTimer", 13);
}
Interface_SetDoAction(play, DO_ACTION_NONE);
pauseCtx->state = 0x12;
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-18 07:08:06 +0000