mirror of
https://github.com/n64decomp/sm64
synced 2026-05-01 03:23:44 +00:00
36 lines
1.7 KiB
Plaintext
36 lines
1.7 KiB
Plaintext
diff a/levels/menu/script.c b/levels/menu/script.c (rejected hunks)
|
|
@@ -53,7 +53,7 @@ const LevelScript level_main_menu_entry_1[] = {
|
|
SLEEP(/*frames*/ 16),
|
|
CLEAR_LEVEL(),
|
|
SLEEP_BEFORE_EXIT(/*frames*/ 1),
|
|
- SET_REG(/*value*/ LEVEL_CASTLE_GROUNDS),
|
|
+ SET_REG(LEVEL_CASTLE_GROUNDS),
|
|
EXIT_AND_EXECUTE(/*seg*/ 0x15, _scriptsSegmentRomStart, _scriptsSegmentRomEnd, level_main_scripts_entry),
|
|
};
|
|
|
|
@@ -72,18 +72,16 @@ const LevelScript level_main_menu_entry_2[] = {
|
|
|
|
/*25*/ FREE_LEVEL_POOL(),
|
|
/*26*/ LOAD_AREA(/*area*/ 2),
|
|
-#ifdef NO_SEGMENTED_MEMORY
|
|
- // sVisibleStars is set to 0 during FIXED_LOAD above on N64, but not when NO_SEGMENTED_MEMORY is used.
|
|
- // lvl_init_act_selector_values_and_stars must be called here otherwise the previous
|
|
- // value is retained and causes incorrect drawing during the 16 transition frames.
|
|
+
|
|
+ // sVisibleStars is set to 0 during FIXED_LOAD above on N64, but not on PC-port.
|
|
+ // lvl_init_act_selector_values_and_stars must be called here otherwise the
|
|
+ // previous value is retained and causes incorrect drawing during the 16 transition
|
|
+ // frames.
|
|
CALL(/*arg*/ 0, /*func*/ lvl_init_act_selector_values_and_stars),
|
|
-#endif
|
|
+
|
|
/*27*/ TRANSITION(/*transType*/ WARP_TRANSITION_FADE_FROM_COLOR, /*time*/ 16, /*color*/ 0xFF, 0xFF, 0xFF),
|
|
/*29*/ SLEEP(/*frames*/ 16),
|
|
/*30*/ SET_MENU_MUSIC(/*seq*/ 0x000D),
|
|
-#ifndef NO_SEGMENTED_MEMORY
|
|
- /*31*/ CALL(/*arg*/ 0, /*func*/ lvl_init_act_selector_values_and_stars),
|
|
-#endif
|
|
/*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),
|