Skip to content

Commit

Permalink
Merge pull request sm64-port#31 from Zero-Shift/master
Browse files Browse the repository at this point in the history
Merged. Thanks for your contribution!

"Changed amount of sleep frames when transitioning from main menu and exiting a stage to fix TAS sync issues."
  • Loading branch information
vrmiguel authored May 10, 2020
2 parents b433139 + 3f9236a commit 19252e4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions levels/menu/script.c
Original file line number Diff line number Diff line change
Expand Up @@ -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*/ 24),
SLEEP(/*frames*/ 16),
CLEAR_LEVEL(),
SLEEP_BEFORE_EXIT(/*frames*/ 1),
SET_REG(/*value*/ LEVEL_CASTLE_GROUNDS),
Expand Down Expand Up @@ -89,7 +89,7 @@ const LevelScript level_main_menu_entry_2[] = {
/*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*/ 24),
/*39*/ SLEEP(/*frames*/ 16),
/*40*/ CLEAR_LEVEL(),
/*41*/ SLEEP_BEFORE_EXIT(/*frames*/ 1),
// L1:
Expand Down

0 comments on commit 19252e4

Please sign in to comment.