From be3de38e26d42b6c019eb656a72fb2fd54292817 Mon Sep 17 00:00:00 2001 From: owlisnotacat1 <118146757+owlisnotacat1@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:08:38 -0600 Subject: [PATCH] run CI.py --- ASM/c/kaleido_scope.c | 2 +- ASM/c/kaleido_scope.h | 2 +- ASM/c/z64.h | 6 +++--- ASM/src/hacks/z_kaleido_scope.asm | 10 +++++----- ASM/src/pause.asm | 2 +- data/presets_default.json | 11 +++++++++++ 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ASM/c/kaleido_scope.c b/ASM/c/kaleido_scope.c index 7f14c1c37..0d826233c 100644 --- a/ASM/c/kaleido_scope.c +++ b/ASM/c/kaleido_scope.c @@ -69,7 +69,7 @@ void kaleidoScope_Case7(z64_game_t* play) { DmaMgr_RequestSync(ICON_STATIC_GAME_OVER, 0x00860000, 0x3300); } } - + } else if (play->common.input[0].pad_pressed.s || play->common.input[0].pad_pressed.b) { Interface_SetDoAction(play, DO_ACTION_NONE); diff --git a/ASM/c/kaleido_scope.h b/ASM/c/kaleido_scope.h index e270dc547..c5c83b576 100644 --- a/ASM/c/kaleido_scope.h +++ b/ASM/c/kaleido_scope.h @@ -70,4 +70,4 @@ typedef enum HudVisibilityMode { /* 13 */ HUD_VISIBILITY_HEARTS_MAGIC_FORCE, // See above /* 50 */ HUD_VISIBILITY_ALL = 50, // Only raises button alphas if not disabled /* 52 */ HUD_VISIBILITY_NOTHING_INSTANT = 52 -} HudVisibilityMode; \ No newline at end of file +} HudVisibilityMode; diff --git a/ASM/c/z64.h b/ASM/c/z64.h index 129f9dafb..83c894b6e 100644 --- a/ASM/c/z64.h +++ b/ASM/c/z64.h @@ -1215,8 +1215,8 @@ typedef struct { uint16_t changing; /* 0x01E4 */ uint16_t screen_prev_idx; /* 0x01E6 */ uint16_t screen_idx; /* 0x01E8 */ - uint16_t pageSwitchTimer; /* 0x01EA */ - uint16_t unk_1EC; /* 0x01EC */ + uint16_t pageSwitchTimer; /* 0x01EA */ + uint16_t unk_1EC; /* 0x01EC */ float unk_1F0; /* 0x01F0 */ float unk_1F4; /* 0x01F4 */ float unk_1F8; /* 0x01F8 */ @@ -1956,7 +1956,7 @@ typedef enum { PAUSE_STATE_RETURN_TO_TITLE_PROMPT, PAUSE_STATE_REUTRN_TO_TITLE, PAUSE_STATE_RETURN_PROMPT_CLOSE, - + } PauseState; // Sub-states of PAUSE_STATE_MAIN diff --git a/ASM/src/hacks/z_kaleido_scope.asm b/ASM/src/hacks/z_kaleido_scope.asm index 2ae87449c..bdf6692ed 100644 --- a/ASM/src/hacks/z_kaleido_scope.asm +++ b/ASM/src/hacks/z_kaleido_scope.asm @@ -17,7 +17,7 @@ kaleidoScope_draw_select_hack_return: .org 0x808264dc b kaleidoScope_SwitchCaseHack ; this branch is to a modified version of the pauseCtx->state switch case - ori at, at, 0x760 ; replaced code + ori at, at, 0x760 ; replaced code nop nop nop @@ -75,12 +75,12 @@ KaleidoScope_Draw_ContinuePromtHack_return: .org 0x80827690 kaleidoScope_SwitchCaseHack: - addu s0, s1, at + addu s0, s1, at lui at, 0x8082 addiu at, 0xA388 lui t8, hi(D_8082B25C_RELOCATED) addiu t8, t8, lo(D_8082B25C_RELOCATED) - sw at, 0(t8) + sw at, 0(t8) lhu t8, 0x01D4(s0) ; loads pauseCtx->state into t8 ori at, zero, 20 beq t8, at, @@case20 ; jumps to case 20 function (not working yet but thats not the issue) @@ -107,7 +107,7 @@ kaleidoScope_SwitchCaseHack: @@case22: b 0x808287D8 ; jumps to case 17 nop - + ;0x8039CAA4 KaleidoScope_DrawPages_ConditionHack: addiu at, zero, 7 @@ -174,4 +174,4 @@ kaleidoScope_draw_select_hack: beq a1, at, kaleidoScope_draw_select_hack_return nop b 0x808226d4 - nop \ No newline at end of file + nop diff --git a/ASM/src/pause.asm b/ASM/src/pause.asm index c88d7e77e..5fe70f652 100644 --- a/ASM/src/pause.asm +++ b/ASM/src/pause.asm @@ -55,4 +55,4 @@ CFG_SAVE_AND_QUIT: .align 0x10 CONTINUE_PROMPT_TEX: .area 0x980, 0 -.endarea \ No newline at end of file +.endarea diff --git a/data/presets_default.json b/data/presets_default.json index 140c7bade..cdb9a3f4a 100644 --- a/data/presets_default.json +++ b/data/presets_default.json @@ -136,6 +136,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": false, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 1, "big_poe_count_random": false, @@ -352,6 +353,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": false, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 3, "big_poe_count_random": false, @@ -559,6 +561,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": true, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 3, "big_poe_count_random": false, @@ -773,6 +776,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": false, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 7, "big_poe_count_random": false, @@ -989,6 +993,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": true, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 3, "big_poe_count_random": false, @@ -1199,6 +1204,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": true, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 3, "big_poe_count_random": false, @@ -1593,6 +1599,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": false, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 7, "big_poe_count_random": false, @@ -1785,6 +1792,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": false, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 7, "big_poe_count_random": false, @@ -2009,6 +2017,7 @@ "fae_torch_count": 3, "ruto_already_f1_jabu": true, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 3, "big_poe_count_random": false, @@ -2229,6 +2238,7 @@ "fae_torch_count": 5, "ruto_already_f1_jabu": false, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": false, "chicken_count": 3, "big_poe_count_random": false, @@ -2414,6 +2424,7 @@ "fae_torch_count": 2, "ruto_already_f1_jabu": false, "fast_shadow_boat": false, + "save_and_quit_from_pause": false, "chicken_count_random": true, "chicken_count": 2, "big_poe_count_random": false,