refresh 4

levels/menu/leveldata.c

@@ -9,15 +9,11 @@
 
 #include "make_const_nonconst.h"
 
-// 0x07000000 - 0x07000008
-static const Ambient ambient_light_menu_1 = {
-    {{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
-};
-
-// 0x07000008 - 0x07000018
-static const Light diffuse_light_menu_1 = {
-    {{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
-};
+// 0x07000000 - 0x07000018
+static const Lights1 lights_menu_save_button = gdSPDefLights1(
+    0x3f, 0x3f, 0x3f,
+    0xff, 0xff, 0xff, 0x28, 0x28, 0x28
+);
 
 // 0x07000018 - 0x07000818
 ALIGNED8 static const u8 texture_menu_stone[] = {
@@ -82,8 +78,8 @@ static const Gfx dl_tex_block_menu_save_button_base[] = {
 
 // 0x070031A0 - 0x07003218
 static const Gfx dl_vertex_menu_save_button_borders[] = {
-    gsSPLight(&diffuse_light_menu_1, 1),
-    gsSPLight(&ambient_light_menu_1, 2),
+    gsSPLight(&lights_menu_save_button.l, 1),
+    gsSPLight(&lights_menu_save_button.a, 2),
     gsSPVertex(vertex_menu_save_button_borders, 16, 0),
     gsSP2Triangles( 0,  1,  2, 0x0,  1,  3,  2, 0x0),
     gsSP2Triangles( 4,  5,  6, 0x0,  5,  7,  6, 0x0),
@@ -129,8 +125,8 @@ static const Gfx dl_tex_block_menu_save_button_back[] = {
 
 // 0x070032E0 - 0x07003330
 static const Gfx dl_vertex_menu_save_button_back[] = {
-    gsSPLight(&diffuse_light_menu_1, 1),
-    gsSPLight(&ambient_light_menu_1, 2),
+    gsSPLight(&lights_menu_save_button.l, 1),
+    gsSPLight(&lights_menu_save_button.a, 2),
     gsSPVertex(vertex_menu_save_button_back, 4, 0),
     gsSP2Triangles( 0,  1,  2, 0x0,  1,  3,  2, 0x0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@@ -182,8 +178,8 @@ const Gfx dl_menu_save_button_back[] = {
 const Gfx dl_menu_save_button_fade_back[] = {
     gsDPPipeSync(),
     gsSPClearGeometryMode(G_SHADING_SMOOTH),
-    gsSPLight(&diffuse_light_menu_1, 1),
-    gsSPLight(&ambient_light_menu_1, 2),
+    gsSPLight(&lights_menu_save_button.l, 1),
+    gsSPLight(&lights_menu_save_button.a, 2),
     gsSPVertex(vertex_menu_save_button_back, 4, 0),
     gsSP2Triangles( 0,  1,  2, 0x0,  1,  3,  2, 0x0),
     gsDPPipeSync(),
@@ -191,15 +187,11 @@ const Gfx dl_menu_save_button_fade_back[] = {
     gsSPEndDisplayList(),
 };
 
-// 0x07003450 - 0x07003458
-static const Ambient ambient_light_menu_2 = {
-    {{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
-};
-
-// 0x07003458 - 0x07003468
-static const Light diffuse_light_menu_2 = {
-    {{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
-};
+// 0x07003450 - 0x07003468
+static const Lights1 lights_menu_main_button = gdSPDefLights1(
+    0x3f, 0x3f, 0x3f,
+    0xff, 0xff, 0xff, 0x28, 0x28, 0x28
+);
 
 // 0x07003468 - 0x07003468
 ALIGNED8 static const u8 texture_menu_erase[] = {
@@ -305,8 +297,8 @@ static const Vtx vertex_menu_main_button_group4[] = {
 
 // 0x07006038 - 0x07006150
 static const Gfx dl_vertex_menu_main_button[] = {
-    gsSPLight(&diffuse_light_menu_2, 1),
-    gsSPLight(&ambient_light_menu_2, 2),
+    gsSPLight(&lights_menu_main_button.l, 1),
+    gsSPLight(&lights_menu_main_button.a, 2),
     gsSPVertex(vertex_menu_main_button_group1, 16, 0),
     gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  5, 0x0),
     gsSP2Triangles( 6,  7,  8, 0x0,  6,  9,  7, 0x0),

levels/menu/script.c

@@ -6,6 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
+#include "game/area.h"
 #include "game/level_update.h"
 #include "menu/file_select.h"
 #include "menu/star_select.h"
@@ -43,16 +44,16 @@ const LevelScript level_main_menu_entry_1[] = {
     FREE_LEVEL_POOL(),
     LOAD_AREA(/*area*/ 1),
     SET_MENU_MUSIC(/*seq*/ 0x0021),
-    TRANSITION(/*transType*/ 0, /*time*/ 16, /*color*/ -1, -1, -1),
+    TRANSITION(/*transType*/ WARP_TRANSITION_FADE_FROM_COLOR, /*time*/ 16, /*color*/ 0xFF, 0xFF, 0xFF),
     CALL(/*arg*/ 0, /*func*/ lvl_init_menu_values_and_cursor_pos),
     CALL_LOOP(/*arg*/ 0, /*func*/ lvl_update_obj_and_load_file_selected),
     GET_OR_SET(/*op*/ OP_SET, /*var*/ VAR_CURR_SAVE_FILE_NUM),
     STOP_MUSIC(/*fadeOutTime*/ 0x00BE),
-    TRANSITION(/*transType*/ 1, /*time*/ 16, /*color*/ -1, -1, -1),
+    TRANSITION(/*transType*/ WARP_TRANSITION_FADE_INTO_COLOR, /*time*/ 16, /*color*/ 0xFF, 0xFF, 0xFF),
     SLEEP(/*frames*/ 16),
     CLEAR_LEVEL(),
     SLEEP_BEFORE_EXIT(/*frames*/ 1),
-    SET_REG(/*value*/ 16),
+    SET_REG(/*value*/ LEVEL_CASTLE_GROUNDS),
     EXIT_AND_EXECUTE(/*seg*/ 0x15, _scriptsSegmentRomStart, _scriptsSegmentRomEnd, level_main_scripts_entry),
 };
 
@@ -71,14 +72,14 @@ const LevelScript level_main_menu_entry_2[] = {
 
     /*25*/ FREE_LEVEL_POOL(),
     /*26*/ LOAD_AREA(/*area*/ 2),
-    /*27*/ TRANSITION(/*transType*/ 0, /*time*/ 16, /*color*/ -1, -1, -1),
+    /*27*/ TRANSITION(/*transType*/ WARP_TRANSITION_FADE_FROM_COLOR, /*time*/ 16, /*color*/ 0xFF, 0xFF, 0xFF),
     /*29*/ SLEEP(/*frames*/ 16),
     /*30*/ SET_MENU_MUSIC(/*seq*/ 0x000D),
     /*31*/ CALL(/*arg*/ 0, /*func*/ lvl_init_act_selector_values_and_stars),
     /*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*/ 1, /*time*/ 16, /*color*/ -1, -1, -1),
+    /*37*/ TRANSITION(/*transType*/ WARP_TRANSITION_FADE_INTO_COLOR, /*time*/ 16, /*color*/ 0xFF, 0xFF, 0xFF),
     /*39*/ SLEEP(/*frames*/ 16),
     /*40*/ CLEAR_LEVEL(),
     /*41*/ SLEEP_BEFORE_EXIT(/*frames*/ 1),