From cd2970ad137cf72a162022e67445470a84af127d Mon Sep 17 00:00:00 2001
From: Prince Frizzy <theclashingfritz@users.noreply.github.com>
Date: Sun, 30 Apr 2023 22:12:37 -0400
Subject: [PATCH] Decrease the sleep times in some spots, We do not need them
 to be so long. (#373)

---
 levels/menu/script.c    | 6 +++---
 levels/scripts.c        | 2 +-
 src/game/level_update.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/levels/menu/script.c b/levels/menu/script.c
index 4e955c12..c191ac8c 100644
--- a/levels/menu/script.c
+++ b/levels/menu/script.c
@@ -50,7 +50,7 @@ const LevelScript level_main_menu_entry_1[] = {
     GET_OR_SET(/*op*/ OP_SET, /*var*/ VAR_CURR_SAVE_FILE_NUM),
     STOP_MUSIC(/*fadeOutTime*/ 0x00BE),
     TRANSITION(/*transType*/ WARP_TRANSITION_FADE_INTO_COLOR, /*time*/ 16, /*color*/ 0xFF, 0xFF, 0xFF),
-    SLEEP(/*frames*/ 16),
+    SLEEP(/*frames*/ 8), // Was 16 frames
     CLEAR_LEVEL(),
     SLEEP_BEFORE_EXIT(/*frames*/ 1),
     SET_REG(/*value*/ LEVEL_CASTLE_GROUNDS),
@@ -80,13 +80,13 @@ const LevelScript level_main_menu_entry_2[] = {
            CALL(/*arg*/ 0, /*func*/ lvl_init_act_selector_values_and_stars),
 
     /*27*/ TRANSITION(/*transType*/ WARP_TRANSITION_FADE_FROM_COLOR, /*time*/ 16, /*color*/ 0xFF, 0xFF, 0xFF),
-    /*29*/ SLEEP(/*frames*/ 16),
+    /*29*/ SLEEP(/*frames*/ 8), // Was 16 frames
     /*30*/ SET_MENU_MUSIC(/*seq*/ 0x000D),
     /*33*/ CALL_LOOP(/*arg*/ 0, /*func*/ lvl_update_obj_and_load_act_button_actions),
     /*35*/ GET_OR_SET(/*op*/ OP_SET, /*var*/ VAR_CURR_ACT_NUM),
     /*36*/ STOP_MUSIC(/*fadeOutTime*/ 0x00BE),
     /*37*/ TRANSITION(/*transType*/ WARP_TRANSITION_FADE_INTO_COLOR, /*time*/ 16, /*color*/ 0xFF, 0xFF, 0xFF),
-    /*39*/ SLEEP(/*frames*/ 16),
+    /*39*/ SLEEP(/*frames*/ 10), // Was 16 frames
     /*40*/ CLEAR_LEVEL(),
     /*41*/ SLEEP_BEFORE_EXIT(/*frames*/ 1),
     // L1:
diff --git a/levels/scripts.c b/levels/scripts.c
index c0f7a231..f48c4d9e 100644
--- a/levels/scripts.c
+++ b/levels/scripts.c
@@ -151,7 +151,7 @@ const LevelScript level_main_scripts_entry[] = {
     LOOP_BEGIN(),
         EXECUTE(/*seg*/ 0x14, _menuSegmentRomStart, _menuSegmentRomEnd, level_main_menu_entry_2),
         JUMP_LINK(script_exec_level_table),
-        SLEEP(/*frames*/ 1),
+        //SLEEP(/*frames*/ 1),
     LOOP_UNTIL(/*op*/ OP_LT, /*arg*/ 0),
     JUMP_IF(/*op*/ OP_EQ, /*arg*/ -1, script_L2),
     JUMP_IF(/*op*/ OP_EQ, /*arg*/ -2, goto_mario_head_regular),
diff --git a/src/game/level_update.c b/src/game/level_update.c
index b3a65a37..dbc4223a 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -278,7 +278,7 @@ void fade_into_special_warp(u32 arg, u32 color) {
 
     fadeout_music(190);
     play_transition(WARP_TRANSITION_FADE_INTO_COLOR, 0x10, color, color, color);
-    level_set_transition(30, NULL);
+    level_set_transition(16, NULL);
 
     warp_special(arg);
 }